diff --git a/deployed/icagenda/administrator/components/com_icagenda/CHANGELOG.php b/deployed/icagenda/administrator/components/com_icagenda/CHANGELOG.php
new file mode 100644
index 00000000..479737d6
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/CHANGELOG.php
@@ -0,0 +1,4381 @@
+<?php defined('_JEXEC') or die(); ?>
+
+<div style="text-align:center"><img src='../media/com_icagenda/images/iconicagenda48.png' alt='iCagenda' /><br/><big style="color:#555">ChangeLog</big></div>
+================================================================================
+? <center><strong><big>Welcome to iCagenda 3.7.15 release!</big></strong></center><br /><p><strong></strong></p><p>Bug Fix Release.</p><p>Update and take advantage of all the improvements done in lastest version of iCagenda!</p><p><strong>Stay safe!</strong></p><br />
+================================================================================
+: <span class="ic-box-important ic-box-12">!</span><span class="ic-important">important</span>&nbsp;<span class="ic-box-added ic-box-12">+</span><span class="ic-added">added</span>&nbsp;<span class="ic-box-removed ic-box-12">-</span><span class="ic-removed">removed</span>&nbsp;<span class="ic-box-changed ic-box-12">~</span><span class="ic-changed">changed</span>&nbsp;<span class="ic-box-fixed ic-box-12">#</span><span class="ic-fixed">fixed</span><br/><i>Info: access to the beta versions and pre-releases are reserved to users with a valid pro subscription.</i><br/>iCagenda™ is distributed under the terms of the GNU General Public License version 3 or later; see LICENSE.txt.
+================================================================================
+
+
+
+iCagenda 3.7.15 <small style="font-weight:normal;">(2020.08.29)</small>
+================================================================================
+# [LOW] Fixed : Missing default utf-8 title formatting if no option set.
+# [LOW] Fixed : Category filter interaction with module list.
+# [LOW] Fixed : Add next date control in admin list and event view.
+
+* Changed files in 3.7.15
+~ admin/models/events.php
+~ admin/utilities/event/event.php
+~ admin/utilities/events/data.php
+~ admin/utilities/render/render.php
+~ site/add/elements/icevent_vars.php
+
+
+iCagenda 3.7.14 <small style="font-weight:normal;">(2020.04.27)</small> Security & Bug Fix Release
+================================================================================
+# [SECURITY][LOW] Exploit type: Blind SQLi
+1 Severity: Low
+1 Versions: 3.6.0 through 3.7.13
+1 Description: The lack of type casting of a variable in SQL statement leads to a SQL injection vulnerability in the events list view.
++ Added : Search in custom fields value with the frontend global search field.
+# [LOW] Fixed : Missing custom cancellation label in detailled view of event.
+# [LOW] Fixed : Showon display of custom label options (should be hidden if default label).
+# [LOW] Fixed : Removed not used asset_id.
+
+* Changed files in 3.7.14
+~ admin/access.xml
+~ admin/models/forms/event.xml
+~ admin/sql/install/mysql/icagenda.install.sql
+~ admin/utilities/event/event.php
+~ admin/utilities/events/data.php
+~ site/models/submit.php
+~ site/models/forms/submit.xml
+~ site/views/list/tmpl/default_filters.php
+
+
+iCagenda 3.7.13 <small style="font-weight:normal;">(2020.04.02)</small>
+================================================================================
++ Added : custom Cancelled label options (text + style).
+# [LOW] Fixed : module language missing string.
+# [LOW] Fixed : missing redirection on Registration form if closed.
+# [LOW][PLUGIN] Fixed : search routing on multilanguages site.
+
+* Changed files in 3.7.13
+~ admin/models/forms/event.xml
+~ admin/utilities/event/event.php
+~ [PLUGIN] plugins/search/icagenda/icagenda.php
+~ [PLUGIN] plugins/search/icagenda/icagenda.xml
+~ site/views/registration/view.html.php
+
+
+iCagenda 3.7.12 <small style="font-weight:normal;">(2020.03.28)</small>
+================================================================================
++ Added : Event cancellation feature to inform your visitors of events cancelled.
++ Added : Possibility to create custom language constants (Language Overrides) for translation of custom fields (Label and value).
++ Added : Falang custom fields element content xml files (version 2.0).
+# [LOW] Fixed : Participants access view for organizers.
+# [LOW] Fixed : JCE image input width.
+# [LOW] Fixed : Event Title "h" tag in default theme for event details view.
+
+* Changed files in 3.7.12
+~ admin/models/event.php
+~ admin/models/registrations.php
+~ admin/models/forms/event.xml
+~ admin/utilities/event/data.php
+~ admin/utilities/event/event.php
+~ admin/utilities/registration/participants.php
+~ admin/views/event/tmpl/edit.php
+~ admin/views/events/tmpl/default.php
+~ admin/views/registrations/tmpl/default.php
+~ [MEDIA] media/css/icagenda-back.css
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.php
+~ [MODULE][PRO] modules/mod_ic_event_list/tmpl/default.php
+~ [MODULE][PRO] modules/mod_ic_event_list/tmpl/icrounded.php
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ site/add/elements/icevent_vars.php
+~ site/models/registration.php
+~ [THEME] site/themes/packs/default/default_event.php
+~ [THEME] site/themes/packs/default/css/default_component.css
+~ [THEME] site/themes/packs/ic_rounded/css/ic_rounded_component.css
+~ site/views/event/tmpl/default_top.php
+~ site/views/registration/view.html.php
+
+
+iCagenda 3.7.11 <small style="font-weight:normal;">(2019.12.19)</small>
+================================================================================
+~ [THEME] Changed : Remove css max-height for image in event details view
+# [LOW] Fixed : missing alt text for images.
+
+* Changed files in 3.7.11
+~ [LIBRARY] libraries/ic_library/thumb/get.php
+~ [THEME] site/themes/packs/default/css/default_component.css
+~ [THEME] site/themes/packs/ic_rounded/css/ic_rounded_component.css
+
+
+iCagenda 3.7.10 <small style="font-weight:normal;">(2019.08.31)</small>
+================================================================================
++ Added : Prefixe for Search in registrations admin list. EVENTID: to search for an event ID.
++ Added : Missing no results message for Search in admin events list.
++ [GLOBALIZATION] Added : zh-CN Chinese (Simplified) date formats.
++ [MODULE] Added : Chinese languages zh-CN and zh-TW as year before month used for date display of the calendar header.
+~ [THEME] Changed : Removed not needed max-width CSS applied on module calendar for ic_rounded theme
+
+* Changed files in 3.7.10
+~ admin/models/registrations.php
+~ admin/views/events/tmpl/default.php
+~ admin/views/icagenda/tmpl/default.php
++ [LIBRARY] libraries/ic_library/globalize/culture/zh-CN.php
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ [THEME] site/themes/packs/ic_rounded/css/ic_rounded_module.css
+
+
+iCagenda 3.7.9 <small style="font-weight:normal;">(2019.06.13)</small>
+================================================================================
++ Added : character encoding Windows-1256 for registrations export.
++ [GLOBALIZATION] Added : de-CH German (Switzerland) date formats.
+# [LOW] Fixed : admin events list search with non-Latin characters.
+# [LOW] Fixed : zero "0" value not saved if used as an option value in dropdown list type custom field.
+# [LOW] Fixed : x-small thumbnail crop option not saved if disabled.
+# [LOW] Fixed : default published state for registrations export when not firstly filtered.
+
+* Changed files in 3.7.9
+~ admin/controllers/registrations.raw.php
+~ admin/models/events.php
+~ admin/models/fields/modal/thumbs.php
+~ admin/models/forms/download.xml
+~ admin/utilities/customfields/customfields.php
++ [LIBRARY] libraries/ic_library/globalize/culture/de-CH.php
+~ site/models/registration.php
+~ site/models/forms/registration.xml
+
+
+iCagenda 3.7.8 <small style="font-weight:normal;">(2019.01.10)</small>
+================================================================================
+# [LOW] Fixed : while adding a patch for old Joomla 3 versions, Published state control was broken with Joomla 3.9 in release 3.7.7 of iCagenda.
+
+* Changed files in 3.7.8
+~ admin/tables/category.php
+~ admin/tables/customfield.php
+~ admin/tables/event.php
+~ admin/tables/feature.php
+~ admin/tables/registration.php
+
+
+iCagenda 3.7.7 <small style="font-weight:normal;">(2019.01.09)</small>
+================================================================================
++ Added : column indexes to improve sql queries performance.
++ Added : search in dates/period (admin).
+# [LOW] Fixed : for Joomla version before 3.7: do not set column alias.
+# [LOW] Fixed : COM_ICAGENDA_REGISTRATION_REGISTER_BTN string override
+# [LOW] Fixed : missing Export button Joomla before 3.7
+# [LOW] Fixed : gravatar on mobile display.
+
+* Changed files in 3.7.7
+~ admin/models/events.php
+~ admin/sql/install/mysql/icagenda.install.sql
+~ admin/tables/category.php
+~ admin/tables/customfield.php
+~ admin/tables/event.php
+~ admin/tables/feature.php
+~ admin/tables/registration.php
+~ admin/views/registrations/view.html.php
+~ admin/views/registrations/tmpl/default.php
+~ site/icagenda.php
+~ site/views/registration/tmpl/default.php
+
+
+iCagenda 3.7.6 <small style="font-weight:normal;">(2018.11.28)</small>
+================================================================================
+# [LOW] Patch for Joomla 3.9.1: Due to a change in Published state control in Joomla core, the side-effect is published toggle/change state is broken in iCagenda.
+1 This affects too a few parts of Joomla core: com_banners Clients, com_users Notes, com_finder Filters and com_messages. I've created PRs to fix this in next Joomla 3.9.2
+
+* Changed files in 3.7.6
+~ admin/tables/category.php
+~ admin/tables/customfield.php
+~ admin/tables/event.php
+~ admin/tables/feature.php
+~ admin/tables/registration.php
+
+
+iCagenda 3.7.5 <small style="font-weight:normal;">(2018.10.30)</small>
+================================================================================
+! Privacy Tools part.2 : integration with Joomla 3.9 Privacy Tools Suite
+! Joomla! Integration:
+1 - Action logs include user actions in iCagenda extension. (Enable "Action Log - iCagenda" plugin).
+1 - iCagenda will include events, registrations and related custom fields to the user data exported on privacy information requests. (Enable "Privacy - iCagenda" plugin).
+1 - iCagenda reports its privacy related capabilities to the Joomla Privacy system. 
++ Added : Plugin Privacy - iCagenda.
++ Added : Plugin Action Log - iCagenda.
+~ [MODULE][PRO] Changed : Improve module font color when image background.
+# [LOW] Fixed : Fix the registrations csv export zip file not unzippable.
+# [LIBRARY][LOW] Fixed : Fix de-DE date formats missing dot.
+# [THEME][LOW] Fixed : Add missing ic-details-cat class default theme.
+
+* Changed files in 3.7.5
+~ script.icagenda.php
+~ admin/models/registrations.php
+~ admin/utilities/registration/registration.php
+~ [LIBRARY] libraries/ic_library/globalize/culture/de-DE.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.xml
+~ [MODULE][PRO] modules/mod_ic_event_list/tmpl/icrounded.php
++ [PLUGIN][ACTIONLOG] plugins/actionlog/icagenda/icagenda.php
++ [PLUGIN][ACTIONLOG] plugins/actionlog/icagenda/icagenda.xml
++ [PLUGIN][PRIVACY] plugins/privacy/icagenda/icagenda.php
++ [PLUGIN][PRIVACY] plugins/privacy/icagenda/icagenda.xml
+~ site/themes/packs/default/default_event.php
+
+
+iCagenda 3.7.4 <small style="font-weight:normal;">(2018.09.26)</small> Security Release
+================================================================================
+# [SECURITY][MEDIUM] Exploit type: XSS
+1 Severity: Low
+1 Versions: 3.6.7 through 3.7.3
+1 Description: Inadequate input filtering on the list of events page, when frontend search filters enable. This may lead to reflective XSS via injection of arbitrary parameters and/or values on the current page url.
+
+
+iCagenda 3.7.3 <small style="font-weight:normal;">(2018.08.23)</small>
+================================================================================
+~ Changed : improve category color brightness control to set font color for date (https://www.w3.org/TR/AERT/#color-contrast).
+~ Changed : a few code clean, minor reviews and deprecated code removal.
+~ Changed : improve words breaking on Chrome for event details information.
+# [LOW] Fixed : Google Maps embed api script broken for a few languages using quotes in translation strings (French...).
+# [LOW] Fixed : Google maps embed iframe url.
+# [LOW] Fixed : php warning on email cloaking if Joomla EmailCloaking plugin is disabled.
+# [LOW] Fixed : frontend search filters Month and Year not displaying events with period on a single month.
+# [LOW] Fixed : missing https ssl url for external calendars and usage stats.
+
+* Changed files in 3.7.3
+~ script.icagenda.php
+~ admin/assets/jcms/info.php
+~ admin/utilities/addtocal/addtocal.php
+~ admin/utilities/events/data.php
+~ admin/utilities/googlemaps/googlemaps.php
+~ admin/utilities/info/info.php
+~ admin/utilities/render/render.php
+~ admin/views/event/tmpl/edit.php
+~ [LIBRARY] libraries/ic_library/color/color.php
+~ [MODULE][PRO] modules/mod_ic_event_list/helper.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.php
+~ site/helpers/iCicons.class.php
+~ site/models/event.php
+~ site/models/registration.php
+~ [THEME] site/themes/packs/default/css/default_component.css
+~ [THEME] site/themes/packs/ic_rounded/css/ic_rounded_component.css
+~ site/views/list/view.feed.php
+~ site/views/submit/view.html.php
+~ site/views/submit/tmpl/default.php
+
+
+iCagenda 3.7.2 <small style="font-weight:normal;">(2018.06.11)</small>
+================================================================================
+! New Google Maps Platform
+1 - Starting June 11th, 2018, Google Maps API no longer support keyless access.
+1 - Starting July 16th, 2018, the billing requirement will be enforced.
+1 - All projects must be associated with a billing account, or will not be able to make Javascript API requests over $200/mo.
+1 - However it is advised to use new option Google Maps Embed API for Maps Service, that remains free with unlimited usage.
++ Added : Google Maps Embed API (New option for Maps Service).
++ Added : Privacy consent information (badge) in admin registrations list.
++ Added : Prefixes for Search in registrations. USERID: to search for a user ID and EMAIL: to search for a user Email address.
+~ Changed : Option for Name Consent allows now to require name visibility consent even if List of Participants is disabled.
+
+* Changed files in 3.7.2
+~ script.icagenda.php
+~ admin/config.xml
+~ admin/models/registrations.php
+~ admin/utilities/googlemaps/googlemaps.php
+~ admin/views/event/tmpl/edit.php
+~ admin/views/registrations/tmpl/default.php
+~ site/models/registration.php
+~ site/views/registration/tmpl/default.php
+~ site/views/submit/tmpl/default.php
+
+
+iCagenda 3.7.1 <small style="font-weight:normal;">(2018.05.28)</small>
+================================================================================
++ Added : option to set Gravatar consent on Registration form: 'Auto' (as for 3.7.0, if list of participants is enabled), 'Require Explicite Consent' (even if list of participants hidden), 'Disabled' (not ask for consent, but never use Gravatar to show avatar. Future options will be developed for 'Avatar', to enable upload or other avatar system integration like Community Builder).
+# [LOW] Fixed PHP 7.2 : count returns php warning when no registration (if Error Reporting is enabled. Don't forget to keep this Joomla configuration option turn off or on default when site is in production).
+# [PLUGIN][SEARCH][LOW] Fixed : global search in private events not returning results even if user logged-in with access permissions.
+
+* Changed files in 3.7.1
+~ script.icagenda.php
+~ admin/config.xml
+~ admin/utilities/registration/registration.php
+~ [PLUGIN][SEARCH] plugins/search/icagenda/icagenda.php
+~ [PLUGIN][SEARCH] plugins/search/icagenda/icagenda.xml
+~ site/models/registration.php
+~ site/views/registration/tmpl/default.php
+
+
+iCagenda 3.7.0 <small style="font-weight:normal;">(2018.05.25)</small>
+================================================================================
+! Privacy Tools part.1 : GDPR REGULATION (EU) 2016/679.
+! New separated database table 'icagenda_user_actions' to store all explicit consents as required by GDPR.
+1 - Registration form: name visibility, Gravatar, Organiser, Terms.
+1 - Submit an Event form: Terms of Service (tos).
+! Fresh New Installation (only!): new default settings
+1 - Event view: participants list hidden by default.
+1 - Registration form: 'Terms & Conditions' consent checkbox enabled by default.
+1 - Registration form: 'Phone' core field disabled by default.
+! Update Installation: new options preset to Privacy by default
+1 - Event view: participant name and gravatar not public by default (require explicite consent).
+1 - Registration form: improved 'Terms & Conditions' consent checkbox.
+1 - Registration form: new 'Name Visibility' consent checkbox (enabled by a new config option in 'Registration' tab).
+1 - Registration form: new 'Gravatar' consent checkbox (auto-enabled if list of participants is active).
+1 - Registration form: new 'Consent to Organiser' consent checkbox (new config option in 'Registration' tab).
+! Announcement : First version to support Joomla 3 only (support for J2.5 has ended).
+~ Changed UX : integrates showon feature in global options of component (showon was introduced in Joomla 3.2.4).
+~ [MEDIA] Changed : iCicons font updated.
+# [LOW] Fixed : Google Maps initialize possible conflict with other extensions using maps.
+# [MODULE][LOW] Fixed : escape div html tags in calendar script to prevent unexpected manipulation of generated content by a third party extension.
+
+* Changed files in 3.7.0
+~ script.icagenda.php
+~ admin/config.xml
+~ admin/models/registration.php
+~ admin/utilities/customfields/customfields.php
++ admin/utilities/form/field/configtermsdefault.php
++ admin/utilities/form/field/terms.php
+~ admin/utilities/googlemaps/googlemaps.php
+~ admin/utilities/registration/participants.php
+~ [MEDIA] media/css/icagenda-front.css
+~ [MEDIA] media/icicons/style.css
+~ [MEDIA] media/icicons/fonts/iCicons.eot
+~ [MEDIA] media/icicons/fonts/iCicons.svg
+~ [MEDIA] media/icicons/fonts/iCicons.ttf
+~ [MEDIA] media/icicons/fonts/iCicons.woff
+~ [MEDIA] media/js/icmap-front.js
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.php
+~ site/models/registration.php
+~ site/models/submit.php
+~ site/models/forms/registration.xml
+~ [THEME] site/themes/packs/default/css/default_component.css
+~ [THEME] site/themes/packs/ic_rounded/css/ic_rounded_component.css
+~ site/views/registration/tmpl/default.php
+
+
+iCagenda 3.6.14 <small style="font-weight:normal;">(2018.05.04)</small>
+================================================================================
+! Cleanup : Spring cleaning time ;-)
+1 - Replace Joomla Framework commonly used but deprecated functions from iCagenda.
+1 - Code Standards review (part 1).
+# [HIGH] Fixed : Permissions Access levels for registration form broken in version 3.6.13.
+# [LOW] Fixed : syntax error, unexpected T_OBJECT_OPERATOR on PHP 5.3 and below (Please, ask your hoster to upgrade your PHP version! Recommended: Joomla 3 + PHP 7).
+# [LOW] Fixed : event's contact email not receiving notification email when new registration.
+# [LOW] Fixed : missing integer control for title characters limit.
+# [MODULE][LOW] Fixed PHP 7.2 : refactory deprecated php code.
+# [MODULE][PRO][LOW] Fixed : PHP Notice in backend log for module template layout icrounded.
+
+* Changed files in 3.6.14
+~ script.icagenda.php
+~ admin/config.xml
+~ admin/controller.php
+~ admin/icagenda.php
+~ admin/assets/jcms/info.php
+~ admin/controllers/event.php
+~ admin/controllers/events.php
+~ admin/controllers/mail.php
+~ admin/controllers/registrations.raw.php
+~ admin/controllers/themes.php
+~ admin/helpers/icagenda.php
+~ admin/models/categories.php
+~ admin/models/customfields.php
+~ admin/models/download.php
+~ admin/models/event.php
+~ admin/models/events.php
+~ admin/models/mail.php
+~ admin/models/registrations.php
+~ admin/models/themes.php
+~ admin/models/fields/icmap/lat.php
+~ admin/models/fields/icmap/lng.php
+~ admin/models/fields/modal/coordinate.php
+~ admin/models/fields/modal/date.php
+~ admin/models/fields/modal/evt_date.php
+~ admin/models/fields/modal/ic_password.php
+~ admin/models/fields/modal/icfile.php
+~ admin/models/fields/modal/iclink_article.php
+~ admin/models/fields/modal/iclink_type.php
+~ admin/models/fields/modal/iclink_url.php
+~ admin/models/fields/modal/ictext_placeholder.php
+~ admin/models/fields/modal/ictxt_article.php
+~ admin/models/fields/modal/media.php
+~ admin/models/fields/modal/menulink.php
+~ admin/models/fields/modal/multicat.php
+~ admin/models/fields/modal/param_place.php
+~ admin/models/fields/modal/ph_regbt.php
+~ admin/models/fields/modal/tos_article.php
+~ admin/tables/category.php
+~ admin/tables/customfield.php
+~ admin/tables/event.php
+~ admin/tables/feature.php
+~ admin/tables/registration.php
+~ admin/utilities/addtocal/addtocal.php
+~ admin/utilities/ajax/ajax.php
+~ admin/utilities/event/event.php
+~ admin/utilities/events/data.php
+~ admin/utilities/form/field/customfieldgroups.php
+~ admin/utilities/form/field/customform.php
+~ admin/utilities/form/field/registrationdates.php
+~ admin/utilities/form/field/registrationpeople.php
+~ admin/utilities/form/field/registrationterms.php
+~ admin/utilities/list/list.php
+~ admin/utilities/manager/manager.php
+~ admin/utilities/menus/menus.php
+~ admin/utilities/params/params.php
+~ admin/utilities/registration/registration.php
+~ admin/views/categories/view.html.php
+~ admin/views/category/view.html.php
+~ admin/views/customfield/view.html.php
+~ admin/views/customfields/view.html.php
+~ admin/views/download/view.html.php
+~ admin/views/event/view.html.php
+~ admin/views/events/view.html.php
+~ admin/views/events/tmpl/default.php
+~ admin/views/feature/view.html.php
+~ admin/views/features/view.html.php
+~ admin/views/icagenda/view.html.php
+~ admin/views/icagenda/tmpl/default.php
+~ admin/views/info/view.html.php
+~ admin/views/mail/view.html.php
+~ admin/views/registration/view.html.php
+~ admin/views/registrations/view.html.php
+~ admin/views/registrations/tmpl/default.php
+~ admin/views/themes/view.html.php
+~ admin/views/themes/tmpl/default.php
+~ [LIBRARY] libraries/ic_library/globalize/convert.php
+~ [LIBRARY] libraries/ic_library/globalize/globalize.php
+~ [LIBRARY] libraries/ic_library/globalize/culture/cs-CZ.php
+~ [LIBRARY] libraries/ic_library/globalize/culture/de-DE.php
+~ [LIBRARY] libraries/ic_library/globalize/culture/el-GR.php
+~ [LIBRARY] libraries/ic_library/globalize/culture/en-GB.php
+~ [LIBRARY] libraries/ic_library/globalize/culture/en-US.php
+~ [LIBRARY] libraries/ic_library/globalize/culture/es-ES.php
+~ [LIBRARY] libraries/ic_library/globalize/culture/fa-IR.php
+~ [LIBRARY] libraries/ic_library/globalize/culture/fi-FI.php
+~ [LIBRARY] libraries/ic_library/globalize/culture/fo-FO.php
+~ [LIBRARY] libraries/ic_library/globalize/culture/fr-FR.php
+~ [LIBRARY] libraries/ic_library/globalize/culture/hr-HR.php
+~ [LIBRARY] libraries/ic_library/globalize/culture/hu-HU.php
+~ [LIBRARY] libraries/ic_library/globalize/culture/iso.php
+~ [LIBRARY] libraries/ic_library/globalize/culture/it-IT.php
+~ [LIBRARY] libraries/ic_library/globalize/culture/lv-LV.php
+~ [LIBRARY] libraries/ic_library/globalize/culture/nb-NO.php
+~ [LIBRARY] libraries/ic_library/globalize/culture/nl-NL.php
+~ [LIBRARY] libraries/ic_library/globalize/culture/pl-PL.php
+~ [LIBRARY] libraries/ic_library/globalize/culture/pt-BR.php
+~ [LIBRARY] libraries/ic_library/globalize/culture/pt-PT.php
+~ [LIBRARY] libraries/ic_library/globalize/culture/ru-RU.php
+~ [LIBRARY] libraries/ic_library/globalize/culture/sk-SK.php
+~ [LIBRARY] libraries/ic_library/globalize/culture/sv-SE.php
+~ [LIBRARY] libraries/ic_library/globalize/culture/tr-TR.php
+~ [LIBRARY] libraries/ic_library/globalize/culture/uk-UA.php
+~ [LIBRARY] libraries/ic_library/globalize/culture/zh-TW.php
+~ [LIBRARY] libraries/ic_library/thumb/get.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.xml
+~ [MODULE][PRO] modules/mod_ic_event_list/tmpl/icrounded.php
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.xml
+~ [PLUGIN] plugins/search/icagenda/icagenda.php
+~ [PLUGIN] plugins/search/icagenda/icagenda.xml
+~ [PLUGIN] plugins/system/ic_autologin/ic_autologin.php
+~ [PLUGIN] plugins/system/ic_autologin/ic_autologin.xml
+~ site/controller.php
+~ site/icagenda.php
+~ site/controllers/registration.php
+~ site/models/event.php
+~ site/models/events.php
+~ site/models/icagenda.php
+~ site/models/list.php
+~ site/models/registration.php
+~ site/models/submit.php
+~ site/models/fields/categories.php
+~ [THEME] site/themes/default.xml
+~ [THEME] site/themes/ic_rounded.xml
+~ [THEME] site/themes/packs/default/default_calendar.php
+~ [THEME] site/themes/packs/default/default_day.php
+~ [THEME] site/themes/packs/default/default_event.php
+~ [THEME] site/themes/packs/default/default_events.php
+~ [THEME] site/themes/packs/default/default_registration.php
+~ [THEME] site/themes/packs/ic_rounded/ic_rounded_calendar.php
+~ [THEME] site/themes/packs/ic_rounded/ic_rounded_day.php
+~ [THEME] site/themes/packs/ic_rounded/ic_rounded_event.php
+~ [THEME] site/themes/packs/ic_rounded/ic_rounded_events.php
+~ [THEME] site/themes/packs/ic_rounded/ic_rounded_registration.php
+~ site/views/event/view.html.php
+~ site/views/list/view.html.php
+~ site/views/registration/view.html.php
+~ site/views/submit/view.html.php
+~ site/views/submit/tmpl/default.php
+
+
+iCagenda 3.6.13 <small style="font-weight:normal;">(2018.04.17)</small>
+================================================================================
+! New : integrates iCagenda component in Joomla extensions updater (LiveUpdate kept for install on J2.5).
++ Added : integrate Falang into frontend search results.
++ Added : character encoding option for registration csv exported file.
++ [PLUGIN] Added : integrate Falang into search plugin.
+~ Changed : moves iCagendaOnListPrepare sooner for a better retrieving of data by plugin event.
+~ Changed : improve registration export modal on Joomla 3.
+~ Changed : improve year frontend filter.
+~ Changed : update snippets (title, meta description) length according to new Google limits (December 2017).
+~ Changed : improve pagination html/css.
+- [MODULE] Removed : Ctrl+Alt+C shortcut to focus on calendar module, to prevent conflict with Polish language shortcut alt+C Ć.
+# [LOW] Fixed : multiple groups select in custom field admin edition.
+# [LOW] Fixed : naming issue with JHtml select.genericlist for people and date form field. Default Joomla api returns not well formed ID : should be jform_people instead of jformpeople (missing underscore).
+# [LOW] Fixed : only positive integer allowed for 'Number/page' in menu options.
+# [LOW] Fixed : missing context in description content.prepare (event view).
+# [LOW] Fixed : full month too large in date box with default theme pack.
+# [LOW] Fixed : first day of the week option for datetime picker.
+# [LOW] Fixed : time display (show/hide option not working properly) in RSS feeds.
+# [LOW] Fixed : back button routing after click on calendar icon was broken.
+# [LOW] Fixed : missing selected date in url on Cancel registration routing back to event view.
+# [LOW] Fixed : print preview error 404 when event title starts with a numeric.
+# [LOW] Fixed : approval error in admin on some server.
+# [LOW] Fixed : conflict with JCE media manager in the feature form field to select an image (files not displayed).
+# [LOW] Fixed : frontend search for ongoing full periods sometimes missing in results.
+# [LOW] Fixed : missing control if no selected single date in registration admin form.
+# [MODULE][LOW] Fixed PHP 7.2 : count returns php warning when null.
+# [MODULE][PRO][LOW] Fixed : module width not 100% when only 1 event, and minor flexbox css improvements.
+# [MODULE][PRO][LOW] Fixed : time format am/pm broken in module iC Event List.
+
+* Changed files in 3.6.13
+~ admin/config.xml
+~ admin/models/event.php
+~ admin/models/registration.php
+~ admin/models/registrations.php
+~ admin/models/fields/modal/evt.php
+~ admin/models/fields/modal/ictextarea_counter.php
+~ admin/models/forms/customfield.xml
+~ admin/models/forms/download.xml
+~ admin/models/forms/event.xml
+~ admin/models/forms/feature.xml
+~ admin/utilities/ajax/ajax.php
+~ admin/utilities/event/event.php
+~ admin/utilities/events/data.php
+~ admin/utilities/form/field/customfieldgroups.php
+~ admin/utilities/form/field/customform.php
+~ admin/utilities/form/field/registrationdates.php
+~ admin/utilities/form/field/registrationpeople.php
+~ admin/utilities/form/field/registrationterms.php
+~ admin/utilities/list/list.php
+~ admin/utilities/render/render.php
+~ admin/views/download/tmpl/default.php
+~ admin/views/event/tmpl/edit.php
+~ admin/views/registrations/view.html.php
+~ admin/views/registrations/view.raw.php
+~ admin/views/registrations/tmpl/default.php
+~ icagenda.xml
+~ [MEDIA] media/css/icagenda-front.css
+~ [MODULE][PRO] modules/mod_ic_event_list/css/default_style.css
+~ [MODULE][PRO] modules/mod_ic_event_list/css/icrounded_style.css
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.php
++ [PLUGIN] plugins/installer/icagenda/icagenda.php
++ [PLUGIN] plugins/installer/icagenda/icagenda.xml
++ [PLUGIN] plugins/installer/icagenda/LICENSE.txt
++ [PLUGIN] plugins/installer/icagenda/language/en-GB/en-GB.plg_installer_icagenda.ini
++ [PLUGIN] plugins/installer/icagenda/language/en-GB/en-GB.plg_installer_icagenda.sys.ini
+~ [PLUGIN] plugins/quickicon/icagendaupdate/icagendaupdate.php
+~ [PLUGIN] plugins/search/icagenda/icagenda.php
+~ [PLUGIN] plugins/search/icagenda/icagenda.xml
+~ [PLUGIN] plugins/system/ic_autologin/ic_autologin.php
+~ script.icagenda.php
+~ site/router.php
+~ site/add/elements/icevent_vars.php
+~ site/add/elements/iclist_vars.php
+~ site/controllers/registration.php
+~ site/helpers/iCicons.class.php
+~ site/models/list.php
+~ site/models/registration.php
+~ site/models/fields/year.php
+~ site/views/event/view.html.php
+~ site/views/event/tmpl/default_top.php
+~ site/views/list/view.feed.php
+~ site/views/list/view.html.php
+~ site/views/list/tmpl/default.xml
+~ site/views/registration/view.html.php
+~ site/views/registration/tmpl/actions.php
++ site/views/registration/tmpl/cancel.php
+~ site/views/registration/tmpl/complete.php
+~ site/views/registration/tmpl/default.php
+~ site/views/submit/tmpl/default.php
+
+
+iCagenda 3.6.12 <small style="font-weight:normal;">(2017.07.27)</small>
+================================================================================
++ Added : filter by approval state in admin list of events.
+~ [MODULE][PRO] Changed : added flexbox CSS to improve multiple columns display in module iC Event list.
+~ [THEMES] Changed : minor improvement of frontend search field height on some site templates.
+~ [THEME][ic_rounded] Changed : in list view, date boxes use now category color for background if no event image.
+# [MEDIUM] Fixed : entering past single date(s) and no period for one event returning a no valid date error warning.
+# [LOW] Fixed : missing Joomla api getMaxUploadSize in J3.6.x (file field type), but if you have kept your Joomla 3 installation safe and up-to-date you didn't have the issue of a broken 'Submit an Event' frontend form.
+
+* Changed files in 3.6.12
+~ admin/models/events.php
+~ admin/tables/event.php
+~ admin/views/events/view.html.php
+~ [MODULE][PRO] modules/mod_ic_event_list/css/default_style.css
+~ [MODULE][PRO] modules/mod_ic_event_list/css/icrounded_style.css
+~ site/layouts/joomla/form/field/file.php
+~ [THEME] site/themes/packs/default/css/default_component.css
+~ [THEME] site/themes/packs/ic_rounded/css/ic_rounded_component.css
+~ [THEME] site/themes/packs/ic_rounded/ic_rounded_events.php
+
+
+iCagenda 3.6.11 <small style="font-weight:normal;">(2017.07.20)</small>
+================================================================================
+~ Changed : minor improvements of the frontend search results (more accurate when Search Mode is Current List).
+# [LOW] Fixed : iCalcreator library php7 issue, rename constructor to __construct.
+# [LOW] Fixed : full period (no weekdays) not displayed when display all dates turned-off.
+# [LOW] Fixed : wrong alert message in admin event edit, if no start and end date for period, and weekday(s) selected.
+# [MODULE][LOW] Patched : possible issue with inconstant "null" date saved by new Joomla calendar picker (since J. 3.7.0), preventing the module calendar to auto-load on current month (This happened when a valid date was previously selected, then by removing date from "Load on date" option field and saving the module, it saved in database a null datetime. A second save of module with this option field empty was needed to remove not expected null datetime saved in database by new joomla calendar picker. The patch included in module does not fix Joomla bug, but fixes possible issue of not loading on current month the iCagenda calendar module).
+
+* Changed files in 3.6.11
+~ admin/tables/event.php
+~ admin/utilities/events/data.php
+~ [LIBRARY] libraries/ic_library/iCalcreator/iCalcreator.class.php
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.php
+
+
+iCagenda 3.6.10 <small style="font-weight:normal;">(2017.07.06)</small>
+================================================================================
+# [MEDIUM] Fixed : datetime picker returning wrong value when empty (period start/end dates and/or single date(s)) that can prevent possibility to save event.
+# [LOW] Fixed : filtering by date broken when 'Display all Dates' option is set on 'no'.
+
+* Changed files in 3.6.10
+~ admin/models/event.php
+~ admin/models/fields/modal/date.php
+~ admin/tables/event.php
+~ admin/utilities/events/data.php
+~ [LIBRARY] libraries/ic_library/date/date.php
+~ script.icagenda.php
+~ site/models/submit.php
+
+
+iCagenda 3.6.9 <small style="font-weight:normal;">(2017.07.05)</small>
+================================================================================
++ Added : global option to select if the search filters apply as a global search or only to the current list.
++ Added : menu options for frontend search filters (not available on Joomla 2.5).
++ Added : [DESC], [SHORTDESC] and [METADESC] tags for email notification (frontend 'Registration' and 'Submit an Event' forms).
++ Added : set datetime picker for event dates in am/pm mode when option enabled for am/pm time.
+# [Joomla 2.5][HIGH] Fixed : list of events white screen of death (Catchable fatal error : JInput::getArray()).
+# [Joomla][LOW] Patched : minimum digits for phone number validation is 7 in Joomla api. Adds a custom rule for phone check to allow a minimum of 6 digits (New Caledonia).
+# [Joomla 3.7][LOW] Fixed : display of Max Server upload limit in frontend file type field, not accurate with iCagenda settings (Joomla! api issue on this new feature, where Joomla layout forces to display the server max upload limit...).
+# [Joomla 3.7][LOW] Fixed : width of the "override" label when selected in dropdown list of custom field types.
+# [MODULE][LOW] Fixed : Hungarian hu-HU year before month in calendar module.
+# [THEME][LOW] Fixed : z-index added to class .ic-share, for AddThis sharing buttons in float position (minor issue with a few site templates screen sizes).
+
+* Changed files in 3.6.9
+~ admin/config.xml
+~ admin/assets/elements/title.php
+~ admin/assets/elements/titleimg.php
+~ admin/models/event.php
++ admin/models/fields/list.php
+~ admin/tables/event.php
+~ admin/utilities/events/data.php
+~ admin/utilities/list/list.php
+~ admin/views/customfield/tmpl/edit.php
+~ admin/views/event/tmpl/edit.php
+~ [LIBRARY] libraries/ic_library/form/field/sortablefields.php
++ [LIBRARY] libraries/ic_library/form/rule/positiveinteger.php
++ [LIBRARY] libraries/ic_library/form/rule/tel.php
+- [LIBRARY][FOLDER] libraries/ic_library/form/rules
+~ [MEDIA] media/css/icagenda-back.css
+~ [MEDIA] media/css/icagenda-back.j25.css
+~ [MEDIA] media/js/icdates.js
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ [PLUGIN] plugins/system/ic_library/ic_library.php
+~ script.icagenda.php
++ site/layouts/joomla/form/field/file.php
+~ site/models/fields/categories.php
+~ site/models/fields/year.php
+~ site/models/registration.php
+~ site/models/submit.php
+~ [THEME] site/themes/packs/default/css/default_component.css
+~ [THEME] site/themes/packs/ic_rounded/css/ic_rounded_component.css
+~ site/views/list/tmpl/default.php
+~ site/views/list/tmpl/default.xml
+~ site/views/list/tmpl/default_filters.php
+~ site/views/submit/tmpl/default.php
+
+
+iCagenda 3.6.8 <small style="font-weight:normal;">(2017.05.03)</small>
+================================================================================
++ Added : get mode option from Joomla plugin email.cloak to set contact email as linkable mailto address (default) or not.
+# [LOW] Fixed : missing addslashes for event stats labels in control panel (broken when double-quotes in event/category title).
+# [LOW] Fixed : issue with counting of events to be displayed when filter by Features is used in main list of events, resulting in extra pages with no events (bug introduced since patch for module in 3.6.7).
+# [LOW] Fixed : URLs after frontend search filters submit and reset click when SEF enable.
+# [LOW] Fixed : [STARTDATETIME] and [ENDDATETIME] tags in registration custom notification email broken if only one period and no single date for the event.
+
+* Changed files in 3.6.8
+~ admin/utilities/events/data.php
+~ admin/utilities/render/render.php
+~ admin/views/icagenda/tmpl/default.php
+~ site/add/elements/icevent_vars.php
+~ site/models/registration.php
+~ site/views/list/tmpl/default.php
+
+
+iCagenda 3.6.7 <small style="font-weight:normal;">(2017.04.27)</small>
+================================================================================
+! Joomla 3.7 Ready
++ Added : icagenda plugin event 'iCagendaOnNewEvent' (When a new event is first published and approved. In plugin group 'icagenda').
++ Added : content plugin event 'iCagendaOnEventPrepare' (Preparing content for output. To modify 'event' data).
++ Added : content plugin event 'iCagendaOnEventBeforeDisplay' (Before the generated content of the 'event details' view).
++ Added : content plugin event 'iCagendaOnEventAfterDisplay' (After the generated content of the 'event details' view).
++ Added : content plugin event 'iCagendaOnListPrepare' (Preparing content for output. To modify 'list of events' data).
++ Added : content plugin event 'iCagendaOnListBeforeDisplay' (Before the generated content of the 'list of events' view).
++ Added : content plugin event 'iCagendaOnListAfterDisplay' (After the generated content of the 'list of events' view).
++ Added : content plugin event 'iCagendaOnRegistrationPrepare' (Preparing content for output. To modify 'event/registration' data).
++ Added : content plugin event 'iCagendaOnRegistrationBeforeDisplay' (Before the generated form of the 'registration' view).
++ Added : content plugin event 'iCagendaOnRegistrationAfterDisplay' (After the generated form of the 'registration' view).
++ Added : content plugin event 'iCagendaOnSubmitPrepare' (Preparing content for output. To modify 'submit an event' data).
++ Added : content plugin event 'iCagendaOnSubmitBeforeDisplay' (Before the generated form of the 'submit an event' view).
++ Added : content plugin event 'iCagendaOnSubmitAfterDisplay' (After the generated form of the 'submit an event' view).
+~ Changed : extends Frontend search results. Add search in Short Description and Address.
+~ Changed : frontend search filters improvement (form method changed from 'post' to 'get', and search enhancement).
+~ Changed : update copyright 2017.
+~ [THEMES] Changed : minor improvements to be more friendly with dark site templates.
+- Removed : hardcoded 'input-large' class from custom form input field type text (to be constant with core fields)
+# [MEDIUM] Fixed : alert message on registration after submit, blocking redirect to confirmation page (registration correctly processed), due to new Joomla Custom Fields system plugin (loading admin helper in frontend).
+# [LOW] Fixed : button style issue with Joomla 3.7.
+# [LOW] Fixed : missing dropdown selection of available dates for register button.
+# [LOW] Fixed : access to complete view if no tickets available after registration.
+# [LOW] Fixed : thumbnails generation from distant url.
+# [LOW] Fixed : registration counter when option 'Display All Dates' is turned off.
+# [LOW] Fixed : custom fields required failled to be checked if form validation is set only on 'Server' for 'Submit an event' form.
+# [LOW] Fixed : html tags error in admin category edit view.
+# [LOW] Fixed : should not display date (wrong format because null) in registration custom notification email when using tags [DATE] and [TIME] and registration mode is 'for all dates'.
+# [MODULE][PRO][LOW] Fixed : wrong counting of events to be displayed when filter by Features is used.
+# [THEMES][LOW] Fixed : frontend search input height on some site templates.
+
+* Changed files in 3.6.7
+~ admin/models/event.php
+~ admin/models/forms/event.xml
+~ admin/utilities/customfields/customfields.php
+~ admin/utilities/events/data.php
+~ admin/utilities/list/list.php
+~ admin/utilities/manager/manager.php
+~ admin/utilities/registration/registration.php
+~ admin/utilities/render/render.php
+~ admin/views/category/tmpl/edit.php
+~ admin/views/icagenda/tmpl/default.php
+~ admin/views/themes/tmpl/default.php
+~ [LIBRARY] libraries/ic_library/url/url.php
+~ [MEDIA] media/css/icagenda-front.css
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.xml
+~ script.icagenda.php
+~ site/add/elements/iclist_vars.php
+~ site/models/events.php
+~ site/models/registration.php
+~ site/models/submit.php
+~ [THEME] site/themes/packs/default/css/default_component.css
+~ [THEME] site/themes/packs/ic_rounded/css/ic_rounded_component.css
+~ site/views/event/tmpl/default.php
+~ site/views/event/view.html.php
+~ site/views/list/tmpl/default_filters.php
+~ site/views/list/tmpl/default.php
+~ site/views/list/view.html.php
+~ site/views/registration/tmpl/default.php
+~ site/views/registration/view.html.php
+~ site/views/submit/tmpl/default.php
+~ site/views/submit/view.html.php
+
+
+iCagenda 3.6.6 <small style="font-weight:normal;">(2016.12.20)</small>
+================================================================================
++ [LIBRARY] Added : form field positive integer.
+~ Changed : improved session management for current date of the event.
+~ Changed : improved registrations status (number of tickets booked/available).
+~ [VIEW] Changed : simplifies event/default_top view file.
+~ [VIEW] Changed : removed header param control in list/default.php view file.
+~ [VIEW] Changed : removed registration type control for custom fields in registration/default.php view file.
+~ [MODULES] Changed : improves routing to event details view.
+# [MEDIUM] Fixed : access to registration form not possible for languages where joomla transliteration returns empty value (Asian languages...).
+# [LOW] Fixed : disallow zero value for number of tickets per registration.
+# [LOW] Fixed : empty space for values of options in custom field type 'List', when no usage of value/label pairs.
+# [LOW] Fixed : time displayed in list of all dates in event details view, even if display time option turned off.
+# [LOW] Fixed : code tags {} inside Short Description should be removed.
+# [LOW] Fixed : do not display a dropdown list of dates if only one option.
+# [LOW] Fixed : no event message not displayed if header subtitle not enabled.
+
+* Changed files in 3.6.6
+~ admin/config.xml
+~ admin/utilities/customfields/customfields.php
+~ admin/utilities/event/event.php
+~ admin/utilities/events/data.php
+~ admin/utilities/events/events.php
+~ admin/utilities/form/field/registrationdates.php
+~ admin/utilities/list/list.php
+~ admin/utilities/registration/participants.php
+~ admin/utilities/registration/registration.php
++ [LIBRARY] libraries/ic_library/form/rules/positiveinteger.php
+~ [MEDIA] media/css/icagenda-back.css
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.php
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ site/add/elements/icevent_vars.php
+~ site/models/event.php
+~ site/models/list.php
+~ site/models/registration.php
+~ site/router.php
+~ [VIEW] site/views/event/tmpl/default_top.php
+~ [VIEW] site/views/list/tmpl/default.php
+~ [VIEW] site/views/registration/tmpl/default.php
+~ site/views/registration/view.html.php
+
+
+iCagenda 3.6.5 <small style="font-weight:normal;">(2016.11.23)</small>
+================================================================================
++ Added : Ajax refresh of number of tickets in the frontend registration form, depending of the date selected.
++ Added : new css classes to able custom styles on period dates in event details view 'List of Dates'.
+~ Changed : refactory of the functions to count number of registrations booked/available for component and modules.
+~ Changed : default status is set to 'published' in status filter when accessing the registrations list in admin (and for export csv).
+~ Changed : improve telephone field type check if valid phone number (registration form).
+# [LOW] Fixed : dates display in admin registrations list, after adding a new registetration using admin, and event registration type is for all dates.
+# [LOW] Fixed : control maximum of available tickets when creating a registration in admin.
+# [LOW] Fixed : control maximum of available tickets in frontend registration form was broken if less available places than selected number of tickets.
+# [LOW] Fixed : missing required attribute when using a custom field of type override name.
+# [LOW] Fixed : submission of empty required custom fields filled with space (missing trim spaces).
+# [LOW] Fixed : search in frontend with from/to the same day returned no event even if events exist for this date.
+# [LOW] Fixed : image select input width when using JCE media field type.
+# [LOW] Fixed : possible wrong date display in event view (when multiple dates).
+# [LOW] Fixed : bugs in RSS feeds (missing category, wrong date...) and minor improvement (using global joomla RSS feeds limit).
+# [MODULE][PRO][LOW] Fixed : introduction text broken (short description).
+
+* Changed files in 3.6.5
+~ admin/models/fields/modal/evt.php
+~ admin/models/fields/modal/icmulti_checkbox.php
+~ admin/models/forms/registration.xml
+~ admin/models/registration.php
+~ admin/models/registrations.php
+~ admin/tables/registration.php
+~ admin/utilities/ajax/ajax.php
+~ admin/utilities/customfields/customfields.php
+~ admin/utilities/event/event.php
+~ admin/utilities/events/data.php
+~ admin/utilities/form/field/registrationdates.php
+~ admin/utilities/form/field/registrationpeople.php
+~ admin/utilities/registration/participants.php
+~ admin/utilities/registration/registration.php
+~ admin/views/registration/tmpl/edit.php
+~ admin/views/registrations/view.html.php
+~ [LIBRARY] libraries/ic_library/form/field/sortablefields.php
+~ [MEDIA] media/css/icagenda-back.css
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.php
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ script.icagenda.php
+~ site/add/elements/icevent_vars.php
+~ site/controller.php
+~ site/controllers/registration.php
+~ site/models/event.php
+~ site/models/events.php
+~ site/models/forms/registration.xml
+~ site/models/list.php
+~ site/models/registration.php
+~ site/views/event/tmpl/default_top.php
+~ site/views/list/view.feed.php
+~ site/views/registration/tmpl/default.php
+~ site/views/registration/view.html.php
+
+
+iCagenda 3.6.4.1 (patch Joomla 2.5) <small style="font-weight:normal;">(2016.10.18)</small>
+================================================================================
+# [Joomla 2.5] Fixed : empty list of events in component List Events view (patch for iCagenda 3.6.4).
+
+* Changed files in 3.6.4.1
+~ admin/utilities/events/data.php
+
+
+iCagenda 3.6.4 <small style="font-weight:normal;">(2016.10.15)</small>
+================================================================================
++ [MODULE][CALENDAR] Added : option to display an event only if a menu item of type 'List Events' (or the selected menu item in the 'Link to Menu Item' option) matches the event depending on the menu options and event settings.
+~ [MODULE][PRO] Changed : code improvement.
+# [LOW] Fixed : https for gravatar on ssl server.
+# [LOW][MODULES] Fixed : alert message for admins in frontend (and improvement of events to be displayed controls).
+# [LOW] Fixed : issue with multiple xml attribute due to a bug with 'showon' in Joomla 3.2.4 > 3.4.1 (custom field admin edit).
+# [LOW] Fixed : event individual option to show or hide AddThis on event details view.
+# [LOW] Fixed : custom fields input width with site templates not supporting Joomla core fields layouts.
+# [LOW] Fixed : global registrations counter.
+
+* Changed files in 3.6.4
+~ admin/config.xml
+~ admin/models/event.php
+~ admin/models/fields/modal/menulink.php
+~ admin/models/forms/customfield.xml
+~ admin/tables/event.php
+~ admin/utilities/addthis/addthis.php
+~ admin/utilities/customfields/customfields.php
+~ admin/utilities/events/data.php
+~ admin/utilities/form/field/customfieldgroups.php
+~ admin/utilities/menus/menus.php
+~ admin/utilities/registration/participants.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.xml
+~ [MODULE][PRO] modules/mod_ic_event_list/tmpl/icrounded.php
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.xml
+~ site/models/event.php
+~ site/models/forms/registration.xml
+~ site/views/list/tmpl/default.php
+
+
+iCagenda 3.6.3 <small style="font-weight:normal;">(2016.09.26)</small>
+================================================================================
++ [MODULE][PRO] Added : options to filter events by Feature(s) in Module iC Event List.
++ Added : plugin event handler on Event Prepare (to allow individually by event, enabling/disabling jComments integration by using JComments tag {jcomments off} in event full description editor. Needs version 1.1.0 of iC JComments plugin: http://icagenda.joomlic.com/resources/addons/jcomments-content-plugin)
+~ [MODULES] Changed : Mode 'auto' for Menu Item Link option now will allow to display events even if no menu item link set properly to display this event (will generate a standard sef url using the home menu item (Joomla! routing system), in the identical way Joomla Articles modules behave).
+~ [THEME PACKS] Changed : Responsive improvements for Frontend Search Filters buttons.
+~ Changed : 'complete' view (landing page after registration with a bit more information on user's registration).
+~ Changed : a bit of code clean-up and minor improvements as well as css corrections to prevent possible css conflict with a few site templates.
+# [LOW][MODULE] Fixed : Registration status fixes in module Calendar (could return close when still open).
+# [LOW][MODULE] Fixed : Events disappearing in module Calendar (issue with date control).
+# [LOW] Fixed : Registration dates if Type is set for registration to all the dates (fix on registration process and update database to fix issue).
+# [LOW] Fixed : Missing event state control if access through event's direct url.
+# [LOW] Fixed : Missing one translation string in confirmation page after registration has been processed ('Registration Information').
+# [LOW] Fixed : Missing checkbox label for Terms and Conditions in Registration form.
+# [LOW] Fixed : Hits only on published events (could have counts on other status).
+# [LOW] Fixed : Script error from a deprecated script (not used anymore) in registration complete view.
+# [LOW] Fixed : Script error in menu item options.
+
+* Changed files in 3.6.3
+~ admin/models/fields/modal/icmulti_opt.php
+~ admin/utilities/customfields/customfields.php
+~ admin/utilities/event/event.php
+~ admin/utilities/events/data.php
+~ admin/utilities/form/field/registrationdates.php
+~ admin/utilities/form/field/registrationterms.php
+~ admin/utilities/registration/participants.php
+~ [MEDIA] media/css/icagenda-front.css
+~ [MODULE][PRO] modules/mod_ic_event_list/helper.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.xml
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.xml
+~ [INSTALL] script.icagenda.php
+~ site/models/event.php
+~ site/models/events.php
+~ site/models/forms/registration.xml
+~ [THEME PACKS] site/themes/packs/default/css/default_component.css
+~ [THEME PACKS] site/themes/packs/default/css/default_component_medium.css
+~ [THEME PACKS] site/themes/packs/default/css/default_component_small.css
+~ [THEME PACKS] site/themes/packs/default/css/default_component_xsmall.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_component.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_component_medium.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_component_small.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_component_xsmall.css
+~ site/views/event/view.html.php
+~ site/views/registration/tmpl/complete.php
+~ site/views/registration/tmpl/default.php
+~ site/views/registration/view.html.php
+
+
+iCagenda 3.6.2 <small style="font-weight:normal;">(2016.09.01)</small>
+================================================================================
+# [LOW] Fixed : Custom fields not saved in 3.6.1 in admin event edit (issue due to frontend fix).
+# [LOW] Fixed : Approval icon in frontend broken (no effect).
+# [LOW] Fixed : Registration button type if no other dates, and period registration complete.
+# [LOW] Fixed : Search input filter not returning past events in search results.
+
+* Changed files in 3.6.2
+~ admin/utilities/customfields/customfields.php
+~ admin/utilities/events/data.php
+~ admin/utilities/form/field/registrationdates.php
+~ admin/utilities/manager/manager.php
+~ admin/utilities/registration/registration.php
+
+
+iCagenda 3.6.1 <small style="font-weight:normal;">(2016.08.29)</small>
+================================================================================
++ Added : force system slugs for overrides of core fields and protect from usage in other custom field types.
+~ Changed : minor UI improvement of custom field edition.
+~ Changed : set properly required column setting in Custom Fields admin list.
+~ Changed : don't show 'slug' option if type is a core field override in custom field edition form (needs minimum Joomla 3.2.4 for showon feature).
+~ Changed : Check if user ID exists to prevent alert message in events admin list. This Joomla alert message is kept for the event edition where user does not exist anymore, but hidden in the admin list of events to prevent misunderstanding.
+# [MEDIUM] Fixed : Custom fields data not saved in frontend 'Submit an Event' form.
+# [LOW] Fixed : event add to cal in .ics format (iCal and Outlook).
+# [LOW] Fixed : warning message if error reporting turn on, and no custom fields set for Submit an Event form.
+# [LOW] Fixed : usage of core_* slug names in not-core field types.
+# [LOW] Fixed : required option broken for core field 'Phone' in registration form.
+# [LOW] Fixed : search filter of type calendar better adjustment to fit with site template not managing well Joomla core calendar picker input field.
+# [LOW] Fixed : advanced email check options in registration form broken.
+# [LOW] Fixed : RSS feeds broken.
+
+* Changed files in 3.6.1
+~ admin/models/events.php
+~ admin/models/forms/customfield.xml
+~ admin/tables/customfield.php
+~ admin/utilities/customfields/customfields.php
+~ admin/utilities/event/data.php
+~ admin/views/customfield/tmpl/edit.php
+~ admin/views/customfields/tmpl/default.php
+~ admin/views/customfields/view.html.php
+~ [MEDIA] media/css/icagenda-front.css
+~ site/models/registration.php
+~ site/views/event/tmpl/default_vcal.php
+~ site/views/list/tmpl/default_filters.php
+~ site/views/list/view.feed.php
+~ site/views/submit/tmpl/default.php
+
+
+iCagenda 3.6.0 <small style="font-weight:normal;">(2016.08.19)</small>
+================================================================================
+! New : Frontend Search Filters
+1 - Global Options: Component Options > List tab.
+1 - Drag & drop filters options to change frontend ordering.
+1 - Options of display (responsive, full width, show or hide 'Search' label...).
+! Refactory : List of events
+1 - The list view is now divided into 3 separate views: list, event and registration.
+1 - Performance improvement: up to 10 times faster to load the main list of events!
+! Refactory : Registration Form
+1 - A full new view HTML structure, to load all fields with a maximum of flexibility
+1 &nbsp; and performance (see custom field groups)
+! New : Admin Custom Fields List and Edition Reviewed
+1 - List: useful info directly in the list of custom fields.
+1 - Edition: Will show option(s) depending on selected parent form and field type
+1 &nbsp; (minimum Joomla 3.2.4 to get this functionnality).
+! New : Custom Field Groups
+1 - Create and manage groups for custom fields (directly in Custom Field edition).
+1 - Set individually in each event edition (Registration tab) the groups of custom fields to use for the registration form.
+! New : Custom Field Types
+1 - New field types: date (calendar), url, email
+1 - New field type "label (separator)": to add label headings inside form (with custom CSS class option)
+1 - New field type "description (separator)": to add a description text inside form (with custom CSS class option)
+1 - Override field types: name, email, phone, date and tickets
+1 &nbsp; (replace the core iCagenda fields, to allow ordering inside custom fields as you want!)
+! New : Statistics
+1 - Hits on events.
+1 - Charts for category and event hits, displayed in the control panel of iCagenda.
+! Anonymous Usage Statistics
+1 Usage statistics or 'Telemetry' is a feature in iCagenda that sends anonymously and automatically your system information (Similar to the Joomla! Statistics plugin introduced in Joomla 3.5).
+1 This will only submit the Joomla! version, PHP version, database engine and version, and iCagenda version. Usage statistics are collected during the update, and help us improve future versions of iCagenda.
+1 The code used for this anonymous data submission can be read in the install script file of the extension (script.icagenda.php).
+1 You can disable this feature in global options of iCagenda component, 'General Settings' tab.
+! New : Module iC Event List (PRO)
+1 - Option to display all dates.
++ Added : option to set month format in the date box (list of events).
++ Added : missing options in filter by custom field type (admin list of custom fields).
++ Added : control for current page in list pagination before rendering.
++ Added : select user in registration edition, with auto-filled name and email (depending on your global settings).
++ Added : admin filter (dropdown) to select custom fields by group.
++ Added : landing page for registration form in frontend.
+- Removed : all not needed anymore rel="nofollow" in modules event links.
+~ Changed : date drop down in registration form is auto selected on the date clicked.
+~ [THEME PACKS] Changed : in THEME_events.php, variable $EVENT_MONTHSHORT replaced by $EVENT_MONTH (to use new month format option).
+~ Changed : includes all fixes and improvements of versions 3.5.14 and 3.5.21 (see releases notes for additional info).
+
+* Changed files in 3.6.0
+~ admin/config.xml
+~ admin/controllers/customfield.php
+~ admin/controllers/registration.php
+~ admin/icagenda.php
+~ admin/liveupdate/liveupdate.php
+~ admin/models/category.php
+~ admin/models/customfield.php
+~ admin/models/customfields.php
+~ admin/models/event.php
+~ admin/models/events.php
+~ admin/models/fields/modal/cat.php
+~ admin/models/fields/modal/checkdnsrr.php
+~ admin/models/fields/modal/ic_editor.php
+~ admin/models/fields/modal/ictext_placeholder.php
++ admin/models/fields/spacer/description.php
++ admin/models/fields/spacer/label.php
+~ admin/models/forms/customfield.xml
+~ admin/models/forms/event.xml
+~ admin/models/forms/registration.xml
+~ admin/models/icagenda.php
+~ admin/models/registrations.php
+~ admin/sql/install/mysql/icagenda.install.sql
+~ admin/sql/uninstall/mysql/icagenda.uninstall.sql
+~ admin/tables/customfield.php
+~ admin/tables/event.php
++ [FOLDER] admin/utilities/addthis/
++ admin/utilities/addthis/addthis.php
++ [FOLDER] admin/utilities/addtocal/
++ admin/utilities/addtocal/addtocal.php
+~ admin/utilities/ajax/ajax.php
++ admin/utilities/ajax/filter.php
+~ admin/utilities/customfields/customfields.php
++ [FOLDER] admin/utilities/event/
++ admin/utilities/event/data.php
++ admin/utilities/event/event.php
+~ admin/utilities/events/data.php
+~ admin/utilities/events/events.php
++ [FOLDER] admin/utilities/form/field/
++ admin/utilities/form/field/customfieldgroups.php
++ admin/utilities/form/field/customform.php
++ admin/utilities/form/field/registrationdates.php
++ admin/utilities/form/field/registrationpeople.php
++ admin/utilities/form/field/registrationterms.php
+~ admin/utilities/form/form.php
++ [FOLDER] admin/utilities/googlemaps/
++ admin/utilities/googlemaps/googlemaps.php
++ [FOLDER] admin/utilities/list/
++ admin/utilities/list/list.php
++ [FOLDER] admin/utilities/manager/
++ admin/utilities/manager/manager.php
++ [FOLDER] admin/utilities/registration/
++ admin/utilities/registration/participants.php
++ admin/utilities/registration/registration.php
++ [FOLDER] admin/utilities/render/
++ admin/utilities/render/render.php
++ admin/utilities/theme/joomla25.php
++ admin/utilities/theme/style.php
+~ admin/utilities/theme/theme.php
+~ admin/views/customfield/tmpl/edit.php
+~ admin/views/customfields/tmpl/default.php
+~ admin/views/customfields/view.html.php
+~ admin/views/event/tmpl/edit.php
+~ admin/views/event/view.html.php
+~ admin/views/events/tmpl/default.php
+~ admin/views/icagenda/tmpl/default.php
+~ admin/views/icagenda/view.html.php
+~ admin/views/info/tmpl/default.php
+~ admin/views/registration/tmpl/edit.php
+~ admin/views/registrations/tmpl/default.php
+~ icagenda.xml
+~ [LIBRARY] libraries/ic_library/date/date.php
+~ [LIBRARY] libraries/ic_library/filter/output.php
++ [LIBRARY][FOLDER] libraries/ic_library/form/
++ [LIBRARY][FOLDER] libraries/ic_library/form/field/
++ [LIBRARY]libraries/ic_library/form/field/sortablefields.php
+~ [LIBRARY] libraries/ic_library/globalize/culture/cs-CZ.php
+~ [LIBRARY] libraries/ic_library/globalize/culture/en-GB.php
++ [LIBRARY][FOLDER] libraries/ic_library/iCalcreator/
++ [LIBRARY]libraries/ic_library/iCalcreator/iCalcreator.class.php
++ [LIBRARY][FOLDER] libraries/ic_library/render/
++ [LIBRARY] libraries/ic_library/render/render.php
+~ [LIBRARY] libraries/ic_library/url/url.php
+~ [MEDIA] media/css/icagenda-back.css
+~ [MEDIA] media/css/icagenda-front.css
+~ [MEDIA] media/css/icagenda-front.j25.css
+~ [MEDIA][iCicons] media/icicons/fonts
+~ [MEDIA][iCicons] media/icicons/style.css
+- [MEDIA] media/images/video_poster_icagenda.jpg
+- [MEDIA] media/images/youtube_iCagenda.png
++ [MEDIA] media/js/Chart.js
++ [MEDIA] media/js/Chart.min.js
+~ [MEDIA] media/js/icagenda.js
+~ [MODULE][PRO] modules/mod_ic_event_list/helper.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.xml
+~ [MODULE][PRO] modules/mod_ic_event_list/tmpl/default.php
+~ [MODULE][PRO] modules/mod_ic_event_list/tmpl/icrounded.php
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.php
+~ [PLUGIN] plugins/search/icagenda/icagenda.php
+~ [PLUGIN] plugins/system/ic_library/ic_library.php
+~ script.icagenda.php
++ site/add/elements/icevent_vars.php
++ site/add/elements/iclist_vars.php
+- site/add/elements/icsetvar.php
+~ site/controller.php
++ [FOLDER] site/controllers/
++ site/controllers/registration.php
+- site/helpers/iCalcreator.class.php
+- site/helpers/ichelper.php
+- site/helpers/icmodel.php
+- site/helpers/media_css.class.php
+~ site/icagenda.php
++ site/models/event.php
+~ site/models/events.php
++ [FOLDER] site/models/fields/
++ site/models/fields/categories.php
++ site/models/fields/month.php
++ site/models/fields/year.php
+~ site/models/forms/registration.xml
+~ site/models/forms/submit.xml
+~ site/models/list.php
++ site/models/registration.php
+~ site/models/submit.php
+~ site/router.php
+~ [THEME PACK] site/themes/packs/default/css/default_component.css
+~ [THEME PACK] site/themes/packs/default/css/default_component_medium.css
+~ [THEME PACK] site/themes/packs/default/css/default_component_small.css
+~ [THEME PACK] site/themes/packs/default/css/default_component_xsmall.css
+~ [THEME PACK] site/themes/packs/default/default_day.php
+~ [THEME PACK] site/themes/packs/default/default_events.php
+~ [THEME PACK] site/themes/packs/ic_rounded/css/ic_rounded_component.css
+~ [THEME PACK] site/themes/packs/ic_rounded/css/ic_rounded_component_medium.css
+~ [THEME PACK] site/themes/packs/ic_rounded/css/ic_rounded_component_small.css
+~ [THEME PACK] site/themes/packs/ic_rounded/css/ic_rounded_component_xsmall.css
+~ [THEME PACK] site/themes/packs/ic_rounded/ic_rounded_day.php
+~ [THEME PACK] site/themes/packs/ic_rounded/ic_rounded_events.php
++ [FOLDER] site/views/event/
++ [FOLDER] site/views/event/tmpl/
++ site/views/event/tmpl/default.php
++ site/views/event/tmpl/default_top.php
++ site/views/event/tmpl/default_vcal.php
++ site/views/event/view.html.php
+- site/views/list/tmpl/actions.php
+~ site/views/list/tmpl/default.php
+~ site/views/list/tmpl/default.xml
+~ site/views/list/tmpl/default_categories.php
++ site/views/list/tmpl/default_filters.php
+- site/views/list/tmpl/default_vcal.php
+- site/views/list/tmpl/event.php
+- site/views/list/tmpl/registration.php
+~ site/views/list/view.feed.php
+~ site/views/list/view.html.php
++ [FOLDER] site/views/registration/
++ [FOLDER] site/views/registration/tmpl/
++ site/views/registration/tmpl/actions.php
++ site/views/registration/tmpl/complete.php
++ site/views/registration/tmpl/default.php
++ site/views/registration/view.html.php
+~ site/views/submit/tmpl/default.php
+~ site/views/submit/view.html.php
+
+
+iCagenda 3.5.21 <small style="font-weight:normal;">(2016.08.04)</small>
+================================================================================
+# [HIGH] Fixed : Fresh install and udpate could fail with a broken admin (only free version).
+# [LOW] Fixed : warning if library disabled in control panel
+
+* Changed files in 3.5.21
+~ admin/icagenda.php
+~ icagenda.xml
+
+
+$ iCagenda 3.6.0-rc1 <small style="font-weight:normal;">(2016.07.30)</small>
+================================================================================
+! Anonymous Usage Statistics
+1 Usage statistics or 'Telemetry' is a feature in iCagenda that sends anonymously and automatically your system information (Similar to the Joomla! Statistics plugin introduced in Joomla 3.5).
+1 This will only submit the Joomla! version, PHP version, database engine and version, and iCagenda version. Usage statistics are collected during the update, and help us improve future versions of iCagenda.
+1 The code used for this anonymous data submission can be read in the install script file of the extension (script.icagenda.php).
+1 You can disable this feature in global options of iCagenda component, 'General Settings' tab.
+# [LOW] Fixed : default setting for new option DateBox Month Format
+# [LOW] Fixed : warning if library disabled in control panel
+# [LOW] Fixed : warning if no custom fields in registration form
+
+* Changed files in 3.6.0-rc1
+~ admin/config.xml
+~ admin/icagenda.php
+~ admin/views/icagenda/tmpl/default.php
+~ admin/views/info/tmpl/default.php
+~ [MEDIA] media/icicons/style.css
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.php
+~ script.icagenda.php
+~ site/add/elements/iclist_vars.php
+~ site/views/registration/tmpl/default.php
+
+
+iCagenda 3.5.20 <small style="font-weight:normal;">(2016.07.28)</small>
+================================================================================
+# [LOW] Fixed : missing Google API Key when set, in frontend 'Submit an Event' form.
+# [LOW] Fixed : missing some current dates (single dates) when 'Current and upcoming events' filtering.
+# [LOW] Fixed : possible issue of css conflict between iCagenda icons font and site template icons font.
+
+* Changed files in 3.5.20
+~ admin/utilities/events/data.php
+~ [MEDIA] media/icicons/style.css
+~ site/views/submit/tmpl/default.php
+
+
+$ iCagenda 3.6.0-beta1 <small style="font-weight:normal;">(2016.07.13)</small>
+================================================================================
+! Refactory : Custom Fields admin list
+1 - improve Custom Fields admin list usability and readability.
+! New : Custom Field Types
+1 - new field type "label (separator)": to add label headings inside form (with custom CSS class option)
+1 - new field type "description (separator)": to add a description text inside form (with custom CSS class option)
++ Added : option to set month format in the date box (list of events).
++ Added : missing options in filter by custom field type (admin list of custom fields).
++ Added : control for current page in list pagination before rendering.
+- Removed : all not needed anymore rel="nofollow" in modules event links.
+~ Changed : includes all fixes and improvements of versions 3.5.18 and 3.5.19 (see releases notes for additional info).
+~ [THEME PACKS] Changed : in THEME_events.php, variable $EVENT_MONTHSHORT replaced by $EVENT_MONTH (to use new month format option).
+# Fixed : event individual option to set registration deadline.
+# Fixed : missing custom fields filled in admin registration edit page.
+# Fixed : minor search filters grid css adjustement.
+# Fixed : Error page if page searched does not exist.
+
+* Changed files in 3.6.0-beta1
+~ admin/config.xml
+~ admin/models/category.php
+~ admin/models/customfield.php
+~ admin/models/customfields.php
+~ admin/models/event.php
+~ admin/models/fields/modal/cat.php
++ admin/models/fields/spacer/description.php
++ admin/models/fields/spacer/label.php
+~ admin/models/forms/customfield.xml
+~ admin/tables/customfield.php
+~ admin/utilities/customfields/customfields.php
+~ admin/utilities/event/event.php
+~ admin/utilities/events/data.php
+~ admin/utilities/events/events.php
+~ admin/utilities/form/field/registrationdates.php
+~ admin/utilities/googlemaps/googlemaps.php
+~ admin/utilities/list/list.php
+~ admin/utilities/registration/registration.php
+~ admin/views/customfield/tmpl/edit.php
+~ admin/views/customfields/tmpl/default.php
+~ admin/views/event/tmpl/edit.php
+~ admin/views/registration/tmpl/edit.php
+~ [LIBRARY] libraries/ic_library/date/date.php
+~ [MEDIA] media/css/icagenda-front.css
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.php
+~ [MODULE][PRO] modules/mod_ic_event_list/tmpl/default.php
+~ [MODULE][PRO] modules/mod_ic_event_list/tmpl/icrounded.php
+~ [PLUGIN] plugins/quickicon/icagendaupdate/icagendaupdate.php
+~ site/add/elements/iclist_vars.php
+~ site/models/list.php
+~ site/models/registration.php
+~ site/models/submit.php
+
+
+iCagenda 3.5.19 <small style="font-weight:normal;">(2016.06.30)</small>
+================================================================================
+! Since June 22, 2016, Google Maps API no longer support keyless access.
+1 Active domains created before June 22, 2016, continue to be able to access the Google Maps JavaScript API, Static Maps API, and Street View Image API without an API key. They are not affected by keyless access being unavailable for new domains.
+1 However it is advised to use a key in order to guarantee the quality of service.
++ Added : Option to set Google Maps browser API key (Global Options > General Settings).
+# [LOW] Fixed : Error sql 00000 in event edition and registration form on PDO sql server.
+# [LOW] Fixed : error page not found if sh404sef extension installed.
+# [LOW][THEME PACK default] Fixed : size of Date Box conteneur when a site template declares a 'box-sizing: border-box' style to all div.
+
+* Changed files in 3.5.19
+~ admin/config.xml
+~ admin/utilities/customfields/customfields.php
+~ admin/views/event/tmpl/edit.php
+~ site/helpers/icmodel.php
+~ site/models/list.php
+~ [THEME PACK] site/themes/packs/default/css/default_component.css
+
+
+iCagenda 3.5.18 <small style="font-weight:normal;">(2016.06.19)</small> Security Release [J! 2.5]
+================================================================================
++ Added : username of the user who has submitted event in frontend (event admin edition, Publishing tab).
+~ Changed : a few minor code cleaning.
+# [SECURITY][MEDIUM][Joomla 2.5.x ONLY!] Fixed : possible non-persistent (or reflected) cross-site scripting vulnerability (Note: if you have a Joomla 3 website, you DON'T have this security vulnerability. If you use iCagenda 3.6.0-alpha, NO ISSUE on both Joomla versions 2.5 and 3). A reflected attack is typically delivered via email or a neutral web site. The bait is an innocent-looking URL, pointing to a trusted site but containing the XSS vector. If the trusted site is vulnerable to the vector, clicking the link can cause the victim's browser to execute the injected script (your joomla 2.5 site is not directly compromised, but your visitor could be... please, update!). Again, it's recommended for all users still using Joomla 2.5, to upgrade to Joomla 3 as soon as possible! (Joomla 2.5 is not updated and end of life since December 2014. iCagenda will stop support Joomla 2.5 after iCagenda 3.6 release.)
+# [LOW] Fixed : alias generation if unicode enabled in Joomla global configuration.
+# [LOW] Fixed : user name display in list of events when created_by not set.
+# [LOW] Fixed : possible issue on multiple clicks on submit button (frontend form) resulting in duplicated data.
+# [LOW] Fixed : ordering by username in admin events list.
+# [LOW] Fixed : white page in admin control panel on pdo-mysql database.
+# [LOW] Fixed : issue with some date formats in en-US language.
+# [LOW] Fixed : issue with quick icon plugin on iCagenda uninstall (Joomla admin control panel white page).
+# [LOW] Fixed : 'Place' name translation with Falang.
+# [LOW] Fixed & improved : Image name control (space replacement) and renaming if needed, in frontend 'Submit an Event' form.
+# [LOW][MODULE][PRO] Fixed : missing events if date filter is set to display only past events.
+
+* Changed files in 3.5.18
+~ admin/models/category.php
+~ admin/models/event.php
+~ admin/models/events.php
+~ admin/models/forms/event.xml
+~ admin/utilities/categories/categories.php
+~ admin/utilities/events/data.php
+~ admin/utilities/form/form.php
+~ admin/views/event/tmpl/edit.php
+~ admin/views/event/view.html.php
+~ admin/views/events/tmpl/default.php
+~ admin/views/icagenda/tmpl/default.php
+~ admin/views/info/tmpl/default.php
+~ [LIBRARY] libraries/ic_library/globalize/culture/en-US.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.php
+~ [PLUGIN] plugins/quickicon/icagendaupdate/icagendaupdate.php
+~ site/helpers/ichelper.php
+~ site/helpers/icmodel.php
+~ site/models/list.php
+~ site/models/submit.php
+~ site/views/list/view.html.php
+~ site/views/submit/tmpl/default.php
+
+
+$ iCagenda 3.6.0-alpha2.1 <small style="font-weight:normal;">(2016.06.02)</small>
+================================================================================
++ Added : missing files of alpha2 (Thanks to the first beta-testers report!)
+
+* Changed files in 3.6.0-alpha2.1
+~ admin/utilities/customfields/customfields.php
+~ admin/utilities/event/data.php
+~ admin/utilities/event/event.php
+
+
+$ iCagenda 3.6.0-alpha2 <small style="font-weight:normal;">(2016.05.31)</small>
+================================================================================
+! New : Registration Form Refactory
+1 - a full new view HTML structure, to load all fields with a maximum of flexibility
+1 &nbsp; and performance (see custom field groups)
+! New : Custom Field Types
+1 - new field types: date (calendar), url, email (new ones will be added in beta1!)
+1 - override field types: name, email, phone, date and tickets
+1 &nbsp; (replace the core iCagenda fields, to allow ordering inside custom fields as you want!)
+! New : Admin Custom Field List and Edition Reviewed
+1 - List: useful info directly in the list of custom fields.
+1 - Edition: Will show option(s) depending on selected parent form and field type
+1 &nbsp; (minimum Joomla 3.2.4 to get this functionnality).
+! And a lot of code improvements! ;-)
++ Added : select user in registration edition, with auto-filled name and email (depending on your global settings).
++ Added : admin filter (dropdown) to select custom fields by group.
++ Added : landing page for registration form in frontend.
+~ Changed : includes all fixes and improvements of versions 3.5.14 to 3.5.17 (see releases notes for additional info).
+# [J2.5][MEDIUM] Fixed (alpha1) : was broken on Joomla 2.5
+# [LOW] Fixed (alpha1) : redirection on successfull registration.
+# [LOW] Fixed (alpha1) : multiple words search in frontend.
+# [LOW] Fixed (alpha1) : pagination issue on Chrome when search filters disabled.
+
+* Changed files in 3.6.0-alpha2
+~ admin/config.xml
+~ admin/controllers/registration.php
+~ admin/controllers/registrations.raw.php
+~ admin/icagenda.php
+~ admin/liveupdate/liveupdate.php
+~ admin/models/category.php
+~ admin/models/customfield.php
+~ admin/models/customfields.php
+~ admin/models/event.php
+~ admin/models/events.php
+~ admin/models/forms/customfield.xml
+~ admin/models/forms/download.xml
+~ admin/models/forms/event.xml
+~ admin/models/forms/registration.xml
+~ admin/models/mail.php
+~ admin/models/registrations.php
+~ admin/tables/customfield.php
+~ admin/utilities/ajax/ajax.php
+~ admin/utilities/categories/categories.php
+~ admin/utilities/customfields/customfields.php
+~ admin/utilities/event/event.php
+~ admin/utilities/events/data.php
+~ admin/utilities/form/field/customfieldgroups.php
++ admin/utilities/form/field/registrationdates.php
++ admin/utilities/form/field/registrationpeople.php
++ admin/utilities/form/field/registrationterms.php
+~ admin/utilities/form/form.php
+~ admin/utilities/list/list.php
+~ admin/utilities/registration/participants.php
+~ admin/utilities/registration/registration.php
+~ admin/utilities/theme/joomla25.php
+~ admin/utilities/theme/theme.php
+~ admin/views/customfield/tmpl/edit.php
+~ admin/views/customfields/tmpl/default.php
+~ admin/views/customfields/view.html.php
+~ admin/views/event/tmpl/edit.php
+~ admin/views/event/view.html.php
+~ admin/views/events/tmpl/default.php
+~ admin/views/icagenda/tmpl/default.php
+~ admin/views/info/tmpl/default.php
+~ admin/views/registration/tmpl/edit.php
+~ admin/views/registrations/tmpl/default.php
+~ icagenda.xml
+~ [LIBRARY] libraries/ic_library/filter/output.php
+~ [LIBRARY] libraries/ic_library/form/field/sortablefields.php
+~ [LIBRARY] libraries/ic_library/globalize/culture/cs-CZ.php
+~ [LIBRARY] libraries/ic_library/globalize/culture/en-GB.php
+~ [LIBRARY] libraries/ic_library/globalize/culture/en-US.php
+~ [LIBRARY] libraries/ic_library/globalize/culture/fa-IR.php
++ [LIBRARY] libraries/ic_library/globalize/culture/fo-FO.php
+~ [LIBRARY] libraries/ic_library/globalize/globalize.php
+~ [LIBRARY] libraries/ic_library/lib_ic_library.xml
++ [LIBRARY] libraries/ic_library/render/render.php
+~ [LIBRARY] libraries/ic_library/thumb/get.php
+~ [LIBRARY] libraries/ic_library/url/url.php
+~ [MEDIA] media/css/icagenda-back.css
+~ [MEDIA] media/css/icagenda-front.css
+~ [MEDIA] media/css/icagenda-front.j25.css
+~ [MEDIA] media/js/icagenda.js
+~ [MODULE][PRO] modules/mod_ic_event_list/helper.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.xml
+~ [MODULE][PRO] modules/mod_ic_event_list/tmpl/default.php
+~ [MODULE][PRO] modules/mod_ic_event_list/tmpl/icrounded.php
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.xml
++ [PLUGIN] plugins/quickicon/icagendaupdate/icagendaupdate.php
++ [PLUGIN] plugins/quickicon/icagendaupdate/icagendaupdate.xml
++ [PLUGIN] plugins/quickicon/icagendaupdate/language/
+~ [PLUGIN] plugins/system/ic_library/ic_library.php
+~ script.icagenda.php
+~ site/add/elements/icevent_vars.php
+~ site/controllers/registration.php
+~ site/icagenda.php
+~ site/models/event.php
+~ site/models/events.php
+~ site/models/forms/registration.xml
+~ site/models/forms/submit.xml
+~ site/models/list.php
+~ site/models/registration.php
+~ site/models/submit.php
+~ site/router.php
+~ [THEME PACK] site/themes/packs/default/css/default_component.css
+~ [THEME PACK] site/themes/packs/default/css/default_module.css
+~ [THEME PACK] site/themes/packs/default/default_day.php
+~ [THEME PACK] site/themes/packs/default/default_event.php
+~ [THEME PACK] site/themes/packs/ic_rounded/css/ic_rounded_component.css
+~ [THEME PACK] site/themes/packs/ic_rounded/css/ic_rounded_module.css
+~ [THEME PACK] site/themes/packs/ic_rounded/ic_rounded_day.php
+~ [THEME PACK] site/themes/packs/ic_rounded/ic_rounded_event.php
+~ site/views/event/tmpl/default.php
+~ site/views/event/view.html.php
+~ site/views/list/tmpl/default.php
+~ site/views/list/tmpl/default_categories.php
+~ site/views/list/view.html.php
+~ site/views/registration/tmpl/complete.php
+~ site/views/registration/tmpl/default.php
+~ site/views/registration/view.html.php
+~ site/views/submit/tmpl/default.php
+
+
+iCagenda 3.5.17 <small style="font-weight:normal;">(2016.04.12)</small>
+================================================================================
++ Added : Patches and controls for Joomla 3.5.1 mail issues, returning a "0 - Invalid address: " error depending of your settings and server.
+~ Changed : admin module options minor UI change, with replacement of icon image (in info message) by iCagenda font icons.
+# [LIBRARY][LOW] Fixed : error if uploaded image is too big for php thumbnails generator (control was broken).
+# [MODULE iC Calendar][J2.5][LOW] Fixed : All categories option select bug on Joomla 2.5
+# [MODULE iC Event List][PRO][LOW] Fixed : wrong info message for admin logged-in on frontend.
+
+* Changed files in 3.5.17
+~ admin/models/mail.php
+~ [LIBRARY] libraries/ic_library/thumb/get.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.php
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.xml
+~ site/helpers/icmodel.php
+~ site/models/submit.php
+
+
+iCagenda 3.5.16 <small style="font-weight:normal;">(2016.03.19)</small>
+================================================================================
+! New : Quick Icon plugin for update notification
+1 - Checks for iCagenda updates and notifies you when you visit the Control Panel page of Joomla! administration.
+! Info : iCagenda 3.5 is Joomla! 3.5 and PHP 7 READY!
++ [GLOBALIZATION] Added : fo-FO Faroese (Faroe Islands) date formats.
+# [MODULE iC Calendar][LOW] Fixed : time loading when a lot of past events.
+# [MODULE iC Event List][PRO][MEDIUM] Fixed : issue with number of events option (not always displaying all the events as set by this option).
+
+* Changed files in 3.5.16
+~ admin/models/events.php
+~ icagenda.xml
+~ [MODULE][PRO] modules/mod_ic_event_list/helper.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.php
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ script.icagenda.php
+~ site/models/events.php
++ [LIBRARY] libraries/ic_library/globalize/culture/fo-FO.php
++ plugins/quickicon/icagendaupdate/icagendaupdate.php
++ plugins/quickicon/icagendaupdate/icagendaupdate.xml
++ [FOLDER] plugins/quickicon/icagendaupdate/language/
+
+
+iCagenda 3.5.15 <small style="font-weight:normal;">(2016.02.19)</small>
+================================================================================
+# [Registrations CSV Export][LOW] Fixed : html tags in 'Notes' when this field was filled in admin registration edition.
+# [Registrations CSV Export][LOW] Fixed : missing period dates (when registration for a full period) in 'date' column.
+# [MODULE iC Event List][PRO][MEDIUM] Fixed : category filter was broken in 3.5.14.
+# [MODULE iC Event List][PRO][LOW] Fixed : some events not displayed, depending on your settings.
+# [MODULE iC Event List][PRO][LOW] Fixed : direct url to event when full period with no weekdays selected.
+# [MODULE iC Calendar][LOW] Fixed : conflict on windows with Ctrl+C and the a11y shortcut keyaccess used for direct-focus on module calendar (replaced by Ctrl+Alt+C).
+
+* Changed files in 3.5.15
+~ admin/models/registrations.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.php
+
+
+iCagenda 3.5.14 <small style="font-weight:normal;">(2016.01.23)</small>
+================================================================================
++ [MODULE iC Event List][PRO] Added : option to display all dates.
++ [Registrations CSV Export] Added : option to export registration ID (disabled by default).
++ [a11y](experimental) : keyboard accessibility for navigation in the calendar module on focus.
++ [THEME PACKS] Added : additional class names for each information fields, to allow individual css styling (ic-info-email, ic-info-website,... and for custom fields, ic-info-[slug]).
+~ Changed : improvement of file renaming on upload of file attachment.
+~ Changed : allow to show registration options in 'Submit an Event' frontend form, even if registrations are disabled in global options, and will set to OFF by default in the form field option.
+~ [THEME PACKS] Changed : review of clearfix in event details view, to allow custom CSS flexibility for floating positions.
+# [LOW] Fixed : if 'Display all dates' option is set to NO, do not show an event in past events, if at least this event has one current/upcoming date.
+# [LOW] Fixed : do not display time in frontend confirmation message after a successful registration, if display time option for this event is set to off.
+# [LOW] Fixed : depending on your site, possibility of an invalid date format (1 January 1970) for registrations notification on a full period (from ... to ...).
+# [LOW] Fixed : remove sup html tags in notification emails, if the date format includes exposant suffix for day (en-US).
+
+* Changed files in 3.5.14
+~ admin/controllers/registrations.raw.php
+~ admin/models/event.php
+~ admin/models/forms/download.xml
+~ admin/models/registrations.php
+~ admin/utilities/events/data.php
+~ admin/utilities/menus/menus.php
+~ [LIBRARY] libraries/ic_library/filter/output.php
+~ [LIBRARY] libraries/ic_library/globalize/globalize.php
+~ [LIBRARY] libraries/ic_library/thumb/get.php
+~ [MODULE][PRO] modules/mod_ic_event_list/helper.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.xml
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.php
+~ site/add/elements/icsetvar.php
+~ site/helpers/icmodel.php
+~ site/models/events.php
+~ site/models/submit.php
+~ [THEME PACKS] site/themes/packs/default/css/default_module.css
+~ [THEME PACKS] site/themes/packs/default/default_day.php
+~ [THEME PACKS] site/themes/packs/default/default_event.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_module.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_day.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_event.php
+~ site/views/list/tmpl/registration.php
+~ site/views/submit/tmpl/default.php
+
+
+$ iCagenda 3.6.0-alpha1 <small style="font-weight:normal;">(2015.12.28)</small>
+================================================================================
+! New : Frontend Search Filters
+1 - Global Options: Component Options > List tab.
+1 - Drag & drop filters options to change frontend ordering.
+1 - Options of display (responsive, full width, show or hide 'Search' label...).
+! New : Statistics
+1 - Hits on events.
+1 - Charts for category and event hits, displayed in the control panel of iCagenda.
+! New : Custom Field Groups
+1 - Create and manage groups for custom fields (directly in Custom Field edition).
+1 - Set individually in each event edition (Registration tab) the groups of custom fields to use for the registration form.
+! New : Module iC Event List (PRO)
+1 - Option to display all dates.
+~ Changed : the list view is now divided into 3 separated views: list, event and registration.
+~ Changed : date drop down in registration form is auto selected on the date clicked.
+
+* Changed files in 3.6.0-alpha1
+~ admin/config.xml
+~ admin/controllers/customfield.php
+~ admin/icagenda.php
+~ admin/models/customfield.php
+~ admin/models/event.php
+~ admin/models/events.php
+~ admin/models/fields/modal/checkdnsrr.php
+~ admin/models/fields/modal/ic_editor.php
+~ admin/models/forms/customfield.xml
+~ admin/models/forms/event.xml
+~ admin/models/icagenda.php
+~ admin/sql/install/mysql/icagenda.install.sql
+~ admin/sql/uninstall/mysql/icagenda.uninstall.sql
+~ admin/tables/customfield.php
+~ admin/tables/event.php
++ [FOLDER] admin/utilities/addthis/
++ admin/utilities/addthis/addthis.php
++ [FOLDER] admin/utilities/addtocal/
++ admin/utilities/addtocal/addtocal.php
++ admin/utilities/ajax/filter.php
+~ admin/utilities/customfields/customfields.php
++ [FOLDER] admin/utilities/event/
++ admin/utilities/event/data.php
++ admin/utilities/event/event.php
+~ admin/utilities/events/data.php
+~ admin/utilities/events/events.php
++ [FOLDER] admin/utilities/form/field/
++ admin/utilities/form/field/customfieldgroups.php
++ admin/utilities/form/field/customform.php
++ [FOLDER] admin/utilities/googlemaps/
++ admin/utilities/googlemaps/googlemaps.php
++ [FOLDER] admin/utilities/list/
++ admin/utilities/list/list.php
++ [FOLDER] admin/utilities/manager/
++ admin/utilities/manager/manager.php
++ [FOLDER] admin/utilities/registration/
++ admin/utilities/registration/participants.php
++ admin/utilities/registration/registration.php
++ [FOLDER] admin/utilities/render/
++ admin/utilities/render/render.php
++ admin/utilities/theme/joomla25.php
++ admin/utilities/theme/style.php
+~ admin/utilities/theme/theme.php
+~ admin/views/customfield/tmpl/edit.php
+~ admin/views/event/tmpl/edit.php
+~ admin/views/events/tmpl/default.php
+~ admin/views/icagenda/tmpl/default.php
+~ admin/views/icagenda/view.html.php
+~ admin/views/info/tmpl/default.php
+~ admin/views/registrations/tmpl/default.php
+~ icagenda.xml
++ [LIBRARY][FOLDER] libraries/ic_library/form/
++ [LIBRARY][FOLDER] libraries/ic_library/form/field/
++ [LIBRARY]libraries/ic_library/form/field/sortablefields.php
++ [LIBRARY][FOLDER] libraries/ic_library/iCalcreator/
++ [LIBRARY]libraries/ic_library/iCalcreator/iCalcreator.class.php
+~ [MEDIA] media/css/icagenda-back.css
+~ [MEDIA] media/css/icagenda-front.css
+~ [MEDIA][iCicons] media/icicons/
++ [MEDIA] media/js/Chart.js
++ [MEDIA] media/js/Chart.min.js
+~ [MODULE][PRO] modules/mod_ic_event_list/helper.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.xml
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.php
+~ [PLUGIN] plugins/search/icagenda/icagenda.php
+~ script.icagenda.php
++ site/add/elements/icevent_vars.php
++ site/add/elements/iclist_vars.php
+- site/add/elements/icsetvar.php
+~ site/controller.php
++ [FOLDER] site/controllers/
++ site/controllers/registration.php
+- site/helpers/iCalcreator.class.php
+- site/helpers/ichelper.php
+- site/helpers/icmodel.php
+- site/helpers/media_css.class.php
+~ site/icagenda.php
++ site/models/event.php
+~ site/models/events.php
++ [FOLDER] site/models/fields/
++ site/models/fields/categories.php
++ site/models/fields/month.php
++ site/models/fields/year.php
+~ site/models/forms/registration.xml
+~ site/models/list.php
++ site/models/registration.php
+~ site/models/submit.php
+~ site/router.php
+~ [THEME PACK] site/themes/packs/default/css/default_component.css
+~ [THEME PACK] site/themes/packs/default/css/default_component_medium.css
+~ [THEME PACK] site/themes/packs/default/css/default_component_small.css
+~ [THEME PACK] site/themes/packs/default/css/default_component_xsmall.css
+~ [THEME PACK] site/themes/packs/ic_rounded/css/ic_rounded_component.css
+~ [THEME PACK] site/themes/packs/ic_rounded/css/ic_rounded_component_medium.css
+~ [THEME PACK] site/themes/packs/ic_rounded/css/ic_rounded_component_small.css
+~ [THEME PACK] site/themes/packs/ic_rounded/css/ic_rounded_component_xsmall.css
++ [FOLDER] site/views/event/
++ [FOLDER] site/views/event/tmpl/
++ site/views/event/tmpl/default.php
++ site/views/event/tmpl/default_top.php
++ site/views/event/tmpl/default_vcal.php
++ site/views/event/view.html.php
+- site/views/list/tmpl/actions.php
+~ site/views/list/tmpl/default.php
+~ site/views/list/tmpl/default.xml
+~ site/views/list/tmpl/default_categories.php
++ site/views/list/tmpl/default_filters.php
+- site/views/list/tmpl/default_vcal.php
+- site/views/list/tmpl/event.php
+- site/views/list/tmpl/registration.php
+~ site/views/list/view.feed.php
+~ site/views/list/view.html.php
++ [FOLDER] site/views/registration/
++ [FOLDER] site/views/registration/tmpl/
++ site/views/registration/tmpl/actions.php
++ site/views/registration/tmpl/complete.php
++ site/views/registration/tmpl/default.php
++ site/views/registration/view.html.php
+~ site/views/submit/tmpl/default.php
+
+
+iCagenda 3.5.13 <small style="font-weight:normal;">(2015.12.05)</small>
+================================================================================
++ Added : in registrations csv export, new option to display 'created date' (when the user registered).
+# [MEDIUM] Fixed : error getimagesize if original image deleted.
+# [MEDIUM] Fixed : not able to get user groups after logged-in user changed his password in frontend (return error message in component and modules).
+# [LOW] Fixed : issue since Joomla 3.4.5 with upload of custom Theme Packs.
+# [LOW] Fixed : issue with date and DST (Day Saving Time) with export to Outlook.
+# [LOW] Fixed : private access level for event information was broken if custom fields.
+# [LOW] Fixed : admin language ordering in events list.
+# [LOW] Fixed : category and search list filters with no effect in registration csv export.
+# [MODULE iC calendar][LOW] Fixed : Loading calendar on defined month/year not working in some cases.
+
+* Changed files in 3.5.13
+~ admin/controllers/registrations.raw.php
+~ admin/models/events.php
+~ admin/models/forms/download.xml
+~ admin/models/registrations.php
+~ admin/models/themes.php
+~ admin/utilities/events/data.php
+~ admin/utilities/events/events.php
+~ admin/utilities/menus/menus.php
+~ [LIBRARY] libraries/ic_library/thumb/get.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.php
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.php
+~ [PLUGIN] plugins/search/icagenda/icagenda.php
+~ site/helpers/icmodel.php
+~ site/models/events.php
+~ site/models/submit.php
+~ site/themes/packs/default/default_day.php
+~ site/themes/packs/default/default_event.php
+~ site/themes/packs/ic_rounded/ic_rounded_day.php
+~ site/themes/packs/ic_rounded/ic_rounded_event.php
+~ site/views/list/tmpl/default_vcal.php
+~ site/views/list/tmpl/event.php
+
+iCagenda 3.5.12 <small style="font-weight:normal;">(2015.10.12)</small>
+================================================================================
++ Added : option field 'Time display' in 'Submit an event' form.
++ Added : global option to Select if 'Time Display' option is set by default on 'Show' or 'hide' when creating a new event ('General Settings' tab of the Global Options of the component).
++ Added : missing separator option in global options for date format.
++ [MODULE iC calendar] Added : option to set custom limit for auto-intro description.
++ [MODULE iC Event List][PRO] Added : option to set HTML filtering for auto-intro description.
+~ Changed : use global date format option in registrations list, and display start and end date when registration for a period.
+# [MODULE iC calendar][LOW] Fixed : display of "booking closed" when events only singles dates, and all upcoming, but registration type option for this event is set to "for all dates of the event".
+# [MODULE iC calendar][LOW] Fixed : in "auto" mode for option "Link to Menu Item", the global option for filter by dates was not defined, if not on a list of events page ("auto" not working properly in this case, in a few cases, depending of your settings, if one at least of the menu item(s) to a list of events was set to use global options for Filter by dates).
+# [MODULE iC calendar][LOW] Fixed : option for filtering HTML tags of intro-text not working in tooltip if not on list of events page.
+# [LOW] Fixed : not displaying full address if country and/or city included in the place name.
+# [LOW] Fixed : display of long content in registrations admin list (overlap in data display).
+
+* Changed files in 3.5.12
+~ admin/config.xml
+~ admin/models/event.php
+~ admin/models/forms/event.xml
+~ admin/models/registrations.php
+~ admin/utilities/events/events.php
+~ admin/utilities/menus/menus.php
+~ admin/views/registrations/tmpl/default.php
+~ [MODULE][PRO] modules/mod_ic_event_list/helper.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.xml
+~ [MODULE][PRO] modules/mod_ic_event_list/tmpl/default.php
+~ [MODULE][PRO] modules/mod_ic_event_list/tmpl/icrounded.php
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.xml
+~ script.icagenda.php
+~ site/add/elements/icsetvar.php
+~ site/helpers/icmodel.php
+~ site/models/forms/submit.xml
+~ site/views/submit/tmpl/default.php
+~ site/views/submit/tmpl/default.xml
+~ site/views/submit/view.html.php
+
+
+iCagenda 3.5.11 <small style="font-weight:normal;">(2015.09.05)</small>
+================================================================================
+# [LOW] Fixed : date format with short month broken (in 3.5.10).
+# [LOW] Fixed : date format with separator broken (since 3.5.6).
+# [MODULE iC calendar][LOW] Fixed : display of current month, whereas option 'Loading on Date' is set on a day of the previous month.
+
+* Changed files in 3.5.11
+~ [LIBRARY] libraries/ic_library/globalize/culture/en-GB.php
+~ [LIBRARY] libraries/ic_library/globalize/culture/en-US.php
+~ [LIBRARY] libraries/ic_library/globalize/culture/fa-IR.php
+~ [LIBRARY] libraries/ic_library/globalize/globalize.php
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.php
+~ site/helpers/ichelper.php
+~ site/helpers/icmodel.php
+
+
+iCagenda 3.5.10 <small style="font-weight:normal;">(2015.09.01)</small>
+================================================================================
++ Added : Compatible with Jalali/Persian calendar in admin (use of Joomla calendar for datetime picker).
++ Added : missing field to select 'Registration type' in the 'Submit an event' form, if registration options displayed.
++ Added : function to disable the submit button in frontend forms, after first click (to prevent multiple clicks during data process).
+~ Changed : Asynchronous Loading of the AddThis widget script
+~ Changed : auto-detect if https/ssl server for loading the AddThis widget script.
+~ [MODULE iC calendar] Changed : you can now select one of the seven days of the week, as the first day of the calendar.
+~ [THEME PACK] Changed : registration header is simplified, and use now its own css classes (ic-reg + suffix)
+~ [THEME PACK] Changed : new ic-current-period class used to replace inline css when for the overline when period started and current (box date in list of events)
+# [LOW] Fixed : a few issues with Jalali calendar in frontend (day 31 of a period not dislayed in calendar, possible datetime contruct error if no single dates in event details view).
+# [LOW] Fixed : if only single dates with no period, and registration type option set to "for all dates of event", the date in registration email notifications was wrong.
+# [LOW] Fixed : loading of event custom fields in registrations list if same id (missing parent_form control).
+# [LOW] Fixed : date could include non-breaking space (&nbsp;) in notification email.
+# [MODULE iC Event List][LOW] Fixed : display of month in the date box, on last day of a month (eg. 31 August) was next month, and not current month.
+
+* Changed files in 3.5.10
+~ admin/models/fields/modal/date.php
+~ admin/models/fields/modal/enddate.php
+~ admin/models/fields/modal/startdate.php
+~ admin/tables/event.php
+~ admin/utilities/customfields/customfields.php
+~ admin/utilities/events/events.php
+~ admin/utilities/form/form.php
+~ admin/views/icagenda/tmpl/default.php
+~ admin/views/registrations/tmpl/default.php
++ [LIBRARY] libraries/ic_library/globalize/convert.php
+~ [LIBRARY] libraries/ic_library/globalize/globalize.php
++ [MEDIA] media/images/loader.gif
+~ [MEDIA] media/js/icdates.js
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.php
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.xml
+~ site/add/elements/icsetvar.php
+~ site/helpers/icmodel.php
+~ site/models/forms/submit.xml
+~ site/models/submit.php
+~ [THEME PACK] site/themes/packs/default/css/default_component.css
+~ [THEME PACK] site/themes/packs/default/default_registration.php
+~ [THEME PACK] site/themes/packs/ic_rounded/css/ic_rounded_component.css
+~ [THEME PACK] site/themes/packs/ic_rounded/ic_rounded_events.php
+~ [THEME PACK] site/themes/packs/ic_rounded/ic_rounded_registration.php
+~ site/views/list/tmpl/registration.php
+~ site/views/submit/tmpl/default.php
+
+
+iCagenda 3.5.9 <small style="font-weight:normal;">(2015.08.01)</small>
+================================================================================
+! Added options for export in csv of a list of registrations (select info to be exported, and select between comma or semicolon as separator for values)
+! You can now send a newsletter for all users registered for an event (all dates), or only for users registered to only one date (or period) of the event.
+~ Changed : dropdowns for event and date in registration form, as well as for newsletter now use ajax for updating the date depending of the selected event, without reloading the page.
+~ Changed : set 'All Events' as default value for 'Filter by Dates' global option (on new install).
+~ [THEME PACK] Changed : ic_rounded module calendar css for table, by addition of class ic-table (minor change to prevent some possible css conflict with site template).
+~ Changed : minimum joomla 3 release is now 3.2.3 (for websites using iCagenda on Joomla 3).
+# [MEDIUM] Fixed : when trying to change state of a registration (broken since 3.5.7) the event state was sometimes changed in the same time (but not removed from database). Sorry for any inconvenience.
+# [LOW] Fixed : change state not working in admin registrations list (not possible to trash or unpublished a registration entry).
+# [LOW] Fixed : lost of changes if changing event in registration admin edition (fixed by using ajax to generate the date list).
+# [MODULES][LOW] Fixed : 'Filter by dates' could be broken for modules, if set in all menus to 'Use Global', and set to 'All Events' in global options.
+# [MODULE iC Event List][LOW] Fixed : notice error if no events to be displayed (undefined variable).
+
+* Changed files in 3.5.9
+~ admin/config.xml
+~ admin/controllers/mail.php
+~ admin/controllers/registration.php
+~ admin/controllers/registrations.php
+~ admin/controllers/registrations.raw.php
+~ admin/models/fields/modal/evt.php
+~ admin/models/fields/modal/evt_date.php
+- admin/models/fields/modal/mailinglist.php
+~ admin/models/forms/download.xml
+~ admin/models/forms/mail.xml
+~ admin/models/forms/registration.xml
+~ admin/models/mail.php
+~ admin/models/registration.php
+~ admin/models/registrations.php
+- admin/tables/mail.php
+~ admin/tables/registration.php
++ admin/utilities/ajax/ajax.php
+~ admin/utilities/events/events.php
+~ admin/utilities/menus/menus.php
+~ admin/views/mail/tmpl/edit.php
+~ admin/views/mail/view.html.php
+~ admin/views/registration/tmpl/edit.php
+~ admin/views/registrations/tmpl/default.php
+~ admin/views/registrations/view.html.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.php
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ script.icagenda.php
+~ [THEME PACK] site/themes/packs/ic_rounded/css/ic_rounded_module.css
+
+
+iCagenda 3.5.8 <small style="font-weight:normal;">(2015.07.17)</small>
+================================================================================
+# [MODULE iC Calendar][LOW] Fixed : no events displayed in the calendar if menus option 'Filter by dates' is set to 'Use Global' (Sorry for any inconvenience).
+
+* Changed files in 3.5.8
+~ admin/utilities/menus/menus.php
+
+
+iCagenda 3.5.7 <small style="font-weight:normal;">(2015.07.16)</small>
+================================================================================
++ Added : publishing info for registrations; Created date/by (null if registration processed before update to 3.5.7 or later) and Modified date/by.
++ [MODULES] Added: alert message with number of events not displayed, when a user with admin permissions is logged-in in frontend (see current fix in modules for events with no menu link to allow the display.).
+~ Changed : end time for single dates is now assumed to be midnight, when filtering today's events.
+~ [THEME PACK] Changed : remove inline css used before to display Terms of Service, and use new names for the css classes.
+# [MODULES][LOW] Fixed : no display of events if no menu link allows the display.
+# [MODULE iC Calendar][LOW] Fixed : possible script conflict if joomla timezone or server timezone selected (highlightToday issue).
+# [MODULE iC Calendar][LOW] Fixed : no display of December events.
+# [LOW] Fixed : filtering of space for dates in notification emails if mail received in plain text.
+# [LOW] Fixed : possible notice 'Undefined variable: dateglobalize_#' in backend, related to date format option (depends on your admin language).
+# [LOW] Fixed : wrong place of a closing div in list of events (3.5.6).
+# [LOW] Fixed : edit own access for registrations (user with only edit own access permissions, will see only its own registrations in the list).
+# [LOW] Fixed : JS notice empty value if Terms of Services not displayed in registration form.
+
+* Changed files in 3.5.7
+~ admin/controllers/registration.php
+~ admin/controllers/registrations.php
+~ admin/models/fields/iclist/globalization.php
+~ admin/models/forms/customfield.xml
+~ admin/models/forms/event.xml
+~ admin/models/forms/registration.xml
+~ admin/models/registration.php
+~ admin/models/registrations.php
+~ admin/sql/install/mysql/icagenda.install.sql
+~ admin/utilities/events/data.php
+~ admin/utilities/events/events.php
+~ admin/utilities/form/form.php
+~ admin/utilities/menus/menus.php
+~ admin/views/event/tmpl/edit.php
+~ admin/views/registration/tmpl/edit.php
+~ admin/views/registrations/tmpl/default.php
+~ [LIBRARY] libraries/ic_library/globalize/globalize.php
+~ [MODULE][PRO] modules/mod_ic_event_list/css/default_style.css
+~ [MODULE][PRO] modules/mod_ic_event_list/css/icrounded_style.css
+~ [MODULE][PRO] modules/mod_ic_event_list/helper.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.php
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.php
+~ site/helpers/icmodel.php
+~ site/models/events.php
+~ site/models/submit.php
+~ [THEME PACK] site/themes/packs/default/css/default_component.css
+~ [THEME PACK] site/themes/packs/default/css/default_module.css
+~ [THEME PACK] site/themes/packs/ic_rounded/css/ic_rounded_component.css
+~ [THEME PACK] site/themes/packs/ic_rounded/css/ic_rounded_module.css
+~ site/views/list/tmpl/default.php
+~ site/views/list/tmpl/registration.php
+~ site/views/submit/tmpl/default.php
+
+
+iCagenda 3.5.6 <small style="font-weight:normal;">(2015.06.29)</small>
+================================================================================
++ Added : Compatible with Jalali/Persian calendar in frontend.
+~ Changed : Update of Info page (addition of credits: languages and external libraries).
+~ Changed : Improvement of add to cal function for a better export to external calendars.
+~ Changed : Improvement of valid dates control in frontend submit an event form.
+~ Changed : migration of globalize date format function to the iC Library, and improvement.
+# [MEDIUM] Fixed : delete custom fields data of an event if this one is deleted.
+# [LOW] Fixed : add to cal issue when hide time selected.
+# [LOW] Fixed : date/dates display in event details depending of number of dates for a period.
+# [LOW] Fixed : registration button was not active when event with a past period, but upcoming single dates.
+# [LOW] Fixed : line return in Notes field, when exporting list of registrations to csv.
+# [LOW] Fixed : confirmed email field (registration form) was not removed from the session.
+# [LOW] Fixed : no display of a few dates in today's events filtering (when period with weekdays, and event running).
+
+* Changed files in 3.5.6
+~ admin/add/ renamed admin/assets/
++ admin/assets/jcms/info.php
+~ admin/config.xml
+~ admin/controller.php
+- [FOLDER] admin/globalization/
+~ admin/icagenda.php
+~ admin/models/event.php
+~ admin/models/events.php
+~ admin/models/fields/iclist/globalization.php
+~ admin/models/fields/modal/date.php
+~ admin/models/fields/modal/evt_date.php
+~ admin/models/forms/event.xml
+~ admin/models/registration.php
+~ admin/models/registrations.php
+~ admin/sql/install/mysql/icagenda.install.sql
+~ admin/tables/registration.php
+~ admin/utilities/customfields/customfields.php
+~ admin/utilities/events/data.php
+~ admin/utilities/events/events.php
++ admin/utilities/info/info.php
+~ admin/views/category/tmpl/edit.php
+~ admin/views/customfield/tmpl/edit.php
+~ admin/views/event/tmpl/edit.php
+~ admin/views/event/view.html.php
+~ admin/views/events/tmpl/default.php
+~ admin/views/events/view.html.php
+~ admin/views/feature/tmpl/edit.php
+~ admin/views/icagenda/tmpl/default.php
+~ admin/views/icagenda/view.html.php
+~ admin/views/info/tmpl/default.php
+~ admin/views/info/view.html.php
+~ admin/views/mail/tmpl/edit.php
+~ admin/views/registration/tmpl/edit.php
+~ admin/views/registration/view.html.php
+~ admin/views/registrations/view.html.php
+~ admin/views/themes/tmpl/default.php
+~ icagenda.xml
+~ [LIBRARY] libraries/ic_library/date/date.php
++ [LIBRARY][FOLDER] libraries/ic_library/globalize/
++ [LIBRARY] libraries/ic_library/globalize/culture/fa-IR.php
++ [LIBRARY] libraries/ic_library/globalize/globalize.php
+~ [LIBRARY] libraries/ic_library/lib_ic_library.xml
+~ [LIBRARY] libraries/ic_library/library/library.php
+~ [LIBRARY] libraries/ic_library/string/string.php
+~ [MEDIA] media/css/icagenda-back.css
+~ [MEDIA] media/css/icagenda-front.css
+~ [MEDIA] media/css/icagenda-front.j25.css
+~ [MEDIA] media/js/icdates.js
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.xml
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.xml
+~ script.icagenda.php
+~ site/helpers/ichelper.php
+~ site/helpers/icmodel.php
+~ site/models/events.php
+~ site/models/forms/submit.xml
+~ site/models/list.php
+~ site/models/submit.php
+~ [THEME PACK] site/themes/packs/default/css/default_component.css
+~ [THEME PACK] site/themes/packs/default/css/default_module.css
+~ [THEME PACK] site/themes/packs/default/default_calendar.php
+~ [THEME PACK] site/themes/packs/default/default_day.php
+~ [THEME PACK] site/themes/packs/default/default_event.php
+~ [THEME PACK] site/themes/packs/default/default_events.php
+~ [THEME PACK] site/themes/packs/default/default_registration.php
+~ [THEME PACK] site/themes/packs/ic_rounded/css/ic_rounded_component.css
+~ [THEME PACK] site/themes/packs/ic_rounded/css/ic_rounded_module.css
+~ [THEME PACK] site/themes/packs/ic_rounded/ic_rounded_calendar.php
+~ [THEME PACK] site/themes/packs/ic_rounded/ic_rounded_day.php
+~ [THEME PACK] site/themes/packs/ic_rounded/ic_rounded_event.php
+~ [THEME PACK] site/themes/packs/ic_rounded/ic_rounded_events.php
+~ [THEME PACK] site/themes/packs/ic_rounded/ic_rounded_registration.php
+~ site/views/list/tmpl/actions.php
+~ site/views/list/tmpl/default.php
+~ site/views/list/tmpl/default.xml
+~ site/views/list/tmpl/default_vcal.php
+~ site/views/list/tmpl/event.php
+~ site/views/list/tmpl/registration.php
+~ site/views/list/view.html.php
+~ site/views/submit/tmpl/default.php
+~ site/views/submit/tmpl/default.xml
+~ site/views/submit/tmpl/send.php
+~ site/views/submit/view.html.php
+
+
+iCagenda 3.5.5 <small style="font-weight:normal;">(2015.04.27)</small>
+================================================================================
+~ Changed : removal of v1 and v2 release notes (link to online change log for these versions).
+# [MEDIUM] Fixed : issue with admin event edition on IE (script error only on Internet Explorer).
+# [LOW] Fixed : wrong file jquery.tipTip.js was included in 3.5.4. This version includes the correct new one with tooltip position fix (as announced in previous release).
+
+* Changed files in 3.5.5
+~ admin/CHANGELOG.php
+~ [MEDIA] media/js/icdates.js
+~ [MEDIA] media/js/jquery.tipTip.js
+
+
+iCagenda 3.5.4 <small style="font-weight:normal;">(2015.04.24)</small>
+================================================================================
+! JComments ready : You can download the free iC JComments plugin to enable comments on events (http://icagenda.joomlic.com/resources/addons).
++ [GLOBALIZATION] Added : fa-IR Persan (Iran) date formats.
++ Added : global option to set text transformation of the event title (Global Options > General Settings tab).
++ Added : check image name in frontend 'Submit an Event form', and if file extension is missing, add the correct one.
+~ Changed : location of css and js core files (removed from admin and site folder, and moved to media).
+~ Changed : improve datetime picker validation (no need to click on validate button to be sure date entered is saved).
+# [MEDIUM] Fixed : missing 404 error page, when SEF is enabled, and event alias in url doesn't exist (was returning the first event found).
+# [MEDIUM] Fixed : Persan language issue, fixed date construct fatal error.
+# [LOW] Fixed : possible iCtip position issue (add to cal, print... tooltip) if another script is changing window top offset().
+# [LOW] Fixed : broken url to event details view in registration form header.
+# [LOW] Fixed : broken approval icon function in admin list of events.
+# [LOW] Fixed : special characters in breadcrumbs.
+# [LOW] Fixed : Nb of registered user, if only one single date, and registration type is changed after a few registrations occured.
+
+* Changed files in 3.5.4
+- [FOLDER] admin/add/css/
+~ admin/add/elements/desc.php
+~ admin/add/elements/title.php
++ admin/add/elements/titleheader.php
+~ admin/add/elements/titleimg.php
+- [FOLDER] admin/add/image/
+~ admin/config.xml
++ admin/globalization/fa-IR.php
+~ admin/models/event.php
+~ admin/models/forms/event.xml
+~ admin/tables/feature.php
+~ admin/utilities/customfields/customfields.php
+~ admin/utilities/events/data.php
+~ admin/utilities/events/events.php
+~ admin/utilities/form/form.php
+~ admin/views/categories/view.html.php
+~ admin/views/category/tmpl/edit.php
+~ admin/views/customfield/tmpl/edit.php
+~ admin/views/customfields/view.html.php
+~ admin/views/event/tmpl/edit.php
+~ admin/views/events/tmpl/default.php
+~ admin/views/events/view.html.php
+~ admin/views/feature/tmpl/edit.php
+~ admin/views/feature/view.html.php
+~ admin/views/features/view.html.php
+~ admin/views/icagenda/tmpl/default.php
+~ admin/views/icagenda/view.html.php
+~ admin/views/info/tmpl/default.php
+~ admin/views/info/view.html.php
+~ admin/views/mail/view.html.php
+~ admin/views/registration/tmpl/edit.php
+~ admin/views/registrations/view.html.php
+~ admin/views/themes/tmpl/default.php
+~ icagenda.xml
+~ [LIBRARY] libraries/ic_library/date/period.php
+~ [LIBRARY] libraries/ic_library/thumb/get.php
+~ [MEDIA] media/css/icagenda-back.css
++ [MEDIA] media/css/icagenda-back.j25.css
+~ [MEDIA] media/css/icagenda-front.css
++ [MEDIA] media/css/icagenda-front.j25.css
+~ [MEDIA] media/css/icagenda.css
++ [MEDIA][FOLDER] media/css/images/
++ [MEDIA] media/css/jquery-ui-1.8.17.custom.css
++ [MEDIA] media/css/template.j25.css
+~ [MEDIA][ICICONS][UPDATE] media/icicons/
+~ [MEDIA][IMAGES][UPDATE] media/images/
+~ [MEDIA] media/js/icdates.js
++ [MEDIA] media/js/icmap-front.js
+~ [MEDIA] media/js/jquery.tipTip.js
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.php
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.php
+~ script.icagenda.pro.php
+- [FOLDER] site/add/css/
+~ site/add/elements/icsetvar.php
+- [FOLDER] site/add/image/
+~ site/controller.php
+~ site/helpers/ichelper.php
+~ site/helpers/icmodel.php
+- [FOLDER] site/js/
+~ site/models/forms/submit.xml
+~ site/models/list.php
+~ site/models/submit.php
+~ site/router.php
+~ [THEME PACK] site/themes/packs/default/css/default_component.css
+~ [THEME PACK] site/themes/packs/default/default_events.php
+~ [THEME PACK] site/themes/packs/default/default_registration.php
+~ [THEME PACK] site/themes/packs/ic_rounded/css/ic_rounded_component.css
+~ [THEME PACK] site/themes/packs/ic_rounded/ic_rounded_events.php
+~ [THEME PACK] site/themes/packs/ic_rounded/ic_rounded_registration.php
++ site/views/list/tmpl/actions.php
+~ site/views/list/tmpl/default.php
+~ site/views/list/tmpl/default_categories.php
+~ site/views/list/tmpl/event.php
+~ site/views/list/tmpl/registration.php
+~ site/views/list/view.html.php
+~ site/views/submit/tmpl/default.php
+~ site/views/submit/tmpl/send.php
+~ site/views/submit/view.html.php
+
+
+iCagenda 3.5.3 <small style="font-weight:normal;">(2015.03.25)</small>
+================================================================================
++ Added : Confirm Email field in frontend Registration form, for not logged-in user.
++ Added : BOM utf-8 to csv export file (special characters).
+~ Changed : improvement of the model for admin event edition.
+~ Changed : postal code is now displayed (if available) in frontend address field.
+# [MEDIUM] Fixed : saving of custom fields and features when new event (with not yet an ID) was broken (no data saved).
+# [THEME PACKS][LOW] Fixed : display of empty participants list when registration not enabled.
+# [LOW] Fixed : display of information details in event details view, was not always displayed depending of options and data filled.
+# [LOW] Fixed : register button when only a single date, and the list display type is not set to display all dates.
+# [LOW] Fixed : added back the alert message on Joomla 2.5 about the impossibility of trashing frontend submitted events if not edited (the issue with trash and empty asset_id is fixed in latest version of Joomla 3).
+
+* Changed files in 3.5.3
+~ admin/config.xml
+~ admin/models/event.php
+~ admin/models/fields/modal/ictext_placeholder.php
+~ admin/models/forms/event.xml
+~ admin/models/registrations.php
+~ admin/tables/event.php
+~ admin/utilities/events/data.php
+~ admin/views/events/tmpl/default.php
+~ admin/views/registrations/view.raw.php
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ site/add/elements/icsetvar.php
+~ site/helpers/ichelper.php
+~ site/helpers/icmodel.php
+~ site/models/list.php
+~ [THEME PACKS] site/themes/packs/default/default_event.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_event.php
+~ site/views/list/tmpl/event.php
+~ site/views/list/tmpl/registration.php
+~ site/views/list/view.html.php
+
+
+iCagenda 3.5.2 <small style="font-weight:normal;">(2015.03.13)</small>
+================================================================================
+~ Changed : name/username allows now numeric characters (server-side iCagenda validator), and addition of joomla client-side username validation.
+~ Changed : minor re-ordering of period options in admin edition of an event, with info text for weekdays.
+# [MEDIUM] Fixed : function to generate small icons in Features was broken.
+# [LOW] Fixed : Custom fields data broken in csv export of registrations.
+# [LOW] Fixed : Number of registered users, for events over a period with no weekdays selected.
+# [LOW] Fixed : List of participants was broken if 'Avatar' and/or 'Username' list display option was selected (option 'Full' was working as expected).
+# [LOW] Fixed : Url to event details view could return a wrong number of registered user if a period with no weekdays selected (component list of events).
+# [LOW] Fixed : notice error when php function dateInterval does not exist on your server.
+# [LOW] Fixed : improvement of the function to get the current layout.
+# [LOW] Fixed : a few date format buggy depending of your settings, and the current language used.
+# [LOW] Fixed : notice error $translator not defined in control panel (language issue) only on free version.
+# [LOW] Fixed : filters display issue in registration admin list on Joomla 2.5 when event title length too high.
+# [MODULE iC Event List][LOW] Fixed : blur x-small thumbs when created in admin.
+
+* Changed files in 3.5.2
+~ admin/add/css/icagenda.j25.css
+~ admin/models/fields/modal/thumbs.php
+~ admin/models/forms/event.xml
+~ admin/models/registrations.php
+~ admin/tables/feature.php
+~ admin/views/event/tmpl/edit.php
+~ admin/views/events/tmpl/default.php
+~ admin/views/icagenda/tmpl/default.php
+~ admin/views/registrations/tmpl/default.php
+~ [LIBRARY] libraries/ic_library/date/period.php
+~ [LIBRARY] libraries/ic_library/thumb/get.php
+~ [MODULE][PRO] modules/mod_ic_event_list/tmpl/icrounded.php
+~ site/add/elements/icsetvar.php
+~ site/helpers/ichelper.php
+~ site/helpers/icmodel.php
+~ site/models/forms/submit.xml
+~ site/models/list.php
+~ [THEME PACKS] site/themes/packs/default/css/default_component.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_component.css
+~ site/views/list/tmpl/registration.php
+~ site/views/list/view.html.php
+~ site/views/submit/tmpl/default.php
+~ site/views/submit/view.html.php
+
+
+iCagenda 3.5.1 <small style="font-weight:normal;">(2015.03.01)</small>
+================================================================================
+~ [MODULE iC calendar] Cleaned : not needed data attributs in arrows navigation.
+# [MEDIUM] Fixed : no display of events if access registered, and user logged-in is not a Super User.
+# [LOW] Fixed : possible issue with Joomla 3.4.0 (not saving event due to a script conflict), if admin module 'Multilanguage status' published (change of the modal for this module, using now Bootstrap).
+# [LOW] Fixed : minor error issue in script used in edit form (admin) for link option on register button.
+# [LOW] Fixed : 'No tickets are available for this date' displayed if no registration done for an event.
+# [LOW] Fixed : incorrect count of available and booked tickets when Registration Type is set to 'all dates of the period'.
+# [LOW] Fixed : link to view event after registration, not linking to registered date event view.
+
+* Changed files in 3.5.1
+~ admin/models/event.php
+~ admin/models/fields/modal/iclink_article.php
+~ admin/models/fields/modal/iclink_type.php
+~ admin/models/fields/modal/iclink_url.php
+~ admin/utilities/events/data.php
+~ admin/utilities/form/form.php
+~ admin/views/event/tmpl/edit.php
+~ admin/views/events/view.html.php
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ site/add/elements/icsetvar.php
+~ site/helpers/icmodel.php
+~ site/models/events.php
+~ site/views/list/tmpl/registration.php
+
+
+iCagenda 3.5.0 <small style="font-weight:normal;">(2015.02.25)</small>
+================================================================================
+! [EXPORT CSV][Registrations] : integration of CSV exportation for a list of registrations. Use the filter dropdowns to select state, event and/or date, and export the list of registered users by clicking on the 'Export' button in the toolbar.
+! [Registrations] : the max number of tickets is now applied to each individual date of an event, if registration per date is selected.
+! [MODULES] Added : event url goes directly to the date selected in the event details view.
+! [FORMS] Improvement in Form Validation. By default, the form validation is process first client-side, using now the joomla core form-validate, and in second validation is server-side, processed by iCagenda. You have option both for the 'Registration' and 'Submit an Event' forms, to select default (2 controls) or only server-side form validation (the most advanced and secured one. The client-side validation adds a more user-friendly way which is faster for user (page not reloaded) to know when a field or more are invalid).
++ Added : Admin filter by registered date in registrations list.
++ Added : Admin filter by category in registrations list.
++ [RSS] Added : get current menu options to filter the RSS feeds (Filter by date, ordering...).
++ [MODULE iC calendar] Added : option to close automatically the tooltip on Mouseout.
++ [PLUGIN Search] Added : Search in shortdesc and metadesc text.
+~ [MODULE iC calendar] Changed : improvement of the tool tip design, and addition of auto vertical scrolling inside tooltip.
+~ [MODULE iC calendar] Changed : All mktime php function changed to be standardized with component refactory.
+~ Many code improvements and minor bugs fixed.
+# [MEDIUM] Fixed : Possible blank page in frontend, or very slow loading of iCagenda. The issue was not identified (seems to be related to php 5.4.37), but the new release 3.5.0 fixes this problem.
+# [MEDIUM] Fixed : Slow loading in frontend, when using distant images, the parent image to generate thumbnails was always controlled, and should not if thumb already existed.
+# [LOW] Fixed : W3C validation.
+# [LOW] Fixed : issue in checking menu item if published (could return a 404 error page if menu item not published).
+# [LOW] Fixed : missing displaytime checking in list of dates rendering (could not display an event over a period, with week days selected, if time not set).
+# [LOW] Fixed : when only single dates filled in 'Submit an Event' form, the event was unpublished.
+# [LOW] Fixed : "Notice: Undefined index:" if some fields are not filled when captcha solution was incorrect in registration form.
+# [LOW] Fixed : issue if captcha plugin option is not set correctly, and set to be shown in form options.
+# [LOW] Fixed : do not display event not approved in RSS feeds.
+# [LOW] Fixed : no display of toolbar in list of events (admin) if no category created (display issue hiding page header).
+# [LOW] Fixed : infotips in registration form not working on Joomla 2.5 (bug introduced in 3.4.1).
+# [LOW][PRO MODULE iC Event List] Fixed : wrong date if period has a start date before today, and end date after today (was displaying tomorrow).
+# [LOW][PRO MODULE iC Event List] Fixed : missing ic- prefix for columns classes in default layout, and rtl files.
+# [SQL] Fixed : possible issue when update from an old version of iCagenda (before 3.2.14 and 3.2.0), with sql updating using the joomla core sql updates system.
+
+* Changed files in 3.5.0
+- admin/add/css/icmap.css
+~ admin/config.xml
++ admin/controllers/registrations.raw.php
+~ admin/globalization/en-GB.php
++ admin/models/download.php
+~ admin/models/events.php
+~ admin/models/fields/icmap/city.php
+~ admin/models/fields/icmap/country.php
+~ admin/models/fields/icmap/lat.php
+~ admin/models/fields/icmap/lng.php
+~ admin/models/fields/modal/date.php
+~ admin/models/fields/modal/ictextarea_counter.php
+~ admin/models/fields/modal/thumbs.php
++ admin/models/forms/download.xml
+~ admin/models/forms/event.xml
+~ admin/models/registrations.php
+~ admin/sql/updates/3.2.0.sql
+~ admin/sql/updates/3.2.14.sql
+~ admin/sql/updates/3.2.sql
+~ admin/utilities/customfields/customfields.php
++ admin/utilities/events/data.php
+~ admin/utilities/events/events.php
+~ admin/utilities/form/form.php
+~ admin/utilities/menus/menus.php
+~ admin/utilities/thumb/thumb.php
+~ admin/views/categories/view.html.php
++ admin/views/download/tmpl/default.php
++ admin/views/download/view.html.php
+~ admin/views/event/tmpl/edit.php
+~ admin/views/event/view.html.php
+~ admin/views/events/tmpl/default.php
+~ admin/views/events/view.html.php
+~ admin/views/registrations/tmpl/default.php
+~ admin/views/registrations/view.html.php
++ admin/views/registrations/view.raw.php
+~ [LIBRARY] libraries/ic_library/date/date.php
+~ [LIBRARY] libraries/ic_library/thumb/create.php
+~ [LIBRARY] libraries/ic_library/thumb/get.php
+~ [MEDIA] media/css/icagenda-back.css
+~ [MEDIA] media/css/icagenda-front.css
++ [MEDIA] media/css/icagenda.css
+~ [MEDIA] media/icicons/style.css
+~ [MEDIA] media/js/icdates.js
+~ [MEDIA] media/js/icform.js
+~ [MODULE][PRO] modules/mod_ic_event_list/css/default_style-rtl.css
+~ [MODULE][PRO] modules/mod_ic_event_list/css/default_style.css
+~ [MODULE][PRO] modules/mod_ic_event_list/css/icrounded_style-rtl.css
+~ [MODULE][PRO] modules/mod_ic_event_list/css/icrounded_style.css
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.php
+~ [MODULE][PRO] modules/mod_ic_event_list/tmpl/default.php
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.xml
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.xml
+~ [PLUGIN] plugins/search/icagenda/icagenda.php
+~ script.icagenda.php
+- site/add/css/icmap.css
+~ site/add/elements/icsetvar.php
+~ site/helpers/ichelper.php
+~ site/helpers/icmodel.php
+~ site/models/events.php
+~ site/models/forms/submit.xml
+~ site/models/list.php
+~ site/models/submit.php
+~ [THEME PACKS] site/themes/packs/default/css/default_component.css
+~ [THEME PACKS] site/themes/packs/default/css/default_component_xsmall.css
+~ [THEME PACKS] site/themes/packs/default/css/default_module.css
+~ [THEME PACKS] site/themes/packs/default/default_day.php
+~ [THEME PACKS] site/themes/packs/default/default_event.php
+~ [THEME PACKS] site/themes/packs/default/default_events.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_component.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_component_xsmall.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_module.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_day.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_event.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_events.php
+~ site/views/list/tmpl/default.php
+~ site/views/list/tmpl/default_categories.php
+~ site/views/list/tmpl/event.php
+~ site/views/list/tmpl/registration.php
+~ site/views/submit/tmpl/default.php
+~ site/views/submit/view.html.php
+
+iCagenda 3.4.1 <small style="font-weight:normal;">(2015.01.30)</small>
+================================================================================
+! Changed : To fix an issue when using a custom captcha plugin (not joomla core reCaptcha plugin), the options has been changed. Now, there's only one place where you can set the captcha plugin used in iCagenda: 'General Settings' tab of the Global Options of the component. And you have individual option to show/hide captcha in 'Registration' and 'Submit an Event' forms. The update script will try to migrate your settings, but it's possible that you will have to set again this option in the menu options of 'Submit en Event' menu item type.
+! Fixed : the 404 error page on multi-language site (when clicking on a module link).
++ Added : Get menu id and title of an event submitted in frontend (notification email, and filter in admin list of events).
++ Added : Options to show/hide period, weekdays and single dates in 'Submit an Event' form.
++ Added : Filter RSS feeds by category filter set in the menu options.
++ Added : Tooltip legends to pagination.
++ Added : Option to show/hide time in date box (list of events).
++ Added : Global Option to set access level to registration form.
++ [Plugin Search] Added : Next date added in search result (after title of the event).
+~ Changed : You can now enter date before 1970/1/1 and after 2038/1/19 (no more unix limitation due to mktime php function, removed from date functions).
+~ Changed : pageclass_sfx moved from id icagenda to a class (ic-list, ic-event, ic-registration, ic-submit, ic-send) to follow joomla standard.
+~ Changed : Google Maps script checking (if api not loaded, iCagenda will load it).
+~ Changed : Main list of events filter by date is improved (full recoding of the dates filtering functions).
+~ Changed : The option 'list of all dates/only next/last date' is changed into 'Display All Dates' yes/no option.
+~ [PRO MODULE iC Event List] Changed : ic- prefix added to section, group and col class names (to prevent class names CSS conflict).
+~ Changed : Many code improvements.
+# [MEDIUM] Fixed : 'auto' mode for menu link in modules was not well filtering language when joomla multi-language enabled. Improvement of the language detection for the menu items to retrieve the correct url.
+# [LOW] Fixed : do not send user notification email after an event submission in frontend, if user has permissions to approve an event.
+# [LOW] Fixed : no thumbnails were generated when '.' found in the image filename (eg. image.name.jpg).
+# [LOW] Fixed : detects if an image file is too large, depending of server memory_limit setting, to prevent a blank page in admin when thumbnails cannot be generated (alert message displayed when a file is too large).
+# [LOW] Fixed : filtering by category in events admin list was broken.
+# [LOW] Fixed : Minor warning message in admin 'Themes manager' page (don't worry, nothing is broken!), 'Error loading component: COM_ICAGENDA, Component not found'.
+# [LOW] Fixed : a few minor issue in admin list of events (date in current language, notice error $list var, ...).
+# [LOW] Fixed : no display of events if category is unpublished.
+# [LOW] Fixed : Keep in session Terms and Conditions checked, when reCaptcha is not correct.
+# [LOW] Fixed : alias not generated when latin and non-latin characters in title (no datetime url safe alias, depending of unicode slug joomla global config setting).
+# [LOW] Fixed : wrong display of menu option 'Features' on Joomla 2.5.
+# [LOW] Fixed : if click on cancel on registration form, and when back to event details view, the back arrow was returning to registration form (now returns to parent list of events).
+
+* Changed files in 3.4.1
+~ admin/add/css/jquery-ui-1.8.17.custom.css
+~ admin/config.xml
+~ admin/globalization/uk-UA.php
+~ admin/models/events.php
+~ admin/models/fields/modal/cat.php
+~ admin/models/fields/modal/date.php
+~ admin/models/fields/modal/enddate.php
+~ admin/models/fields/modal/ictextarea_counter.php
+~ admin/models/fields/modal/startdate.php
+~ admin/models/fields/modal/template.php
+~ admin/models/forms/event.xml
+~ admin/tables/event.php
+~ admin/utilities/events/events.php
+~ admin/utilities/form/form.php
+~ admin/utilities/menus/menus.php
+~ admin/views/event/tmpl/edit.php
+~ admin/views/event/view.html.php
+~ admin/views/events/tmpl/default.php
+~ admin/views/events/view.html.php
+~ admin/views/themes/tmpl/default.php
+~ admin/views/themes/view.html.php
+~ [LIBRARY] libraries/ic_library/date/date.php
+~ [LIBRARY] libraries/ic_library/date/period.php
+~ [LIBRARY] libraries/ic_library/thumb/create.php
+~ [LIBRARY] libraries/ic_library/thumb/get.php
+~ [MEDIA] media/css/icagenda-front.css
+~ [MEDIA] media/js/icdates.js
+~ [MODULE][PRO] modules/mod_ic_event_list/css/default_style.css
+~ [MODULE][PRO] modules/mod_ic_event_list/css/icrounded_style.css
+~ [MODULE][PRO] modules/mod_ic_event_list/helper.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.xml
+~ [MODULE][PRO] modules/mod_ic_event_list/tmpl/default.php
+~ [MODULE][PRO] modules/mod_ic_event_list/tmpl/icrounded.php
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ [PLUGIN] plugins/search/icagenda/icagenda.php
+~ script.icagenda.php
+~ site/add/css/jquery-ui-1.8.17.custom.css
+~ site/helpers/ichelper.php
+~ site/helpers/icmodel.php
+~ site/models/events.php
++ site/models/forms/registration.xml
+~ site/models/forms/submit.xml
+~ site/models/list.php
+~ site/models/submit.php
+~ [THEME PACKS] site/themes/packs/default/css/default_component.css
+~ [THEME PACKS] site/themes/packs/default/default_event.php
+~ [THEME PACKS] site/themes/packs/default/default_events.php
+~ [THEME PACKS] site/themes/packs/default/default_registration.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_component.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_module.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_day.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_event.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_events.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_registration.php
+~ site/views/list/tmpl/default.php
+~ site/views/list/tmpl/default.xml
++ site/views/list/tmpl/default_categories.php
+~ site/views/list/tmpl/default_vcal.php
+~ site/views/list/tmpl/event.php
+~ site/views/list/tmpl/registration.php
+~ site/views/list/view.feed.php
+~ site/views/list/view.html.php
+~ site/views/submit/tmpl/default.php
+~ site/views/submit/tmpl/default.xml
+~ site/views/submit/tmpl/send.php
+~ site/views/submit/view.html.php
+
+
+iCagenda 3.4.0 <small style="font-weight:normal;">(2014.12.22)</small>
+================================================================================
+! New : Custom fields.
+1 - Available in registration and event edition forms.
+1 - Field types : text, list, radio buttons.
+! New : Feature Icons.
+1 - Create icons for each feature.
+1 - Attribute one or more features individually for each event.
+1 - Feature can be for example: Parking, Refreshments, Restaurant, Hotel, Free, TV, Toilets, Swimming, Airport... (no limit of usage!).
+! New : Librairies
+1 - iC Library : standalone library (loaded by a plugin).
+1 - iCagenda Utilities : integrated library of iCagenda.
+! New : Full Thumbnails generator
+1 - Options for 4 predetermined sizes : large, medium, small, xsmall.
+1 - For each thumbnail size, individual options : width, height, quality, crop.
+! Improvement and new options:
+1 - Captcha option added in 'Registration' and 'Submit an event' forms.
+1 - RTL integration (component and modules)
+1 - SQL requests improvement (faster process of database queries)
+1 - Link to event details from modules and search plugin now detect the category filter setting from each menu items.
+1 - Notification email to user who has submitted an event in frontend, with an Event Reference Number.
+1 - ...
+! Please check all release notes since 3.4.0-alpha1 to review all the changes and new options added since 3.3.8
+
+* Release Notes 3.4.0
+~ Changed : 'btn' class renamed in 'ic-btn' for frontend (mainly used for buttons).
+~ Changed : a few css improvement (ic_rounded theme, liveupdate design...), and new classes added for a few core functions (date time display...).
+# [LOW] Fixed : minor issues with 3.4.0-rc.
+
+* Changed files in 3.4.0
+~ admin/config.xml
+~ admin/icagenda.php
+~ admin/liveupdate/assets/liveupdate.css
+~ admin/liveupdate/classes/abstractconfig.php
+~ admin/liveupdate/classes/tmpl/nagscreen.php
+~ admin/liveupdate/classes/tmpl/overview.php
+~ admin/liveupdate/classes/updatefetch.php
+~ admin/utilities/customfields/customfields.php
+~ admin/utilities/events/events.php
++ admin/utilities/params/params.php
+~ admin/views/icagenda/tmpl/default.php
+~ admin/views/info/tmpl/default.php
+~ [LIBRARY] libraries/ic_library/date/date.php
++ [LIBRARY] libraries/ic_library/date/period.php
+~ [MEDIA] media/css/icagenda-front.css
++ [MEDIA] media/js/icagenda.js
+~ [MODULE][PRO] modules/mod_ic_event_list/helper.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.php
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.php
+~ [PLUGIN] plugins/system/ic_library/ic_library.php
+~ script.icagenda.php
+~ site/helpers/ichelper.php
+~ site/helpers/icmodel.php
+~ site/helpers/media_css.class.php
+~ site/models/events.php
+~ [THEME PACKS] site/themes/packs/default/css/default_component.css
+~ [THEME PACKS] site/themes/packs/default/css/default_component_xsmall.css
+~ [THEME PACKS] site/themes/packs/default/default_event.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_component.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_component_medium.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_component_small.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_component_xsmall.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_event.php
+~ site/views/list/tmpl/default.php
+~ site/views/list/tmpl/event.php
+~ site/views/list/tmpl/registration.php
+~ site/views/list/view.html.php
+~ site/views/submit/tmpl/default.php
+~ site/views/submit/tmpl/send.php
+~ site/views/submit/view.html.php
+
+
+$ iCagenda 3.4.0-rc <small style="font-weight:normal;">(2014.12.14)</small>
+================================================================================
+! RTL integration (component and modules)
+! SQL requests improvement (faster process of database queries)
+! [MODULES & PLUGIN] Link to event details from modules and search plugin now detect the category filter setting from each menu items.
+! Notification email to user who has submitted an event in frontend, with an Event Reference Number (of type YYYYMMDDID where YYYY is year, MM is month, DD is day and ID is event id).
++ Added : form fields saved to session to keep data after submission of the form if a wrong captcha value was entered.
++ Added : nofollow for 'registration' and 'submit an event' form links (to not been read by search engine).
++ Added : option to set ordering of categories in drop-down field.
++ Added : option to set a category as default in drop-down field.
+~ Changed : auto-generation of alias improved.
+~ Changed : default order of categories in drop-down field by title (previously by id).
+# [LOW] Fixed : issue with single date before 1999-11-30.
+# [LOW] Fixed : tooltip not working in 'Submit an Event' form on Joomla 3.3.6 (fixed since alpha-1).
+# [LOW] Fixed : pixelated event image in details view, if original image is too small.
+# [LOW] Fixed : notice error 'DS' in admin and frontend after Joomla upgrade from 2.5 to 3.3.
+# [LOW] Fixed : text counter bug in frontend 'Submit an Event' form on IE11.
+
+* Changed files in 3.4.0-rc
+~ admin/config.xml
+~ admin/icagenda.php
+~ admin/models/category.php
+~ admin/models/event.php
+~ admin/models/events.php
+~ admin/models/feature.php
+~ admin/models/fields/icmap/city.php
+~ admin/models/fields/icmap/country.php
+~ admin/models/fields/icmap/lat.php
+~ admin/models/fields/icmap/lng.php
+~ admin/models/fields/modal/cat.php
+~ admin/models/fields/modal/date.php
+~ admin/models/fields/modal/iclink_type.php
+~ admin/models/fields/modal/ictextarea_counter.php
+~ admin/models/fields/modal/multicat.php
+~ admin/models/forms/feature.xml
+~ admin/tables/category.php
+~ admin/tables/customfield.php
+~ admin/tables/event.php
+~ admin/tables/feature.php
+~ admin/tables/registration.php
+~ admin/utilities/customfields/customfields.php
+~ admin/utilities/events/events.php
+~ admin/utilities/form/form.php
++ admin/utilities/menus/menus.php
+~ admin/utilities/thumb/thumb.php
+~ libraries/ic_library/filter/output.php
+~ libraries/ic_library/url/url.php
+~ media/css/icagenda-front.css
+~ media/js/icform.js
++ [MODULE][PRO] modules/mod_ic_event_list/css/default_style-rtl.css
+~ [MODULE][PRO] modules/mod_ic_event_list/css/default_style.css
++ [MODULE][PRO] modules/mod_ic_event_list/css/icrounded_style-rtl.css
+~ [MODULE][PRO] modules/mod_ic_event_list/css/icrounded_style.css
+~ [MODULE][PRO] modules/mod_ic_event_list/helper.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.xml
+~ [MODULE][PRO] modules/mod_ic_event_list/tmpl/default.php
+~ [MODULE][PRO] modules/mod_ic_event_list/tmpl/icrounded.php
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.php
+~ site/add/css/style.css
+~ site/add/elements/icsetvar.php
+~ site/helpers/ichelper.php
+~ site/helpers/icmodel.php
+~ site/icagenda.php
++ site/models/events.php
+~ site/models/forms/submit.xml
+~ site/models/list.php
+~ site/models/submit.php
++ [THEME PACKS] site/themes/packs/default/css/default_component-rtl.css
+~ [THEME PACKS] site/themes/packs/default/css/default_component.css
++ [THEME PACKS] site/themes/packs/default/css/default_module-rtl.css
+~ [THEME PACKS] site/themes/packs/default/default_day.php
+~ [THEME PACKS] site/themes/packs/default/default_registration.php
++ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_component-rtl.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_component.css
++ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_module-rtl.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_day.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_event.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_events.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_registration.php
+~ site/views/list/tmpl/default.php
+~ site/views/list/tmpl/default.xml
+~ site/views/list/tmpl/event.php
+~ site/views/list/tmpl/registration.php
+~ site/views/list/view.html.php
+~ site/views/submit/tmpl/default.php
+~ site/views/submit/tmpl/default.xml
+~ site/views/submit/tmpl/send.php
+~ site/views/submit/view.html.php
+
+
+$ iCagenda 3.4.0-beta2 <small style="font-weight:normal;">(2014.11.09)</small>
+================================================================================
++ Captcha option added in 'Registration' and 'Submit an event' forms. You can select the joomla captcha plugin that will be used in the form.
++ Added : Custom fields filled added in the registration notification emails.
++ Added : 3 tags in registration notification emails : [CUSTOMFIELDS] (list of custom fields), [DATE] (only date) and [TIME] (only time).
++ Added : Option to redirect after validation of the frontend 'Submit an Event' form (default, article or url).
++ Added : Option to set a characters limit for Title in List of Events.
++ Added : Option to create custom CSS stylesheets to add to the iCagenda styles or to override existing CSS styles and classes (Global Options).
++ [PRO MODULE iC Event List] Added : Options to set a header and/or footer custom text.
++ [MODULE iC Calendar] Added : Option to select the date on which the calendar will load (month and year).
++ [MODULE iC Calendar] Added : Option to show/hide Month and/or Year navigation.
+~ Changed : display of "LiveUpdate" button only to user with component global options permissions.
+~ [MODULE iC Calendar] Changed : navigation routing improved in calendar (now compatible with Advanced Module Manager by NoNumber).
+~ [Theme Packs] Changed : load animated png is replaced by a animated gif (to prevent not working on not compatible browsers).
+# [LOW] Fixed : 'view event' redirect link, after registration submission.
+# [LOW] Fixed : nofollow for 'print' and 'add to cal' icons links.
+# [LOW] Fixed : issue with custom field type 'list' if set to 'required'. Field was not checked properly if 'alias' and 'slug' identical.
+# [LOW] Fixed : Add to iCal if SEF not activated (wrong url).
+# [LOW] Fixed : displays users registered depending on the date (when 'All dates of each event' option is selected in menu options).
+# [LOW] Fixed : possibility to edit or removed a registered user when the event is not published.
+# [LOW] Fixed : changed 'all period' to 'all dates' in registration option, and fix an issue in data saved when no period for an event.
+# [LOW] Fixed : possible issues with "edit own" permission for event edition.
+# [LOW] Fixed : auto-increment of image name in frontend submit an event form, if image name already exists.
+# [LOW] Fixed : error when searching in event with special characters (ą ę ć ś ź ł ż ó ż ń).
+# [PRO MODULE iC Event List] [LOW] Fixed : wrong date depending of the time zone (only if datetime or date display is selected).
+
+* Changed files in 3.4.0-beta2
+~ admin/config.xml
+~ admin/models/events.php
+~ admin/models/fields/modal/evt.php
+~ admin/models/fields/modal/evt_date.php
+~ admin/models/fields/modal/iclink_type.php
+~ admin/models/fields/modal/thumbs.php
+~ admin/models/forms/event.xml
+~ admin/models/forms/registration.xml
+~ admin/utilities/customfields/customfields.php
++ admin/utilities/events/events.php
+~ admin/utilities/form/form.php
+~ admin/views/events/tmpl/default.php
+~ admin/views/events/view.html.php
+~ admin/views/icagenda/tmpl/default.php
+~ admin/views/registrations/tmpl/default.php
++ libraries/ic_library/date/date.php
+~ libraries/ic_library/lib_ic_library.xml
+~ libraries/ic_library/thumb/create.php
+~ libraries/ic_library/url/url.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.xml
+~ [MODULE][PRO] modules/mod_ic_event_list/tmpl/default.php
+~ [MODULE][PRO] modules/mod_ic_event_list/tmpl/icrounded.php
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.xml
+~ [PLUGIN] plugins/system/ic_library/ic_library.php
+~ site/add/elements/icsetvar.php
+~ site/helpers/iCicons.class.php
+~ site/helpers/icmodel.php
+~ site/helpers/media_css.class.php
+~ site/models/list.php
+~ site/models/submit.php
+~ [THEME PACKS] site/themes/packs/default/css/default_component.css
+~ [THEME PACKS] site/themes/packs/default/css/default_module.css
++ [THEME PACKS] site/themes/packs/default/images/ic_load.gif
+- [THEME PACKS] site/themes/packs/default/images/ic_load.png
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_component.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_module.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_event.php
++ [THEME PACKS] site/themes/packs/ic_rounded/images/ic_load.gif
+- [THEME PACKS] site/themes/packs/ic_rounded/images/ic_load.png
+~ site/views/list/tmpl/default.php
+~ site/views/list/tmpl/default_vcal.php
+~ site/views/list/tmpl/event.php
+~ site/views/list/tmpl/registration.php
+~ site/views/list/view.html.php
+~ site/views/submit/tmpl/default.php
+~ site/views/submit/tmpl/default.xml
+~ site/views/submit/view.html.php
+
+
+$ iCagenda 3.4.0-beta1 <small style="font-weight:normal;">(2014.07.23)</small>
+================================================================================
++ Added : Short Description field (you can now enter a special short description, to be used in the list of events as Intro Text).
++ Added : Limit options for Short Description, Auto-Introtext and Meta Description. Addition of a live counter of remaining characters both in admin event edit and submit an event forms.
++ Added : Option for maximum size of the uploaded image in frontend 'submit an event' form. This new function controls the file before upload, check the size and file type, and display a preview if the file is conformed.
++ Added : image added to rss feeds
++ [SQL] Added : 'shortdesc' in '#__icagenda_events' table
+~ Changed : 'Meta' is replaced by 'Auto-Introtext' in Intro Text option (global component and modules options).
+~ [THEME PACKS] Changed : Begin of renaming of existing CSS classes of ic_rounded theme pack (to use standardized naming, and prevent CSS conflicts with site templates and other third party extensions. Don't forget to update your custom theme pack if needed!)
+~ Changed : a few code improvements, and control alert messages added.
+# [LOW] Fixed : possible issue on a fresh install, with a wrong installation of the iC Library.
+# [LOW] Fixed : wrong display in frontend of radio buttons, when using a Gantry Template.
+
+* Changed files in 3.4.0-beta1
+~ admin/add/css/icagenda.j25.css
+~ admin/config.xml
++ admin/models/fields/modal/ictextarea_counter.php
+~ admin/models/forms/event.xml
+~ admin/views/event/tmpl/edit.php
+~ admin/views/event/view.html.php
+~ admin/views/icagenda/tmpl/color.php
+~ icagenda.xml
+~ libraries/ic_library/lib_ic_library.xml
+~ media/css/icagenda-back.css
+~ media/css/icagenda-front.css
++ media/js/icform.js
+~ [MODULE][PRO] modules/mod_ic_event_list/css/default_style.css
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.xml
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.xml
+~ script.icagenda.pro.php
+~ site/add/css/icagenda.j25.css
+~ site/add/elements/icsetvar.php
+~ site/helpers/icmodel.php
+~ site/icagenda.php
+~ site/models/forms/submit.xml
+~ site/models/list.php
+~ site/models/submit.php
+~ [THEME PACKS] site/themes/packs/default/css/default_component.css
+~ [THEME PACKS] site/themes/packs/default/default_event.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_component.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_event.php
+~ site/views/list/tmpl/default.php
+~ site/views/list/tmpl/default.xml
+~ site/views/list/view.html.php
+~ site/views/submit/tmpl/default.php
+~ site/views/submit/tmpl/default.xml
+~ site/views/submit/view.html.php
+
+
+$ iCagenda 3.4.0-alpha2 <small style="font-weight:normal;">(2014.07.16)</small>
+================================================================================
++ Added : Alert message with list of custom theme packs not updated to be compatible with custom fields and feature icons.
++ Added : Check if at least 1 category is published before adding/editing an event.
++ Added : Option to show/hide custom fields in frontend 'Submit an event' form (Menu Item params and Global Options).
++ Added : Own server for Testing Updates (alpha & beta).
+# [MEDIUM] Fixed : SQL error 1064 in event edit if no custom fields exists.
+# [LOW] Fixed : bug in checking if a slug already exists (custom fields) (could display multiple times the custom field in event details view).
+# [LOW] Fixed : bug in display of information option in Event Details view.
+# [LOW] Fixed : bug in fields display options in the form to submit an event in frontend.
+# [LOW][PRO][MODULE iC Event List] Fixed : today date was not always properly set depending on your hosting location (now uses Joomla config offset).
+
+* Changed files in 3.4.0-alpha2
+~ admin/config.xml
+~ admin/liveupdate/classes/abstractconfig.php
+~ admin/liveupdate/config.php
+~ admin/models/customfields.php
++ admin/sql/install/mysql/icagenda.install.sql
+- admin/sql/install.mysql.utf8.sql
++ admin/sql/uninstall/mysql/icagenda.uninstall.sql
+- admin/sql/uninstall.mysql.utf8.sql
+~ admin/tables/customfield.php
+~ admin/utilities/categories/categories.php
+~ admin/utilities/customfields/customfields.php
++ admin/utilities/theme/theme.php
+~ admin/views/customfields/tmpl/default.php
+~ admin/views/event/tmpl/edit.php
+~ admin/views/event/view.html.php
+~ admin/views/events/view.html.php
+~ admin/views/features/tmpl/default.php
+~ admin/views/icagenda/tmpl/color.php
+~ admin/views/icagenda/tmpl/default.php
+~ admin/views/info/tmpl/default.php
+~ admin/views/themes/tmpl/default.php
+~ icagenda.xml
++ [iC Library] libraries/ic_library/file/file.php
+~ [iC Library] libraries/ic_library/lib_ic_library.xml
+~ [MODULE][PRO] modules/mod_ic_event_list/css/icrounded_style.css
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.php
+~ [PLUGIN][iC Library] plugins/system/ic_library/ic_library.php
+~ script.icagenda.pro.php
+~ site/add/elements/icsetvar.php
+~ site/helpers/icmodel.php
+~ [THEME PACKS] site/themes/packs/default/default_event.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_event.php
+~ site/views/submit/tmpl/default.php
+~ site/views/submit/tmpl/default.xml
+~ site/views/submit/view.html.php
+
+
+$ iCagenda 3.4.0-alpha1 <small style="font-weight:normal;">(2014.07.11)</small>
+================================================================================
+! New : Custom fields.
+1 Available in registration and event edition forms.
+1 Field types : text, list, radio buttons.
+! New : Feature Icons.
+1 Create icons for each feature.
+1 Attribute one or more features individually for each event.
+1 Feature can be for example: Parking, Refreshments, Restaurant, Hotel, Free, TV, Toilets, Swimming, Airport... (no limit of usage!).
+! New : Librairies
+1 iC Library : standalone library (loaded by a plugin).
+1 iCagenda Utilities : integrated library of iCagenda.
+! New : Full Thumbnails generator
+1 Options for 4 predetermined sizes : large, medium, small, xsmall.
+1 For each thumbnail size, individual options : width, height, quality, crop.
+! Many code lines cleaned up, and global improvement. (zip is now 0,4 mb lighter!)
++ Added : Modified Date and Modified By fields in admin event edit form.
++ [PRO][MODULE iC Event List] Added : Detection of the categor(y)ies set in the menu items to generate link of an event.
++ [PRO][MODULE iC Event List] Added : Show/Hide venue name
+~ [PRO][MODULE iC Event List] Changed : Improved design of icrounded layout.
+~ Changed : default ordering of admin list of events is now ID descendant (latest created event in first position).
+~ Changed : default ordering of admin list of registered users is now ID descendant (latest registered user in first position).
+~ Changed : option to set 'Intro Text'; auto, hide, short desc or meta (global options and modules params).
+# [LOW] Fixed : created date was missing in old versions of iCagenda (before 3.1.5). This version update database to set a valid created date for events created with versions of iCagenda < 3.1.5, and set in this order : modified date if valid or next/last date if valid or, at the end, will use current date. (this fix is to prevent wrong 'Created on 30 November -0001' in search results)
+
+* Changed files in 3.4.0-alpha1
+~ admin/access.xml
+~ admin/add/elements/title.php
+~ admin/add/elements/titleimg.php
+~ admin/config.xml
++ admin/controllers/customfield.php
++ admin/controllers/customfields.php
+~ admin/controllers/event.php
++ admin/controllers/feature.php
++ admin/controllers/features.php
+~ admin/helpers/icagenda.php
+~ admin/icagenda.php
++ admin/models/customfield.php
++ admin/models/customfields.php
+~ admin/models/event.php
+~ admin/models/events.php
++ admin/models/feature.php
++ admin/models/features.php
+~ admin/models/fields/modal/date.php
++ admin/models/fields/modal/thumbs.php
++ admin/models/forms/customfield.xml
+~ admin/models/forms/event.xml
++ admin/models/forms/feature.xml
+~ admin/models/forms/registration.xml
+~ admin/models/icagenda.php
+~ admin/models/registration.php
+~ admin/models/registrations.php
++ admin/tables/customfield.php
+~ admin/tables/event.php
++ admin/tables/feature.php
+~ admin/tables/icagenda.php
+~ admin/tables/registration.php
++ admin/utilities/categories/categories.php
++ admin/utilities/class/class.php
++ admin/utilities/customfields/customfields.php
++ admin/utilities/form/form.php
++ admin/utilities/thumb/thumb.php
+~ admin/views/category/tmpl/edit.php
++ admin/views/customfield/tmpl/edit.php
++ admin/views/customfield/view.html.php
++ admin/views/customfields/tmpl/default.php
++ admin/views/customfields/view.html.php
+~ admin/views/event/tmpl/edit.php
+~ admin/views/events/tmpl/default.php
+~ admin/views/events/view.html.php
++ admin/views/feature/tmpl/edit.php
++ admin/views/feature/view.html.php
++ admin/views/features/tmpl/default.php
++ admin/views/features/view.html.php
+~ admin/views/icagenda/tmpl/default.php
+~ admin/views/icagenda/view.html.php
+~ admin/views/info/tmpl/default.php
+~ admin/views/registration/tmpl/edit.php
+~ admin/views/registrations/tmpl/default.php
+~ icagenda.xml
++ media/css/icagenda-back.css
++ media/css/icagenda-front.css
+~ [iCicons][New icons] media/icicons/
++ media/images/customfields-16.png
++ media/images/customfields-48.png
++ media/images/features-16.png
++ media/images/features-48.png
++ media/images/panel_denied/customfields-48.png
++ media/images/panel_denied/features-48.png
+~ [IMAGES][All png optimized] media/images/
+~ media/js/icdates.js
+- [FOLDER] media/scripts/
+~ [MODULE][PRO] modules/mod_ic_event_list/css/default_style.css
+~ [MODULE][PRO] modules/mod_ic_event_list/css/icrounded_style.css
+~ [MODULE][PRO] modules/mod_ic_event_list/helper.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.xml
+~ [MODULE][PRO] modules/mod_ic_event_list/tmpl/default.php
+~ [MODULE][PRO] modules/mod_ic_event_list/tmpl/icrounded.php
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.xml
+- [FOLDER] plugins/search/plg_icagenda/
++ [FOLDER] plugins/search/icagenda/
+- [FOLDER] plugins/system/plg_ic_autologin/
++ [FOLDER] plugins/system/ic_autologin/
++ plugins/system/ic_library/ic_library.php
++ plugins/system/ic_library/ic_library.xml
+~ script.icagenda.pro.php
+~ site/add/elements/icsetvar.php
+~ site/helpers/ichelper.php
+~ site/helpers/iCicons.class.php
+~ site/helpers/icmodel.php
+~ site/icagenda.php
+~ site/js/icmap.js
+~ site/models/forms/submit.xml
+~ site/models/list.php
+~ site/models/submit.php
+~ site/router.php
+~ [THEME PACKS] site/themes/packs/default/css/default_component.css
+~ [THEME PACKS] site/themes/packs/default/css/default_module.css
+~ [THEME PACKS] site/themes/packs/default/default_day.php
+~ [THEME PACKS] site/themes/packs/default/default_event.php
+~ [THEME PACKS] site/themes/packs/default/default_events.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_component.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_component_small.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_component_xsmall.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_module.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_day.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_event.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_events.php
+~ site/views/list/tmpl/default.php
+~ site/views/list/tmpl/default.xml
+~ site/views/list/tmpl/event.php
+~ site/views/list/tmpl/registration.php
+~ site/views/list/view.feed.php
+~ site/views/list/view.html.php
+~ site/views/submit/tmpl/default.php
++ [iC Library] libraries/ic_library/color/color.php
++ [iC Library] libraries/ic_library/filter/output.php
++ [iC Library] libraries/ic_library/lib_ic_library.xml
++ [iC Library] libraries/ic_library/library/library.php
++ [iC Library] libraries/ic_library/string/string.php
++ [iC Library] libraries/ic_library/thumb/create.php
++ [iC Library] libraries/ic_library/thumb/get.php
++ [iC Library] libraries/ic_library/thumb/image.php
++ [iC Library] libraries/ic_library/url/url.php
++ [SQL] #__icagenda_customfields_data
++ [SQL] #__icagenda_feature
++ [SQL] #__icagenda_feature_xref
+
+
+iCagenda 3.3.8 <small style="font-weight:normal;">(2014.07.04)</small>
+================================================================================
++ Added : Events RSS feeds integrated to Joomla (This is a partial integration, displaying all events. An advanced integration with options, and events image in the RSS feed, will be added in 3.4.0 version, thanks to the new iC Library not yet implemented).
+~ Changed : ChangeLog design
+# [HIGH] Fixed : did not save the date selected during registration in datetime database format , depending on date format settings (was not working properly with name of the day of the week display displayed, eg. Saturday, 21 June 2014, or if AM/PM selected).
+# [LOW] Fixed : quote issue in short description when sharing on facebook.
+
+* Changed files in 3.3.8
+~ admin/add/css/icagenda.css
++ admin/CHANGELOG.php
+- admin/UPDATELOGS.php
+~ admin/models/fields/modal/evt_date.php
+~ admin/views/icagenda/tmpl/color.php
+~ admin/views/icagenda/tmpl/default.php
+~ admin/views/icagenda/view.html.php
+~ icagenda.xml
+~ script.icagenda.php
+~ site/helpers/icmodel.php
+~ site/models/list.php
+~ site/views/list/tmpl/default.php
+~ site/views/list/tmpl/event.php
+~ site/views/list/tmpl/registration.php
++ site/views/list/view.feed.php
+
+
+iCagenda 3.3.7 <small style="font-weight:normal;">(2014.05.29)</small>
+================================================================================
+! New : Custom notification emails to a user after registration to an event can be edit in html using your favorite editor.
++ Added : individual options for the display of fields in menu "Submit an event".
+~ Changed : New registration button (uses icons, colors, and a redirect to login with return page, if user has no permission).
+# [MEDIUM] Fixed : link to past event if "only next/last date" selected in the menu option, returned a view with no data, depending of value set in option 'Selection of events'.
+# [LOW] Fixed : bug if 'today' and 'all dates' selected, could display no events (missing offset in date controls).
+# [LOW] Fixed : in iCagenda 3.3.6, the notification emails to a user after registration to an event, do not account for newlines.
+# [LOW] Fixed : Print popup view, if SEF disabled.
+
+* Changed files in 3.3.7
+~ admin/add/css/icagenda.j25.css
+~ admin/config.xml
++ admin/models/fields/modal/ic_editor.php
+~ [iCicons][Update] media/icicons/
+~ site/helpers/icmodel.php
+~ site/models/forms/submit.xml
+~ site/models/list.php
+~ site/models/submit.php
+~ [THEME PACKS] site/themes/packs/default/css/default_component.css
+~ [THEME PACKS] site/themes/packs/default/css/default_module.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_component.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_module.css
+~ site/views/list/tmpl/event.php
+~ site/views/list/tmpl/registration.php
+~ site/views/submit/tmpl/default.php
+~ site/views/submit/tmpl/default.xml
+~ site/views/submit/view.html.php
+
+
+iCagenda 3.3.6 <small style="font-weight:normal;">(2014.05.16)</small>
+================================================================================
++ Added : Option for Intro Text : hide, the short description (generated from full description) or the meta description (Global Options of the component, and options of the modules).
++ [GLOBALIZATION] Added : tr-TR Turkish (Turkey) date formats.
++ [MODULE Calendar] Added : ID is added next to title of the menu, in option to select 'link to menu'.
++ [PRO] Added : Option to set minimum release stability for update notifications. (PRO OPTIONS tab in global options of iCagenda Pro)
+~ [Optimization] : SQL request filtering improved in order to fix an issue, and speed up loading (more optimization to come concerning speed of page loading).
+~ Changed : Division of the events tab in the global configuration into 2 tabs : Events (list of events options) and Event (details view options).
+~ Changed : Updated addthis script (v300).
+# [Optimization] Fixed : the list model was running the loading of data twice, and with this issue fixed the execution time for displaying a list is now halved (Thanks doorknob!).
+# [HIGH]Fixed : Access to registration form if registration not activated in options.
+# [LOW] Fixed : (only on Joomla 2.5) wrong display of print page if 'All Dates for each event' is selected in menu option.
+# [LOW][MODULE Calendar][JS] Fixed : It was correctly deleting and adding the class style_Today but not the reverse for style_Day (by doorknob).
+# [LOW]Fixed : Issue with Turkish language in admin events list (due to setlocale function, not used anymore).
+# [LOW]Fixed : wrong closing select tags in 2 fields of the registration form.
+# [LOW]Fixed : missing div tag in registration form.
+
+* Changed files in 3.3.6
+~ admin/config.xml
+~ admin/globalization/iso.php
++ admin/globalization/tr-TR.php
+~ admin/models/fields/modal/menulink.php
+~ admin/views/events/tmpl/default.php
+~ admin/views/events/view.html.php
+~ media/scripts/icthumb.php
+~ [MODULE][PRO] modules/mod_ic_event_list/helper.php
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ [MODULE] modules/mod_iccalendar/js/jQuery.highlightToday.js
+~ [MODULE] modules/mod_iccalendar/js/jQuery.highlightToday.min.js
+~ site/add/elements/icsetvar.php
+~ site/helpers/ichelper.php
+~ site/helpers/icmodel.php
+~ site/models/list.php
+~ site/views/list/tmpl/default.php
+~ site/views/list/tmpl/event.php
+~ site/views/list/tmpl/registration.php
+~ site/views/list/view.html.php
+
+
+iCagenda 3.3.5-1 (patch) <small style="font-weight:normal;">(2014.04.29)</small>
+================================================================================
+# Fixed : possible issue with uploaded files (image and/or file) not attached correctly in frontend submission form.
+
+* Changed files in 3.3.5-1
+~ site/views/submit/tmpl/default.php
+
+
+iCagenda 3.3.5 <small style="font-weight:normal;">(2014.04.27)</small>
+================================================================================
++ Added : Control if event is published before editing a user registered for an event. (prevent error if user is registered to an unpublished event)
++ Added : Control if registered date still exists when editing a user registered for an event.
+~ Changed : can convert date format depending on the option setting for date format (menu or global), when registration saved since version 3.3.3.
+# [MEDIUM] Fixed : Date selection in Registration edition.
+# [LOW] Fixed : missing loading of template.js on registration edition (Joomla 2.5).
+# [LOW] Fixed : wrong css styling of pagination (Joomla 2.5).
+
+* Changed files in 3.3.5
+~ admin/add/css/template.css
+~ admin/models/fields/modal/evt_date.php
+~ admin/models/fields/modal/evt.php
+~ admin/models/registrations.php
+~ admin/views/registration/tmpl/edit.php
+~ admin/views/registrations/tmpl/default.php
+~ site/helpers/icmodel.php
+
+
+iCagenda 3.3.4 <small style="font-weight:normal;">(2014.04.25)</small>
+================================================================================
+! Joomla 3.3 Ready! This version has been tested on 3.3.0 rc, and a few improvements has been done to run well on the new Joomla 3.3 available soon !
++ Added : Displays 'Home Page' and 'Submit a New Event' buttons, after validation of the event submission form, if user is logged in (was only displayed when user not logged in).
++ Added : Show 'Registration Options' in frontend submission form, only if registration is activated in global options.
+~ Changed : Hide User ID when logged-in in registration form (was visible only for registered user).
+~ Changed : no more 'onload' to initialize Google Maps (could prevent onload conflict with other extensions).
+# [MEDIUM][Joomla 3.2.x & 3.3-beta] Fixed : in the frontend submission form, when user logged-in, 'disabled' changed to 'readonly' for user name and email, as it will not be submitted on a Joomla 3.3 website, and was giving the bug of double-click-needed on the submit button on J3.2.
+# [MEDIUM][Joomla 2.5] Fixed : Global Options BUG with options not accessible -> Not correct path for js files in admin (after change of location for the scripts files in 3.3.3), on Joomla 2.5.
+# [LOW] Fixed : Possible missing close div in submission form, if registration not displayed.
+# [LOW][MODULE Calendar] Fixed : time was displayed even if the option to show time in event edition was disabled. Control missing in default theme pack.
+
+* Changed files in 3.3.4
+~ admin/add/elements/desc.php
+~ admin/add/elements/title.php
+~ admin/icagenda.php
+- admin/models/fields/modal/time.php
+~ admin/models/forms/event.xml
+~ admin/views/event/tmpl/edit.php
+~ admin/views/icagenda/tmpl/default.php
+~ admin/views/icagenda/view.html.php
+~ script.icagenda.php
+~ site/helpers/icmodel.php
+~ site/models/submit.php
+~ [THEME PACKS] site/themes/packs/default/default_day.php
+~ site/views/list/tmpl/registration.php
+~ site/views/submit/tmpl/default.php
+~ site/views/submit/tmpl/send.php
+~ site/views/submit/view.html.php
++ media/js/jquery.noconflict.js
+
+
+iCagenda 3.3.3 <small style="font-weight:normal;">(2014.04.20)</small>
+================================================================================
+! New : Edition in admin of a user registered for an event, and possibility to create a new registered user.
+! New : Advanced options for Registration Button. You can now replace individually for each event, the link on the button by an external url or an article ('Options' tab, in admin event edition). Another option is added for browser target of the registration button.
++ Added : Global option to set a default date format (general settings tab).
++ [MODULE Calendar] Added : Option to display a custom text in header of calendar. (Thanks doorknob)
++ [MODULE Calendar] Added : Option to set a padding for the tooltip, on mobile devices. (Thanks doorknob)
+~ Changed : Date selected during a registration will be saved in database without formatting.
+~ Changed : IcoMoon replaced by iCicon font (iCagenda vector icons font), for print and calendar icons on Joomla 3.
+~ Changed : forms (Submission and Registration): uses iCtip script to generate information tooltips (replaces css3 tooltips, and adds responsive behaviour to detect screen border).
+~ Changed : folder 'add/js' moved from admin and site folders to media folder.
+~ [THEME PACKS] Changed : in THEME_day.php file, 'cal_date' changed to 'data-cal-date' (to avoid possible future conflicts as html5 is developed).
+~ [ROUTER SEF] Changed : "event_registration" to "registration" at the end of url to registration form (when SEF enabled).
+~ Code : many code cleaned and/or improved (Thank you Doorknob for your precious contribution!).
+- [ROUTER SEF] Removed : "event_details" at the end of url to event details view (when SEF enabled) and provides a better SEO score.
+- [MODULE] Removed : br tags after date/close header in calendar tooltip.
+# [MEDIUM] Fixed : error in a php function which changes event time (winter/summer time) when event over a period starting before daylight saving, and finishing after daylight saving.
+# [MEDIUM] Fixed : displaying of today, and/or upcoming, or past events are now using Joomla config time zone, to prevent issue with server timezone.
+# [LOW] Fixed : ordering of categories (admin).
+# [LOW] Fixed : possibility of a PHP Warning: Invalid argument supplied for foreach() in /components/com_icagenda/views/list/tmpl/event.php on line 48, in your site error log.
+# [LOW] Fixed : Not sending notification to the user who registers for an event, if email is not set as required.
+# [LOW] Fixed : Error if no events, with Addthis button.
+# [LOW] Fixed : Bug in All Dates, when only sunday for period (wrong display : "Sunday & Sunday").
+# [LOW] Fixed : It was not loading Google Maps script if only coordinates were indicated (empty address).
+# [LOW][PLUGIN Search] Fixed : Display of events not filtered by current language.
+# [LOW][PRO][MODULE iC Event List] Fixed : Possible missing thumbnail, if no leading "/" in image url.
+
+* Changed files in 3.3.3
+~ admin/add/css/icagenda.css
+~ admin/add/image/joomlic_iCagenda.png
+~ admin/add/image/logo_icagenda.png
+- [FOLDER] admin/add/js/
+~ admin/config.xml
+~ admin/controllers/categories.php
+~ admin/controllers/event.php
++ admin/controllers/registration.php
+~ admin/helpers/icagenda.php
+~ admin/liveupdate/liveupdate.php
+~ admin/models/event.php
+~ admin/models/events.php
+~ admin/models/fields/modal/date.php
++ admin/models/fields/modal/evt.php
++ admin/models/fields/modal/evt_date.php
+~ admin/models/fields/modal/icalert_msg.php
++ admin/models/fields/modal/iclink_article.php
++ admin/models/fields/modal/iclink_type.php
++ admin/models/fields/modal/iclink_url.php
+~ admin/models/forms/event.xml
++ admin/models/forms/registration.xml
++ admin/models/registration.php
+~ admin/tables/category.php
+~ admin/tables/event.php
++ admin/tables/registration.php
+~ admin/views/categories/tmpl/default.php
+~ admin/views/event/tmpl/edit.php
+~ admin/views/events/tmpl/default.php
+~ admin/views/icagenda/tmpl/default.php
+~ admin/views/info/tmpl/default.php
++ admin/views/registration/tmpl/edit.php
++ admin/views/registration/tmpl/index.html
++ admin/views/registration/view.html.php
+~ admin/views/registrations/tmpl/default.php
+~ admin/views/registrations/view.html.php
+~ admin/views/themes/tmpl/default.php
+~ media/scripts/icthumb.php
+~ [MODULE][PRO] modules/mod_ic_event_list/css/default_style.css
+~ [MODULE][PRO] modules/mod_ic_event_list/css/icrounded_style.css
+~ [MODULE][PRO] modules/mod_ic_event_list/helper.php
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ [MODULE] modules/mod_iccalendar/js/jQuery.highlightToday.js
+~ [MODULE] modules/mod_iccalendar/js/jQuery.highlightToday.min.js
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.xml
+~ [PLUGIN] plugins/search/plg_icagenda/icagenda.php
+~ script.icagenda.php
+~ site/add/css/icagenda.css
+~ site/add/css/style.css
+~ site/add/elements/icsetvar.php
+- [FOLDER] site/add/js/
+~ site/helpers/ichelper.php
+~ site/helpers/iCicons.class.php
+~ site/helpers/icmodel.php
+~ site/router.php
+~ [THEME PACKS] site/themes/packs/default/css/default_component.css
+~ [THEME PACKS] site/themes/packs/default/css/default_component_xsmall.css
+~ [THEME PACKS] site/themes/packs/default/css/default_module.css
+~ [THEME PACKS] site/themes/packs/default/default_day.php
+~ [THEME PACKS] site/themes/packs/default/default_registration.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_component.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_component_xsmall.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_module.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_module_small.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_day.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_event.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_registration.php
+~ site/views/list/tmpl/default.php
+~ site/views/list/tmpl/event.php
+~ site/views/list/tmpl/registration.php
+~ site/views/submit/tmpl/default.php
+
+
+iCagenda 3.3.2 <small style="font-weight:normal;">(2014.03.17)</small>
+================================================================================
+! [PLUGIN] New plugin iCagenda search, enables searching in events.
+- Removed : option 'All options' (by individual date and for all period) in 'Registration type' (not logical).
+# [MEDIUM] Fixed : Not displaying singles dates in registration form.
+# [LOW] Fixed : Not setting default value correctly for new global options: show/hide venue's name, city, country and short description.
+# [LOW][THEME PACKS] Fixed : Missing ic-box-date class in ic_rounded xsmall media css file.
+# [LOW][MODULE] Fixed : possibility of a notice message related to the jquery checking.
+
+* Changed files in 3.3.2
+~ admin/models/forms/event.xml
+~ admin/tables/event.php
+~ icagenda.xml
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.php
++ [PLUGIN] plugins/search/plg_icagenda/icagenda.php
++ [PLUGIN] plugins/search/plg_icagenda/icagenda.xml
++ [PLUGIN] plugins/search/plg_icagenda/index.html
++ [PLUGIN][FOLDER] language
+~ script.icagenda.php
+~ site/add/elements/icsetvar.php
+~ site/helpers/icmodel.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_component.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_component_xsmall.css
+~ site/views/list/view.html.php
+
+
+iCagenda 3.3.1 <small style="font-weight:normal;">(2014.03.14)</small>
+================================================================================
++ Added : Global options to show/hide information in list of events (venue's name, city, country, short description).
++ Added : Global options to show/hide day, month and/or year in date box of the list of events.
++ Added : Global option to set HTML filtering in Short Description (All italicized, No HTML or Authorized tags: <br />, <b>, <strong>, <i>, <em>, <u>).
++ Added : Global option to set first day of the week (used when list of weekdays is displayed).
++ [MODULE iC Calendar] Added : Options to select a background color for days with only one event or more than one event.
++ [MODULE iC Calendar] Added : HTML Filtering Option for Short Description in tooltip.
+~ Changed : redirect to login page if user has no access to submission form or is not logged-in.
+~ [THEME PACKS] Changed : display order of Venue's name, city and country in tooltip of the calendar (now on the same line).
+~ [THEME PACKS][ic_rounded] Changed class names for day, month and year in date box.
+- [THEME PACKS] Removed, module iC calendar : <i> tags for short description in tooltip.
+# [MEDIUM] Fixed : Duplicate display of alert message, and not display of event details, if event not approved, and user logged-in with approval permissions.
+# [MODULE iC Calendar][LOW] Fixed : Not displaying events in module calendar on Joomla 2.5, if all categories selected.
+
+* Changed files in 3.3.1
+~ admin/config.xml
+~ admin/models/registrations.php
+~ admin/views/icagenda/tmpl/default.php
+~ admin/views/info/tmpl/default.php
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.xml
+~ site/add/elements/icsetvar.php
+~ site/helpers/icmodel.php
+~ [THEME PACKS] site/themes/packs/default/css/default_component.css
+~ [THEME PACKS] site/themes/packs/default/css/default_module.css
+~ [THEME PACKS] site/themes/packs/default/default_day.php
+~ [THEME PACKS] site/themes/packs/default/default_events.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_component.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_module.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_day.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_events.php
+~ site/views/list/tmpl/default.php
+~ site/views/list/tmpl/event.php
+~ site/views/list/view.html.php
+~ site/views/submit/tmpl/default.php
+
+
+iCagenda 3.3.0 <small style="font-weight:normal;">(2014.03.06)</small>
+================================================================================
+! [Theme Packs] Added media css files for Responsive Design.
+! [SQL] Creates table #__icagenda_customfields database to prepare future Custom Fields System.
++ Added : Options to show/hide the fields in Event Submission Form.
++ Added : Option "Contact's email" in Admin notification mailing list for registrations.
++ Added : Filter by Upcoming/Past/Today events (Admin Events List).
++ Added : Filter by event (Admin Registrations List).
++ [MODULE iC Calendar] Added : Multi-selection of categories.
++ [MODULE iC Calendar] Added : Option to select a default font color for calendar.
++ [SQL] Added : 'metadesc' field to store an event meta-description (if not set, uses the new function to generate a short meta-description based on full description (limited to 160 characters to give the best SEO performance).
++ [SQL] Added : 'custom_fields' field to store data from custom fields (not yet available).
+~ [Theme Pack] DEFAULT : major changes in event details view (default_event.php) and list view (default_events.php) by removing table tags, and using div to display content. Many class names changed with a leading prefix 'ic-' added to prevent possible conflict of naming with site templates css files.
+~ Updated : iCalcreator updated from v2.16.12 to v2.18 (Add to iCal and Outlook).
+~ Changed : limited length for url when adding an event to Yahoo and Google calendar (to prevent errors).
+~ Changed : Updating preview of event image in edit admin when mouseover preview link.
+~ Changed : Removal of the 404 block in order to prevent double display of an error page (depending of the site template used).
+~ [SEO] Changed and enhanced : meta title and description are improved, better filtering, and give the best possible SEO performance.
+~ [PRO][MODULE iC Event List] Changed : Using user timezone or if not set, Joomla server time zone, to set today time.
+# [HIGH] Security : Fixed access to registration form when an event is unpublished or finished (prevents spamming).
+# [MEDIUM] Fixed : conflict with module login, when a user log-in or log-out on the event details view, if 'add to cal' activated (loading iCal/outlook .ics file).
+# [MEDIUM] Fixed : redirect to login page if user has no access to registration form and event details page (if direct visit to this page).
+# [LOW] Fixed : not sending if missing space after comma, in custom list of emails for notification email.
+# [LOW] Fixed : add to outlook calendar if no end date.
+# [LOW] Fixed : Error introduced in a previous version with 'add to cal' function, concerning Windows live and yahoo calendars (url broken).
+# [LOW] Fixed : Error to get show_page_heading from menu, when not set.
+# [LOW] Fixed : conflict of 'date' variable between event details view and calendar (renamed 'iccaldate' in calendar).
+# [LOW] Fixed : Error in setting next date if only one date (and/or only sunday) selected as weekday (period events).
+#  Many minor bugs fixed, and many code improvement.
+
+* Changed files in 3.3.0
+~ admin/config.xml
+~ admin/models/category.php
+~ admin/models/event.php
+~ admin/models/events.php
+~ admin/models/forms/event.xml
+~ admin/models/mail.php
+~ admin/models/registrations.php
+~ admin/sql/install.mysql.utf8.sql
+~ admin/sql/uninstall.mysql.utf8.sql
+~ admin/tables/event.php
+~ admin/views/categories/tmpl/default.php
+~ admin/views/event/tmpl/edit.php
+~ admin/views/events/tmpl/default.php
+~ admin/views/events/view.html.php
+~ admin/views/icagenda/tmpl/default.php
+~ admin/views/info/tmpl/default.php
+~ admin/views/registrations/tmpl/default.php
+~ admin/views/registrations/view.html.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.xml
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.xml
+~ script.icagenda.php
+~ site/add/css/icagenda.css
+~ site/add/css/style.css
+~ site/add/elements/icsetvar.php
+~ site/helpers/iCalcreator.class.php
+~ site/helpers/ichelper.php
+~ site/helpers/iCicons.class.php
+~ site/helpers/icmodel.php
++ site/helpers/media_css.class.php
+~ site/models/list.php
+~ site/models/submit.php
+~ [THEME PACKS] site/themes/packs/default/css/default_component.css
++ [THEME PACKS] site/themes/packs/default/css/default_component_large.css
++ [THEME PACKS] site/themes/packs/default/css/default_component_medium.css
++ [THEME PACKS] site/themes/packs/default/css/default_component_small.css
++ [THEME PACKS] site/themes/packs/default/css/default_component_xsmall.css
+~ [THEME PACKS] site/themes/packs/default/css/default_module.css
++ [THEME PACKS] site/themes/packs/default/css/default_module_large.css
++ [THEME PACKS] site/themes/packs/default/css/default_module_medium.css
++ [THEME PACKS] site/themes/packs/default/css/default_module_small.css
++ [THEME PACKS] site/themes/packs/default/css/default_module_xsmall.css
+~ [THEME PACKS] site/themes/packs/default/default_event.php
+~ [THEME PACKS] site/themes/packs/default/default_events.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_component.css
++ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_component_large.css
++ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_component_medium.css
++ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_component_small.css
++ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_component_xsmall.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_module.css
++ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_module_large.css
++ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_module_medium.css
++ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_module_small.css
++ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_module_xsmall.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_event.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_events.php
+~ site/views/list/tmpl/default.php
+~ site/views/list/tmpl/default.xml
+~ site/views/list/tmpl/default_vcal.php
+~ site/views/list/tmpl/event.php
+~ site/views/list/tmpl/registration.php
+~ site/views/submit/tmpl/default.php
+~ site/views/submit/view.html.php
++ SQL : Adding 'metadesc' column to table #__icagenda_events
++ SQL : Adding 'custom_fields' column to table #__icagenda_registration
++ SQL : Create table #__icagenda_customfields
+
+
+
+iCagenda 3.2.13 <small style="font-weight:normal;">(2014.02.01)</small>
+================================================================================
+! [COMPONENT] Advanced Admin ACL (manage access permissions in iCagenda Backend).
+! [MODULE iC Calendar] Enhancement of tooltip display on mobile device. Addition of new options in params of the module. (Thanks doorknob!)
+! [MODULE iC Calendar] Beta timezone options removed. A new script, developped by doorknob, is now setting "today" highlight according to visitor local time. You keep option to use Joomla Server Time Zone, and you can set highlight on UTC time zone.
+! [GNU/GLP License] Update license to version 3 (or later).
++ Added : Category filtering in administration list of events.
++ Added : Category ordering in administration list of events.
+~ [Source Language] Fixed of a few errors in english (en-GB British) source translations files (centre, information...). (Thanks Phil Winsor!)
+# [LOW] Fixed : limited length to 2068 bytes of the url to add an event to Google Calendar, to prevent 404 error (url length limitation).
+# [LOW] Fixed : missing [...] for short description, in default Theme Pack.
+# [LOW] Fixed : attachment field in event form (mouseover).
+# [LOW] Fixed : Some global styling error in main css files, and some other needed replacements.
+# [LOW] Fixed : Conflict Bootstrap/Google Maps, on Zoom Control and street view button (Joomla 3.2).
+# [LOW][THEME PACKS] Fixed : Email cloacking click in 'Default' Theme Pack.
+# [LOW][MODULE iC Calendar] Fixed : Missing <tr> tags in week days thead.
+# [MEDIUM][MODULE iC Calendar] Fixed : Removed limit of sql request.
+
+* Changed files in 3.2.13
+! [GNU/GLP License v3] LICENSE.txt
+~ admin/access.xml
+~ admin/add/css/icagenda.css
+~ admin/helpers/icagenda.php
+~ admin/icagenda.php
+~ admin/liveupdate/classes/tmpl/nagscreen.php
+~ admin/models/events.php
+~ admin/models/fields/modal/icalert_msg.php
+~ admin/models/fields/modal/icfile.php
+~ admin/tables/event.php
+~ admin/views/categories/tmpl/default.php
+~ admin/views/category/tmpl/edit.php
+~ admin/views/event/tmpl/edit.php
+~ admin/views/events/tmpl/default.php
+~ admin/views/events/view.html.php
+~ admin/views/icagenda/tmpl/default.php
+~ admin/views/info/tmpl/default.php
+~ admin/views/mail/tmpl/edit.php
+~ admin/views/registrations/tmpl/default.php
+~ admin/views/themes/tmpl/default.php
++ media/images/global_options-48.png
++ [Folder] media/images/panel_denied/
++ [MODULE][PRO] modules/mod_ic_event_list/LICENSE.txt
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.xml
+~ [MODULE][PRO] modules/mod_ic_event_list/tmpl/icrounded.php
+~ [MODULE] modules/mod_iccalendar/helper.php
+- [MODULE] modules/mod_iccalendar/js/function.js
+- [MODULE] modules/mod_iccalendar/js/function_312.js
+- [MODULE] modules/mod_iccalendar/js/function_316.js
+- [MODULE] modules/mod_iccalendar/js/ictip.js
++ [MODULE] modules/mod_iccalendar/js/jQuery.highlightToday.js
++ [MODULE] modules/mod_iccalendar/js/jQuery.highlightToday.min.js
++ [MODULE] modules/mod_iccalendar/LICENSE.txt
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.xml
+~ [PLUGIN] plugins/plg_ic_autologin/ic_autologin.php
++ [PLUGIN] plugins/plg_ic_autologin/LICENSE.txt
+~ script.icagenda.php
+~ site/add/css/icagenda.css
+~ site/add/css/style.css
+~ site/helpers/ichelper.php
+~ site/helpers/icmodel.php
+~ site/icagenda.php
+~ site/js/icmap.js
+- site/js/map.js
+~ [THEME PACKS] site/themes/packs/default/css/default_module.css
+~ [THEME PACKS] site/themes/packs/default/default_day.php
+~ [THEME PACKS] site/themes/packs/default/default_event.php
+~ [THEME PACKS] site/themes/packs/default/default_events.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_module.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_day.php
+~ site/views/list/tmpl/event.php
+
+
+iCagenda 3.2.12 <small style="font-weight:normal;">(2014.01.08)</small>
+================================================================================
+! [MODULE iC Calendar] Disabling by default the function detecting the visitor time zone in module calendar, in order to highlight 'today'. This script function was giving some issue depending of your server, settings, and joomla version. You can now find an option in parameters of the module calendar, where you can use the visitor time zone to set 'today' highlight. If option 'Beta 1 - Visitor Time Zone' selected, when a new visitor comes to your website, it sets a variable containing his time zone in session cookies (so could slow a little when first visit of this user, as it reloads the page one time). And it keeps this information in browser cookies. If option 'Beta 2 - Visitor Time Zone' selected, retrieves the time zone of the visitor each time a page with a calendar module is loaded. If you encounter an error or problem during loading of a page where a module calendar is displayed, select 'Joomla - Server Time Zone' to use the global configuration Time Zone set for your website, and clean your cookies. A better and more advanced solution will be developped to set the detection of visitor time zone.
+~ Minor enhancements and corrections in code.
+~ [iCicons] Update of iCagenda iCicons font.
+# [LOW][MODULE iC Event List][PRO] Fixed : Issue on joomla 2.5 with option 'All' in multi-select of categories resulting in an empty list.
+# [LOW] Fixed : missing strip_tags in event.php tmpl view file.
+
+* Changed files in 3.2.12
+~ [FOLDER][iCicons] media/icicons
++ media/js/detect_timezone.js
++ media/js/jquery.detect_timezone.js
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.php
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.xml
+~ script.icagenda.php
+~ site/helpers/icmodel.php
+~ site/models/forms/submit.xml
+~ [THEME PACKS] site/themes/packs/default/css/default_component.css
+~ [THEME PACKS] site/themes/packs/default/default_registration.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_component.css
+
+
+iCagenda 3.2.11 FIX for 3.2.10 <small style="font-weight:normal;">(2014.01.04)</small>
+================================================================================
+! The function detecting the visitor time zone, in order to highlight 'today', and introduced in version 3.2.10, is now disabled on Joomla 2.5 website due to a possible alert message (no error on Joomla 3). This feature needs more developpement and testing before being introduced again for Joomla 2.5 sites, because of all possible script conflicts that happen on this platform (Joomla 3.2.1 is much more fluid!).
+# [HIGH][MODULE iC Calendar] Fixed : Possible issue with calendar (redirecting to home page if script for setting visitor time zone failed).
+# [MEDIUM] Fixed : Issue when 'All Dates' selected, and SEF not activated, in opening event details (error 404).
+
+* Changed files in 3.2.11
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ site/views/list/tmpl/default.php
+
+
+iCagenda 3.2.10 <small style="font-weight:normal;">(2014.01.03)</small>
+================================================================================
++ Added : Options for emails of notification and confirmation - Registration form.
++ [MODULE iC Event List][PRO] Added : 'Upcoming & Today' and 'Today' filter options.
++ [MODULE iC Event List][PRO] Added : Multi-selection of categories.
++ [MODULE iC Calendar] Added : Option to display 'country'.
+~ Updated : Translation Credits and Contributors informations.
+~ [MODULE iC Calendar] Enhancement : get visitor timezone and set it to session using javascript (client side) to highlight correctly 'today'.
+~ [MODULE iC Calendar] Changed : get option 'display time' and global setting 'time format', in tooltip.
+# [LOW] Fixed : Filtering of html content of the tip related to 'Add to Cal' button.
+# [LOW][MODULE iC Calendar] Fixed : Error on a php 5.2 server, because of the new function to order events per hour in the tooltip (We really recommend switching to minimum php 5.3).
+# [LOW][THEME PACKS] Fixed : Link on title in default theme pack.
+
+* Changed files in 3.2.10
+~ admin/config.xml
++ admin/models/fields/modal/ictext_placeholder.php
+~ admin/views/icagenda/tmpl/default.php
+~ admin/views/info/tmpl/default.php
+~ [MODULE][PRO] modules/mod_ic_event_list/helper.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.xml
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.xml
+~ script.icagenda.php
+~ site/helpers/iCicons.class.php
+~ site/helpers/icmodel.php
+~ [THEME PACKS] site/themes/packs/default/default_day.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_day.php
+
+
+iCagenda 3.2.9 <small style="font-weight:normal;">(2013.12.28)</small>
+================================================================================
++ Added : Add to calendar icon (iCal, Google, Yahoo, Windows Live and Outlook calendars) in event details view.
++ Added : Print icon in event details view.
++ [MODULE Calendar] Added : Time for each event, in infotip.
++ [MODULE Calendar] Added : Option to used the text 'Close' in the infotip, translated in your current language, or use of a custom value.
++ [MODULE iC Event List][PRO] Added : Option to display list in columns (1 to 4 columns per row).
+~ [THEME PACKS] Changed : style class 'content' renamed in 'ic-content'.
+~ [THEME PACKS] Removed : Back button from Theme Packs, and added it in view file (to add future options for this button).
+# [LOW] Fixed : Missing date in url, when clicking on [...] in short description, if 'All Dates' option selected for the list of events page view.
+# [MEDIUM] Fixed : Change og tag description to full description, for sharing on social networks (remove html tags).
+# [MEDIUM][MODULES] Fixed : Date display in Event details view after click on module links, was wrong if 'All Dates' option selected for the list of events page view.
+# [MEDIUM][MODULE CALENDAR] Fixed : missing closing div in loading html (may in a rare cases give an error in displaying script code).
+
+* Changed files in 3.2.9
+~ admin/config.xml
+~ admin/models/fields/modal/ictxt_default.php
+~ admin/models/fields/modal/icvalue_opt.php
+~ admin/views/info/tmpl/default.php
++ [FOLDER] media/images/cal/
+~ [MODULE][PRO] modules/mod_ic_event_list/css/default_style.css
+~ [MODULE][PRO] modules/mod_ic_event_list/css/icrounded_style.css
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.xml
+~ [MODULE][PRO] modules/mod_ic_event_list/tmpl/default.php
+~ [MODULE][PRO] modules/mod_ic_event_list/tmpl/icrounded.php
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.xml
+~ site/add/css/style.css
+~ site/add/elements/icsetvar.php
+~ site/controller.php
++ site/helpers/iCalcreator.class.php
+~ site/helpers/ichelper.php
++ site/helpers/iCicons.class.php
+~ site/helpers/icmodel.php
+~ site/models/list.php
+~ [THEME PACKS] site/themes/packs/default/css/default_component.css
+~ [THEME PACKS] site/themes/packs/default/css/default_module.css
+~ [THEME PACKS] site/themes/packs/default/default_day.php
+~ [THEME PACKS] site/themes/packs/default/default_event.php
+~ [THEME PACKS] site/themes/packs/default/default_events.php
+~ [THEME PACKS] site/themes/packs/default/default_registration.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_component.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_module.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_day.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_event.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_events.php
+~ site/views/list/tmpl/default.php
++ site/views/list/tmpl/default_vcal.php
+~ site/views/list/tmpl/event.php
+~ site/views/list/view.html.php
+
+
+iCagenda 3.2.8 <small style="font-weight:normal;">(2013.12.15)</small>
+================================================================================
+! New : Option to display All Dates for each event (or Next/last date of each event as it was before this release).
+! [THEME PACKS] Important : New file THEME_events.php to replace THEME_list.php, and new names of data variables.
++ Added : Globalization Date Format file for Ukrainian uk-UA
++ Added : Localization of Google-maps based on the current language of the site. (Thanks SLV!)
+~ [MODULE iC Event List][PRO] Changed : Enhancement of Date and Time option.
+~ Changed : Enhancement of css of Submission form on J2.5 websites.
+# [LOW] Fixed : alone div tag, which can give problem of display of submission form page.
+# [LOW] Fixed : issue in style display of category title.
+# [LOW] Fixed : category title and description in header of list of events sometimes in double.
+# [THEME PACKS][LOW] Fixed : css missing style for category name in header of the list of events.
+# [MODULE iC Event List][PRO][LOW] Fixed : Possible issue with module display.
+# [MODULE Calendar][MEDIUM] Fixed : Possible issue with module changing months, due to a bug in text "loading...".
+
+* Changed files in 3.2.8
+~ admin/add/css/icagenda.css
+~ admin/config.xml
++ admin/globalization/uk-UA.php
++ admin/models/fields/modal/icalert_msg.php
+~ admin/views/event/tmpl/edit.php
+~ [MODULE][PRO] modules/mod_ic_event_list/css/icrounded_style.css
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.xml
+~ [MODULE][PRO] modules/mod_ic_event_list/tmpl/default.php
+~ [MODULE][PRO] modules/mod_ic_event_list/tmpl/icrounded.php
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.php
+~ script.icagenda.php
+~ site/add/css/icagenda.j25.css
+- site/add/css/template.css
++ site/add/elements/icsetvar.php
+~ site/helpers/ichelper.php
+~ site/helpers/icmodel.php
+~ site/models/list.php
+~ [THEME PACKS] site/themes/packs/default/css/default_component.css
+~ [THEME PACKS] site/themes/packs/default/css/default_module.css
+~ [THEME PACKS] site/themes/packs/default/default_event.php
++ [THEME PACKS] site/themes/packs/default/default_events.php
+- [THEME PACKS] site/themes/packs/default/default_list.php
+~ [THEME PACKS] site/themes/packs/default/default_registration.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_component.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_module.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_event.php
++ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_events.php
+- [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_list.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_registration.php
+~ site/views/list/tmpl/default.php
+~ site/views/list/tmpl/default.xml
+~ site/views/list/tmpl/event.php
+~ site/views/list/tmpl/registration.php
+~ site/views/list/view.html.php
+~ site/views/submit/tmpl/default.php
+~ site/views/submit/tmpl/send.php
+
+
+iCagenda 3.2.7 <small style="font-weight:normal;">(2013.11.23)</small>
+================================================================================
+~ [MODULE iC calendar] Changed : minor edit in sql request of module iC calendar
+# [LOW] Fixed : bug in breadcrumbs event details view.
+# [THEME PACKS][LOW] Fixed : possible issue of display break when using ic_rounded theme (depending of your site template).
+
+* Changed files in 3.2.7
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_list.php
+~ site/views/list/tmpl/event.php
+
+
+iCagenda 3.2.6 <small style="font-weight:normal;">(2013.11.21)</small>
+================================================================================
+! New : Option (menu and global) to display Category informations; title and/or description (in header of list of events).
++ Added : Event Details view added to Breadcrumbs.
++ Added : Option Top & Bottom for navigation arrows (list of events).
+# [MODULE iC Event List][PRO] Fixed : time not displayed correctly in module iC Event List.
+# [MODULE iC Event List][PRO] Fixed : clic to event details views was not working on IE 9 (and under) with icrounded layout.
+
+* Changed files in 3.2.6
+~ admin/config.xml
++ admin/models/fields/modal/icmulti_checkbox.php
++ admin/models/fields/modal/icmulti_opt.php
+~ admin/models/forms/category.xml
+~ admin/views/icagenda/tmpl/default.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.php
+~ [MODULE][PRO] modules/mod_ic_event_list/tmpl/default.php
+~ [MODULE][PRO] modules/mod_ic_event_list/tmpl/icrounded.php
+~ site/helpers/icmodel.php
+~ site/models/list.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_component.css
+~ site/views/list/tmpl/default.php
+~ site/views/list/tmpl/default.xml
+~ site/views/list/tmpl/event.php
+~ site/views/list/view.html.php
+
+
+iCagenda 3.2.5 <small style="font-weight:normal;">(2013.11.11)</small>
+================================================================================
+! Terms and Conditions Option added to registration form.
+! Design compatibility with Joomla 3.2.0 (admin header html) and enhancements in admin display.
++ [THEME PACKS] Added css and php integration of registration infos in calendar tooltip.
++ [MODULE iC Calendar] Added : Options to display city, name of venue, short description, and registration infos (number of seats, seats available and already registered).
+~ [MODULE iC Calendar] Changed : 'today' day is now using joomla timezone (was server timezone before).
+
+* Changed files in 3.2.5
+~ admin/add/css/icagenda.css
+~ admin/add/css/icagenda.j25.css
+~ admin/config.xml
+- admin/models/fields/eventtitle.php
++ admin/models/fields/modal/ictxt_article.php
++ admin/models/fields/modal/ictxt_content.php
++ admin/models/fields/modal/ictxt_default.php
++ admin/models/fields/modal/ictxt_type.php
+~ admin/models/forms/category.xml
+~ admin/models/forms/event.xml
+~ admin/views/categories/view.html.php
+~ admin/views/category/tmpl/edit.php
+~ admin/views/category/view.html.php
+~ admin/views/event/tmpl/edit.php
+~ admin/views/event/view.html.php
+~ admin/views/events/view.html.php
+~ admin/views/icagenda/view.html.php
+~ admin/views/info/view.html.php
+~ admin/views/mail/view.html.php
+~ admin/views/registrations/view.html.php
+~ admin/views/themes/view.html.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.xml
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.xml
+~ script.icagenda.php
+- site/add/js/address.js
+- site/add/js/dates.js
+~ [THEME PACKS] site/themes/packs/default/css/default_module.css
+~ [THEME PACKS] site/themes/packs/default/default_day.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_module.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_day.php
+~ site/views/list/tmpl/registration.php
+
+
+iCagenda 3.2.4 <small style="font-weight:normal;">(2013.10.29)</small>
+================================================================================
++ [MODULE iC Event List][PRO] Added : category color as background of the date, in 'default' layout.
+~ [MODULE iC Calendar] Changed : authorizes <br /> and <br> html tags in Short Description.
+# Fixed : Issue when only sunday selected for period events, all days of the week were displayed.
+# Fixed : Not display of Google Maps (blank) after update to last release 3.2.3, when Google Maps Global Options were not set before.
+# Fixed : safehtml filter from joomla not working in frontend (skipping html tags, as should not). Filter set now to raw to not skip tags.
+# Fixed : issue when access levels to Event Submission Form set to multiple levels (was not filtering access levels as expected).
+# [THEME PACKS] Fixed : Issue Alignement of editor buttons in submission form.
+# [MODULE iC Event List][PRO] Fixed : wrong display of events in column, due to a conflict in some site templates.
+
+* Changed files in 3.2.4
+~ admin/views/event/tmpl/edit.php
+~ [MODULE][PRO] modules/mod_ic_event_list/css/default_style.css
+~ [MODULE][PRO] modules/mod_ic_event_list/css/icrounded_style.css
+~ [MODULE][PRO] modules/mod_ic_event_list/helper.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.xml
+~ [MODULE][PRO] modules/mod_ic_event_list/tmpl/default.php
+~ [MODULE][PRO] modules/mod_ic_event_list/tmpl/icrounded.php
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ site/helpers/icmodel.php
+~ site/models/forms/submit.xml
+~ site/models/submit.php
+~ [THEME PACKS] site/themes/packs/default/css/default_component.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_component.css
+~ site/views/list/tmpl/default.php
+~ site/views/list/view.html.php
+~ site/views/submit/tmpl/default.php
+~ site/views/submit/view.html.php
+
+
+iCagenda 3.2.3 <small style="font-weight:normal;">(2013.10.20)</small>
+================================================================================
+! [THEME PACKS] Updated : enhancements of ic_rounded theme pack, to give a better responsive experience. All table tags have been removed, and replace with div tags, and with addition of @media css styling depending of the device (mobile, tablet, desktop). This new version of ic_rounded theme pack will now have version number respectively to the component version. (to improve tracking updates by users creating their own theme. For your information, a website page is in preparation for you to get more information and documentation about creating and updating a personal Theme Pack, and new features for Theme Pack manager are in brainstorming!).
+! No loading of Google Maps scripts, if no address is set, or if global option is set on Hide (to speed up loading when this files are not needed).
++ Added : missing Options Week Days in Frontend Submission Form.
++ [MODULE iC Event List][PRO] Added : Options to display date and time, city, short description, and registration infos (number of seats, seats available and already booked).
+~ [THEME PACKS] Changed : enhancements of the back arrow to detect if a previous page has been visited. Code in themes php file is now simplified.
+~ Changed : enhancements of Open Graph tags (title, type, image, url, description, sitename).
+~ Changed : enhancements and changes in <hn> tags used in iCagenda, to able a better structural hierarchy of list of events. (auto-detect if page heading is displayed in content or not, to set properly the Hn tag).
+~ Changed : views php files to speed up loading of iCagenda (list of events, event details and event registration).
+# Fixed : Calendar Issue; Bug in some countries about the time change. If a date of an event over a period was the day of the time change, it was generated 2 times. The new feature integrates this setting to not double this day.
+
+
+* Changed files in 3.2.3
++ admin/models/fields/modal/icvalue_field.php
++ admin/models/fields/modal/icvalue_opt.php
+~ [MODULE][PRO] modules/mod_ic_event_list/css/default_style.css
+~ [MODULE][PRO] modules/mod_ic_event_list/css/icrounded_style.css
+~ [MODULE][PRO] modules/mod_ic_event_list/helper.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.php
+~ [MODULE][PRO] modules/mod_ic_event_list/mod_ic_event_list.xml
+~ [MODULE][PRO] modules/mod_ic_event_list/tmpl/default.php
+~ [MODULE][PRO] modules/mod_ic_event_list/tmpl/icrounded.php
+~ [MODULE] modules/mod_iccalendar/helper.php
++ site/helpers/ichelper.php
+~ site/helpers/icmodel.php
+~ site/models/forms/submit.xml
+~ site/models/list.php
+~ site/models/submit.php
+~ [THEME PACKS] site/themes/packs/default/css/default_component.css
+~ [THEME PACKS] site/themes/packs/default/css/default_module.css
+~ [THEME PACKS] site/themes/packs/default/default_calendar.php
+~ [THEME PACKS] site/themes/packs/default/default_day.php
+~ [THEME PACKS] site/themes/packs/default/default_event.php
+~ [THEME PACKS] site/themes/packs/default/default_list.php
+~ [THEME PACKS] site/themes/packs/default/default_registration.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_component.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_module.css
++ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_alldates.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_calendar.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_day.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_event.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_list.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_registration.php
+~ site/views/list/tmpl/default.php
+~ site/views/list/tmpl/event.php
+~ site/views/list/tmpl/registration.php
+~ site/views/list/view.html.php
+~ site/views/submit/tmpl/default.php
+~ site/views/submit/tmpl/send.php
+
+
+iCagenda 3.2.2 <small style="font-weight:normal;">(2013.10.10)</small>
+================================================================================
+! [iCicons] Use of integrated vector icons 'iCicons' designed for iCagenda (will evolve!).
+# Fixed : List of dates in registration form (was not filtering by weekdays).
+# [iCicons] Fixed : Android not display of arrows in ascii code (calendar, back button, back/next navigation).
+# [iCicons] Fixed : Iphone/Ipad, arrows were not clickable (calendar, back button, back/next navigation).
+# Fixed : ACL access levels filtering for events in front-end.
+# Fixed : Request of Itemid in submit form.
+~ Changed : better filtering of Approval access.
+~ Changed : clean-up of some php functions, and sql request in frontend.
+~ [THEME PACKS] Changed : enhancements of module css, and adding vector icon for back button.
+
+* Changed files in 3.2.2
+~ admin/views/events/tmpl/default.php
+~ icagenda.xml
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.php
+~ [MODULE] modules/mod_iccalendar/mod_iccalendar.xml
+~ site/helpers/icmodel.php
+~ site/models/submit.php
+~ [THEME PACKS] site/themes/default.xml
+~ [THEME PACKS] site/themes/ic_rounded.xml
+~ [THEME PACKS] site/themes/packs/default/css/default_module.css
+~ [THEME PACKS] site/themes/packs/default/default_event.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_module.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_event.php
+~ site/views/list/view.html.php
+~ site/views/submit/tmpl/default.php
++ [FOLDER] media/icicons/
++ [FOLDER] media/icicons/fonts/
++ media/icicons/fonts/iCicons.eot
++ media/icicons/fonts/iCicons.svg
++ media/icicons/fonts/iCicons.ttf
++ media/icicons/fonts/iCicons.woff
++ media/icicons/lte-ie7.js
++ media/icicons/style.css
+
+
+iCagenda 3.2.1 <small style="font-weight:normal;">(2013.10.07)</small>
+================================================================================
+! First Stable release with 'Submit an Event' feature. For Users of the free version, see all the Release Notes of previous RC versions (available for Pro).
+~ Changed : Use of DATE_FORMAT_LC3 in list of events, admin (to get date in Russian on windows server).
+# Fixed : Remove nowrap css class attribute, to prevent not wrapping to the next line for long title (this is solved in iCagenda, but you may have the same problem in Joomla 3 articles. Proposal of modification added on Joomla core Github).
+# Fixed : Error message when updating from an older version, if category filter was set to one category (new option multiple-categories filtering).
+
+* Changed files in 3.2.1
+~ admin/views/events/tmpl/default.php
+~ site/helpers/icmodel.php
+~ site/models/list.php
+
+
+iCagenda 3.2.0 RC4 <small style="font-weight:normal;">(2013.10.04)</small>
+================================================================================
+! Added : New option, Multi-selection of categories, in parameters of the menu link to list of events.
+! Changed : Updated Google Maps API to V3 https
++ Added : Notification email to a user when his event submitted has been approved by a manager.
++ Added : Redirect to login page if Approval Manager is not connected on event details page (replacing 404 page).
++ Added : New icons for 'Approve this event' (J2.5 using icons, and J3 using icomoon).
++ Added : New tooltip script for manager icons.
++ Added : Router SEF for Submit an Event.
+# [LOW] Bug : inserting an extra number data at the end of the footer text line, in notification email send to Approval managers.
+# [LOW] Bug : Number of events in header was not well set, when an Approval Manager is logged-in.
+# [LOW] Display : Display of info tooltip when Phone Field not shown in registration form.
+# [MEDIUM] Bug : display of 'sunday', when no days of the week selected for a period event, in event details view.
+~ [THEME PACKS] Changed : Manager Icons are removed from theme packs (to prevent not display in personal theme pack) and added in event.php file.
+~ Changed : Attachment opens now in a new window (target blank).
+
+* Changed files in 3.2.0 RC4
+~ admin/config.xml
+~ admin/models/fields/modal/cat.php
++ admin/models/fields/modal/multicat.php
+~ admin/models/forms/event.xml
+~ admin/views/event/tmpl/edit.php
+~ admin/views/events/tmpl/default.php
+~ admin/views/icagenda/tmpl/default.php
+~ admin/views/info/tmpl/default.php
+~ icagenda.xml
+~ site/add/css/style.css
+~ site/helpers/icmodel.php
+~ site/models/forms/submit.xml
+~ site/models/list.php
+~ site/models/submit.php
+~ site/router.php
+~ [THEME PACKS] site/themes/default.xml
+~ [THEME PACKS] site/themes/ic_rounded.xml
+~ [THEME PACKS] site/themes/packs/default/css/default_component.css
+~ [THEME PACKS] site/themes/packs/default/default_event.php
+~ [THEME PACKS] site/themes/packs/default/default_list.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_component.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_event.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_list.php
+~ site/views/list/tmpl/default.xml
+~ site/views/list/tmpl/event.php
+~ site/views/list/tmpl/registration.php
+~ site/views/list/view.html.php
+~ site/views/submit/tmpl/default.php
+~ site/views/submit/tmpl/send.php
+~ site/views/submit/view.html.php
++ [FOLDER] media/css/
++ media/css/tipTip.css
++ [FOLDER] media/css/manager/
++ media/images/manager/approval_16.png
++ [FOLDER] media/js/
++ media/js/jquery.tipTip.js
+
+
+
+iCagenda 3.2.0 RC3 <small style="font-weight:normal;">(2013.09.26)</small>
+================================================================================
+! Changes in the display of Global Options (added General Settings Tab)
+! Fixed : important issue in notification emails send to managers authorized to approve events (due to a bug if user is depending of more than one user groups)
+! Changed : Approval can be processed directly in Frontend, at event preview page.
++ Added : Check if managers with Approval permissions are Enabled and Activated.
++ Added : Option to select Template in menu-item link 'Submit an Event'.
++ Added : Global option to enable or disable auto login in url links included in notification emails.
++ Added : implemented Page Header and page class suffix in 'Submit an Event' page.
+~ Changed : Events submitted in Frontend by a user (manager) belonging to an authorized group will be automatically approved.
+~ Changed : Back button in event details view return to list of events ( replace history.go(-1) ).
+
+* Changed files in 3.2.0 RC3
++ admin/add/elements/desc.php
+~ admin/config.xml
+~ admin/models/forms/event.xml
+~ script.icagenda.pro.php
+~ site/helpers/icmodel.php
+~ site/models/forms/submit.xml
+~ site/models/list.php
+~ site/models/submit.php
+~ [THEME PACKS] site/themes/packs/default/default_event.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_event.php
+~ site/views/list/tmpl/registration.php
+~ site/views/submit/tmpl/default.php
+~ site/views/submit/tmpl/default.xml
+~ site/views/submit/tmpl/send.php
+~ site/views/submit/view.html.php
+
+
+iCagenda 3.2.0 RC2 <small style="font-weight:normal;">(2013.09.22)</small>
+================================================================================
+# Fixed : Access Permissions to 'Submit an Event' form (missing global option).
++ Added : Options to customize the content when a user access to the 'Submit an Event' page, and this user is not connected, or connected but does not have sufficient rights.
+
+* Changed files in 3.2.0 RC2
+~ admin/config.xml
++ admin/models/fields/modal/ictext_content.php
++ admin/models/fields/modal/ictext_type.php
+~ site/helpers/icmodel.php
+~ site/models/list.php
+~ site/views/submit/tmpl/default.php
+
+
+iCagenda 3.2.0 RC <small style="font-weight:normal;">(2013.09.20)</small>
+================================================================================
+! NEW : Menu Type to 'Submit an Event' in frontend.
+! NEW : Selection of days of the week for period events (additional options to come for dates settings!).
+! NEW : Plugin iCagenda Autologin.
+
+* Changed files in 3.2.0 RC
+~ admin/config.xml
+~ admin/models/event.php
+~ admin/models/events.php
++ admin/models/fields/modal/tos_article.php
+~ admin/models/fields/modal/tos_content.php
++ admin/models/fields/modal/tos_default.php
++ admin/models/fields/modal/tos_type.php
+~ admin/tables/event.php
+~ admin/views/event/tmpl/edit.php
+~ [MODULE PRO] modules/mod_ic_event_list/mod_ic_event_list.php
+~ [MODULE] modules/mod_iccalendar/helper.php
+~ script.icagenda.php
+~ site/helpers/icmodel.php
+~ site/models/list.php
+~ site/models/submit.php
+~ [THEME PACKS] site/themes/default.xml
+~ [THEME PACKS] site/themes/packs/default/default_event.php
+~ [THEME PACKS] site/themes/packs/default/default_list.php
+~ [THEME PACKS] site/themes/ic_rounded.xml
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_event.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_list.php
++ site/views/submit/tmpl/default.php
++ site/views/submit/tmpl/default.xml
++ site/views/submit/tmpl/send.php
++ site/views/submit/view.html.php
++ [PLUGIN] plugins/plg_ic_autologin/ic_autologin.php
++ [PLUGIN] plugins/plg_ic_autologin/ic_autologin.xml
++ SQL : Adding 'daystime' column to table icagenda_events
+
+
+iCagenda 3.1.13 <small style="font-weight:normal;">(2013.09.20)</small>
+================================================================================
+# Fixed : display in frontend of the fake date 30 november 1999, if no single date is set.
+
+* Changed files in 3.1.13
+~ site/helpers/icmodel.php
+
+
+iCagenda 3.1.12 <small style="font-weight:normal;">(2013.09.17)</small>
+================================================================================
+# Fixed : A problem with the control of the upcoming date for events over a period (unpublished event and message 'no valid date'). This bug is present since version 3.1.5, and rarely appeared.
+# Fixed : conflict CSS days font color in calendar module with some Shape5 templates.
+
+* Changed files in 3.1.12
+~ site/helpers/icmodel.php
+~ [THEME PACKS] site/themes/default.xml
+~ [THEME PACKS] site/themes/ic_rounded.xml
+~ [THEME PACKS] site/themes/packs/default/css/default_module.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_module.css
+
+
+iCagenda 3.1.11 <small style="font-weight:normal;">(2013.09.13)</small>
+================================================================================
+# Fixed : Italian bug in translation files, responsible of missing features in event edit (admin).
+# Fixed : Error mktime when saving a new event (due to no filling of single dates). A fix should update in the same way events with this issue in the frontend.
+
+* Changed files in 3.1.11
+~ admin/models/fields/modal/date.php
+~ admin/views/event/tmpl/edit.php
+~ site/helpers/icmodel.php
+
+
+iCagenda 3.1.10 <small style="font-weight:normal;">(2013.09.12)</small>
+================================================================================
++ added : control if allow_url_fopen and GD are enabled (thumbnails generator)
++ added : files to prepare the next release with Submit an Event feature!
++ added : Approval option in event edit (will be operating in release 3.2!).
+~ Changed : new dates control when saving an event, display now an alert message for new event, and block saving of a new event if no valid date.
+~ Changed : enhancement of period datepicker (not possible now to have end date before start date)
+# Fixed : not generation of thumbs when extension of a file in caps.
+# MODULE iC calendar : Fixed possible conflicts due to div tags enclosed within scripts (rare conflict, manifested by the appearance of a part of the script on the page, and the non-functioning of the calendar).
+# THEME IC_ROUNDED : display of next date (Time 2 times), list of events.
+
+* Changed files in 3.1.10
+~ admin/add/js/icdates.js
+~ admin/config.xml
+~ admin/controllers/events.php
++ admin/helpers/html/events.php
+~ admin/models/event.php
+~ admin/models/fields/modal/date.php
+~ admin/models/fields/modal/enddate.php
+~ admin/models/fields/modal/startdate.php
++ admin/models/fields/modal/tos_content.php
+~ admin/models/forms/event.xml
+~ admin/tables/event.php
+~ admin/views/event/tmpl/edit.php
+~ admin/views/events/tmpl/default.php
+~ [PRO] modules/mod_ic_event_list/mod_ic_event_list.php
+~ modules/mod_iccalendar/helper.php
+~ modules/mod_iccalendar/mod_iccalendar.php
+~ site/add/js/icdates.js
+~ site/helpers/icmodel.php
++ site/models/forms/submit.xml
+~ site/models/list.php
++ site/models/submit.php
+~ [THEME PACKS] site/themes/ic_rounded.xml
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_list.php
++ SQL : Adding 'approval' column to table icagenda_events
+
+
+iCagenda 3.1.9 <small style="font-weight:normal;">(2013.09.06)</small>
+================================================================================
+! MODULE iC calendar : possibility now to publish many calendars on a single page.
++ Added : Extra-control if mime-type of the event's image is correct (in order to process thumbnails creation).
++ Added : Complete or not form fields 'Name' and 'Email' with the profile information of a Joomla user connected, in registration form.
++ Added : Option to enable or disable the thumbnail generator.
++ Added : 'Notes' field text area in Registration form (set disabled as default).
++ Added : Option Show/Hide 'Notes' in registration form.
++ Added : Option Show/Hide 'Phone' in registration form.
++ Added : Information and control of folder creation used by iCagenda (thumbnails, attachments).
+~ THEME PACKS : version 2.0 (default and ic_rounded).
+~ Changed : period of dates with start date the same day than end date is now displayed as 'date start time - end time' (eg. 23 April 2013 10:00-19:00)
+~ Changed : list of date formats was without <optgroup> infos in Joomla 3
+# MODULE iC calendar : Fixed, Tooltip Close X button was not working on Apple mobile devices.
+# Fixed : bugs in thumbnails generator if ROOT/images folder doesn't exist. Solve an issue if path to images is not 'images'.
+
+* Changed files in 3.1.9
+~ admin/config.xml
+~ admin/models/event.php
+~ admin/models/fields/iclist/globalization.php
+~ admin/models/fields/modal/enddate.php
+~ admin/models/fields/modal/startdate.php
+~ admin/models/forms/event.xml
+~ admin/models/registrations.php
+~ admin/tables/event.php
+~ admin/views/event/tmpl/edit.php
+~ admin/views/events/tmpl/default.php
+~ admin/views/registrations/tmpl/default.php
+~ media/scripts/icthumb.php
+~ [PRO] modules/mod_ic_event_list/mod_ic_event_list.php
+~ [PRO] modules/mod_ic_event_list/mod_ic_event_list.xml
++ modules/mod_iccalendar/helper.php
+~ modules/mod_iccalendar/mod_iccalendar.php
+~ modules/mod_iccalendar/mod_iccalendar.xml
+~ script.icagenda.php
+- site/helpers/icmodcalendar.php
+~ site/helpers/icmodel.php
+~ site/models/list.php
+~ [THEME PACKS] site/themes/default.xml
+~ [THEME PACKS] site/themes/ic_rounded.xml
+~ [THEME PACKS] site/themes/packs/default/default_event.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/css/ic_rounded_module.css
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_day.php
+~ [THEME PACKS] site/themes/packs/ic_rounded/ic_rounded_event.php
+~ site/views/list/tmpl/registration.php
+~ site/views/list/view.html.php
++ SQL : Adding 'created_by_email' column to table icagenda_events
++ SQL : Adding 'weekdays' column to table icagenda_events
++ SQL : Adding 'notes' column to table icagenda_registration
+
+
+iCagenda 3.1.8 <small style="font-weight:normal;">(2013.08.30)</small>
+================================================================================
+# Fixed : Error message in liveupdate (developed by Nicholas from Akeeba) to work under php 5.2. I've added a php control to be able to load storage.php file. But, we truly recommend every user to upgrade their php version to a minimum of 5.3, as recommended by Joomla core, and as minimum to be able to install Joomla 3. In the future, you can encounter other such issue, or error message, if you're still in a PHP version lower than 5.3.
++ Added : Alert Message in control panel of the component, if PHP version is lower than 5.3.
+
+* Changed files in 3.1.8
+~ admin/liveupdate/classes/storage/storage.php
+~ admin/views/icagenda/tmpl/default.php
+
+
+iCagenda 3.1.7 <small style="font-weight:normal;">(2013.08.29)</small>
+================================================================================
++ Added : Created_by filter in list of registered users (admin).
++ Added : Option to use php function checkdnsrr in registration form, to check if email provider is valid (this option is now disabled by default).
++ Added : Options for event details view: show/hide dates, Google Maps, information... and set access level for some.
++ Added : Options to order by dates list of single dates, and display a vertical or horizontal list.
++ Added : Option for registration form : auto-filled name or username, in name's form field (was only name before).
++ MODULE iC calendar : Option to display only start date in the calendar, in case of an event over a period.
+~ MODULE iC calendar : Changes in script code of function.js file to prevent some conflict.
+~ Changed : Search in registrations list extended: username, name, email, date, phone, people... (only search in Title before this release)
+~ Changed : Default value is now set to "by individual date" in 'Registration Type' field.
+~ Changed : Upgraded files of LiveUpdate by Akeeba, updates system integrated in iCagenda.
+# Fixed : sending notification email to author of an event, when new registration. Fixed of [AUTHOREMAIL] tag.
+# Fixed : Error Debug of Google Maps (icmap.js).
+
+* Changed files in 3.1.7
+~ admin/config.xml
+~ admin/liveupdate/ (All php files of this folder updated)
++ admin/models/fields/modal/checkdnsrr.php
+~ admin/models/forms/event.xml
+~ admin/models/registrations.php
+~ admin/views/icagenda/tmpl/default.php
+~ admin/views/registrations/tmpl/default.php
+~ modules/mod_iccalendar/js/function.js
+~ modules/mod_iccalendar/mod_iccalendar.xml
+~ site/helpers/icmodcalendar.php
+~ site/helpers/icmodel.php
+~ site/js/icmap.js
+~ site/themes/packs/default/default_event.php
+~ site/views/list/tmpl/registration.php
+
+
+iCagenda 3.1.6 <small style="font-weight:normal;">(2013.08.20)</small>
+================================================================================
+# Fixed : NextDate control when event set on a period in the future.
++ Added : Control of time when event with a date in a period the same as a single date.
++ Added : On windows server and php version < 5.3, disable check function if provider of an email address during registration is valid, as checkdnsrr is implemented on windows server only since php 5.3.0
+
+* Changed files in 3.1.6
+~ site/helpers/icmodel.php
+
+
+iCagenda 3.1.5 Security Release and enhancements! <small style="font-weight:normal;">(2013.08.19)</small>
+================================================================================
+! Security Release : fixed a XSS vulnerability discovered by Stefan Horlacher from Compass Security AG (www.csnc.ch) (many thanks Stefan to keep the web clean and secured!). Another issue was resolved, discovered by Giusebos, which allowed sending spam to the administrator and the creator of the event, using cookies via registration form. And that's not all! As we always want to add much more security, some filtering enhancements have been added to the registration form (see below).
+! Change : Now, when an event over a period with an end date and its time set to 00:00:00, this end date is displayed in frontend (list of events, and modules).
++ Added : New options in filtering events in menuitem. Now you can display all events, upcoming events, past events, events of the day and upcoming, or today's events.
++ Added : Page 404 when event not found.
++ Added : Enhancement of Email control during registration. Test if provider is valid.
++ Added : Test of the Name during registration. Now, a name cannot start with a number and cannot contain any of the following characters: / \ < > "_QQ_" [ ] ( ) " ; = + &.
++ Added : Control in front-end if dates of events are valid (control was before only in admin edit)
+# Fixed : was counted archived events in header of list of events, and should not.
+# Fixed : if end time is lower or equal to start time of an event over a period, end date is displayed.
+# Fixed : Author name and username were not correctly displayed in admin events list, and now display correctly the user selected in 'created by'.
+
+* Changed files in 3.1.5
+~ admin/models/events.php
+~ admin/tables/event.php
+~ admin/views/events/tmpl/default.php
+~ site/helpers/icmodcalendar.php
+~ site/helpers/icmodel.php
+~ site/views/list/tmpl/default.xml
+~ site/views/list/tmpl/event.php
+~ site/views/list/tmpl/registration.php
+
+
+iCagenda 3.1.4 <small style="font-weight:normal;">(2013.08.13)</small>
+================================================================================
+# Fixed : bug in function for detecting wrong dates entered by user, which was not always working as expected, depending of time setting in joomla config
+# Fixed : change in function for globalized date format of month and of day, to prevent some errors due to locale (Russian...)
+# Fixed : Not sending notification email to the registered user (if his email address is entered and required)
++ Added : Control of event ID to prevent spamming emails to administrator by a robot (notification email admin)
+~ Changed : Translation of Date in current language (admin - list of events)
+
+* Changed files in 3.1.4
+~ admin/tables/event.php
+~ admin/views/events/tmpl/default.php
+~ site/helpers/icmodcalendar.php
+~ site/helpers/icmodel.php
+~ site/themes/packs/default/css/default_module.css
+~ site/themes/packs/ic_rounded/css/ic_rounded_module.css
+
+
+iCagenda 3.1.3 <small style="font-weight:normal;">(2013.08.09)</small>
+================================================================================
+# Fixed : global option to hide the participants list not working properly
+# Fixed : notice message above registration option field, in event edit
+~ MODULE iC calendar : changed, access levels control, to speed up loading of pages with calendar
++ MODULE iC calendar : loading picture when charging a new month
+
+* Changed files in 3.1.3
+~ admin/models/fields/modal/ph_regbt.php
+~ modules/mod_iccalendar/js/function.js
+~ modules/mod_iccalendar/mod_iccalendar.php
+~ site/helpers/icmodcalendar.php
+~ site/helpers/icmodel.php
+~ site/themes/packs/default/css/default_module.css
+~ site/themes/packs/ic_rounded/css/ic_rounded_module.css
+~ (added) site/themes/packs/default/images/ic_load.png
+~ (added) site/themes/packs/ic_rounded/images/ic_load.png
+
+
+iCagenda 3.1.2 <small style="font-weight:normal;">(2013.08.05)</small>
+================================================================================
+! Important editing of thumbnails generator (List of events in admin, Calendar module, and Event List module). Now, file renaming for thumbnails (remove all special caracters to get a clean url for image), and copy of distant pictures (to prevent broken link). Accepted as image extensions (File Types) for event image : jpg, jpeg, png, gif, bmp
+# Fixed : Slow change of month of the calendar (thumbnail generator error function)
+# Fixed : Slow display of events in module iC Event List (Pro Version)
+~ changed : [J3 issue] jQuery UI version in admin, from 1.9.2 to 1.8.23 to prevent a conflict with description tooltip (appeared since joomla 3.1.4)
+
+* Changed files in 3.1.2
+~ admin/views/event/tmpl/edit.php
+~ admin/views/events/tmpl/default.php
+~ media/scripts/icthumb.php
+~ script.icagenda.php
+~ site/helpers/icmodcalendar.php
+
+
+iCagenda 3.1.1 <small style="font-weight:normal;">(2013.07.29)</small>
+================================================================================
+# Fixed : Wrong filtering of Viewing Access Levels in list of events page
+# Fixed : error in modules (front-end), when url to image is broken or invalid
+~ changed : url of image when sharing on facebook (other enhancements planned)
+
+* Changed files in 3.1.1
+~ admin/views/icagenda/view.html.php
+~ script.icagenda.php
+~ site/helpers/icmodcalendar.php
+~ site/helpers/icmodel.php
+~ site/views/list/tmpl/event.php
+
+
+iCagenda 3.1.0 <small style="font-weight:normal;">(2013.07.26)</small>
+================================================================================
+! New : Automatic thumbnails generator in modules (some options, and enhancements will be added later in theme packs)
+# Fixed : Issues with J3 after upgrade from joomla 3.1.x to 3.1.4 (error 500 default layout missing, and JFile not found)
+# Fixed : not sending admin notification email (error in 3.0.1 and 3.0 pre-releases)
+# Fixed : No updating of Next Date when menu set to Upcoming Events
+# Fixed : participant slide effect and display options not working
++ Added : Global Option for email field in frontend registration (required or not)
+~ many code review
+
+* Changed files in 3.1.0
+~ admin/config.xml
+~ admin/models/categories.php
+~ admin/models/fields/modal/ph_regbt.php
+~ admin/tables/event.php
+~ admin/views/events/tmpl/default.php
+~ admin/views/icagenda/view.html.php
+~ media/scripts/icthumb.php
+~ script.icagenda.php
+~ site/helpers/icmodcalendar.php
+~ site/helpers/icmodel.php
+~ site/models/list.php
+~ site/themes/packs/default/default_event.php
+~ site/themes/packs/default/css/default_component.css
+~ site/themes/packs/ic_rounded/ic_rounded_event.php
+~ site/themes/packs/ic_rounded/css/ic_rounded_component.css
+~ site/views/list/tmpl/registration.php
+
+
+iCagenda 3.0.1 <small style="font-weight:normal;">(2013.07.04)</small>
+================================================================================
+# Fixed : auto-play of the tutorial video on Chrome and Safari (the video should not autoplay)
+# Fixed : missing admin pagination in categories list
+# Fixed : buttons display over the datepicker (time show/hide button activated)
+
+* Changed files in 3.0.1
+~ admin/add/css/jquery-ui-1.8.17.custom.css
+~ admin/views/categories/tmpl/default.php
+~ admin/views/categories/view.html.php
+~ admin/views/event/tmpl/edit.php
+~ admin/views/event/view.html.php
+
+
+iCagenda 3.0 RC <small style="font-weight:normal;">(2013.06.30)</small>
+================================================================================
+# Fixed : Thumbnail generator in events list admin : error when using a distant url
+# Fixed : Position and zooming in admin, in events created before update
+# Fixed : Colors of options buttons in event admin edit : not always visible, in events created before update
+# Fixed : Theme ic_rounded : problem of display with long title
++ Added : Custom text option for registration button
++ Added : Control if link to event picture is valid, in admin
+~ updated : display in Global Options of the component and modules
+
+
+iCagenda 3.0 beta 1 <small style="font-weight:normal;">(2013.06.09)</small>
+================================================================================
+! First beta version compatible with Joomla 3 and Joomla 2.5
+
+* Changed files in 3.0
+! Given that this new version brings compatibility with Joomla 3, all php files were reviewed to allow dual Joomla 2.5 / 3.x compatibility. Other files were also reviewed, with a major overhaul of logic and graphic structure of iCagenda. The list of modified files is reset with this new version 3.0 of iCagenda and the list of modified files will be detailed again from future release 3.0.1
+
+
+iCagenda v2 ChangeLog <small style="font-weight:normal;">(2012.12.31 > 2013.05.29)</small>
+? <a href="http://icagenda.joomlic.com/docs/changelog/87-v2-changelog" target="_blank" style="color:#fff">http://icagenda.joomlic.com/docs/changelog/87-v2-changelog</a>
+
+iCagenda v1 ChangeLog <small style="font-weight:normal;">(2012.08.07 > 2012.08.29)</small>
+? <a href="http://icagenda.joomlic.com/docs/changelog/89-v1-changelog" target="_blank" style="color:#fff">http://icagenda.joomlic.com/docs/changelog/89-v1-changelog</a>
+
+;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/access.xml b/deployed/icagenda/administrator/components/com_icagenda/access.xml
new file mode 100644
index 00000000..eb9e6bbe
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/access.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<access component="com_icagenda">
+	<section name="component">
+		<action name="core.admin" title="JACTION_ADMIN" description="JACTION_ADMIN_COMPONENT_DESC" />
+		<action name="core.manage" title="JACTION_MANAGE" description="JACTION_MANAGE_COMPONENT_DESC" />
+		<action name="core.create" title="JACTION_CREATE" description="JACTION_CREATE_COMPONENT_DESC" />
+		<action name="core.delete" title="JACTION_DELETE" description="JACTION_DELETE_COMPONENT_DESC" />
+		<action name="core.edit" title="JACTION_EDIT" description="JACTION_EDIT_COMPONENT_DESC" />
+		<action name="core.edit.state" title="JACTION_EDITSTATE" description="JACTION_EDITSTATE_COMPONENT_DESC" />
+		<action name="core.edit.own" title="JACTION_EDITOWN" description="JACTION_EDITOWN_COMPONENT_DESC" />
+		<action name="icagenda.access.categories" title="COM_ICAGENDA_ACCESS_VIEW_CATEGORIES"
+			description="COM_ICAGENDA_ACCESS_VIEW_CATEGORIES_DESC" />
+		<action name="icagenda.access.events" title="COM_ICAGENDA_ACCESS_VIEW_EVENTS"
+			description="COM_ICAGENDA_ACCESS_VIEW_EVENTS_DESC" />
+		<action name="icagenda.access.registrations" title="COM_ICAGENDA_ACCESS_VIEW_REGISTRATIONS"
+			description="COM_ICAGENDA_ACCESS_VIEW_REGISTRATIONS_DESC" />
+		<action name="icagenda.access.newsletter" title="COM_ICAGENDA_ACCESS_VIEW_NEWSLETTER"
+			description="COM_ICAGENDA_ACCESS_VIEW_NEWSLETTER_DESC" />
+		<action name="icagenda.access.customfields" title="COM_ICAGENDA_ACCESS_VIEW_CUSTOMFIELDS"
+			description="COM_ICAGENDA_ACCESS_VIEW_CUSTOMFIELDS_DESC" />
+		<action name="icagenda.access.features" title="COM_ICAGENDA_ACCESS_VIEW_FEATURES"
+			description="COM_ICAGENDA_ACCESS_VIEW_FEATURES_DESC" />
+		<action name="icagenda.access.themes" title="COM_ICAGENDA_ACCESS_VIEW_THEMES"
+			description="COM_ICAGENDA_ACCESS_VIEW_THEMES_DESC" />
+	</section>
+</access>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/assets/elements/desc.php b/deployed/icagenda/administrator/components/com_icagenda/assets/elements/desc.php
new file mode 100644
index 00000000..6a3f38ae
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/assets/elements/desc.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.5.4 2015-04-02
+ * @since       3.2.0.3
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('JPATH_BASE') or die;
+
+jimport('joomla.form.formfield');
+
+// Test if translation is missing, set to en-GB by default
+$language = JFactory::getLanguage();
+$language->load('com_icagenda', JPATH_ADMINISTRATOR, 'en-GB', true);
+$language->load('com_icagenda', JPATH_ADMINISTRATOR, null, true);
+
+
+class JFormFieldDesc extends JFormField
+{
+	protected $type = 'Desc';
+
+	protected function getLabel()
+	{
+		return ' ';
+	}
+
+	protected function getInput()
+	{
+		$html = array();
+
+		$document = JFactory::getDocument();
+
+		// Joomla 2.5
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			JHtml::stylesheet('com_icagenda/template.j25.css', false, true);
+			JHtml::stylesheet('com_icagenda/icagenda-back.j25.css', false, true);
+
+			JHTML::_('behavior.framework');
+
+			// load jQuery, if not loaded before
+			$scripts = array_keys($document->_scripts);
+			$scriptFound = false;
+			$scriptuiFound = false;
+
+			for ($i = 0; $i < count($scripts); $i++)
+			{
+				if (stripos($scripts[$i], 'jquery.min.js') !== false)
+				{
+					$scriptFound = true;
+				}
+				// load jQuery, if not loaded before as jquery
+				if (stripos($scripts[$i], 'jquery.js') !== false)
+				{
+					$scriptFound = true;
+				}
+				if (stripos($scripts[$i], 'jquery-ui.min.js') !== false)
+				{
+					$scriptuiFound = true;
+				}
+			}
+
+			// jQuery Library Loader
+			if (!$scriptFound)
+			{
+				// load jQuery, if not loaded before
+				if (!JFactory::getApplication()->get('jquery'))
+				{
+					JFactory::getApplication()->set('jquery', true);
+					// add jQuery
+					$document->addScript('https://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js');
+					$document->addScript( JURI::root( true ) . '/media/com_icagenda/js/jquery.noconflict.js' );
+				}
+			}
+
+			if (!$scriptuiFound)
+			{
+				$document->addScript('https://ajax.googleapis.com/ajax/libs/jqueryui/1.9.2/jquery-ui.min.js');
+			}
+
+			$document->addScript( JURI::root( true ) . '/media/com_icagenda/js/template.js' );
+		}
+
+		$label = $this->element['label'];
+		$label = $this->translateLabel ? JText::_($label) : $label;
+
+		$style = $this->element['style'];
+		$style = $this->translateLabel ? JText::_($style) : $style;
+
+		$class = $this->element['class'];
+		$class = $this->translateLabel ? JText::_($class) : $class;
+
+
+		// Contruction
+		$html[] = "<div class='";
+		$html[] = $class;
+		$html[] = "' ";
+		$html[] = "style='";
+		$html[] = $style;
+		$html[] = "display:block;clear:both;'>";
+		$html[] = $label;
+		$html[] = "</div>";
+
+		return implode('',$html);
+
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/assets/elements/index.html b/deployed/icagenda/administrator/components/com_icagenda/assets/elements/index.html
new file mode 100644
index 00000000..fa6d84e8
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/assets/elements/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/assets/elements/title.php b/deployed/icagenda/administrator/components/com_icagenda/assets/elements/title.php
new file mode 100644
index 00000000..080e3b0a
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/assets/elements/title.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.6.9 2017-07-04
+ * @since       1.2.3
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('JPATH_BASE') or die;
+
+jimport('joomla.form.formfield');
+
+// Test if translation is missing, set to en-GB by default
+$language = JFactory::getLanguage();
+$language->load('com_icagenda', JPATH_ADMINISTRATOR, 'en-GB', true);
+$language->load('com_icagenda', JPATH_ADMINISTRATOR, null, true);
+
+JHtml::stylesheet('com_icagenda/icagenda-back.css', false, true);
+
+
+class JFormFieldTitle extends JFormField
+{
+	protected $type = 'Title';
+
+	protected function getLabel()
+	{
+		return ' ';
+	}
+
+	protected function getInput()
+	{
+		$html = array();
+
+		$document = JFactory::getDocument();
+		$document->addStyleSheet( JURI::root( true ) . '/media/com_icagenda/icicons/style.css' );
+
+		// Joomla 2.5
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			JHtml::stylesheet('com_icagenda/template.j25.css', false, true);
+			JHtml::stylesheet('com_icagenda/icagenda-back.j25.css', false, true);
+
+			JHTML::_('behavior.framework');
+
+			// load jQuery, if not loaded before
+			$scripts = array_keys($document->_scripts);
+			$scriptFound = false;
+			$scriptuiFound = false;
+
+			for ($i = 0; $i < count($scripts); $i++)
+			{
+				if (stripos($scripts[$i], 'jquery.min.js') !== false)
+				{
+					$scriptFound = true;
+				}
+				// load jQuery, if not loaded before as jquery
+				if (stripos($scripts[$i], 'jquery.js') !== false)
+				{
+					$scriptFound = true;
+				}
+				if (stripos($scripts[$i], 'jquery-ui.min.js') !== false)
+				{
+					$scriptuiFound = true;
+				}
+			}
+
+			// jQuery Library Loader
+			if (!$scriptFound)
+			{
+				// load jQuery, if not loaded before
+				if (!JFactory::getApplication()->get('jquery'))
+				{
+					JFactory::getApplication()->set('jquery', true);
+					// add jQuery
+					$document->addScript('https://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js');
+					$document->addScript( JURI::root( true ) . '/media/com_icagenda/js/jquery.noconflict.js' );
+				}
+			}
+
+			if (!$scriptuiFound)
+			{
+				$document->addScript('https://ajax.googleapis.com/ajax/libs/jqueryui/1.9.2/jquery-ui.min.js');
+			}
+
+			$document->addScript( JURI::root( true ) . '/media/com_icagenda/js/template.js' );
+		}
+
+    	$label = $this->element['label'];
+		$label = $this->translateLabel ? JText::_($label) : $label;
+
+    	$style = $this->element['style'];
+		$style = $this->translateLabel ? JText::_($style) : $style;
+
+    	$class = $this->element['class'];
+		$class = $this->translateLabel ? JText::_($class) : $class;
+
+
+		// Contruction
+    	$html[] = "<div class='";
+    	$html[] = $class;
+    	$html[] = " element-title' ";
+    	$html[] = "style='";
+    	$html[] = $style;
+    	$html[] = "'>";
+    	$html[] = $label;
+    	$html[] = "</div>";
+
+    	return implode('',$html);
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/assets/elements/titleheader.php b/deployed/icagenda/administrator/components/com_icagenda/assets/elements/titleheader.php
new file mode 100644
index 00000000..4bff26d4
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/assets/elements/titleheader.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.5.4 2015-04-13
+ * @since       3.5.4
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('JPATH_BASE') or die;
+
+jimport('joomla.form.formfield');
+
+
+class JFormFieldTitleHeader extends JFormField
+{
+	protected $type = 'TitleHeader';
+
+	protected function getInput()
+	{
+		return ' ';
+	}
+
+	protected function getLabel()
+	{
+    	$label = $this->element['label'];
+		$label = $this->translateLabel ? JText::_($label) : $label;
+
+    	$html = '<h3>' . $label . '</h3>';
+
+    	return $html;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/assets/elements/titleimg.php b/deployed/icagenda/administrator/components/com_icagenda/assets/elements/titleimg.php
new file mode 100644
index 00000000..4aab4509
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/assets/elements/titleimg.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.6.9 2017-07-04
+ * @since       1.2.3
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('JPATH_BASE') or die;
+
+jimport('joomla.form.formfield');
+
+// Test if translation is missing, set to en-GB by default
+$language = JFactory::getLanguage();
+$language->load('com_icagenda', JPATH_ADMINISTRATOR, 'en-GB', true);
+$language->load('com_icagenda', JPATH_ADMINISTRATOR, null, true);
+
+JHtml::stylesheet('com_icagenda/icagenda-back.css', false, true);
+
+
+class JFormFieldTitleImg extends JFormField
+{
+	protected $type = 'TitleImg';
+
+	protected function getLabel()
+	{
+		return ' ';
+	}
+
+	protected function getInput()
+	{
+		$html = array();
+
+		// Affichage texte
+
+		$label = $this->element['label'];
+		$label = $this->translateLabel ? JText::_($label) : $label;
+
+		$style = $this->element['style'];
+		$style = $this->translateLabel ? JText::_($style) : $style;
+
+		$class = $this->element['class'];
+		$class = $this->translateLabel ? JText::_($class) : $class;
+
+		$icimage = $this->element['icimage'];
+		$image = '../media/com_icagenda/images/'. $icimage .'';
+
+		$icicon = $this->element['icicon'];
+
+		// Contruction
+		$html[] = '<div class="';
+		$html[] = $class;
+		$html[] = ' element-title-img" ';
+		$html[] = 'style="';
+		$html[] = $style;
+		$html[] = '">';
+
+		if ($icimage)
+		{
+			$html[] = '<img src="';
+			$html[] = $image;
+			$html[] = '" />';
+		}
+		elseif ($icicon)
+		{
+			$html[] = '<span class="iCicon-';
+			$html[] = $icicon;
+			$html[] = '"></span> ';
+		}
+
+		$html[] = $label;
+		$html[] = '</div>';
+
+		return implode('',$html);
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/assets/index.html b/deployed/icagenda/administrator/components/com_icagenda/assets/index.html
new file mode 100644
index 00000000..42682b47
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/assets/index.html
@@ -0,0 +1 @@
+<html><body></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/assets/jcms/info.php b/deployed/icagenda/administrator/components/com_icagenda/assets/jcms/info.php
new file mode 100644
index 00000000..47ccd10c
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/assets/jcms/info.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.3 2018-08-09
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Adapted from Nicholas K. Dionysopoulos - www.akeebabackup.com
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.5.6
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+class iCagendaSystemInfo
+{
+	/** @var string Unique identifier for the site, created from server variables */
+	private $siteId;
+	/** @var array Associative array of data being sent */
+	private $data = array();
+	/** @var string Remote url to upload the stats */
+	private $remoteUrl = 'https://stats.joomlic.com/index.php';
+
+	public function setSiteId($siteId)
+	{
+		$this->siteId = $siteId;
+	}
+
+	/**
+	 * Sets the value of a collected variable. Use NULL as value to unset it
+	 *
+	 * @param   string  $key        Variable name
+	 * @param   string  $value      Variable value
+	 */
+	public function setValue($key, $value)
+	{
+		if (is_null($value) && isset($this->data[$key]))
+		{
+			unset($this->data[$key]);
+		}
+		else
+		{
+			$this->data[$key] = $value;
+		}
+	}
+
+	/**
+	 * Uploads collected data to the remote server
+	 *
+	 * @param   bool    $useIframe  Should I create an iframe to upload data or should I use cURL/fopen?
+	 *
+	 * @return  string|bool     The HTML code if an iframe is requested or a boolean if we're using cURL/fopen
+	 */
+	public function sendInfo($useIframe = false)
+	{
+		// No site ID? Well, simply do nothing
+		if ( ! $this->siteId)
+		{
+			return '';
+		}
+
+		// First of all let's add the siteId
+		$this->setValue('sid', $this->siteId);
+
+		// Then let's create the url
+		$url = array();
+
+		foreach ($this->data as $param => $value)
+		{
+			$url[] .= $param . '=' . $value;
+		}
+
+		$url = $this->remoteUrl . '?' . implode('&', $url);
+
+        // Should I create an iframe?
+        if ($useIframe)
+        {
+            return '<!-- Anonymous usage statistics collection for iCagenda software --><iframe style="display: none" src="' . $url . '"></iframe>';
+        }
+        else
+        {
+            // Do we have cURL installed?
+            if (function_exists('curl_init'))
+            {
+                $ch = curl_init($url);
+
+                curl_setopt($ch, CURLOPT_TIMEOUT, 5);
+
+                return curl_exec($ch);
+            }
+            else
+            {
+                // Nope, let's try with fopen and cross our fingers
+                return @fopen($url, 'r');
+            }
+        }
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/config.xml b/deployed/icagenda/administrator/components/com_icagenda/config.xml
new file mode 100644
index 00000000..ca695564
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/config.xml
@@ -0,0 +1,2362 @@
+<?xml version="1.0" encoding="utf-8"?>
+<config
+	addfieldpath="/libraries/ic_library/form/field"
+	addrulepath="/libraries/ic_library/form/rule"
+	>
+
+	<fieldset
+		name="component"
+		label="COM_ICAGENDA_COMPONENT_LABEL"
+		addfieldpath="/administrator/components/com_icagenda/assets/elements"
+		>
+
+		<field
+			type="TitleImg"
+			label="COM_ICAGENDA_DESC"
+			class="styleblanck"
+			icimage="joomlic_iCagenda.png"
+		/>
+
+		<field name="version" type="hidden" class="inputbox" />
+		<field name="release" type="hidden" class="inputbox" />
+		<field name="icsys" type="hidden" class="inputbox" />
+		<field name="author" type="hidden" class="inputbox" />
+		<field name="bootstrapType" type="hidden" default="1" class="inputbox" />
+	</fieldset>
+
+	<fieldset
+		name="list"
+		label="ICLIST"
+		addfieldpath="/administrator/components/com_icagenda/models/fields"
+		>
+
+		<field
+			type="TitleImg"
+			label="COM_ICAGENDA_LIST_PARAMS_DESC"
+			class="alert alert-info"
+			icicon="info-circle"
+		/>
+
+		<field
+			type="TitleImg"
+			label="COM_ICAGENDA_LIST_FILTERS"
+			class="stylebox lead input-xxlarge"
+			icicon="filter"
+		/>
+
+		<field
+			name="time"
+			type="list"
+			label="COM_ICAGENDA_TIME_LBL"
+			description="COM_ICAGENDA_TIME_DESC"
+			default="1"
+			class="inputbox"
+			>
+			<option value="2">COM_ICAGENDA_OPTION_PAST_EVENTS</option>
+			<option value="4">COM_ICAGENDA_OPTION_CURRENT_EVENTS_TODAY_EVENTS</option>
+			<option value="1">COM_ICAGENDA_OPTION_CURRENT_EVENTS_TODAY_AND_UPCOMING_EVENTS</option>
+			<option value="3">COM_ICAGENDA_OPTION_UPCOMING_EVENTS</option>
+			<option value="0">COM_ICAGENDA_OPTION_ALL_EVENTS</option>
+		</field>
+
+		<field
+			name="orderby"
+			type="list"
+			label="COM_ICAGENDA_LBL_DATE"
+			description="COM_ICAGENDA_DESC_DATE"
+			default="2"
+			>
+			<option value="1">COM_ICAGENDA_DATE_DESC</option>
+			<option value="2">COM_ICAGENDA_DATE_ASC</option>
+		</field>
+
+		<field
+			name="datesDisplay"
+			type="radio"
+			label="COM_ICAGENDA_LIST_TYPE_LBL"
+			description="COM_ICAGENDA_LIST_TYPE_DESC"
+			default="1"
+			class="btn-group"
+			onchange="icalert()"
+			>
+			<option value="1">JYES</option>
+			<option value="2">JNO</option>
+		</field>
+
+		<!--field
+			name="datesDisplay"
+			type="list"
+			label="COM_ICAGENDA_LIST_TYPE_LBL"
+			description="COM_ICAGENDA_LIST_TYPE_DESC"
+			default="1"
+			class="inputbox"
+			>
+			<option value="1">COM_ICAGENDA_LIST_ALL_DATES</option>
+			<option value="2">COM_ICAGENDA_LIST_ALL_EVENTS</option>
+		</field-->
+
+		<field
+			type="TitleImg"
+			label="COM_ICAGENDA_LIST_SEARCH_FILTERS_FRONTEND"
+			class="stylebox lead input-xxlarge"
+			icicon="bi-color-header"
+		/>
+
+		<field
+			name="search_filters"
+			type="radio"
+			label="COM_ICAGENDA_LIST_SEARCH_FILTERS_FRONTEND_LBL"
+			description="COM_ICAGENDA_LIST_SEARCH_FILTERS_FRONTEND_DESC"
+			default="0"
+			class="btn-group"
+			>
+			<option value="1">JENABLED</option>
+			<option value="0">JDISABLED</option>
+		</field>
+
+		<field
+			name="filters_mode"
+			type="list"
+			label="COM_ICAGENDA_LIST_SEARCH_FILTERS_MODE_LBL"
+			description="COM_ICAGENDA_LIST_SEARCH_FILTERS_MODE_DESC"
+			default="1"
+			class="btn-group"
+			showon="search_filters:1"
+			>
+			<option value="1">COM_ICAGENDA_LIST_SEARCH_FILTERS_MODE_CURRENT_LIST</option>
+			<option value="2">COM_ICAGENDA_LIST_SEARCH_FILTERS_MODE_GLOBAL_LIST</option>
+		</field>
+
+		<field
+			name="filters_display"
+			type="radio"
+			label="COM_ICAGENDA_LIST_SEARCH_FILTERS_DISPLAY_LBL"
+			description="COM_ICAGENDA_LIST_SEARCH_FILTERS_DISPLAY_DESC"
+			default="2"
+			class="btn-group"
+			showon="search_filters:1"
+			>
+			<option value="2">COM_ICAGENDA_RESPONSIVE</option>
+			<option value="1">COM_ICAGENDA_FULL_WIDTH</option>
+		</field>
+
+		<field
+			name="filters_label"
+			type="radio"
+			label="COM_ICAGENDA_LIST_SEARCH_FILTERS_LABEL_LBL"
+			description="COM_ICAGENDA_LIST_SEARCH_FILTERS_LABEL_DESC"
+			default="1"
+			class="btn-group"
+			showon="search_filters:1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="filter_search"
+			type="hidden"
+			rendertype="radio"
+			label="COM_ICAGENDA_LIST_SEARCH_FILTERS_SEARCH_LBL"
+			description=""
+			default="2"
+			class="btn-group"
+			labelclass="control-label"
+			showon="search_filters:1"
+			>
+			<option value="2">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="filter_from"
+			type="hidden"
+			rendertype="radio"
+			label="COM_ICAGENDA_LIST_SEARCH_FILTERS_FROM_LBL"
+			description=""
+			default="1"
+			class="btn-group"
+			labelclass="control-label"
+			showon="search_filters:1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="filter_to"
+			type="hidden"
+			rendertype="radio"
+			label="COM_ICAGENDA_LIST_SEARCH_FILTERS_TO_LBL"
+			description=""
+			default="1"
+			class="btn-group"
+			labelclass="control-label"
+			showon="search_filters:1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="filter_category"
+			type="hidden"
+			rendertype="radio"
+			label="COM_ICAGENDA_LIST_SEARCH_FILTERS_CATEGORY_LBL"
+			description=""
+			default="1"
+			class="btn-group"
+			labelclass="control-label"
+			showon="search_filters:1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="filter_month"
+			type="hidden"
+			rendertype="radio"
+			label="COM_ICAGENDA_LIST_SEARCH_FILTERS_MONTH_LBL"
+			description=""
+			default="1"
+			class="btn-group"
+			labelclass="control-label"
+			showon="search_filters:1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="filter_year"
+			type="hidden"
+			rendertype="radio"
+			label="COM_ICAGENDA_LIST_SEARCH_FILTERS_YEAR_LBL"
+			description=""
+			default="1"
+			class="btn-group"
+			labelclass="control-label"
+			showon="search_filters:1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="filter_ordering"
+			type="ic.sortablefields"
+			label="COM_ICAGENDA_LIST_SEARCH_FILTERS_LBL"
+			description="COM_ICAGENDA_LIST_SEARCH_FILTERS_DESC"
+			class="alert alert-info input-xxlarge"
+			default="filter_search,filter_from,filter_to,filter_category,filter_month,filter_year"
+			showon="search_filters:1"
+		/>
+
+		<field type="Title" label=" " class="stylenote" />
+
+		<field
+			type="TitleImg"
+			label="COM_ICAGENDA_LIST_HEADER"
+			class="stylebox lead input-xxlarge"
+			icicon="bi-color-header"
+		/>
+
+		<field
+			name="headerList"
+			type="list"
+			label="COM_ICAGENDA_LIST_HEADER_LABEL"
+			description="COM_ICAGENDA_LIST_HEADER_DESC"
+			default="1"
+			>
+			<option value="1">JALL</option>
+			<option value="2">COM_ICAGENDA_LIST_HEADER_ONLY_TITLE</option>
+			<option value="3">COM_ICAGENDA_LIST_HEADER_ONLY_SUBTITLE</option>
+			<option value="4">JNONE</option>
+		</field>
+
+		<field
+			name="CatDesc_global"
+			type="modal_icmulti_opt"
+			label="COM_ICAGENDA_DISPLAY_CATINFOS_LABEL"
+			description="COM_ICAGENDA_DISPLAY_CATINFOS_DESC"
+			default="0"
+			labelclass="control-label"
+		/>
+
+		<field
+			name="CatDesc_checkbox"
+			type="modal_icmulti_checkbox"
+			label=" "
+			class="checkbox"
+			labelclass="control-label"
+		/>
+
+		<field
+			type="TitleImg"
+			label="COM_ICAGENDA_LIST_NAVIGATOR"
+			class="stylebox lead input-xxlarge"
+			icicon="navigation"
+		/>
+
+		<field
+			name="navposition"
+			type="list"
+			label="COM_ICAGENDA_LIST_NAVIGATOR_POSITION_LABEL"
+			description="COM_ICAGENDA_LIST_NAVIGATOR_POSITION_DESC"
+			default="1"
+			>
+			<option value="0">COM_ICAGENDA_TOP</option>
+			<option value="1">COM_ICAGENDA_BOTTOM</option>
+			<option value="2">COM_ICAGENDA_TOP_AND_BOTTOM</option>
+		</field>
+
+		<field
+			name="arrowtext"
+			type="radio"
+			label="COM_ICAGENDA_LIST_ARROWS_TEXT_LABEL"
+			description="COM_ICAGENDA_LIST_ARROWS_TEXT_DESC"
+			default="1"
+			class="btn-group"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="pagination"
+			type="radio"
+			label="COM_ICAGENDA_LIST_PAGINATION_LABEL"
+			description="COM_ICAGENDA_LIST_PAGINATION_TEXT_DESC"
+			default="1"
+			class="btn-group"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			type="TitleImg"
+			label="COM_ICAGENDA_LIST_DATEBOX"
+			class="stylebox lead input-xxlarge"
+			icicon="calendar-2"
+		/>
+
+		<field
+			name="day_display_global"
+			type="radio"
+			label="COM_ICAGENDA_LIST_DATEBOX_DAY_DISPLAY_LABEL"
+			description="COM_ICAGENDA_LIST_DATEBOX_DAY_DISPLAY_DESC"
+			default="1"
+			class="btn-group"
+			filter="options"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="month_display_global"
+			type="radio"
+			label="COM_ICAGENDA_LIST_DATEBOX_MONTH_DISPLAY_LABEL"
+			description="COM_ICAGENDA_LIST_DATEBOX_MONTH_DISPLAY_DESC"
+			default="1"
+			class="btn-group"
+			filter="options"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="event_month_format"
+			type="list"
+			label="COM_ICAGENDA_LIST_DATEBOX_MONTH_FORMAT_LABEL"
+			description="COM_ICAGENDA_LIST_DATEBOX_MONTH_FORMAT_DESC"
+			default="monthshort"
+			filter="options"
+			showon="month_display_global:1"
+			>
+			<option value="monthshort">COM_ICAGENDA_DATEFORMAT_EVENT_MONTH_SHORT</option>
+			<option value="month">COM_ICAGENDA_DATEFORMAT_EVENT_MONTH_FULL</option>
+			<option value="m">COM_ICAGENDA_DATEFORMAT_EVENT_MONTH_NUM_M</option>
+			<option value="n">COM_ICAGENDA_DATEFORMAT_EVENT_MONTH_NUM_N</option>
+		</field>
+
+		<field
+			name="year_display_global"
+			type="radio"
+			label="COM_ICAGENDA_LIST_DATEBOX_YEAR_DISPLAY_LABEL"
+			description="COM_ICAGENDA_LIST_DATEBOX_YEAR_DISPLAY_DESC"
+			default="1"
+			class="btn-group"
+			filter="options"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="time_display_global"
+			type="radio"
+			label="COM_ICAGENDA_LIST_DATEBOX_TIME_DISPLAY_LABEL"
+			description="COM_ICAGENDA_LIST_DATEBOX_TIME_DISPLAY_DESC"
+			default="0"
+			class="btn-group"
+			filter="options"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			type="TitleImg"
+			label="COM_ICAGENDA_LIST_INFORMATION"
+			class="stylebox lead input-xxlarge"
+			icicon="info"
+		/>
+
+		<field
+			name="list_title_length"
+			type="text"
+			label="COM_ICAGENDA_LIST_TITLE_LENGTH_LABEL"
+			description="COM_ICAGENDA_LIST_TITLE_LENGTH_DESC"
+			default=""
+			class="input-mini"
+			filter="integer"
+		/>
+
+		<field
+			name="venue_display_global"
+			type="radio"
+			label="COM_ICAGENDA_LIST_VENUE_DISPLAY_LABEL"
+			description="COM_ICAGENDA_LIST_VENUE_DISPLAY_DESC"
+			default="1"
+			class="btn-group"
+			filter="options"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="city_display_global"
+			type="radio"
+			label="COM_ICAGENDA_LIST_CITY_DISPLAY_LABEL"
+			description="COM_ICAGENDA_LIST_CITY_DISPLAY_DESC"
+			default="1"
+			class="btn-group"
+			filter="options"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="country_display_global"
+			type="radio"
+			label="COM_ICAGENDA_LIST_COUNTRY_DISPLAY_LABEL"
+			description="COM_ICAGENDA_LIST_COUNTRY_DISPLAY_DESC"
+			default="1"
+			class="btn-group"
+			filter="options"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="shortdesc_display_global"
+			type="radio"
+			label="COM_ICAGENDA_LIST_INTROTEXT_DISPLAY_LABEL"
+			description="COM_ICAGENDA_LIST_INTROTEXT_DISPLAY_DESC"
+			default=""
+			class="btn-group"
+			filter="options"
+			>
+			<option value="">IC_AUTO</option>
+			<option value="0">JHIDE</option>
+			<option value="1">IC_SHORTDESC</option>
+			<option value="2">IC_AUTO_INTROTEXT</option>
+		</field>
+	</fieldset>
+
+	<fieldset
+		name="details"
+		label="ICEVENT"
+		addfieldpath="/administrator/components/com_content/models/fields"
+		>
+
+		<field
+			type="TitleImg"
+			label="COM_ICAGENDA_EVENT_PARAMS_DESC"
+			class="alert alert-info"
+			icicon="info-circle"
+		/>
+
+		<field
+			type="TitleImg"
+			label="ICDESC"
+			class="stylebox lead input-xxlarge"
+			icicon="iclogo"
+		/>
+
+		<field
+			name="desc_display_event"
+			type="list"
+			label="COM_ICAGENDA_EVENT_DESCRIPTION_DISPLAY_LABEL"
+			description="COM_ICAGENDA_EVENT_DESCRIPTION_DISPLAY_DESC"
+			default=""
+			filter="options"
+			>
+			<option value="">IC_AUTO</option>
+			<option value="1">IC_FULLDESC</option>
+			<option value="2">IC_SHORTDESCRIPTION</option>
+			<option value="3">IC_SHORT_AND_FULL_DESCRIPTION</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			type="TitleImg"
+			label="COM_ICAGENDA_LEGEND_INFORMATION"
+			class="stylebox lead input-xxlarge"
+			icicon="info"
+		/>
+
+		<field
+			name="infoDetails"
+			type="radio"
+			label="COM_ICAGENDA_INFORMATION_LABEL"
+			description="COM_ICAGENDA_INFORMATION_DESC"
+			default="1"
+			class="btn-group"
+			labelclass="control-label"
+			filter="options"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="accessInfoDetails"
+			type="accesslevel"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			default="1"
+			class="inputbox"
+			size="1"
+			showon="infoDetails:1"
+		/>
+
+		<field
+			name="targetLink"
+			type="list"
+			label="COM_ICAGENDA_TARGET_LINK_LABEL"
+			description="COM_ICAGENDA_TARGET_LINK_DESC"
+			default="1"
+			class="inputbox"
+			filter="options"
+			showon="infoDetails:1"
+			>
+			<option value="1">JBROWSERTARGET_NEW</option>
+			<option value="0">JBROWSERTARGET_PARENT</option>
+		</field>
+
+		<field
+			type="TitleImg"
+			label="COM_ICAGENDA_LEGEND_GOOGLE_MAPS"
+			class="stylebox lead input-xxlarge"
+			icicon="location"
+		/>
+
+		<field
+			name="GoogleMaps"
+			type="radio"
+			label="COM_ICAGENDA_LEGEND_GOOGLE_MAPS"
+			description="COM_ICAGENDA_GOOGLE_MAPS_DESC"
+			default="1"
+			class="btn-group"
+			labelclass="control-label"
+			filter="options"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="accessGoogleMaps"
+			type="accesslevel"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			default="1"
+			class="inputbox"
+			size="1"
+			showon="GoogleMaps:1"
+		/>
+
+		<field
+			type="TitleImg"
+			label="COM_ICAGENDA_EVENT_ALL_DATES"
+			class="stylebox lead input-xxlarge"
+			icicon="calendar"
+		/>
+
+		<field
+			type="TitleImg"
+			label="COM_ICAGENDA_EVENT_ALL_DATES_DESC"
+			class="stylenote alert alert-info input-xxlarge"
+			icicon="info-circle"
+		/>
+
+		<field
+			name="SingleDates"
+			type="radio"
+			label="COM_ICAGENDA_EVENT_SINGLE_DATES_LABEL"
+			description="COM_ICAGENDA_EVENT_SINGLE_DATES_DESC"
+			default="1"
+			class="btn-group"
+			labelclass="control-label"
+			filter="options"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="SingleDatesOrder"
+			type="list"
+			label="COM_ICAGENDA_LBL_DATE"
+			description="COM_ICAGENDA_DESC_DATE"
+			default="1"
+			class="inputbox"
+			showon="SingleDates:1"
+			>
+			<option value="1">COM_ICAGENDA_DATE_DESC</option>
+			<option value="2">COM_ICAGENDA_DATE_ASC</option>
+		</field>
+
+		<field
+			name="SingleDatesListModel"
+			type="list"
+			label="COM_ICAGENDA_EVENT_SINGLE_DATES_LIST_LABEL"
+			description="COM_ICAGENDA_EVENT_SINGLE_DATES_LIST_DESC"
+			default="1"
+			class="inputbox"
+			showon="SingleDates:1"
+			>
+			<option value="1">COM_ICAGENDA_EVENT_SINGLE_DATES_VERTICAL</option>
+			<option value="2">COM_ICAGENDA_EVENT_SINGLE_DATES_HORIZONTAL</option>
+		</field>
+
+		<field type="Title" label=" " class="stylenote" />
+
+		<field
+			name="PeriodDates"
+			type="radio"
+			label="COM_ICAGENDA_EVENT_PERIOD_LABEL"
+			description="COM_ICAGENDA_EVENT_PERIOD_DESC"
+			default="1"
+			class="btn-group"
+			labelclass="control-label"
+			filter="options"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			type="TitleImg"
+			label="COM_ICAGENDA_LIST_OF_PARTICIPANTS_LABEL"
+			class="stylebox lead input-xxlarge"
+			icicon="people"
+		/>
+
+		<field
+			name="participantList"
+			type="radio"
+			label="COM_ICAGENDA_LIST_OF_PARTICIPANTS_LABEL"
+			description="COM_ICAGENDA_LIST_OF_PARTICIPANTS_DESC"
+			default="0"
+			class="btn-group"
+			filter="options"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="accessParticipantList"
+			type="accesslevel"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			showon="participantList:1"
+		/>
+
+		<field
+			name="participantSlide"
+			type="radio"
+			label="COM_ICAGENDA_LIST_OF_PARTICIPANTS_SLIDE_LABEL"
+			description="COM_ICAGENDA_LIST_OF_PARTICIPANTS_SLIDE_DESC"
+			default="1"
+			class="btn-group"
+			filter="options"
+			showon="participantList:1"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="participantDisplay"
+			type="list"
+			label="COM_ICAGENDA_LIST_OF_PARTICIPANTS_DISPLAY_LABEL"
+			description="COM_ICAGENDA_LIST_OF_PARTICIPANTS_DISPLAY_DESC"
+			default="1"
+			class="inputbox"
+			filter="options"
+			showon="participantList:1"
+			>
+			<option value="1">COM_ICAGENDA_LIST_OF_PARTICIPANTS_DISPLAY_FULL</option>
+			<option value="2">COM_ICAGENDA_LIST_OF_PARTICIPANTS_DISPLAY_AVATAR</option>
+			<option value="3">COM_ICAGENDA_LIST_OF_PARTICIPANTS_DISPLAY_NAMES</option>
+		</field>
+
+		<field
+			name="fullListColumns"
+			type="radio"
+			label="COM_ICAGENDA_LIST_DISPLAY_FULL_COLUMN_LABEL"
+			description="COM_ICAGENDA_LIST_DISPLAY_FULL_COLUMN_DESC"
+			default="tiers"
+			class="btn-group"
+			filter="options"
+			showon="participantList:1"
+			>
+			<option value="total">1</option>
+			<option value="demi">2</option>
+			<option value="tiers">3</option>
+			<option value="quart">4</option>
+		</field>
+	</fieldset>
+
+	<fieldset
+		name="register"
+		label="COM_ICAGENDA_REGISTRATION_LABEL"
+		addfieldpath="/administrator/components/com_icagenda/utilities/form/field"
+		>
+
+		<field
+			type="TitleImg"
+			label="COM_ICAGENDA_REGISTRATION_TO_EVENT_DESC"
+			class="alert alert-info"
+			icicon="info-circle"
+		/>
+
+		<field
+			type="TitleImg"
+			label="COM_ICAGENDA_TITLE_REGISTRATION"
+			class="stylebox lead input-xxlarge"
+			icicon="register"
+		/>
+
+		<field
+			name="statutReg"
+			type="radio"
+			label="COM_ICAGENDA_REGISTRATIONS_LABEL"
+			description="COM_ICAGENDA_REGISTRATIONS_DESC"
+			default="0"
+			class="btn-group"
+			>
+			<option value="1">JON</option>
+			<option value="0">JOFF</option>
+		</field>
+
+		<field
+			name="reg_form_access"
+			type="accesslevel"
+			label="JFIELD_ACCESS_LABEL"
+			description="COM_ICAGENDA_REGISTRATION_ACCESS_LEVEL_DESC"
+			default="1"
+			class="inputbox"
+			size="1"
+		/>
+
+		<field
+			name="reg_deadline"
+			type="radio"
+			label="COM_ICAGENDA_REGISTRATION_DEADLINE_LABEL"
+			description="COM_ICAGENDA_REGISTRATION_DEADLINE_DESC"
+			default=""
+			class="btn-group"
+			>
+			<option value="">COM_ICAGENDA_REGISTRATION_DEADLINE_START</option>
+			<option value="2">COM_ICAGENDA_REGISTRATION_DEADLINE_END</option>
+		</field>
+
+		<field
+			name="maxRlist"
+			type="text"
+			label="COM_ICAGENDA_MAX_PER_REGISTRATION_LABEL"
+			description="COM_ICAGENDA_MAX_PER_REGISTRATION_DESC"
+			default="5"
+			class="inputbox input-mini"
+			size="2"
+			filter="integer"
+			validate="ic.positiveinteger"
+		/>
+
+		<field
+			name="RegButtonText"
+			type="modal_ph_regbt"
+			label="COM_ICAGENDA_REGISTRATION_BUTTON_TEXT"
+			description="COM_ICAGENDA_OVERRIDE_BUTTON_TEXT_DESC"
+			default=""
+		/>
+
+		<field
+			type="TitleImg"
+			label="COM_ICAGENDA_FORM_LABEL"
+			class="stylebox lead input-xxlarge"
+			icicon="form"
+		/>
+
+		<field type="Title" label="COM_ICAGENDA_REGISTRATION_EMAIL_FIELD" class="stylesub" />
+
+		<field
+			name="emailRequired"
+			type="radio"
+			label="COM_ICAGENDA_REGISTRATION_EMAIL_REQUIRED_LABEL"
+			description="COM_ICAGENDA_REGISTRATION_EMAIL_REQUIRED_DESC"
+			default="1"
+			class="btn-group"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="emailConfirm"
+			type="radio"
+			label="COM_ICAGENDA_REGISTRATION_EMAIL_CONFIRM_DISPLAY_LABEL"
+			description="COM_ICAGENDA_REGISTRATION_EMAIL_CONFIRM_DISPLAY_DESC"
+			default="1"
+			class="btn-group"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="limitRegEmail"
+			type="radio"
+			label="COM_ICAGENDA_REGISTRATION_LIMIT_EMAIL_LABEL"
+			description="COM_ICAGENDA_REGISTRATION_LIMIT_EMAIL_DESC"
+			default="1"
+			class="btn-group"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="limitRegDate"
+			type="radio"
+			label="COM_ICAGENDA_REGISTRATION_LIMIT_DATE_LABEL"
+			description="COM_ICAGENDA_REGISTRATION_LIMIT_DATE_DESC"
+			default="1"
+			class="btn-group"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="emailCheckdnsrr"
+			type="radio"
+			label="COM_ICAGENDA_REGISTRATION_EMAIL_CHECKDNSRR_LABEL"
+			description="COM_ICAGENDA_REGISTRATION_EMAIL_CHECKDNSRR_DESC"
+			default="0"
+			class="btn-group"
+			>
+			<option value="1">JENABLED</option>
+			<option value="0">JDISABLED</option>
+		</field>
+
+		<!-- Hidden Control Field for Checkdnsrr -->
+		<field
+			name="Checkdnsrr"
+			type="modal_checkdnsrr"
+			label=""
+			description=" "
+		/>
+
+		<field type="Title" label="COM_ICAGENDA_REGISTRATION_PHONE_FIELD" class="stylesub" />
+
+		<field
+			name="phoneDisplay"
+			type="radio"
+			label="COM_ICAGENDA_REGISTRATION_PHONE_DISPLAY_LABEL"
+			description="COM_ICAGENDA_REGISTRATION_PHONE_DISPLAY_DESC"
+			default="0"
+			class="btn-group"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="phoneRequired"
+			type="radio"
+			label="COM_ICAGENDA_REGISTRATION_PHONE_REQUIRED_LABEL"
+			description="COM_ICAGENDA_REGISTRATION_PHONE_REQUIRED_DESC"
+			default="0"
+			class="btn-group"
+			showon="phoneDisplay:1"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field type="Title" label="COM_ICAGENDA_REGISTRATION_NOTES_FIELD" class="stylesub" />
+
+		<field
+			name="notesDisplay"
+			type="radio"
+			label="COM_ICAGENDA_REGISTRATION_NOTES_DISPLAY_LABEL"
+			description="COM_ICAGENDA_REGISTRATION_NOTES_DISPLAY_DESC"
+			default="0"
+			class="btn-group"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field type="Title" label="COM_ICAGENDA_CAPTCHA" class="stylesub" />
+
+		<field
+			name="reg_captcha"
+			type="radio"
+			label="COM_ICAGENDA_CAPTCHA"
+			description="COM_ICAGENDA_REGISTRATION_CAPTCHA_DESC"
+			default="0"
+			class="btn-group"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field type="Title" label="COM_ICAGENDA_FORM_VALIDATE_LBL" class="stylesub" />
+
+		<field
+			name="reg_form_validation"
+			type="radio"
+			label="COM_ICAGENDA_FORM_VALIDATE_LBL"
+			description="COM_ICAGENDA_FORM_VALIDATE_DESC"
+			default=""
+			class="btn-group"
+			>
+			<option value="">COM_ICAGENDA_FORM_SERVER_CLIENT_VALIDATION</option>
+			<option value="1">COM_ICAGENDA_FORM_SERVER_VALIDATION</option>
+		</field>
+
+		<field
+			type="TitleImg"
+			label="COM_ICAGENDA_REGISTRATION_CONSENT_PERSONAL_DATA_LEGEND"
+			class="stylebox lead input-xxlarge"
+			icicon="iclogo"
+		/>
+
+		<field
+			name="participant_name_visibility"
+			type="list"
+			label="COM_ICAGENDA_PRIVACY_PARTICIPANT_NAME_VISIBILITY_LABEL"
+			description="COM_ICAGENDA_PRIVACY_PARTICIPANT_INFORMATION_VISIBILITY_DESC"
+			default=""
+			class="btn-group"
+			filter="options"
+			>
+			<option value="">COM_ICAGENDA_PRIVACY_ORGANISER</option>
+			<option value="1">COM_ICAGENDA_PRIVACY_PUBLIC</option>
+			<option value="2">COM_ICAGENDA_PRIVACY_USERS</option>
+		</field>
+
+		<field
+			name="participant_name_consent"
+			type="list"
+			label="COM_ICAGENDA_PRIVACY_PARTICIPANT_NAME_REQUIRE_CONSENT_LABEL"
+			description="COM_ICAGENDA_PRIVACY_PARTICIPANT_NAME_REQUIRE_CONSENT_DESC"
+			default=""
+			class="btn-group"
+			filter="options"
+			showon="participant_name_visibility:1,2"
+			>
+			<option value="">IC_AUTO</option>
+			<option value="1">COM_ICAGENDA_PRIVACY_REQUIRE_CONSENT</option>
+			<option value="0">COM_ICAGENDA_PRIVACY_FORCE_NAME_VISIBILITY_AS_SET</option>
+		</field>
+
+		<field
+			name="privacy_consent_alert"
+			type="note"
+			label="COM_ICAGENDA_PRIVACY_PARTICIPANT_FORCE_VISIBILITY_ALERT_LABEL"
+			description="COM_ICAGENDA_PRIVACY_PARTICIPANT_FORCE_VISIBILITY_ALERT_DESC"
+			class="alert alert-warning"
+			showon="participant_name_visibility:1,2"
+		/>
+
+		<field
+			name="participant_gravatar_consent"
+			type="list"
+			label="COM_ICAGENDA_PRIVACY_PARTICIPANT_GRAVATAR_REQUIRE_CONSENT_LABEL"
+			description="COM_ICAGENDA_PRIVACY_PARTICIPANT_GRAVATAR_REQUIRE_CONSENT_DESC"
+			default=""
+			class="btn-group"
+			filter="options"
+			>
+			<option value="">IC_AUTO</option>
+			<option value="1">COM_ICAGENDA_PRIVACY_REQUIRE_CONSENT</option>
+			<option value="0">JDISABLED</option>
+		</field>
+
+		<field
+			name="privacy_gravatar_alert"
+			type="note"
+			label="COM_ICAGENDA_PRIVACY_PARTICIPANT_GRAVATAR_ALERT_LABEL"
+			description="COM_ICAGENDA_PRIVACY_PARTICIPANT_GRAVATAR_ALERT_DESC"
+			class="alert alert-info"
+			showon="participant_gravatar_consent:"
+		/>
+
+		<field
+			name="privacy_organiser"
+			type="radio"
+			label="COM_ICAGENDA_REGISTRATION_CONSENT_ORGANISER_LABEL"
+			description="COM_ICAGENDA_REGISTRATION_CONSENT_ORGANISER_DESC"
+			default="0"
+			class="btn-group"
+			>
+			<option value="1">JENABLED</option>
+			<option value="0">JDISABLED</option>
+		</field>
+
+		<field
+			type="TitleImg"
+			label="COM_ICAGENDA_REGISTRATION_TERMS_LABEL"
+			class="stylebox lead input-xxlarge"
+			icicon="iclogo"
+		/>
+
+		<field
+			name="terms"
+			type="radio"
+			label="COM_ICAGENDA_REGISTRATION_TERMS_LABEL"
+			description="COM_ICAGENDA_REGISTRATION_TERMS_DESC"
+			default="1"
+			class="btn-group"
+			>
+			<option value="1">JENABLED</option>
+			<option value="0">JDISABLED</option>
+		</field>
+
+		<field
+			name="terms_type"
+			type="radio"
+			label="COM_ICAGENDA_REGISTRATION_TERMS_TEXTTYPE_LABEL"
+			description="COM_ICAGENDA_REGISTRATION_TERMS_TEXTTYPE_DESC"
+			default=""
+			class="btn-group"
+			>
+			<option value="">IC_WEBSITE_TERMS</option>
+			<option value="1">IC_ARTICLE</option>
+			<option value="2">IC_CUSTOM_TEXT</option>
+			<option value="3">IC_LANGUAGE_STRING</option>
+		</field>
+
+		<field 
+			name="termsArticle" 
+			type="modal_article"
+			label=""
+			description="COM_ICAGENDA_FIELD_SELECT_ARTICLE_DESC"
+			select="true"
+			new="true"
+			edit="true"
+			clear="true"
+			showon="terms_type:1"
+		/>
+
+		<field 
+			name="termsContent"
+			type="editor"
+			label=""
+			filter="JComponentHelper::filterText"
+			buttons="readmore,pagebreak"
+			showon="terms_type:2"
+		/>
+
+		<field
+			name="termsDefault"
+			type="icagenda.configtermsdefault"
+			label=""
+			description="COM_ICAGENDA_REGISTRATION_TERMS"
+			showon="terms_type:3"
+		/>
+
+		<field
+			type="TitleImg"
+			label="COM_ICAGENDA_TITLE_REGISTRATION_NOTIFICATIONS"
+			class="stylebox lead input-xxlarge"
+			icicon="iclogo"
+		/>
+
+		<field type="Title" label="COM_ICAGENDA_NOTIFICATION_BY_EMAIL_ADMIN" class="stylesub" />
+
+		<field
+			name="emailAdminSend"
+			type="radio"
+			label="COM_ICAGENDA_NOTIFICATION_BY_EMAIL_ADMIN_LBL"
+			description="COM_ICAGENDA_NOTIFICATION_BY_EMAIL_ADMIN_DESC"
+			default="1"
+			class="btn-group"
+			>
+			<option value="1">JENABLED</option>
+			<option value="0">JDISABLED</option>
+		</field>
+
+		<field
+			type="Title"
+			label="COM_ICAGENDA_NOTIFICATION_BY_EMAIL_ADMIN_SELECTION_INFO"
+			class="stylenote alert alert-info"
+			showon="emailAdminSend:1"
+		/>
+
+		<field
+			name="emailAdminSend_select"
+			type="list"
+			label=""
+			description="COM_ICAGENDA_NOTIFICATION_BY_EMAIL_ADMIN_SELECTION_INFO"
+			default="0"
+			multiple="true"
+			showon="emailAdminSend:1"
+			>
+			<option value="0">COM_ICAGENDA_EMAIL_SITE</option>
+			<option value="1">COM_ICAGENDA_EMAIL_CREATOR</option>
+			<option value="3">COM_ICAGENDA_EMAIL_EVENT_CONTACT</option>
+			<option value="2">COM_ICAGENDA_EMAIL_CUSTOM_LIST</option>
+		</field>
+
+		<field
+			name="emailAdminSend_Placeholder"
+			type="modal_ictext_Placeholder"
+			label="COM_ICAGENDA_EMAIL_CUSTOM_LIST"
+			description="COM_ICAGENDA_REGISTRATION_EMAIL_ADMIN_CUSTOM_LIST_DESC"
+			showon="emailAdminSend:1"
+		/>
+
+		<field type="Title" label="COM_ICAGENDA_REGISTRATION_EMAIL_USER" class="stylesub" />
+
+		<field
+			name="emailUserSend"
+			type="radio"
+			label="COM_ICAGENDA_CONFIRMATION_BY_EMAIL_USER_LBL"
+			description="COM_ICAGENDA_CONFIRMATION_BY_EMAIL_USER_DESC"
+			default="1"
+			class="btn-group"
+			>
+			<option value="1">JENABLED</option>
+			<option value="0">JDISABLED</option>
+		</field>
+
+		<field
+			name="regEmailUser"
+			type="radio"
+			label="COM_ICAGENDA_REGISTRATION_EMAIL_USER_CONTENT_LABEL"
+			description="COM_ICAGENDA_REGISTRATION_EMAIL_USER_CONTENT_DESC"
+			default="1"
+			class="btn-group"
+			>
+			<option value="1">JDEFAULT</option>
+			<option value="0">COM_ICAGENDA_CUSTOM_EMAILS</option>
+		</field>
+
+		<field
+			type="TitleImg"
+			label="COM_ICAGENDA_CUSTOM_EMAILS"
+			class="stylebox lead input-xxlarge"
+			icicon="iclogo"
+			showon="regEmailUser:0"
+		/>
+
+		<field
+			type="TitleImg"
+			label="COM_ICAGENDA_REGISTRATION_EMAIL_USER_NOTICE"
+			class="stylenote alert alert-info"
+			icimage="info.png"
+			showon="regEmailUser:0"
+		/>
+
+		<field
+			type="Title"
+			label="COM_ICAGENDA_REGISTRATION_EMAIL_USER_PERIOD"
+			class="stylesub"
+			showon="regEmailUser:0"
+		/>
+
+		<field
+			name="emailUserSubjectPeriod"
+			type="modal_ictext_Placeholder"
+			label="COM_ICAGENDA_REGISTRATION_EMAIL_USER_PERIOD_CUSTOM_SUBJECT_LBL"
+			description="COM_ICAGENDA_REGISTRATION_EMAIL_USER_PERIOD_CUSTOM_SUBJECT_DESC"
+			class="input-xxlarge"
+			showon="regEmailUser:0"
+		/>
+
+		<field
+			name="emailUserBodyPeriod"
+			type="modal_iC_editor"
+			label="COM_ICAGENDA_REGISTRATION_EMAIL_USER_PERIOD_CUSTOM_BODY_LBL"
+			description="COM_ICAGENDA_REGISTRATION_EMAIL_USER_PERIOD_CUSTOM_BODY_DESC"
+			default=""
+			class="input-xxlarge"
+			rows="10"
+			cols="80"
+			filter="JComponentHelper::filterText"
+			showon="regEmailUser:0"
+		/>
+
+		<field type="Title" label="COM_ICAGENDA_REGISTRATION_EMAIL_USER_DATE" class="stylesub" showon="regEmailUser:0" />
+
+		<field
+			name="emailUserSubjectDate"
+			type="modal_ictext_Placeholder"
+			label="COM_ICAGENDA_REGISTRATION_EMAIL_USER_DATE_CUSTOM_SUBJECT_LBL"
+			description="COM_ICAGENDA_REGISTRATION_EMAIL_USER_DATE_CUSTOM_SUBJECT_DESC"
+			class="input-xxlarge"
+			showon="regEmailUser:0"
+		/>
+
+		<field
+			name="emailUserBodyDate"
+			type="modal_iC_editor"
+			label="COM_ICAGENDA_REGISTRATION_EMAIL_USER_DATE_CUSTOM_BODY_LBL"
+			description="COM_ICAGENDA_REGISTRATION_EMAIL_USER_DATE_CUSTOM_BODY_DESC"
+			default=""
+			class="input-xxlarge"
+			rows="10"
+			cols="80"
+			filter="JComponentHelper::filterText"
+			showon="regEmailUser:0"
+		/>
+	</fieldset>
+
+	<fieldset
+		name="submit"
+		label="COM_ICAGENDA_SUBMIT_AN_EVENT_LABEL"
+		addfieldpath="/administrator/components/com_content/models/fields"
+		>
+
+		<field
+			type="TitleImg"
+			label="COM_ICAGENDA_SUBMIT_AN_EVENT_DESC"
+			class="alert alert-info"
+			icicon="info-circle"
+		/>
+
+		<field
+			type="TitleImg"
+			label="COM_ICAGENDA_SUBMIT_PERMISSIONS_LABEL"
+			class="stylebox lead input-xxlarge"
+			icicon="private"
+		/>
+
+		<field type="Title" label="COM_ICAGENDA_SUBMIT_FRONTEND_ACCESS_LABEL" class="stylesub" />
+
+		<field
+			name="submitAccess"
+			type="accesslevel"
+			label="JFIELD_ACCESS_LABEL"
+			description="COM_ICAGENDA_SUBMIT_FRONTEND_ACCESS_DESC"
+			default="2"
+			multiple="true"
+		/>
+
+		<field
+			name="submitNotLogin"
+			type="modal_ictext_type"
+			label="COM_ICAGENDA_SUBMIT_NOT_LOGIN_LBL"
+			description="COM_ICAGENDA_SUBMIT_NOT_LOGIN_DESC"
+			default=""
+		/>
+
+		<field
+			name="submitNotLogin_Content"
+			type="modal_ictext_content"
+			label=" "
+			class="inputbox"
+			buttons="readmore,pagebreak"
+			placeholder="text"
+			filter="JComponentHelper::filterText"
+		/>
+
+		<field
+			name="submitNoRights"
+			type="modal_ictext_type"
+			label="COM_ICAGENDA_SUBMIT_NO_RIGHTS_LBL"
+			description="COM_ICAGENDA_SUBMIT_NO_RIGHTS_DESC"
+			default=""
+		/>
+
+		<field
+			name="submitNoRights_Content"
+			type="modal_ictext_content"
+			label=" "
+			class="inputbox"
+			buttons="readmore,pagebreak"
+			placeholder="text"
+			filter="JComponentHelper::filterText"
+		/>
+
+		<field type="Title" label="COM_ICAGENDA_SUBMIT_APPROVAL_LABEL" class="stylesub" />
+
+		<field
+			name="approvalGroups"
+			type="usergroup"
+			label="IC_MANAGERS"
+			description="COM_ICAGENDA_SUBMIT_APPROVAL_GROUPS_DESC"
+			default="8"
+			multiple="true"
+		/>
+
+		<field
+			type="TitleImg"
+			label="COM_ICAGENDA_SUBMIT_MANAGERS_NOTE"
+			class="stylenote alert alert-info input-xxlarge"
+			icicon="info-circle"
+		/>
+
+		<!-- Submit Form Settings -->
+		<field
+			type="TitleImg"
+			label="COM_ICAGENDA_FORM_LABEL"
+			class="stylebox lead input-xxlarge"
+			icicon="form"
+		/>
+
+		<field
+			name="submit_imageDisplay"
+			type="radio"
+			label="COM_ICAGENDA_SUBMIT_EVENT_IMAGE_DISPLAY_LABEL"
+			description="COM_ICAGENDA_SUBMIT_EVENT_IMAGE_DISPLAY_DESC"
+			default="1"
+			class="btn-group"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="submit_imageMaxSize"
+			type="text"
+			label="COM_ICAGENDA_SUBMIT_EVENT_IMAGE_MAX_SIZE_LABEL"
+			description="COM_ICAGENDA_SUBMIT_EVENT_IMAGE_MAX_SIZE_DESC"
+			default="800"
+			class="inputbox input-mini"
+			showon="submit_imageDisplay:1"
+		/>
+
+		<field
+			name="submit_periodDisplay"
+			type="radio"
+			label="COM_ICAGENDA_SUBMIT_PERIOD_DISPLAY_LABEL"
+			description="COM_ICAGENDA_SUBMIT_PERIOD_DISPLAY_DESC"
+			default="1"
+			class="btn-group"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="submit_weekdaysDisplay"
+			type="radio"
+			label="COM_ICAGENDA_SUBMIT_WEEKDAYS_DISPLAY_LABEL"
+			description="COM_ICAGENDA_SUBMIT_WEEKDAYS_DISPLAY_DESC"
+			default="1"
+			class="btn-group"
+			showon="submit_periodDisplay:1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="submit_datesDisplay"
+			type="radio"
+			label="COM_ICAGENDA_SUBMIT_DATES_DISPLAY_LABEL"
+			description="COM_ICAGENDA_SUBMIT_DATES_DISPLAY_DESC"
+			default="1"
+			class="btn-group"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="submit_displaytimeDisplay"
+			type="radio"
+			label="COM_ICAGENDA_SUBMIT_DISPLAYTIME_DISPLAY_LABEL"
+			description="COM_ICAGENDA_SUBMIT_DISPLAYTIME_DISPLAY_DESC"
+			default="0"
+			class="btn-group"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="submit_shortdescDisplay"
+			type="radio"
+			label="COM_ICAGENDA_SUBMIT_SHORTDESC_DISPLAY_LABEL"
+			description="COM_ICAGENDA_SUBMIT_SHORTDESC_DISPLAY_DESC"
+			default="1"
+			class="btn-group"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="submit_descDisplay"
+			type="radio"
+			label="COM_ICAGENDA_SUBMIT_DESCRIPTION_DISPLAY_LABEL"
+			description="COM_ICAGENDA_SUBMIT_DESCRIPTION_DISPLAY_DESC"
+			default="1"
+			class="btn-group"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="submit_metadescDisplay"
+			type="radio"
+			label="COM_ICAGENDA_SUBMIT_METADESCRIPTION_DISPLAY_LABEL"
+			description="COM_ICAGENDA_SUBMIT_METADESCRIPTION_DISPLAY_DESC"
+			default="0"
+			class="btn-group"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="submit_venueDisplay"
+			type="radio"
+			label="COM_ICAGENDA_SUBMIT_VENUE_DISPLAY_LABEL"
+			description="COM_ICAGENDA_SUBMIT_VENUE_DISPLAY_DESC"
+			default="1"
+			class="btn-group"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="submit_emailDisplay"
+			type="radio"
+			label="COM_ICAGENDA_SUBMIT_EMAIL_DISPLAY_LABEL"
+			description="COM_ICAGENDA_SUBMIT_EMAIL_DISPLAY_DESC"
+			default="1"
+			class="btn-group"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="submit_phoneDisplay"
+			type="radio"
+			label="COM_ICAGENDA_SUBMIT_PHONE_DISPLAY_LABEL"
+			description="COM_ICAGENDA_SUBMIT_PHONE_DISPLAY_DESC"
+			default="1"
+			class="btn-group"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="submit_websiteDisplay"
+			type="radio"
+			label="COM_ICAGENDA_SUBMIT_WEBSITE_DISPLAY_LABEL"
+			description="COM_ICAGENDA_SUBMIT_WEBSITE_DISPLAY_DESC"
+			default="1"
+			class="btn-group"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="submit_customfieldsDisplay"
+			type="radio"
+			label="COM_ICAGENDA_CUSTOMFIELDS"
+			description="COM_ICAGENDA_SUBMIT_CUSTOMFIELDS_DISPLAY_DESC"
+			default="1"
+			class="btn-group"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="submit_fileDisplay"
+			type="radio"
+			label="COM_ICAGENDA_SUBMIT_ATTACHMENT_DISPLAY_LABEL"
+			description="COM_ICAGENDA_SUBMIT_ATTACHMENT_DISPLAY_DESC"
+			default="1"
+			class="btn-group"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="submit_gmapDisplay"
+			type="radio"
+			label="COM_ICAGENDA_SUBMIT_GMAP_DISPLAY_LABEL"
+			description="COM_ICAGENDA_SUBMIT_GMAP_DISPLAY_DESC"
+			default="1"
+			class="btn-group"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="submit_regoptionsDisplay"
+			type="radio"
+			label="COM_ICAGENDA_SUBMIT_REGISTRATION_OPTIONS_DISPLAY_LABEL"
+			description="COM_ICAGENDA_SUBMIT_REGISTRATION_OPTIONS_DISPLAY_DESC"
+			default="1"
+			class="btn-group"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="submit_captcha"
+			type="radio"
+			label="COM_ICAGENDA_CAPTCHA"
+			description="COM_ICAGENDA_SUBMIT_CAPTCHA_DESC"
+			default="0"
+			class="btn-group"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field type="Title" label="COM_ICAGENDA_FORM_VALIDATE_LBL" class="stylesub" />
+
+		<field
+			name="submit_form_validation"
+			type="radio"
+			label="COM_ICAGENDA_FORM_VALIDATE_LBL"
+			description="COM_ICAGENDA_FORM_VALIDATE_DESC"
+			default=""
+			class="btn-group"
+			>
+			<option value="">COM_ICAGENDA_FORM_SERVER_CLIENT_VALIDATION</option>
+			<option value="1">COM_ICAGENDA_FORM_SERVER_VALIDATION</option>
+		</field>
+
+		<!--field
+			type="TitleImg"
+			label="COM_ICAGENDA_SUBMIT_REDIRECT_LABEL"
+			class="stylebox lead input-xxlarge"
+			icicon="iclogo"
+		/-->
+
+		<!--field
+			name="submit_redirectUrl"
+			type="url"
+			label="COM_ICAGENDA_SUBMIT_REDIRECT_URL_LABEL"
+			description="COM_ICAGENDA_SUBMIT_REDIRECT_URL_DESC"
+			default=""
+			hint="http://www.example.com"
+		/-->
+
+		<field
+			name="submitReturn"
+			type="modal_iclink_type"
+			label="COM_ICAGENDA_SUBMIT_RETURN_LBL"
+			description="COM_ICAGENDA_SUBMIT_RETURN_DESC"
+			default=""
+		/>
+
+		<field
+			name="submitReturn_Article"
+			type="modal_iclink_article"
+			label=" "
+			class="inputbox"
+		/>
+
+		<field
+			name="submitReturn_Url"
+			type="modal_iclink_url"
+			label=" "
+			class="inputbox"
+			hint="http://www.example.com"
+		/>
+
+		<!-- Terms of Service -->
+		<field
+			type="TitleImg"
+			label="COM_ICAGENDA_SUBMIT_TOS_LABEL"
+			class="stylebox lead input-xxlarge"
+			icicon="iclogo"
+		/>
+
+		<field
+			name="tos"
+			type="radio"
+			label="COM_ICAGENDA_SUBMIT_TOS_LABEL"
+			description="COM_ICAGENDA_SUBMIT_TOS_DESC"
+			default="1"
+			class="btn-group"
+			>
+			<option value="1">JENABLED</option>
+			<option value="0">JDISABLED</option>
+		</field>
+
+		<field
+			name="tos_Type"
+			type="modal_ictxt_type"
+			label="COM_ICAGENDA_SUBMIT_TOS_TEXTTYPE_LABEL"
+			description="COM_ICAGENDA_SUBMIT_TOS_TEXTTYPE_DESC"
+			default=""
+			class="btn-group"
+		/>
+
+		<field
+			name="tosArticle"
+			type="modal_ictxt_article"
+			label=" "
+			description="COM_ICAGENDA_FIELD_SELECT_ARTICLE_DESC"
+			default=""
+			edit="true"
+			clear="true"
+		/>
+
+		<field
+			name="tosContent"
+			type="modal_ictxt_content"
+			label=" "
+			class="inputbox"
+			buttons="readmore,pagebreak"
+			placeholder="text"
+			filter="JComponentHelper::filterText"
+		/>
+
+		<field
+			name="tosDefault"
+			type="modal_ictxt_default"
+			label=" "
+			description="COM_ICAGENDA_TOS"
+		/>
+	</fieldset>
+
+	<fieldset
+		name="global"
+		label="COM_ICAGENDA_GLOBAL_PARAMS_LABEL"
+		>
+
+		<field
+			type="TitleImg"
+			label="COM_ICAGENDA_GLOBAL_PARAMS_INFO"
+			class="alert alert-info"
+			icicon="info-circle"
+		/>
+
+		<!-- Maps Service -->
+		<field
+			type="TitleImg"
+			label="COM_ICAGENDA_LEGEND_GOOGLE_MAPS"
+			class="stylebox lead input-xxlarge"
+			icicon="location"
+		/>
+
+		<field
+			type="list"
+			name="maps_service"
+			label="COM_ICAGENDA_MAPS_SERVICE_LABEL"
+			description="COM_ICAGENDA_MAPS_SERVICE_DESC"
+			default=""
+			>
+			<option value="">COM_ICAGENDA_SELECT_MAPS_SERVICE</option>
+			<option value="2">COM_ICAGENDA_GOOGLE_MAPS_EMBED_API</option>
+			<option value="3">COM_ICAGENDA_GOOGLE_MAPS_JAVASCRIPT_API</option>
+		</field>
+
+		<field
+			type="TitleImg"
+			label="COM_ICAGENDA_GOOGLE_MAPS_API_INFO"
+			class="stylenote alert alert-warning input-xxlarge"
+			showon="maps_service:2,3"
+		/>
+
+		<field
+			name="googlemaps_embed_key"
+			type="text"
+			label="COM_ICAGENDA_GOOGLE_MAPS_EMBED_KEY_LABEL"
+			showon="maps_service:2"
+		/>
+
+		<field
+			type="TitleImg"
+			label="COM_ICAGENDA_GOOGLE_MAPS_EMBED_KEY_DESC"
+			class="stylenote alert alert-info input-xxlarge"
+			showon="maps_service:2"
+		/>
+
+		<field
+			name="googlemaps_browser_key"
+			type="text"
+			label="COM_ICAGENDA_GOOGLE_MAPS_BROWSER_KEY_LABEL"
+			showon="maps_service:3"
+		/>
+
+		<field
+			type="TitleImg"
+			label="COM_ICAGENDA_GOOGLE_MAPS_BROWSER_KEY_DESC"
+			class="stylenote alert alert-info input-xxlarge"
+			showon="maps_service:3"
+		/>
+
+		<field
+			name="googlemaps_client_id"
+			type="text"
+			label="COM_ICAGENDA_GOOGLE_MAPS_CLIENT_ID_LABEL"
+			hint="gme-*"
+			showon="maps_service:3"
+		/>
+
+		<field
+			type="TitleImg"
+			label="COM_ICAGENDA_GOOGLE_MAPS_CLIENT_ID_DESC"
+			class="stylenote alert alert-info input-xxlarge"
+			showon="maps_service:3"
+		/>
+
+		<!-- Captcha plugin -->
+		<field
+			type="TitleImg"
+			label="COM_ICAGENDA_CAPTCHA_LABEL"
+			class="stylebox lead input-xxlarge"
+			icicon="iclogo"
+		/>
+
+		<field
+			name="captcha"
+			type="plugins"
+			label="COM_ICAGENDA_CAPTCHA_LABEL"
+			description="COM_ICAGENDA_CAPTCHA_DESC"
+			default=""
+			folder="captcha"
+			filter="cmd"
+			>
+			<option value="">JOPTION_USE_DEFAULT</option>
+		</field>
+
+		<!-- Icons -->
+		<field
+			type="TitleImg"
+			label="COM_ICAGENDA_ICONS"
+			class="stylebox lead input-xxlarge"
+			icicon="icons"
+		/>
+
+		<field
+			name="iconPrint_global"
+			type="list"
+			label="COM_ICAGENDA_ICON_PRINT_LABEL"
+			description="COM_ICAGENDA_ICON_PRINT_DESC"
+			default="0"
+			>
+			<option value="0">JHIDE</option>
+			<!--option value="1">IC_ONLY_EVENTS_LIST</option-->
+			<option value="2">IC_ONLY_EVENT_DETAILS</option>
+			<!--option value="3">JALL</option-->
+		</field>
+
+		<field
+			name="iconAddToCal_global"
+			type="list"
+			label="COM_ICAGENDA_ICON_ADDTOCAL_LABEL"
+			description="COM_ICAGENDA_ICON_ADDTOCAL_DESC"
+			default="0"
+			>
+			<option value="0">JHIDE</option>
+			<!--option value="1">IC_ONLY_EVENTS_LIST</option-->
+			<option value="2">IC_ONLY_EVENT_DETAILS</option>
+			<!--option value="3">JALL</option-->
+		</field>
+
+		<field
+			name="iconAddToCal_size"
+			type="radio"
+			label="COM_ICAGENDA_ICON_ADDTOCAL_SIZE_LABEL"
+			description="COM_ICAGENDA_ICON_ADDTOCAL_SIZE_DESC"
+			default="16"
+			class="btn-group"
+			>
+			<option value="16">16 px</option>
+			<option value="24">24 px</option>
+			<option value="32">32 px</option>
+		</field>
+
+		<field
+			name="iconAddToCal_options"
+			type="list"
+			label="COM_ICAGENDA_ICON_ADDTOCAL_OPTIONS_LABEL"
+			description="COM_ICAGENDA_ICON_ADDTOCAL_OPTIONS_DESC"
+			multiple="true"
+			>
+			<option value="1">COM_ICAGENDA_GCALENDAR_LABEL</option>
+			<option value="2">COM_ICAGENDA_VCAL_ICAL_LABEL</option>
+			<option value="3">COM_ICAGENDA_OUTLOOK_LABEL</option>
+			<option value="4">COM_ICAGENDA_LIVE_CALENDAR_LABEL</option>
+			<option value="5">COM_ICAGENDA_YAHOO_CALENDAR_LABEL</option>
+		</field>
+
+		<field
+			name="features_icon_size_list"
+			type="list"
+			label="COM_ICAGENDA_FEATURES_ICONSIZE_LIST_LABEL"
+			description="COM_ICAGENDA_FEATURES_ICONSIZE_LIST_DESC"
+			default=""
+			class="inputbox"
+			filter="options"
+			>
+			<option value="">COM_ICAGENDA_FEATURES_ICONSIZE_NONE</option>
+			<option value="16_bit">COM_ICAGENDA_FEATURES_ICONSIZE_16</option>
+			<option value="24_bit">COM_ICAGENDA_FEATURES_ICONSIZE_24</option>
+			<option value="32_bit">COM_ICAGENDA_FEATURES_ICONSIZE_32</option>
+			<option value="48_bit">COM_ICAGENDA_FEATURES_ICONSIZE_48</option>
+			<option value="64_bit">COM_ICAGENDA_FEATURES_ICONSIZE_64</option>
+		</field>
+
+		<field
+			name="features_icon_size_event"
+			type="list"
+			label="COM_ICAGENDA_FEATURES_ICONSIZE_EVENT_LABEL"
+			description="COM_ICAGENDA_FEATURES_ICONSIZE_EVENT_DESC"
+			default=""
+			class="inputbox"
+			filter="options"
+			>
+			<option value="">COM_ICAGENDA_FEATURES_ICONSIZE_NONE</option>
+			<option value="16_bit">COM_ICAGENDA_FEATURES_ICONSIZE_16</option>
+			<option value="24_bit">COM_ICAGENDA_FEATURES_ICONSIZE_24</option>
+			<option value="32_bit">COM_ICAGENDA_FEATURES_ICONSIZE_32</option>
+			<option value="48_bit">COM_ICAGENDA_FEATURES_ICONSIZE_48</option>
+			<option value="64_bit">COM_ICAGENDA_FEATURES_ICONSIZE_64</option>
+		</field>
+
+		<field
+			name="show_icon_title"
+			type="radio"
+			label="COM_ICAGENDA_SHOW_FEATURE_ICON_TITLE_LABEL"
+			description="COM_ICAGENDA_SHOW_FEATURE_ICON_TITLE_DESC"
+			default="1"
+			class="btn-group"
+			filter="options"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<!-- AddThis -->
+		<field
+			type="TitleImg"
+			label="COM_ICAGENDA_ADDTHIS"
+			class="stylebox lead input-xxlarge"
+			icimage="addthis_16.png"
+		/>
+
+		<field type="Title" label="COM_ICAGENDA_ADDTHIS_DESC" class="stylered input-xxlarge" />
+
+		<field
+			name="atlist"
+			type="radio"
+			label="COM_ICAGENDA_ADDTHIS_LIST_LABEL"
+			description="COM_ICAGENDA_ADDTHIS_LIST_DESC"
+			default="0"
+			class="btn-group"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="atevent"
+			type="radio"
+			label="COM_ICAGENDA_ADDTHIS_EVENT_LABEL"
+			description="COM_ICAGENDA_ADDTHIS_EVENT_DESC"
+			default="1"
+			class="btn-group"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="atfloat"
+			type="radio"
+			label="COM_ICAGENDA_ADDTHIS_FLOAT_LABEL"
+			description="COM_ICAGENDA_ADDTHIS_FLOAT_DESC"
+			default="2"
+			class="btn-group"
+			>
+			<option value="0">JNO</option>
+			<option value="1">JGLOBAL_LEFT</option>
+			<option value="2">JGLOBAL_RIGHT</option>
+		</field>
+
+		<field
+			name="aticon"
+			type="radio"
+			label="COM_ICAGENDA_ADDTHIS_ICON_LABEL"
+			description="COM_ICAGENDA_ADDTHIS_ICON_DESC"
+			default="2"
+			class="btn-group"
+			>
+			<option value="1">COM_ICAGENDA_ADDTHIS_16</option>
+			<option value="2">COM_ICAGENDA_ADDTHIS_32</option>
+		</field>
+
+		<field
+			name="addthis"
+			type="text"
+			label="COM_ICAGENDA_ADDTHIS_ID_LABEL"
+			description="COM_ICAGENDA_ADDTHIS_ID_DESC"
+		/>
+
+		<field
+			type="TitleImg"
+			label="COM_ICAGENDA_ADDTHIS_NOTE"
+			class="stylenote alert alert-info input-xxlarge"
+			icimage="info.png"
+		/>
+
+		<!-- Screen Width Thresholds -->
+		<field
+			type="TitleImg"
+			label="COM_ICAGENDA_SCREEN_WIDTH_THRESHOLDS_LABEL"
+			class="stylebox lead input-xxlarge"
+			icicon="screen"
+		/>
+
+		<field
+			name="largewidththreshold"
+			type="text"
+			label="COM_ICAGENDA_LARGE_WIDTH_THRESHOLD_LABEL"
+			description="COM_ICAGENDA_LARGE_WIDTH_THRESHOLD_DESC"
+			default="1201"
+			class="inputbox"
+			size="30"
+		/>
+
+		<field
+			name="mediumwidththreshold"
+			type="text"
+			label="COM_ICAGENDA_MEDIUM_WIDTH_THRESHOLD_LABEL"
+			description="COM_ICAGENDA_MEDIUM_WIDTH_THRESHOLD_DESC"
+			default="769"
+			class="inputbox"
+			size="30"
+		/>
+
+		<field
+			name="smallwidththreshold"
+			type="text"
+			label="COM_ICAGENDA_SMALL_WIDTH_THRESHOLD_LABEL"
+			description="COM_ICAGENDA_SMALL_WIDTH_THRESHOLD_DESC"
+			default="481"
+			class="inputbox"
+			size="30"
+		/>
+
+		<!-- Thumbnails -->
+		<field
+			type="TitleImg"
+			label="COM_ICAGENDA_THUMBNAILS_LABEL"
+			class="stylebox lead input-xxlarge"
+			icicon="thumbs"
+		/>
+
+		<field
+			name="thumb_generator"
+			type="radio"
+			label="COM_ICAGENDA_ICTHUMB_LABEL"
+			description="COM_ICAGENDA_ICTHUMB_DESC"
+			default="1"
+			class="btn-group"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="thumb_large"
+			type="modal_thumbs"
+			label="COM_ICAGENDA_THUMB_LARGE_LBL"
+			description="COM_ICAGENDA_THUMB_LARGE_DESC"
+			class="input-small"
+			showon="thumb_generator:1"
+		/>
+
+		<field
+			name="thumb_medium"
+			type="modal_thumbs"
+			label="COM_ICAGENDA_THUMB_MEDIUM_LBL"
+			description="COM_ICAGENDA_THUMB_MEDIUM_DESC"
+			class="input-small"
+			showon="thumb_generator:1"
+		/>
+
+		<field
+			name="thumb_small"
+			type="modal_thumbs"
+			label="COM_ICAGENDA_THUMB_SMALL_LBL"
+			description="COM_ICAGENDA_THUMB_SMALL_DESC"
+			class="input-small"
+			showon="thumb_generator:1"
+		/>
+
+		<field
+			name="thumb_xsmall"
+			type="modal_thumbs"
+			label="COM_ICAGENDA_THUMB_XSMALL_LBL"
+			description="COM_ICAGENDA_THUMB_XSMALL_DESC"
+			class="input-small"
+			showon="thumb_generator:1"
+		/>
+
+		<!-- Date and Time -->
+		<field
+			type="TitleImg"
+			label="COM_ICAGENDA_DATETIME_LABEL"
+			class="stylebox lead input-xxlarge"
+			icicon="clock"
+		/>
+
+		<field
+			name="date_format_global"
+			type="iclist_globalization"
+			label="COM_ICAGENDA_LBL_FORMAT"
+			description="COM_ICAGENDA_LBL_FORMAT"
+			default=""
+			class="inputbox"
+		/>
+
+		<field
+			name="date_separator"
+			type="text"
+			label="COM_ICAGENDA_LBL_DATE_SEPARATOR"
+			description="COM_ICAGENDA_DESC_DATE_COMPONENTS_SEPARATOR"
+			default=""
+			class="inputbox"
+			size="5"
+		/>
+
+		<field
+			name="displaytime"
+			type="radio"
+			label="COM_ICAGENDA_TIMEDISPLAY_DEFAULT_LABEL"
+			description="COM_ICAGENDA_TIMEDISPLAY_DEFAULT_DESC"
+			default="1"
+			class="btn-group"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="timeformat"
+			type="radio"
+			label="COM_ICAGENDA_TIME_FORMAT_LABEL"
+			description="COM_ICAGENDA_TIME_FORMAT_DESC"
+			default="1"
+			class="btn-group"
+			>
+			<option value="1">COM_ICAGENDA_24</option>
+			<option value="2">COM_ICAGENDA_12</option>
+		</field>
+
+		<field
+			name="firstday_week_global"
+			type="list"
+			label="COM_ICAGENDA_FIRSTDAY_WEEK_LABEL"
+			description="COM_ICAGENDA_FIRSTDAY_WEEK_DESC"
+			default="1"
+			>
+			<option value="1">MONDAY</option>
+			<option value="0">SUNDAY</option>
+		</field>
+
+		<!-- Categories -->
+		<field
+			type="TitleImg"
+			label="COM_ICAGENDA_CATEGORY_SELECT_LIST"
+			class="stylebox lead input-xxlarge"
+			icicon="iclogo"
+		/>
+
+		<field
+			name="orderby_catlist"
+			type="list"
+			label="COM_ICAGENDA_CATEGORY_ORDER_LABEL"
+			description="COM_ICAGENDA_CATEGORY_SELECT_LIST_ORDER_DESC"
+			default="alpha"
+			>
+			<option value="none">JGLOBAL_NO_ORDER</option>
+			<option value="alpha">JGLOBAL_TITLE_ALPHABETICAL</option>
+			<option value="ralpha">JGLOBAL_TITLE_REVERSE_ALPHABETICAL</option>
+			<option value="order">JGLOBAL_CATEGORY_MANAGER_ORDER</option>
+		</field>
+
+		<field
+			name="default_catlist"
+			type="modal_cat"
+			label="COM_ICAGENDA_CATEGORY_SELECT_LIST_DEFAULT_LABEL"
+			description="COM_ICAGENDA_CATEGORY_SELECT_LIST_DEFAULT_DESC"
+			class="inputbox"
+		/>
+
+		<field
+			name="admin_status_catlist"
+			type="list"
+			label="COM_ICAGENDA_CATEGORY_SELECT_LIST_STATUS_ADMIN_LABEL"
+			description="COM_ICAGENDA_CATEGORY_SELECT_LIST_STATUS_ADMIN_DESC"
+			default="1"
+			multiple="true"
+			>
+			<option value="1">JPUBLISHED</option>
+			<option value="0">JUNPUBLISHED</option>
+			<option value="2">JARCHIVED</option>
+		</field>
+
+		<field
+			name="site_status_catlist"
+			type="list"
+			label="COM_ICAGENDA_CATEGORY_SELECT_LIST_STATUS_SITE_LABEL"
+			description="COM_ICAGENDA_CATEGORY_SELECT_LIST_STATUS_SITE_DESC"
+			default="1"
+			multiple="true"
+			>
+			<option value="1">JPUBLISHED</option>
+			<option value="0">JUNPUBLISHED</option>
+			<option value="2">JARCHIVED</option>
+		</field>
+
+		<!-- Users -->
+		<field
+			type="TitleImg"
+			label="IC_USERS"
+			class="stylebox lead input-xxlarge"
+			icicon="people"
+		/>
+
+		<field type="Title" label="COM_ICAGENDA_JOOMLA_USER_LABEL" class="stylesub" />
+
+		<field
+			name="autofilluser"
+			type="radio"
+			label="COM_ICAGENDA_REGISTRATION_JOOMLA_USER_AUTOFILL_LABEL"
+			description="COM_ICAGENDA_REGISTRATION_JOOMLA_USER_AUTOFILL_DESC"
+			default="1"
+			class="btn-group"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="nameJoomlaUser"
+			type="radio"
+			label="COM_ICAGENDA_REGISTRATION_JOOMLA_USER_NAME_LABEL"
+			description="COM_ICAGENDA_REGISTRATION_JOOMLA_USER_NAME_DESC"
+			default="2"
+			class="btn-group"
+			>
+			<option value="1">IC_NAME</option>
+			<option value="2">IC_USERNAME</option>
+		</field>
+
+		<field type="Title" label="COM_ICAGENDA_SENDING_EMAIL_LABEL" class="stylesub" />
+
+		<field
+			name="auto_login"
+			type="radio"
+			label="COM_ICAGENDA_AUTOLOGIN_LABEL"
+			description="COM_ICAGENDA_AUTOLOGIN_DESC"
+			default="1"
+			class="btn-group"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<!-- Miscellaneous -->
+		<field
+			type="TitleImg"
+			label="COM_ICAGENDA_MISCELLANEOUS_LABEL"
+			class="stylebox lead input-xxlarge"
+			icicon="options"
+		/>
+
+		<field type="Title" label="COM_ICAGENDA_EVENT_TITLE_LBL" class="stylesub" />
+
+		<field
+			name="titleTransform"
+			type="list"
+			label="COM_ICAGENDA_TEXT_TRANSFORM_LBL"
+			description="COM_ICAGENDA_TEXT_TRANSFORM_DESC"
+			default=""
+			class="btn-group"
+			>
+			<option value="">JNONE</option>
+			<option value="1">IC_FIRST_UPPERCASE</option>
+			<option value="2">IC_CAPITALIZE</option>
+			<option value="3">IC_UPPERCASE</option>
+			<option value="4">IC_LOWERCASE</option>
+		</field>
+
+		<field type="Title" label="COM_ICAGENDA_SHORT_DESCRIPTION_LBL" class="stylesub" />
+
+		<field
+			name="char_limit_short_description"
+			type="text"
+			label="COM_ICAGENDA_LBL_LIMIT"
+			description="COM_ICAGENDA_SHORT_DESCRIPTION_LIMIT_DESC"
+			default="100"
+			class="inputbox input-mini"
+			size="5"
+			filter="integer"
+		/>
+
+		<field type="Title" label="COM_ICAGENDA_META_DESCRIPTION_LBL" class="stylesub" />
+
+		<field
+			name="char_limit_meta_description"
+			type="text"
+			label="COM_ICAGENDA_LBL_LIMIT"
+			description="COM_ICAGENDA_META_DESCRIPTION_LIMIT_DESC"
+			default="320"
+			class="inputbox input-mini"
+			size="5"
+			filter="integer"
+		/>
+
+		<field type="Title" label="COM_ICAGENDA_AUTO_SHORT_DESCRIPTION_LBL" class="stylesub" />
+
+		<field
+			name="ShortDescLimit"
+			type="text"
+			label="COM_ICAGENDA_LBL_LIMIT"
+			description="COM_ICAGENDA_AUTO_INTROTEXT_LIMIT_DESC"
+			default="100"
+			class="inputbox input-mini"
+			size="5"
+			filter="integer"
+		/>
+
+		<field
+			name="Filtering_ShortDesc_Global"
+			type="list"
+			label="COM_ICAGENDA_HTML_FILTERING_LABEL"
+			description="COM_ICAGENDA_FILTERING_SHORTDESC_DESC"
+			default=""
+			class="btn-group"
+			>
+			<option value="">COM_ICAGENDA_ALL_ITALIC</option>
+			<option value="0">COM_ICAGENDA_NO_HTML</option>
+			<option value="1">COM_ICAGENDA_AUTHORIZED_HTML_TAGS</option>
+		</field>
+
+		<field
+			name="HTMLTags_ShortDesc_Global"
+			type="list"
+			label="COM_ICAGENDA_AUTHORIZED_HTML_TAGS"
+			description="COM_ICAGENDA_FILTERING_SHORTDESC_AUTHORIZED_HTML_TAGS_DESC"
+			class="btn-group"
+			multiple="true"
+			>
+			<option value="1">&lt;br &#47;&gt;</option>
+			<option value="2">&lt;b&gt;</option>
+			<option value="3">&lt;strong&gt;</option>
+			<option value="4">&lt;i&gt;</option>
+			<option value="5">&lt;em&gt;</option>
+			<option value="6">&lt;u&gt;</option>
+		</field>
+
+		<field type="Title" label="JGLOBAL_FIELDSET_ADVANCED" class="stylesub" />
+
+		<field
+			name="usage_stats"
+			type="list"
+			label="COM_ICAGENDA_OPTIONS_USAGE_STATS_LBL"
+			description="COM_ICAGENDA_OPTIONS_USAGE_STATS_DESC"
+			default="1"
+			>
+			<option value="1">JENABLED</option>
+			<option value="0">JDISABLED</option>
+		</field>
+
+		<field type="Title" label="COM_ICAGENDA_CUSTOMIZATION" class="stylesub" />
+
+		<field
+			name="customCSS_activation"
+			type="radio"
+			label="COM_ICAGENDA_CUSTOM_CSS_ACTIVATION_LBL"
+			description="COM_ICAGENDA_CUSTOM_CSS_ACTIVATION_DESC"
+			default="0"
+			class="btn-group"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="customCSS"
+			type="textarea"
+			label="COM_ICAGENDA_CUSTOM_CSS_LBL"
+			description="COM_ICAGENDA_CUSTOM_CSS_DESC"
+			default=""
+			class="input-xxlarge"
+			rows="5"
+			cols="50"
+			hint="COM_ICAGENDA_CUSTOM_CSS_HINT"
+			showon="customCSS_activation:1"
+		/>
+	</fieldset>
+
+	<fieldset
+		name="permissions"
+		label="JCONFIG_PERMISSIONS_LABEL"
+		description="JCONFIG_PERMISSIONS_DESC"
+		>
+
+		<field
+			name="rules"
+			type="rules"
+			label="JCONFIG_PERMISSIONS_LABEL"
+			class="inputbox"
+			validate="rules"
+			filter="rules"
+			component="com_icagenda"
+			section="component"
+		/>
+	</fieldset>
+
+</config>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/controller.php b/deployed/icagenda/administrator/components/com_icagenda/controller.php
new file mode 100644
index 00000000..456e151b
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/controller.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-26
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * Controller class - iCagenda.
+ */
+class iCagendaController extends JControllerLegacy
+{
+	/**
+	 * Method to display a view.
+	 *
+	 * @param   boolean      $cachable   If true, the view output will be cached
+	 * @param   array        $urlparams  An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  JController  This object to support chaining.
+	 * @since   1.0
+	 */
+	public function display($cachable = false, $urlparams = false)
+	{
+		require_once JPATH_COMPONENT . '/helpers/icagenda.php';
+
+		$jinput = JFactory::getApplication()->input;
+
+		// Load the submenu.
+		iCagendaHelper::addSubmenu($jinput->get('view', 'icagenda'));
+		$view = $jinput->get('view', 'icagenda');
+		$jinput->set('view', $view);
+
+		parent::display();
+
+		return $this;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/controllers/categories.php b/deployed/icagenda/administrator/components/com_icagenda/controllers/categories.php
new file mode 100644
index 00000000..48995074
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/controllers/categories.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.3.3 2014-04-12
+ * @since       1.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+jimport('joomla.application.component.controlleradmin');
+
+/**
+ * Categories list controller class.
+ */
+class iCagendaControllerCategories extends JControllerAdmin
+{
+	/**
+	 * Proxy for getModel.
+	 * @since	1.0
+	 */
+	public function getModel($name = 'category', $prefix = 'iCagendaModel')
+	{
+		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
+
+		return $model;
+	}
+
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/controllers/category.php b/deployed/icagenda/administrator/components/com_icagenda/controllers/category.php
new file mode 100644
index 00000000..e1ddb05b
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/controllers/category.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.2.13 2014-01-26
+ * @since       1.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+jimport('joomla.application.component.controllerform');
+
+/**
+ * Category controller class.
+ */
+class iCagendaControllerCategory extends JControllerForm
+{
+
+    function __construct() {
+        $this->view_list = 'categories';
+        parent::__construct();
+    }
+
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/controllers/customfield.php b/deployed/icagenda/administrator/components/com_icagenda/controllers/customfield.php
new file mode 100644
index 00000000..976c53be
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/controllers/customfield.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.6.0 2015-12-03
+ * @since       3.4.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+jimport('joomla.application.component.controllerform');
+
+/**
+ * Custom Field controller class.
+ */
+class iCagendaControllerCustomfield extends JControllerForm
+{
+    function __construct()
+    {
+        $this->view_list = 'customfields';
+        parent::__construct();
+    }
+
+	/**
+	 * Return Ajax to save a new custom field group
+	 *
+	 * @since 3.6.0
+	 */
+	function newGroup()
+	{
+		icagendaAjaxFilter::saveCustomFieldGroup();
+	}
+
+	/**
+	 * Return Ajax to check if a custom field group is set to any custom field
+	 *
+	 * @since 3.6.0
+	 */
+	function checkGroup()
+	{
+		icagendaAjaxFilter::checkCustomFieldGroup();
+	}
+
+	/**
+	 * Return Ajax to delete a custom field group
+	 *
+	 * @since 3.6.0
+	 */
+	function deleteGroup()
+	{
+		icagendaAjaxFilter::deleteCustomFieldGroup();
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/controllers/customfields.php b/deployed/icagenda/administrator/components/com_icagenda/controllers/customfields.php
new file mode 100644
index 00000000..afa097f5
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/controllers/customfields.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.4.0 2014-05-01
+ * @since       3.4.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+jimport('joomla.application.component.controlleradmin');
+
+/**
+ * Categories list controller class.
+ */
+class iCagendaControllerCustomfields extends JControllerAdmin
+{
+	/**
+	 * Proxy for getModel.
+	 * @since	1.0
+	 */
+	public function getModel($name = 'customfield', $prefix = 'iCagendaModel')
+	{
+		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
+
+		return $model;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/controllers/event.php b/deployed/icagenda/administrator/components/com_icagenda/controllers/event.php
new file mode 100644
index 00000000..b104f3dc
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/controllers/event.php
@@ -0,0 +1,144 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-26
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+jimport('joomla.application.component.controllerform');
+
+/**
+ * Event controller class.
+ */
+class iCagendaControllerEvent extends JControllerForm
+{
+	function __construct()
+	{
+		$this->view_list = 'events';
+
+		parent::__construct();
+	}
+
+	/**
+	 * Method override to check if you can add a new record.
+	 *
+	 * @param   array  $data  An array of input data.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.0
+	 */
+	protected function allowAdd($data = array())
+	{
+		// Initialise variables.
+		$input      = JFactory::getApplication()->input;
+		$user       = JFactory::getUser();
+		$categoryId = JArrayHelper::getValue($data, 'catid', $input->getInt('filter_category_id'), 'int');
+		$allow      = null;
+
+		if ($categoryId)
+		{
+			// If the category has been passed in the data or URL check it.
+			$allow = $user->authorise('core.create', 'com_icagenda.category.' . $categoryId);
+		}
+
+		if ($allow === null)
+		{
+			// In the absense of better information, revert to the component permissions.
+			return parent::allowAdd();
+		}
+		else
+		{
+			return $allow;
+		}
+	}
+
+	/**
+	 * Method override to check if you can edit an existing record.
+	 *
+	 * @param   array   $data  An array of input data.
+	 * @param   string  $key   The name of the key for the primary key.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.0
+	 */
+	protected function allowEdit($data = array(), $key = 'id')
+	{
+		// Initialise variables.
+		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
+		$user     = JFactory::getUser();
+		$userId   = $user->get('id');
+
+		// Check general edit permission first.
+		if ($user->authorise('core.edit', 'com_icagenda.event.' . $recordId))
+		{
+			return true;
+		}
+
+		// Fallback on edit.own.
+		// First test if the permission is available.
+		if ($user->authorise('core.edit.own', 'com_icagenda.event.' . $recordId))
+		{
+			// Now test the owner is the user.
+			$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
+
+			if (empty($ownerId) && $recordId)
+			{
+				// Need to do a lookup from the model.
+				$record = $this->getModel()->getItem($recordId);
+
+				if (empty($record))
+				{
+					return false;
+				}
+
+				$ownerId = $record->created_by;
+			}
+
+			// If the owner matches 'me' then do the test.
+			if ($ownerId == $userId)
+			{
+				return true;
+			}
+		}
+
+		// Since there is no asset tracking, revert to the component permissions.
+		return parent::allowEdit($data, $key);
+	}
+
+	/**
+	 * Method to run batch operations.
+	 *
+	 * @param   object  $model  The model.
+	 *
+	 * @return  boolean  True if successful, false otherwise and internal error is set.
+	 *
+	 * @since   1.0
+	 */
+	public function batch($model = null)
+	{
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		// Set the model
+		$model = $this->getModel('Event', '', array());
+
+		// Preset the redirect
+		$this->setRedirect(JRoute::_('index.php?option=com_icagenda&view=events' . $this->getRedirectToListAppend(), false));
+
+		return parent::batch($model);
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/controllers/events.php b/deployed/icagenda/administrator/components/com_icagenda/controllers/events.php
new file mode 100644
index 00000000..6d3a504f
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/controllers/events.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-26
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+jimport('joomla.application.component.controlleradmin');
+
+/**
+ * Events list controller class.
+ */
+class iCagendaControllerEvents extends JControllerAdmin
+{
+	/**
+	 * Proxy for getModel.
+	 *
+	 * @since   1.0
+	 */
+	public function getModel($name = 'event', $prefix = 'iCagendaModel', $config = array('ignore_request' => true))
+	{
+		return parent::getModel($name, $prefix, $config);
+	}
+
+	/**
+	 * Method to save the submitted ordering values for records via AJAX.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public function saveOrderAjax()
+	{
+		$app   = JFactory::getApplication();
+		$input = $app->input;
+
+		$pks   = $input->post->get('cid', array(), 'array');
+		$order = $input->post->get('order', array(), 'array');
+
+		// Sanitize the input
+		JArrayHelper::toInteger($pks);
+		JArrayHelper::toInteger($order);
+
+		// Get the model
+		$model = $this->getModel();
+
+		// Save the ordering
+		$return = $model->saveorder($pks, $order);
+
+		if ($return)
+		{
+			echo "1";
+		}
+
+		// Close the application
+		$app->close();
+	}
+
+	public function __construct($config = array())
+	{
+		parent::__construct($config);
+
+		$this->registerTask('unapprove', 'approve');
+	}
+
+	/**
+	 * Method to approve an event.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function approve()
+	{
+		// Check for request forgeries.
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$app   = JFactory::getApplication();
+		$input = $app->input;
+
+		$ids   = $input->post->get('cid', array(), 'array');
+
+		if (empty($ids))
+		{
+			$app->enqueueMessage(JText::_('JERROR_NO_ITEMS_SELECTED'), 'warning');
+		}
+		else
+		{
+			// Get the model.
+			$model = $this->getModel();
+
+			// Change the state of the records.
+			if ( ! $model->approve($ids))
+			{
+				$app->enqueueMessage($model->getError(), 'warning');
+			}
+			else
+			{
+				$this->setMessage(JText::plural('COM_ICAGENDA_N_EVENTS_APPROVED', count($ids)));
+			}
+		}
+
+		$this->setRedirect('index.php?option=com_icagenda&view=events');
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/controllers/feature.php b/deployed/icagenda/administrator/components/com_icagenda/controllers/feature.php
new file mode 100644
index 00000000..24b7dcb2
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/controllers/feature.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      doorknob
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.4.0 2014-07-02
+ * @since       3.4.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+jimport('joomla.application.component.controllerform');
+
+/**
+ * Feature controller class.
+ */
+class iCagendaControllerFeature extends JControllerForm
+{
+	function __construct()
+	{
+		$this->view_list = 'features';
+
+		parent::__construct();
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/controllers/features.php b/deployed/icagenda/administrator/components/com_icagenda/controllers/features.php
new file mode 100644
index 00000000..40d43254
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/controllers/features.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      doorknob & Cyril Rezé
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.4.0 2014-07-02
+ * @since       3.4.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+jimport('joomla.application.component.controlleradmin');
+
+/**
+ * Features list controller class.
+ */
+class iCagendaControllerFeatures extends JControllerAdmin
+{
+	/**
+	 * Proxy for getModel.
+	 * @since	3.4.0
+	 */
+	public function getModel($name = 'feature', $prefix = 'iCagendaModel')
+	{
+		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
+
+		return $model;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/controllers/icagenda.php b/deployed/icagenda/administrator/components/com_icagenda/controllers/icagenda.php
new file mode 100644
index 00000000..f40874c0
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/controllers/icagenda.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.0 2013-05-05
+ * @since       1.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+jimport('joomla.application.component.controlleradmin');
+
+/**
+ * Categories list controller class.
+ */
+// J2.5 : class iCagendaControlleriCagenda extends JControllerAdmin
+class iCagendaControlleriCagenda extends JControllerLegacyAdmin
+{
+	/**
+	 * Proxy for getModel.
+	 * @since	1.6
+	 */
+	public function &getModel($name = 'icagenda', $prefix = 'iCagendaModel')
+	{
+		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
+		return $model;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/controllers/index.html b/deployed/icagenda/administrator/components/com_icagenda/controllers/index.html
new file mode 100644
index 00000000..42682b47
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/controllers/index.html
@@ -0,0 +1 @@
+<html><body></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/controllers/mail.php b/deployed/icagenda/administrator/components/com_icagenda/controllers/mail.php
new file mode 100644
index 00000000..de51ee8f
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/controllers/mail.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-26
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+jimport('joomla.application.component.controllerform');
+
+/**
+ * Event controller class.
+ */
+class iCagendaControllerMail extends JControllerForm
+{
+	function __construct()
+	{
+		$this->view_list = 'icagenda';
+
+		parent::__construct();
+	}
+
+	/**
+	 * Return Ajax to load date select options
+	 *
+	 * @since   3.5.9
+	 */
+	function dates()
+	{
+		icagendaAjax::getOptionsEventDates('mail');
+
+		// Cut the execution short
+//		JFactory::getApplication()->close();
+	}
+
+	/**
+	 * Send the mail
+	 *
+	 * @return  void
+	 *
+	 * @since   3.5.9
+	 */
+	public function send()
+	{
+		// Check for request forgeries.
+		JSession::checkToken('request') or jexit(JText::_('JINVALID_TOKEN'));
+
+		$app    = JFactory::getApplication();
+		$jinput = $app->input;
+		$model  = $this->getModel('Mail');
+
+		if ( ! $model->send())
+		{
+			// Get the user data.
+			$requestData = $this->input->post->get('jform', array(), 'array');
+
+			// Save the data in the session.
+			$app->setUserState('com_icagenda.mail.data', $requestData);
+
+			// Redirect back to the newsletter screen.
+			$this->setRedirect(JRoute::_('index.php?option=com_icagenda&view=mail&layout=edit', false));
+
+			return false;
+		}
+
+		// Flush the data from the session.
+		$app->setUserState('com_icagenda.mail.data', null);
+
+		// Redirect back to the newsletter screen.
+		$this->setRedirect(JRoute::_('index.php?option=com_icagenda&view=mail&layout=edit', false));
+
+		return true;
+	}
+
+	/**
+	 * Cancel the mail
+	 *
+	 * @return  void
+	 *
+	 * @since   3.5.9
+	 */
+	public function cancel($key = null)
+	{
+		// Check for request forgeries.
+		JSession::checkToken('request') or jexit(JText::_('JINVALID_TOKEN'));
+
+		$app = JFactory::getApplication();
+
+		// Flush the data from the session.
+		$app->setUserState('com_icagenda.mail.data', null);
+
+		$this->setRedirect(JRoute::_('index.php?option=com_icagenda', false));
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/controllers/registration.php b/deployed/icagenda/administrator/components/com_icagenda/controllers/registration.php
new file mode 100644
index 00000000..182a6474
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/controllers/registration.php
@@ -0,0 +1,115 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.6.0 2016-03-01
+ * @since       3.3.3
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+jimport('joomla.application.component.controllerform');
+
+/**
+ * Registration controller class.
+ */
+class iCagendaControllerRegistration extends JControllerForm
+{
+    function __construct()
+    {
+        $this->view_list = 'registrations';
+        parent::__construct();
+    }
+
+	/**
+	 * Return Ajax to load date select options
+	 *
+	 * @since 3.5.9
+	 */
+	function dates()
+	{
+		icagendaAjax::getOptionsEventDates('registration');
+
+		// Cut the execution short
+//		JFactory::getApplication()->close();
+	}
+
+	/**
+	 * Return Full name/Username using Ajax (depending on Global Options)
+	 *
+	 * @since 3.6.0
+	 */
+	function registrationName()
+	{
+		$userId = JFactory::getApplication()->input->get('userid', '');
+
+		icagendaAjax::getRegistrationName($userId);
+
+//		$user = JFactory::getUser($userId);
+
+//		return $user->name;
+	}
+
+	/**
+	 * Method override to check if you can edit an existing record.
+	 *
+	 * @param   array   $data  An array of input data.
+	 * @param   string  $key   The name of the key for the primary key.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.3.3
+	 */
+	protected function allowEdit($data = array(), $key = 'id')
+	{
+		// Initialise variables.
+		$recordId	= (int) isset($data[$key]) ? $data[$key] : 0;
+		$user		= JFactory::getUser();
+		$userId		= $user->get('id');
+
+		// Check general edit permission first.
+		if ($user->authorise('core.edit', 'com_icagenda.registration.' . $recordId))
+		{
+			return true;
+		}
+
+		// Fallback on edit.own.
+		// First test if the permission is available.
+		if ($user->authorise('core.edit.own', 'com_icagenda.registration.' . $recordId))
+		{
+			// Now test the owner is the user.
+			$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
+			if (empty($ownerId) && $recordId)
+			{
+				// Need to do a lookup from the model.
+				$record = $this->getModel()->getItem($recordId);
+
+				if (empty($record))
+				{
+					return false;
+				}
+
+				$ownerId = $record->created_by;
+			}
+
+			// If the owner matches 'me' then do the test.
+			if ($ownerId == $userId)
+			{
+				return true;
+			}
+		}
+
+		// Since there is no asset tracking, revert to the component permissions.
+		return parent::allowEdit($data, $key);
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/controllers/registrations.php b/deployed/icagenda/administrator/components/com_icagenda/controllers/registrations.php
new file mode 100644
index 00000000..2f4d46ac
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/controllers/registrations.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.5.9 2015-07-22
+ * @since       2.0.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+jimport('joomla.application.component.controlleradmin');
+
+/**
+ * Registrations list controller class.
+ */
+class iCagendaControllerRegistrations extends JControllerAdmin
+{
+	/**
+	 * Proxy for getModel.
+	 * @since	2.0.0
+	 */
+	public function getModel($name = 'registration', $prefix = 'iCagendaModel', $config = array('ignore_request' => true))
+	{
+		return parent::getModel($name, $prefix, $config);
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/controllers/registrations.raw.php b/deployed/icagenda/administrator/components/com_icagenda/controllers/registrations.raw.php
new file mode 100644
index 00000000..191a1c9d
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/controllers/registrations.raw.php
@@ -0,0 +1,156 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.9 2019-06-05
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.5.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * Registrations list controller class.
+ *
+ * @since	3.5.0
+ */
+class icagendaControllerRegistrations extends JControllerLegacy
+{
+	/**
+	 * @var    string  The context for persistent state.
+	 *
+	 * @since  3.5.0
+	 */
+	protected $context = 'com_icagenda.registrations';
+
+	/**
+	 * Proxy for getModel.
+	 *
+	 * @param   string  $name    The name of the model.
+	 * @param   string  $prefix  The prefix for the model class name.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModel
+	 *
+	 * @since   3.5.0
+	 */
+	public function getModel($name = 'Registrations', $prefix = 'iCagendaModel', $config = array())
+	{
+		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
+
+		return $model;
+	}
+
+	/**
+	 * Display method for the raw track data.
+	 *
+	 * @param   boolean  $cachable   If true, the view output will be cached
+	 * @param   array    $urlparams  An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  JController  This object to support chaining.
+	 *
+	 * @since   3.5.0
+	 */
+	public function display($cachable = false, $urlparams = false)
+	{
+		// Get the document object.
+		$document	= JFactory::getDocument();
+		$vName		= 'registrations';
+		$vFormat	= 'raw';
+
+		// Get and render the view.
+		if ($view = $this->getView($vName, $vFormat))
+		{
+			// Get the model for the view.
+			$model = $this->getModel($vName);
+
+			// Load the filter state.
+			$app = JFactory::getApplication();
+
+			$search = $app->getUserState($this->context . '.filter.search');
+			$model->setState('filter.search', $search);
+
+			$published = $app->getUserState($this->context . '.filter.state', '1');
+			$model->setState('filter.state', $published);
+
+			$categoryId = $app->getUserState($this->context . '.filter.categories');
+			$model->setState('filter.categories', $categoryId);
+
+			$eventId = $app->getUserState($this->context . '.filter.events');
+			$model->setState('filter.events', $eventId);
+
+			$date = $app->getUserState($this->context . '.filter.dates');
+			$model->setState('filter.dates', $date);
+
+			$model->setState('list.limit', 0);
+			$model->setState('list.start', 0);
+
+			$input = JFactory::getApplication()->input;
+			$form  = $input->get('jform', array(), 'array');
+
+			$model->setState('event_title', $form['event_title']);
+			$model->setState('date', $form['date']);
+			$model->setState('tickets', $form['tickets']);
+			$model->setState('name', $form['name']);
+			$model->setState('email', $form['email']);
+			$model->setState('phone', $form['phone']);
+			$model->setState('customfields', $form['customfields']);
+			$model->setState('notes', $form['notes']);
+			$model->setState('status', $form['status']);
+			$model->setState('created', $form['created']);
+			$model->setState('reg_id', $form['reg_id']);
+
+			$model->setState('basename', $form['basename']);
+			$model->setState('separator', $form['separator']);
+			$model->setState('compressed', $form['compressed']);
+
+			$config = JFactory::getConfig();
+			$cookie_domain = $config->get('cookie_domain', '');
+			$cookie_path = $config->get('cookie_path', '/');
+
+			// Joomla 3
+			if (version_compare(JVERSION, '3.0', 'ge'))
+			{
+				setcookie(JApplicationHelper::getHash($this->context . '.event_title'), $form['event_title'], time() + 365 * 86400, $cookie_path, $cookie_domain);
+				setcookie(JApplicationHelper::getHash($this->context . '.date'), $form['date'], time() + 365 * 86400, $cookie_path, $cookie_domain);
+				setcookie(JApplicationHelper::getHash($this->context . '.tickets'), $form['tickets'], time() + 365 * 86400, $cookie_path, $cookie_domain);
+				setcookie(JApplicationHelper::getHash($this->context . '.name'), $form['name'], time() + 365 * 86400, $cookie_path, $cookie_domain);
+				setcookie(JApplicationHelper::getHash($this->context . '.email'), $form['email'], time() + 365 * 86400, $cookie_path, $cookie_domain);
+				setcookie(JApplicationHelper::getHash($this->context . '.phone'), $form['phone'], time() + 365 * 86400, $cookie_path, $cookie_domain);
+				setcookie(JApplicationHelper::getHash($this->context . '.customfields'), $form['customfields'], time() + 365 * 86400, $cookie_path, $cookie_domain);
+				setcookie(JApplicationHelper::getHash($this->context . '.notes'), $form['notes'], time() + 365 * 86400, $cookie_path, $cookie_domain);
+				setcookie(JApplicationHelper::getHash($this->context . '.status'), $form['status'], time() + 365 * 86400, $cookie_path, $cookie_domain);
+				setcookie(JApplicationHelper::getHash($this->context . '.created'), $form['created'], time() + 365 * 86400, $cookie_path, $cookie_domain);
+				setcookie(JApplicationHelper::getHash($this->context . '.reg_id'), $form['reg_id'], time() + 365 * 86400, $cookie_path, $cookie_domain);
+
+				setcookie(JApplicationHelper::getHash($this->context . '.basename'), $form['basename'], time() + 365 * 86400, $cookie_path, $cookie_domain);
+				setcookie(JApplicationHelper::getHash($this->context . '.separator'), $form['separator'], time() + 365 * 86400, $cookie_path, $cookie_domain);
+				setcookie(JApplicationHelper::getHash($this->context . '.compressed'), $form['compressed'], time() + 365 * 86400, $cookie_path, $cookie_domain);
+			}
+			// Joomla 2.5
+			else
+			{
+				setcookie(JApplication::getHash($this->context.'.basename'), $form['basename'], time() + 365 * 86400, $cookie_path, $cookie_domain);
+				setcookie(JApplication::getHash($this->context.'.separator'), $form['separator'], time() + 365 * 86400, $cookie_path, $cookie_domain);
+				setcookie(JApplication::getHash($this->context.'.compressed'), $form['compressed'], time() + 365 * 86400, $cookie_path, $cookie_domain);
+			}
+
+			// Push the model into the view (as default).
+			$view->setModel($model, true);
+
+			// Push document object into the view.
+			$view->document = $document;
+
+			$view->display();
+		}
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/controllers/themes.php b/deployed/icagenda/administrator/components/com_icagenda/controllers/themes.php
new file mode 100644
index 00000000..7c4024d5
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/controllers/themes.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-26
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       2.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+jimport('joomla.application.component.controllerform');
+jimport('joomla.client.helper');
+
+class iCagendaControllerthemes extends JControllerForm
+{
+	protected $option = 'com_icagenda';
+
+	function __construct()
+	{
+		parent::__construct();
+
+		$this->registerTask('themeinstall', 'themeinstall');
+	}
+
+	function themeinstall()
+	{
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$post  = JFactory::getApplication()->input->post;
+		$theme = array();
+
+		if ($post->get('theme_component'))
+		{
+			$theme['component'] = 1;
+		}
+
+		if (empty($theme))
+		{
+			$ftp =& JClientHelper::setCredentialsFromRequest('ftp');
+
+			$model = &$this->getModel('themes');
+
+			if ($model->install($theme))
+			{
+				$cache = JFactory::getCache('mod_menu');
+				$cache->clean();
+
+				$msg = JText::_('COM_ICAGENDA_SUCCESS_THEME_INSTALLED');
+			}
+		}
+		else
+		{
+			$msg = JText::_('COM_ICAGENDA_ERROR_THEME_APPLICATION_AREA');
+		}
+
+		$this->setRedirect('index.php?option=com_icagenda&view=themes', $msg);
+	}
+
+	function cancel()
+	{
+		$this->setRedirect('index.php?option=com_icagenda');
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/helpers/html/events.php b/deployed/icagenda/administrator/components/com_icagenda/helpers/html/events.php
new file mode 100644
index 00000000..56f3b76d
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/helpers/html/events.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.1.10 2013-09-11
+ * @since       3.2
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+/**
+ * Extended Utility class for the iCagenda component.
+ *
+ * @package     Joomla.Administrator
+ * @subpackage  com_iCagenda
+ * @since       3.2
+ */
+class JHtmlEvents
+{
+
+	public static function approveEvents()
+	{
+		$states = array(
+			1	=> array(
+				'img'				=> 'tick.png',
+				'task'				=> 'approve',
+				'text'				=> '',
+				'active_title'		=> 'COM_ICAGENDA_TOOLBAR_APPROVE',
+				'inactive_title'	=> '',
+				'tip'				=> true,
+				'active_class'		=> 'unpublish',
+				'inactive_class'	=> 'unpublish'
+			),
+			0	=> array(
+				'img'				=> 'publish_x.png',
+				'task'				=> '',
+				'text'				=> '',
+				'active_title'		=> '',
+				'inactive_title'	=> 'COM_ICAGENDA_APPROVED',
+				'tip'				=> true,
+				'active_class'		=> 'publish',
+				'inactive_class'	=> 'publish'
+			)
+		);
+		return $states;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/helpers/html/index.html b/deployed/icagenda/administrator/components/com_icagenda/helpers/html/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/helpers/html/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/helpers/icagenda.php b/deployed/icagenda/administrator/components/com_icagenda/helpers/icagenda.php
new file mode 100644
index 00000000..db33e664
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/helpers/icagenda.php
@@ -0,0 +1,278 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-26
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * iCagenda helper.
+ */
+class iCagendaHelper
+{
+	/**
+	 * Configure the Linkbar.
+	 */
+	public static function addSubmenu($submenu)
+	{
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			JSubMenuHelper::addEntry(
+				JText::_('COM_ICAGENDA_TITLE_ICAGENDA'),
+				'index.php?option=com_icagenda&view=icagenda',
+				$submenu == 'icagenda'
+			);
+			if (JFactory::getUser()->authorise('icagenda.access.categories', 'com_icagenda'))
+			{
+				JSubMenuHelper::addEntry(
+					JText::_('COM_ICAGENDA_TITLE_CATEGORIES'),
+					'index.php?option=com_icagenda&view=categories',
+					$submenu == 'categories'
+				);
+			}
+			if (JFactory::getUser()->authorise('icagenda.access.events', 'com_icagenda'))
+			{
+				JSubMenuHelper::addEntry(
+					JText::_('COM_ICAGENDA_TITLE_EVENTS'),
+					'index.php?option=com_icagenda&view=events',
+					$submenu == 'events'
+				);
+			}
+			if (JFactory::getUser()->authorise('icagenda.access.registrations', 'com_icagenda'))
+			{
+				JSubMenuHelper::addEntry(
+					JText::_('COM_ICAGENDA_TITLE_REGISTRATION'),
+					'index.php?option=com_icagenda&view=registrations',
+					$submenu == 'registrations'
+				);
+			}
+			if (JFactory::getUser()->authorise('icagenda.access.newsletter', 'com_icagenda'))
+			{
+				JSubMenuHelper::addEntry(
+					JText::_('COM_ICAGENDA_TITLE_NEWSLETTER'),
+					'index.php?option=com_icagenda&view=mail&layout=edit',
+					$submenu == 'newsletter'
+				);
+			}
+			if (JFactory::getUser()->authorise('icagenda.access.customfields', 'com_icagenda'))
+			{
+				JSubMenuHelper::addEntry(
+					JText::_('COM_ICAGENDA_TITLE_CUSTOMFIELDS'),
+					'index.php?option=com_icagenda&view=customfields',
+					$submenu == 'customfields'
+				);
+			}
+			if (JFactory::getUser()->authorise('icagenda.access.features', 'com_icagenda'))
+			{
+				JSubMenuHelper::addEntry(
+					JText::_('COM_ICAGENDA_TITLE_FEATURES'),
+					'index.php?option=com_icagenda&view=features',
+					$submenu == 'features'
+				);
+			}
+			if (JFactory::getUser()->authorise('icagenda.access.themes', 'com_icagenda'))
+			{
+				JSubMenuHelper::addEntry(
+					JText::_('COM_ICAGENDA_THEMES'),
+					'index.php?option=com_icagenda&view=themes',
+					$submenu == 'themes'
+				);
+			}
+			JSubMenuHelper::addEntry(
+				JText::_('COM_ICAGENDA_INFO'),
+				'index.php?option=com_icagenda&view=info',
+				$submenu == 'info'
+			);
+
+			$document = JFactory::getDocument();
+
+			/**
+			 * Set Titles iCagenda
+			 */
+			if ($submenu == 'icagenda')
+			{
+				$document->setTitle(JText::_('COM_ICAGENDA'));
+			}
+			if ($submenu == 'categories')
+			{
+				$document->setTitle(JText::_('COM_ICAGENDA') . ' | ' . JText::_('COM_ICAGENDA_TITLE_CATEGORIES'));
+			}
+			if ($submenu == 'events')
+			{
+				$document->setTitle(JText::_('COM_ICAGENDA') . ' | ' . JText::_('COM_ICAGENDA_TITLE_EVENTS'));
+			}
+			if ($submenu == 'registrations')
+			{
+				$document->setTitle(JText::_('COM_ICAGENDA') . ' | ' . JText::_('COM_ICAGENDA_TITLE_REGISTRATION'));
+			}
+			if ($submenu == 'newsletter')
+			{
+				$document->setTitle(JText::_('COM_ICAGENDA') . ' | ' . JText::_('COM_ICAGENDA_TITLE_NEWSLETTER'));
+			}
+			if ($submenu == 'customfields')
+			{
+				$document->setTitle(JText::_('COM_ICAGENDA') . ' | ' . JText::_('COM_ICAGENDA_TITLE_CUSTOMFIELDS'));
+			}
+			if ($submenu == 'features')
+			{
+				$document->setTitle(JText::_('COM_ICAGENDA') . ' | ' . JText::_('COM_ICAGENDA_TITLE_FEATURES'));
+			}
+			if ($submenu == 'themes')
+			{
+				$document->setTitle(JText::_('COM_ICAGENDA') . ' | ' . JText::_('COM_ICAGENDA_THEMES'));
+			}
+			if ($submenu == 'info')
+			{
+				$document->setTitle(JText::_('COM_ICAGENDA') . ' | ' . JText::_('COM_ICAGENDA_INFO'));
+			}
+
+			$document->addStyleDeclaration('
+				.icon48icagenda{background: url(../media/com_icagenda/images/XXX.png);}
+				.icon-48-events {background: url(../media/com_icagenda/images/all_events-48.png) no-repeat;}
+				.icon-48-event {background: url(../media/com_icagenda/images/new_event-48.png) no-repeat;}
+				.icon-48-registration {background: url(../media/com_icagenda/images/registration-48.png) no-repeat;}
+				.icon-48-categories {background: url(../media/com_icagenda/images/all_cats-48.png) no-repeat;}
+				.icon-48-category {background: url(../media/com_icagenda/images/new_cat-48.png) no-repeat;}
+				.icon-48-generic {background: url(../media/com_icagenda/images/iconicagenda48.png) no-repeat;}
+				.icon-48-mail {background: url(../media/com_icagenda/images/newsletter-48.png) no-repeat;}
+				.icon-48-themes {background: url(../media/com_icagenda/images/themes-48.png) no-repeat;}
+				.icon-48-customfields {background: url(../media/com_icagenda/images/customfields-48.png) no-repeat;}
+				.icon-48-info {background: url(../media/com_icagenda/images/info-48.png) no-repeat;}
+			');
+		}
+		else
+		{
+			JHtmlSidebar::addEntry(
+				JText::_('COM_ICAGENDA_TITLE_ICAGENDA'),
+				'index.php?option=com_icagenda&view=icagenda',
+				$submenu == 'icagenda'
+			);
+			if (JFactory::getUser()->authorise('icagenda.access.categories', 'com_icagenda'))
+			{
+				JHtmlSidebar::addEntry(
+					JText::_('COM_ICAGENDA_TITLE_CATEGORIES'),
+					'index.php?option=com_icagenda&view=categories',
+					$submenu == 'categories'
+				);
+			}
+			if (JFactory::getUser()->authorise('icagenda.access.events', 'com_icagenda'))
+			{
+				JHtmlSidebar::addEntry(
+					JText::_('COM_ICAGENDA_TITLE_EVENTS'),
+					'index.php?option=com_icagenda&view=events',
+					$submenu == 'events'
+				);
+			}
+			if (JFactory::getUser()->authorise('icagenda.access.registrations', 'com_icagenda'))
+			{
+				JHtmlSidebar::addEntry(
+					JText::_('COM_ICAGENDA_TITLE_REGISTRATION'),
+					'index.php?option=com_icagenda&view=registrations',
+					$submenu == 'registrations'
+				);
+			}
+			if (JFactory::getUser()->authorise('icagenda.access.newsletter', 'com_icagenda'))
+			{
+				JHtmlSidebar::addEntry(
+					JText::_('COM_ICAGENDA_TITLE_NEWSLETTER'),
+					'index.php?option=com_icagenda&view=mail&layout=edit',
+					$submenu == 'newsletter'
+				);
+			}
+			if (JFactory::getUser()->authorise('icagenda.access.customfields', 'com_icagenda'))
+			{
+				JHtmlSidebar::addEntry(
+					JText::_('COM_ICAGENDA_TITLE_CUSTOMFIELDS'),
+					'index.php?option=com_icagenda&view=customfields',
+					$submenu == 'customfields'
+				);
+			}
+			if (JFactory::getUser()->authorise('icagenda.access.features', 'com_icagenda'))
+			{
+				JHtmlSidebar::addEntry(
+					JText::_('COM_ICAGENDA_TITLE_FEATURES'),
+					'index.php?option=com_icagenda&view=features',
+					$submenu == 'features'
+				);
+			}
+			if (JFactory::getUser()->authorise('icagenda.access.themes', 'com_icagenda'))
+			{
+				JHtmlSidebar::addEntry(
+					JText::_('COM_ICAGENDA_THEMES'),
+					'index.php?option=com_icagenda&view=themes',
+					$submenu == 'themes'
+				);
+			}
+			JHtmlSidebar::addEntry(
+				JText::_('COM_ICAGENDA_INFO'),
+				'index.php?option=com_icagenda&view=info',
+				$submenu == 'info'
+			);
+		}
+	}
+
+	/**
+	 * Gets a list of the actions that can be performed.
+	 */
+	public static function getActions($messageId = 0)
+	{
+		$user   = JFactory::getUser();
+		$result = new JObject;
+
+		if (empty($messageId))
+		{
+			$assetName = 'com_icagenda';
+		}
+		else
+		{
+			$assetName = 'com_icagenda.message.'.(int) $messageId;
+		}
+
+		$actions = array(
+			'core.admin',
+			'core.manage',
+			'core.create',
+			'core.edit',
+			'core.delete',
+			'core.edit.state',
+			'core.edit.own',
+			'icagenda.access.categories',
+			'icagenda.access.events',
+			'icagenda.access.registrations',
+			'icagenda.access.newsletter',
+			'icagenda.access.customfields',
+			'icagenda.access.features',
+			'icagenda.access.themes'
+		);
+
+		foreach ($actions as $action)
+		{
+			$result->set($action, $user->authorise($action, $assetName));
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Tests whether a string is serialized before attempting to unserialize it
+	 *
+	 * ( TO BE REMOVED WHEN ALL CALLS FROM IC LIBRARY !!! )
+	 */
+	public static function isSerialized($str)
+	{
+		return ($str == serialize(false) || @unserialize($str) !== false);
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/helpers/index.html b/deployed/icagenda/administrator/components/com_icagenda/helpers/index.html
new file mode 100644
index 00000000..42682b47
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/helpers/index.html
@@ -0,0 +1 @@
+<html><body></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/icagenda.php b/deployed/icagenda/administrator/components/com_icagenda/icagenda.php
new file mode 100644
index 00000000..839e91b8
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/icagenda.php
@@ -0,0 +1,182 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-26
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+// Get Application
+$app = JFactory::getApplication();
+
+// Check Errors: iC Library & iCagenda Utilities
+$UTILITIES_DIR = is_dir(JPATH_ADMINISTRATOR . '/components/com_icagenda/utilities');
+
+if ( ( ! $UTILITIES_DIR)
+	|| ( ! class_exists('iCLibrary')) )
+{
+	$alert_message = JText::_('ICAGENDA_CAN_NOT_LOAD') . '<br />';
+	$alert_message.= '<ul>';
+	if ( ! class_exists('iCLibrary')) $alert_message.= '<li>' . JText::_('IC_LIBRARY_NOT_LOADED') . '</li>';
+	if ( ! $UTILITIES_DIR) $alert_message.= '<li>' . JText::_('ICAGENDA_A_FOLDER_IS_MISSING') . '</li>';
+	$alert_message.= '</ul>';
+	if ( ! $UTILITIES_DIR) $alert_message.= JText::_('ICAGENDA_IS_NOT_CORRECTLY_INSTALLED') . ' ';
+	if ( ! $UTILITIES_DIR) $alert_message.= JText::_('ICAGENDA_INSTALL_AGAIN') . '<br />';
+	if ( ! $UTILITIES_DIR) $alert_message.= JText::_('IC_ALTERNATIVELY') . ':<br /><ul>';
+	if ($UTILITIES_DIR) $alert_message.= JText::_('IC_PLEASE') . ', ';
+	if ( ! class_exists('iCLibrary'))
+	{
+		if ( ! $UTILITIES_DIR) $alert_message.= '<li>';
+		$alert_message.= JText::_('IC_LIBRARY_CHECK_PLUGIN_AND_LIBRARY');
+		if ( ! $UTILITIES_DIR) $alert_message.= '</li>';
+	}
+	if ( ! $UTILITIES_DIR)
+	{
+		$alert_message.= '<li>' . JText::Sprintf('ICAGENDA_UTILITIES_FIX_MANUAL'
+						, '<strong>admin/utilities</strong>'
+						, '<strong>administrator/components/com_icagenda/</strong>');
+		$alert_message.= '</li></ul>';
+	}
+
+	// Get the message queue
+	$messages = $app->getMessageQueue();
+
+	$display_alert_message = false;
+
+	// If we have messages
+	if (is_array($messages) && count($messages))
+	{
+		// Check each message for the one we want
+		foreach ($messages as $key => $value)
+		{
+			if ($value['message'] == $alert_message)
+			{
+				$display_alert_message = true;
+			}
+		}
+	}
+
+	if ( ! $display_alert_message)
+	{
+		$app->enqueueMessage($alert_message, 'error');
+
+		return;
+	}
+}
+else
+{
+	// Loads Utilities
+	JLoader::registerPrefix('icagenda', JPATH_ADMINISTRATOR . '/components/com_icagenda/utilities');
+
+	// Common fields
+	JFormHelper::addFieldPath(JPATH_ADMINISTRATOR . '/components/com_icagenda/utilities/form/field');
+
+	if ( ! defined('IC_LIBRARY'))
+	{
+		define('IC_LIBRARY', '1.3.0');
+	}
+}
+
+// Set Input J3
+$jinput = JFactory::getApplication()->input;
+
+// Load Live Update & Joomla import
+require_once JPATH_ADMINISTRATOR . '/components/com_icagenda/liveupdate/liveupdate.php';
+
+if ($jinput->get('view') == 'liveupdate')
+{
+	LiveUpdate::handleRequest();
+
+	return;
+}
+
+if (version_compare(JVERSION, '3.0', 'lt'))
+{
+	jimport('joomla.application.component.controller');
+
+	$level = E_ALL & ~E_NOTICE & ~E_DEPRECATED;
+
+	// Remove not-error message (only needed for Joomla 2.5) : Strict Standards
+	if (version_compare(PHP_VERSION, '5.4.0-dev', '>='))
+	{
+		if ( ! defined('E_STRICT'))
+		{
+			define('E_STRICT', 2048);
+		}
+
+		$level &= ~E_STRICT;
+	}
+
+	error_reporting($level);
+}
+
+// Set some css property
+$document = JFactory::getDocument();
+$document->addStyleDeclaration('.icon-48-icagenda {background-image: none;}');
+
+// Load Vector iCicons Font
+JHtml::stylesheet( 'media/com_icagenda/icicons/style.css' );
+
+// CSS files which could be overridden into your site template. (eg. /templates/my_template/css/com_icagenda/icagenda-back.css)
+JHtml::stylesheet( 'com_icagenda/icagenda-back.css', false, true );
+
+// Load translations
+$language = JFactory::getLanguage();
+$language->load('com_icagenda', JPATH_ADMINISTRATOR, 'en-GB', true);
+$language->load('com_icagenda', JPATH_ADMINISTRATOR, null, true);
+
+// Access check.
+if ( ! JFactory::getUser()->authorise('core.manage', 'com_icagenda'))
+{
+	$app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'error');
+
+	return false;
+}
+
+// Require helper file
+JLoader::register('iCagendaHelper', dirname(__FILE__) . '/helpers/icagenda.php');
+
+// Check config params
+icagendaParams::encryptPassword();
+
+// Get an instance of the controller prefixed by iCagenda
+// Joomla 3.x / 2.5 SWITCH
+if (version_compare(JVERSION, '3.0', 'ge'))
+{
+	$controller = JControllerLegacy::getInstance('iCagenda');
+}
+else
+{
+	$controller = JController::getInstance('iCagenda');
+}
+
+// Perform the Request task
+$controller->execute($jinput->get('task'));
+
+// Redirect if set by the controller
+$controller->redirect();
diff --git a/deployed/icagenda/administrator/components/com_icagenda/icagenda.xml b/deployed/icagenda/administrator/components/com_icagenda/icagenda.xml
new file mode 100644
index 00000000..eeb3ed70
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/icagenda.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="component" version="3.2.4" method="upgrade">
+	<name>iCagenda</name>
+	<author>Cyril Rezé / Jooml!C</author>
+	<creationDate>2020-08-29</creationDate>
+	<copyright>Copyright (c) 2012-2020 Jooml!C / Cyril Rezé. All rights reserved.</copyright>
+	<license>GNU General Public License version 3 or later; see LICENSE.txt</license>
+	<authorEmail>info@joomlic.com</authorEmail>
+	<authorUrl>www.joomlic.com</authorUrl>
+	<version>3.7.15</version>
+	<description>COM_ICAGENDA_DESC</description>
+
+	<scriptfile>script.icagenda.php</scriptfile>
+
+	<install> <!-- Runs on install -->
+		<sql>
+			<file driver="mysql" charset="utf8">sql/install/mysql/icagenda.install.sql</file>
+			<file driver="mysql">sql/install/mysql/icagenda.install.sql</file>
+			<file driver="mysqli" charset="utf8">sql/install/mysql/icagenda.install.sql</file>
+			<file driver="mysqli">sql/install/mysql/icagenda.install.sql</file>
+		</sql>
+	</install>
+
+	<uninstall> <!-- Runs on uninstall -->
+		<sql>
+			<file driver="mysql" charset="utf8">sql/uninstall/mysql/icagenda.uninstall.sql</file>
+			<file driver="mysql">sql/uninstall/mysql/icagenda.uninstall.sql</file>
+			<file driver="mysqli" charset="utf8">sql/uninstall/mysql/icagenda.uninstall.sql</file>
+			<file driver="mysqli">sql/uninstall/mysql/icagenda.uninstall.sql</file>
+		</sql>
+	</uninstall>
+
+	<update> <!-- Runs on update -->
+		<schemas>
+			<schemapath type="mysql">sql/updates</schemapath>
+		</schemas>
+	</update>
+
+	<libraries>
+		<library folder="libraries" library="ic_library" name="iC Library" element="lib_ic_library" />
+	</libraries>
+
+	<modules>
+		<module folder="modules" module="mod_iccalendar" name="iCagenda - Calendar" />
+	</modules>
+
+	<plugins>
+		<plugin folder="plugins" plugin="icagenda" name="Action Log - iCagenda" group="actionlog" element="ic_actionlog" />
+		<plugin folder="plugins" plugin="icagenda" name="Installer - iCagenda" group="installer" element="ic_installer" />
+		<plugin folder="plugins" plugin="icagenda" name="Privacy - iCagenda" group="privacy" element="ic_privacy" />
+		<plugin folder="plugins" plugin="icagendaupdate" name="Quick Icon - iCagenda :: Update Notification" group="quickicon" element="ic_update" />
+		<plugin folder="plugins" plugin="icagenda" name="Search - iCagenda" group="search" element="ic_search" />
+		<plugin folder="plugins" plugin="ic_autologin" name="System - iCagenda :: Autologin" group="system" element="ic_autologin" />
+		<plugin folder="plugins" plugin="ic_library" name="System - iC Library" group="system" element="ic_library" />
+	</plugins>
+
+	<files folder="site">
+		<!-- FILE -->
+		<filename>index.html</filename>
+		<filename>icagenda.php</filename>
+		<filename>controller.php</filename>
+		<filename>router.php</filename>
+		<!-- FOLDER -->
+		<folder>add</folder>
+		<folder>controllers</folder>
+		<folder>helpers</folder>
+		<folder>layouts</folder>
+		<folder>models</folder>
+		<folder>themes</folder>
+		<folder>views</folder>
+	</files>
+
+	<languages folder="site">
+		<language tag="en-GB">language/en-GB/en-GB.com_icagenda.ini</language>
+		<language tag="fr-FR">language/fr-FR/fr-FR.com_icagenda.ini</language>
+		<language tag="it-IT">language/it-IT/it-IT.com_icagenda.ini</language>
+	</languages>
+
+	<media destination="com_icagenda" folder="media">
+		<filename>index.html</filename>
+		<folder>css</folder>
+		<folder>icicons</folder>
+		<folder>images</folder>
+		<folder>js</folder>
+	</media>
+
+	<administration>
+
+		<menu link="option=com_icagenda&amp;view=icagenda" img='../media/com_icagenda/images/iconicagenda16.png'>COM_ICAGENDA_MENU</menu>
+		<submenu>
+			<menu link="option=com_icagenda&amp;view=icagenda" view="icagenda" img='../media/com_icagenda/images/iconicagenda16.png' alt="iCagenda/Home">COM_ICAGENDA_TITLE_ICAGENDA</menu>
+			<menu link="option=com_icagenda&amp;view=categories" view="categories" img='../media/com_icagenda/images/all_cats-16.png' alt="iCagenda/Categories">COM_ICAGENDA_MENU_CATEGORIES</menu>
+			<menu link="option=com_icagenda&amp;view=events" view="events" img='../media/com_icagenda/images/all_events-16.png' alt="iCagenda/Events">COM_ICAGENDA_EVENTS</menu>
+			<menu link="option=com_icagenda&amp;view=registrations" view="registrations" img='../media/com_icagenda/images/registration-16.png' alt="iCagenda/Registrations">COM_ICAGENDA_REGISTRATION</menu>
+			<menu link="option=com_icagenda&amp;view=mail&amp;layout=edit" view="mail" img='../media/com_icagenda/images/newsletter-16.png' alt="iCagenda/Newsletter">COM_ICAGENDA_MAIL</menu>
+			<menu link="option=com_icagenda&amp;view=customfields" view="customfields" img='../media/com_icagenda/images/customfields-16.png' alt="iCagenda/Newsletter">COM_ICAGENDA_MENU_CUSTOMFIELDS</menu>
+			<menu link="option=com_icagenda&amp;view=features" view="features" img='../media/com_icagenda/images/features-16.png' alt="iCagenda/Newsletter">COM_ICAGENDA_MENU_FEATURES</menu>
+			<menu link="option=com_icagenda&amp;view=themes" view="themes" img='../media/com_icagenda/images/themes-16.png' alt="iCagenda/themes">COM_ICAGENDA_THEMES</menu>
+			<menu link="option=com_icagenda&amp;view=info" view="info" img='../media/com_icagenda/images/info-16.png' alt="iCagenda/info">COM_ICAGENDA_INFO</menu>
+		</submenu>
+
+		<files folder="admin">
+			<filename>access.xml</filename>
+			<filename>CHANGELOG.php</filename>
+			<filename>config.xml</filename>
+			<filename>controller.php</filename>
+			<filename>index.html</filename>
+			<filename>icagenda.php</filename>
+			<folder>assets</folder>
+			<folder>controllers</folder>
+			<folder>helpers</folder>
+			<folder>liveupdate</folder>
+			<folder>models</folder>
+			<folder>sql</folder>
+			<folder>tables</folder>
+			<folder>utilities</folder>
+			<folder>views</folder>
+		</files>
+		<languages folder="admin">
+			<language tag="en-GB">language/en-GB/en-GB.com_icagenda.ini</language>
+			<language tag="en-GB">language/en-GB/en-GB.com_icagenda.sys.ini</language>
+			<language tag="fr-FR">language/fr-FR/fr-FR.com_icagenda.ini</language>
+			<language tag="fr-FR">language/fr-FR/fr-FR.com_icagenda.sys.ini</language>
+			<language tag="it-IT">language/it-IT/it-IT.com_icagenda.ini</language>
+			<language tag="it-IT">language/it-IT/it-IT.com_icagenda.sys.ini</language>
+		</languages>
+	</administration>
+
+	<updateservers>
+		<server type="extension" name="iCagenda Update Site">https://www.joomlic.com/icupdates/icagenda.xml</server>
+	</updateservers>
+
+</extension>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/index.html b/deployed/icagenda/administrator/components/com_icagenda/index.html
new file mode 100644
index 00000000..42682b47
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/index.html
@@ -0,0 +1 @@
+<html><body></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/LICENSE.txt b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/LICENSE.txt
new file mode 100644
index 00000000..cd63b9ea
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/LICENSE.txt
@@ -0,0 +1,177 @@
+==============================================================================
+Akeeba Live Update - One-click updates for Joomla! extensions
+Copyright ©2011 Nicholas K. Dionysopoulos / AkeebaBackup.com
+
+Live Update is a sub-component to assist you in providing one-click updates
+for your Joomla! 1.5 and Joomla! 1.6 extensions. It is licensed under the
+GNU Lesser General Public License version 3 or, at your option, any later
+version published by the Free Software Foundation. You can use it royalty-
+free in any Joomla! extension, Free or Proprietary. The full text of its
+license is provided below.
+==============================================================================
+
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/assets/current-32.png b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/assets/current-32.png
new file mode 100644
index 00000000..a896663e
Binary files /dev/null and b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/assets/current-32.png differ
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/assets/fail-24.png b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/assets/fail-24.png
new file mode 100644
index 00000000..62ae36cd
Binary files /dev/null and b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/assets/fail-24.png differ
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/assets/liveupdate-48.png b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/assets/liveupdate-48.png
new file mode 100644
index 00000000..077c1e05
Binary files /dev/null and b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/assets/liveupdate-48.png differ
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/assets/liveupdate.css b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/assets/liveupdate.css
new file mode 100644
index 00000000..f21bed1c
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/assets/liveupdate.css
@@ -0,0 +1,161 @@
+/**
+ * @package LiveUpdate
+ * @copyright Copyright (c)2010-2012 Nicholas K. Dionysopoulos / AkeebaBackup.com
+ * @license GNU LGPLv3 or later <http://www.gnu.org/copyleft/lesser.html>
+ */
+@CHARSET "UTF-8";
+
+.icon-48-liveupdate { background-image: url(liveupdate-48.png) }
+
+var { font-style: italic; font-weight: bold; }
+p.liveupdate-url { font-family: "Lucida Sans Mono", "Courier New", Courier, monospace; }
+
+div.liveupdate-notsupported,
+div.liveupdate-stuck {
+	border: thin solid #990000;
+	background: #fff0f0;
+	padding: 1em;
+	color: #330000;
+	-moz-border-radius: 10px;
+	-webkit-border-radius: 10px;
+	-o-border-radius: 10px;
+	border-radius: 10px;
+	-moz-box-shadow: 5px 5px 5px #f9f9f9;
+	-webkit-box-shadow: 5px 5px 5px #f9f9f9;
+	box-shadow: 5px 5px 5px #f9f9f9;
+}
+div.liveupdate-notsupported h3,
+div.liveupdate-stuck h3 {
+/*	background: transparent url("fail-24.png") top left no-repeat; */
+	text-align: center;
+	min-height: 24px;
+	padding: 2px 0 0 28px;
+	font-size: x-large;
+	color: red;
+	text-shadow: 1px 1px 6px #333;
+}
+
+div.liveupdate-hasupdates {
+	border: thin solid #999900;
+	background: #2F96B4;
+	padding: 1em;
+	color: #333300;
+	-moz-border-radius: 10px;
+	-webkit-border-radius: 10px;
+	-o-border-radius: 10px;
+	border-radius: 10px;
+	-moz-box-shadow: 5px 5px 5px #f9f9f9;
+	-webkit-box-shadow: 5px 5px 5px #f9f9f9;
+	box-shadow: 5px 5px 5px #f9f9f9;
+}
+
+div.liveupdate-hasupdates h3 {
+/*	background: transparent url("warn-24.png") top left no-repeat; */
+	text-align: center;
+	min-height: 24px;
+	padding: 2px 0 12px 0;
+	font-size: x-large;
+	color: #fff;
+	text-shadow: 1px 1px 6px #333;
+}
+
+div.liveupdate-noupdates {
+	border: thin solid #009900;
+	background: #51A351;
+	padding: 1em;
+	color: #003300;
+	-moz-border-radius: 10px;
+	-webkit-border-radius: 10px;
+	-o-border-radius: 10px;
+	border-radius: 10px;
+	-moz-box-shadow: 5px 5px 5px #d4d4d4;
+	-webkit-box-shadow: 5px 5px 5px #d4d4d4;
+	box-shadow: 5px 5px 5px #d4d4d4;
+}
+
+div.liveupdate-noupdates h3 {
+/*	background: transparent url("ok-24.png") top left no-repeat; */
+	text-align: center;
+	min-height: 24px;
+	padding: 2px 0 12px 0;
+	font-size: x-large;
+	color: #fff;
+	text-shadow: 1px 1px 6px #333;
+}
+
+div.liveupdate-infotable {
+	width: 600px;
+	margin: auto auto;
+	padding: 10px;
+	border: thin solid #333;
+	background: #fefefe;
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
+	-o-border-radius: 5px;
+	border-radius: 5px;
+}
+div.liveupdate-infotable .row0 { background: #fcfcfc }
+div.liveupdate-infotable .row1 { background: #f0f0f0 }
+div.liveupdate-row { padding: 5px; }
+span.liveupdate-label { display: inline-block; vertical-align: top; width: 160px; font-weight: bold; }
+span.liveupdate-data { display: inline-block; vertical-align: top; max-width: 420px; overflow: none }
+
+p.liveupdate-buttons { text-align: center; margin: 1em; }
+
+p.liveupdate-error-needsauth {
+	margin: 1em;
+	background: #ffcccc;
+	border: medium solid #ff0000;
+	color: #660000;
+	font-size: large;
+	font-weight: bold;
+	padding: 1em;
+	text-align: center;
+	text-shadow: 1px 1px 2px white;
+	-moz-border-radius: 10px;
+	-webkit-border-radius: 10px;
+	-o-border-radius: 10px;
+	border-radius: 10px;
+	-moz-box-shadow: 5px 5px 5px #d4d4d4;
+	-webkit-box-shadow: 5px 5px 5px #d4d4d4;
+	box-shadow: 5px 5px 5px #d4d4d4;
+}
+
+p.liveupdate-poweredby { font-size: 8pt; color: silver; margin: 1em 0 0.5em 0 }
+p.liveupdate-poweredby a { color: silver; }
+div.liveupdate-ftp p { margin: 1em 2em; line-height: 140%; border: thin solid #00c; padding: 0.5em; color: #006; background-color: #f0f0ff; font-size: 12pt; text-shadow: 1px 1px 3px silver }
+
+#nagscreen {
+	margin: 1em;
+	background: #BD362F;
+	color: #fff;
+	font-size: 14px;
+	font-weight: bold;
+	padding: 1em;
+	text-align: center;
+	text-shadow: 1px 1px 2px #333;
+	-moz-border-radius: 10px;
+	-webkit-border-radius: 10px;
+	-o-border-radius: 10px;
+	border-radius: 10px;
+	-moz-box-shadow: 5px 5px 5px #d4d4d4;
+	-webkit-box-shadow: 5px 5px 5px #d4d4d4;
+	box-shadow: 5px 5px 5px #d4d4d4;
+}
+.nagversioninfo {
+	font-size: 1em;
+	text-align: center;
+	margin: 20px 15% 30px 15%;
+}
+.nagtext {
+	font-weight: normal;
+	font-size: 1.2em;
+	text-align: center;
+	margin: 20px 15%;
+}
+.nagstability {
+	font-weight: normal;
+	font-size: 1em;
+	text-align: left;
+	margin: 10px 20%
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/assets/nosupport-32.png b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/assets/nosupport-32.png
new file mode 100644
index 00000000..a3bf2a72
Binary files /dev/null and b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/assets/nosupport-32.png differ
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/assets/ok-24.png b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/assets/ok-24.png
new file mode 100644
index 00000000..f4d97a7b
Binary files /dev/null and b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/assets/ok-24.png differ
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/assets/update-32.png b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/assets/update-32.png
new file mode 100644
index 00000000..5142dec7
Binary files /dev/null and b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/assets/update-32.png differ
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/assets/warn-24.png b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/assets/warn-24.png
new file mode 100644
index 00000000..b65a4930
Binary files /dev/null and b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/assets/warn-24.png differ
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/classes/abstractconfig.php b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/classes/abstractconfig.php
new file mode 100644
index 00000000..29597f96
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/classes/abstractconfig.php
@@ -0,0 +1,234 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ *
+ * @package LiveUpdate 2.1.5 - 2.2.1
+ * @copyright Copyright (c)2010-2012 Nicholas K. Dionysopoulos / AkeebaBackup.com
+ * @license GNU LGPLv3 or later <http://www.gnu.org/copyleft/lesser.html>
+ *
+ * @version     3.1.7 2013-08-28
+ * @since       1.2.6
+ */
+
+defined('_JEXEC') or die();
+
+/**
+ * This is the base class inherited by the config.php file in LiveUpdate's root.
+ * You may override it non-final members to customise its behaviour.
+ * @author Nicholas K. Dionysopoulos <nicholas@akeebabackup.com>
+ *
+ */
+abstract class LiveUpdateAbstractConfig extends JObject
+{
+	/** @var string The extension name, e.g. com_foobar, plg_foobar, mod_foobar, tpl_foobar etc */
+	protected $_extensionName = 'com_icagenda';
+	/** @var string The human-readable name of your extension */
+	protected $_extensionTitle = 'iCagenda - Events Management Extension for Joomla!';
+	/**
+	 * The filename of the XML manifest of your extension. Leave blank to use extensionname.xml. For example,
+	 * if the extension is com_foobar, it will look for com_foobar.xml and foobar.xml in the component's
+	 * directory.
+	 * @var string
+	 * */
+	protected $_xmlFilename = '';
+
+	/** @var string The information storage adapter to use. Can be 'file' or 'component' */
+	protected $_storageAdapter = 'file';
+	/** @var array The configuration options for the storage adapter used */
+	protected $_storageConfig = array('path' => JPATH_CACHE);
+	/**
+	 * How to determine if a new version is available. 'different' = if the version number is different,
+	 * the remote version is newer, 'vcompare' = use version compare between the two versions, 'newest' =
+	 * compare the release dates to find the newest. I suggest using 'different' on most cases.
+	 * @var string
+	 */
+	protected $_versionStrategy = 'different';
+
+	/** @var The current version of your extension. Populated automatically from the XML manifest. */
+	protected $_currentVersion = '';
+	/** @var The current release date of your extension. Populated automatically from the XML manifest. */
+	protected $_currentReleaseDate = '';
+
+	/** @var string The URL to the INI update stream of this extension */
+	protected $_updateURL = '';
+	/** @var bool Does the download URL require authorization to download the package? */
+	protected $_requiresAuthorization = false;
+
+	/** @var string The username to authorize a download on your site */
+	protected $_username = '';
+	/** @var string The password to authorize a download on your site */
+	protected $_password = '';
+	/** @var string The Download ID to authorize a download on your site; use it instead of the username/password pair */
+	protected $_downloadID = '';
+
+	/** @var string The path to a local copy of cacert.pem, required if you plan on using HTTPS URLs to fetch live udpate information or download files from */
+	protected $_cacerts = null;
+
+	/** @var string The minimum stability level to report as available update. One of alpha, beta, rc and stable. */
+	protected $_minStability = 'alpha';
+
+	/**
+	 * Singleton implementation
+	 * @return LiveUpdateConfig An instance of the Live Update configuration class
+	 */
+	public static function &getInstance()
+	{
+		static $instance = null;
+
+		if(!is_object($instance)) {
+			$instance = new LiveUpdateConfig();
+		}
+
+		return $instance;
+	}
+
+	/**
+	 * Public constructor. It populates all extension-specific fields. Override to your liking if necessary.
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->populateExtensionInfo();
+		$this->populateAuthorization();
+	}
+
+	/**
+	 * Returns the URL to the update INI stream. By default it returns the value to
+	 * the protected $_updateURL property of the class. Override with your implementation
+	 * if you want to modify its logic.
+	 */
+	public function getUpdateURL()
+	{
+		return $this->_updateURL;
+	}
+
+	/**
+	 * Override this ethod to load customized CSS and media files instead of the stock
+	 * CSS and media provided by Live Update. If you override this class it MUST return
+	 * true, otherwise LiveUpdate's CSS will be loaded after yours and will override your
+	 * settings.
+	 *
+	 * @return bool Return true to stop Live Update from loading its own CSS files.
+	 */
+	public function addMedia()
+	{
+		return false;
+	}
+
+	/**
+	 * Gets the authorization string to append to the download URL. It returns either the
+	 * download ID or username/password pair. Please override the class constructor, not
+	 * this method, if you want to fetch these values.
+	 */
+	public final function getAuthorization()
+	{
+		if(!empty($this->_downloadID)) {
+			return "dlid=".urlencode($this->_downloadID);
+		}
+		if(!empty($this->_username) && !empty($this->_password)) {
+			return "username=".urlencode($this->_username)."&password=".urlencode($this->_password);
+		}
+		return "";
+	}
+
+	public final function requiresAuthorization()
+	{
+		return $this->_requiresAuthorization;
+	}
+
+	/**
+	 * Returns all the information we have about the extension and its update preferences
+	 * @return array The extension information
+	 */
+	public final function getExtensionInformation()
+	{
+		return array(
+			'name'			=> $this->_extensionName,
+			'title'			=> $this->_extensionTitle,
+			'version'		=> $this->_currentVersion,
+			'date'			=> $this->_currentReleaseDate,
+			'updateurl'		=> $this->_updateURL,
+			'requireauth'	=> $this->_requiresAuthorization
+		);
+	}
+
+	/**
+	 * Returns the information regarding the storage adapter
+	 * @return array
+	 */
+	public final function getStorageAdapterPreferences()
+	{
+		$config = $this->_storageConfig;
+		$config['extensionName'] = $this->_extensionName;
+
+		return array(
+			'adapter'		=> $this->_storageAdapter,
+			'config'		=> $config
+		);
+	}
+
+	public final function getVersionStrategy()
+	{
+		return $this->_versionStrategy;
+	}
+
+	/**
+	 * Get the current version from the XML manifest of the extension and
+	 * populate the class' properties.
+	 */
+	private function populateExtensionInfo()
+	{
+		require_once dirname(__FILE__).'/xmlslurp.php';
+		$xmlslurp = new LiveUpdateXMLSlurp();
+		$data = $xmlslurp->getInfo($this->_extensionName, $this->_xmlFilename);
+		if(empty($this->_currentVersion)) $this->_currentVersion = $data['version'];
+		if(empty($this->_currentReleaseDate)) $this->_currentReleaseDate = $data['date'];
+	}
+
+	/**
+	 * Fetch username/password and Download ID from the component's configuration.
+	 */
+	protected function populateAuthorization()
+	{
+		if(!$this->_requiresAuthorization) return;
+
+		// Do we already have authorizaton information?
+		if( (!empty($this->_username) && !empty($this->_password)) || !empty($this->_downloadID) ) {
+			return;
+		}
+
+		if(substr($this->_extensionName,0,3) != 'com') return;
+
+		// Not using JComponentHelper to avoid conflicts ;)
+		$db = JFactory::getDbo();
+		$sql = $db->getQuery(true)
+			->select($db->qn('params'))
+			->from($db->qn('#__extensions'))
+			->where($db->qn('type').' = '.$db->q('component'))
+			->where($db->qn('element').' = '.$db->q($this->_extensionName));
+		$db->setQuery($sql);
+		$rawparams = $db->loadResult();
+		$params = new JRegistry();
+		$params->loadString($rawparams, 'JSON');
+
+		$this->_username	= $params->get('username','');
+		$this->_password	= $params->get('password','');
+		$this->_downloadID	= $params->get('downloadid','');
+	}
+
+	public function applyCACert(&$ch)
+	{
+		if(!empty($this->_cacerts)) {
+			if(file_exists($this->_cacerts)) {
+				@curl_setopt($ch, CURLOPT_CAINFO, $this->_cacerts);
+			}
+		}
+	}
+
+	public function getMinimumStability()
+	{
+		return $this->_minStability;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/classes/controller.php b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/classes/controller.php
new file mode 100644
index 00000000..98fe674c
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/classes/controller.php
@@ -0,0 +1,274 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ *
+ * @package LiveUpdate 2.1.5 - 2.2.1
+ * @copyright Copyright (c)2010-2013 Nicholas K. Dionysopoulos / AkeebaBackup.com
+ * @license GNU LGPLv3 or later <http://www.gnu.org/copyleft/lesser.html>
+ *
+ * @version     3.1.7 2013-08-28
+ * @since       1.2.6
+ */
+
+defined('_JEXEC') or die();
+
+JLoader::import('joomla.application.component.controller');
+
+if(!class_exists('JoomlaCompatController')) {
+	if(interface_exists('JController')) {
+		abstract class JoomlaCompatController extends JControllerLegacy {}
+	} else {
+		class JoomlaCompatController extends JController {}
+	}
+}
+
+/**
+ * The Live Update MVC controller
+ */
+class LiveUpdateController extends JoomlaCompatController
+{
+	/**
+	 * Object contructor
+	 * @param array $config
+	 *
+	 * @return LiveUpdateController
+	 */
+	public function __construct($config = array())
+	{
+		parent::__construct();
+
+		$this->registerDefaultTask('overview');
+	}
+
+	/**
+	 * Runs the overview page task
+	 */
+	public function overview()
+	{
+		$this->display();
+	}
+
+	/**
+	 * Starts the update procedure. If the FTP credentials are required, it asks for them.
+	 */
+	public function startupdate()
+	{
+		$updateInfo = LiveUpdate::getUpdateInformation();
+		if($updateInfo->stability != 'stable') {
+			$skipNag = JRequest::getBool('skipnag', false);
+			if(!$skipNag) {
+				$this->setRedirect('index.php?option='.JRequest::getCmd('option','').'&view='.JRequest::getCmd('view','liveupdate').'&task=nagscreen');
+				$this->redirect();
+			}
+		}
+
+		$ftp = $this->setCredentialsFromRequest('ftp');
+		if($ftp === true) {
+			// The user needs to supply the FTP credentials
+			$this->display();
+		} else {
+			// No FTP credentials required; proceed with the download
+			$this->setRedirect('index.php?option='.JRequest::getCmd('option','').'&view='.JRequest::getCmd('view','liveupdate').'&task=download');
+			$this->redirect();
+		}
+	}
+
+	/**
+	 * Download the update package
+	 */
+	public function download()
+	{
+		$ftp = $this->setCredentialsFromRequest('ftp');
+		$model = $this->getThisModel();
+		$result = $model->download();
+		if(!$result) {
+			// Download failed
+			$msg = JText::_('LIVEUPDATE_DOWNLOAD_FAILED');
+			$this->setRedirect('index.php?option='.JRequest::getCmd('option','').'&view='.JRequest::getCmd('view','liveupdate').'&task=overview', $msg, 'error');
+		} else {
+			// Download successful. Let's extract the package.
+			$url = 'index.php?option='.JRequest::getCmd('option','').'&view='.JRequest::getCmd('view','liveupdate').'&task=extract';
+			$user = JRequest::getString('username', null, 'GET', JREQUEST_ALLOWRAW);
+			$pass = JRequest::getString('password', null, 'GET', JREQUEST_ALLOWRAW);
+			if($user) {
+				$url .= '&username='.urlencode($user).'&password='.urlencode($pass);
+			}
+			$this->setRedirect($url);
+		}
+		$this->redirect();
+	}
+
+	public function extract()
+	{
+		$ftp = $this->setCredentialsFromRequest('ftp');
+		$model = $this->getThisModel();
+		$result = $model->extract();
+		if(!$result) {
+			// Download failed
+			$msg = JText::_('LIVEUPDATE_EXTRACT_FAILED');
+			$this->setRedirect('index.php?option='.JRequest::getCmd('option','').'&view='.JRequest::getCmd('view','liveupdate').'&task=overview', $msg, 'error');
+		} else {
+			// Extract successful. Let's install the package.
+			$url = 'index.php?option='.JRequest::getCmd('option','').'&view='.JRequest::getCmd('view','liveupdate').'&task=install';
+			$user = JRequest::getString('username', null, 'GET', JREQUEST_ALLOWRAW);
+			$pass = JRequest::getString('password', null, 'GET', JREQUEST_ALLOWRAW);
+			if($user) {
+				$url .= '&username='.urlencode($user).'&password='.urlencode($pass);
+			}
+
+			// Do we have SRP installed yet?
+			$app = JFactory::getApplication();
+			$jResponse = $app->triggerEvent('onSRPEnabled');
+			$status = false;
+			if(!empty($jResponse)) {
+				$status = false;
+				foreach($jResponse as $response)
+				{
+					$status = $status || $response;
+				}
+			}
+
+			// SRP enabled, use it
+			if($status) {
+				$return = $url;
+				$url = $model->getSRPURL($return);
+				if(!$url) {
+					$url = $return;
+				}
+			}
+
+			$this->setRedirect($url);
+		}
+		$this->redirect();
+	}
+
+	public function install()
+	{
+		$ftp = $this->setCredentialsFromRequest('ftp');
+		$model = $this->getThisModel();
+		$result = $model->install();
+		if(!$result) {
+			// Installation failed
+			$model->cleanup();
+			$this->setRedirect('index.php?option='.JRequest::getCmd('option','').'&view='.JRequest::getCmd('view','liveupdate').'&task=overview');
+			$this->redirect();
+		} else {
+			// Installation successful. Show the installation message.
+			$cache = JFactory::getCache('mod_menu');
+			$cache->clean();
+
+			$this->display();
+		}
+	}
+
+	public function cleanup()
+	{
+		// Perform the cleanup
+		$ftp = $this->setCredentialsFromRequest('ftp');
+		$model = $this->getThisModel();
+		$model->cleanup();
+
+		// Force reload update information
+		$dummy = LiveUpdate::getUpdateInformation(true);
+
+		die('OK');
+	}
+
+	/**
+	 * Displays the current view
+	 * @param bool $cachable Ignored!
+	 */
+	public final function display($cachable = false, $urlparams = false)
+	{
+		$viewLayout	= JRequest::getCmd( 'layout', 'default' );
+
+		$view = $this->getThisView();
+
+		// Get/Create the model
+		$model = $this->getThisModel();
+		$view->setModel($model, true);
+
+		// Assign the FTP credentials from the request, or return TRUE if they are required
+		JLoader::import('joomla.client.helper');
+		$ftp	= $this->setCredentialsFromRequest('ftp');
+		$view->assignRef('ftp', $ftp);
+
+		// Set the layout
+		$view->setLayout($viewLayout);
+
+		// Display the view
+		$view->display();
+	}
+
+	public final function getThisView()
+	{
+		static $view = null;
+
+		if(is_null($view))
+		{
+			$basePath = $this->basePath;
+			$tPath = dirname(__FILE__).'/tmpl';
+
+			require_once('view.php');
+			$view = new LiveUpdateView(array('base_path'=>$basePath, 'template_path'=>$tPath));
+		}
+
+		return $view;
+	}
+
+	public final function getThisModel()
+	{
+		static $model = null;
+
+		if(is_null($model))
+		{
+			require_once('model.php');
+			$model = new LiveUpdateModel();
+			$task = $this->task;
+
+			$model->setState( 'task', $task );
+
+			$app	= JFactory::getApplication();
+			$menu	= $app->getMenu();
+			if (is_object( $menu ))
+			{
+				$item = $menu->getActive();
+				if ($item)
+				{
+					$params	= $menu->getParams($item->id);
+					// Set Default State Data
+					$model->setState( 'parameters.menu', $params );
+				}
+			}
+
+		}
+
+		return $model;
+	}
+
+	private function setCredentialsFromRequest($client)
+	{
+		// Determine wether FTP credentials have been passed along with the current request
+		JLoader::import('joomla.client.helper');
+		$user = JRequest::getString('username', null, 'GET', JREQUEST_ALLOWRAW);
+		$pass = JRequest::getString('password', null, 'GET', JREQUEST_ALLOWRAW);
+		if ($user != '' && $pass != '')
+		{
+			// Add credentials to the session
+			if (JClientHelper::setCredentials($client, $user, $pass)) {
+				$return = false;
+			} else {
+				$return = JError::raiseWarning('SOME_ERROR_CODE', 'JClientHelper::setCredentialsFromRequest failed');
+			}
+		}
+		else
+		{
+			// Just determine if the FTP input fields need to be shown
+			$return = !JClientHelper::hasCredentials('ftp');
+		}
+
+		return $return;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/classes/download.php b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/classes/download.php
new file mode 100644
index 00000000..8e571bf4
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/classes/download.php
@@ -0,0 +1,443 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ *
+ * @package LiveUpdate 2.1.5 - 2.2.1
+ * @copyright  Copyright (c)2010-2013 Nicholas K. Dionysopoulos / AkeebaBackup.com
+ * @license    GNU LGPLv3 or later <http://www.gnu.org/copyleft/lesser.html>
+ *
+ * @version     3.1.7 2013-08-28
+ * @since       1.2.6
+ */
+
+defined('_JEXEC') or die();
+
+/**
+ * Allows downloading packages over the web to your server
+ */
+class LiveUpdateDownloadHelper
+{
+	/**
+	 * Downloads from a URL and saves the result as a local file
+	 *
+	 * @param   string  $url     The URL to fetch
+	 * @param   string  $target  Where to save the file
+	 *
+	 * @return  boolean  True on success
+	 */
+	public static function download($url, $target)
+	{
+		// Import Joomla! libraries
+		JLoader::import('joomla.filesystem.file');
+
+		/** @var bool Did we try to force permissions? */
+		$hackPermissions = false;
+
+		// Make sure the target does not exist
+		if (JFile::exists($target))
+		{
+			if (!@unlink($target))
+			{
+				JFile::delete($target);
+			}
+		}
+
+		// Try to open the output file for writing
+		$fp = @fopen($target, 'wb');
+
+		if ($fp === false)
+		{
+			// The file can not be opened for writing. Let's try a hack.
+			$empty = '';
+			if (JFile::write($target, $empty))
+			{
+				if (self::chmod($target, 511))
+				{
+					$fp				 = @fopen($target, 'wb');
+					$hackPermissions = true;
+				}
+			}
+		}
+
+		$result = false;
+
+		if ($fp !== false)
+		{
+			// First try to download directly to file if $fp !== false
+			$adapters	 = self::getAdapters();
+			$result		 = false;
+
+			while (!empty($adapters) && ($result === false))
+			{
+				// Run the current download method
+				$method	 = 'get' . strtoupper(array_shift($adapters));
+				$result	 = self::$method($url, $fp);
+
+				// Check if we have a download
+				if ($result === true)
+				{
+					// The download is complete, close the file pointer
+					@fclose($fp);
+
+					// If the filesize is not at least 1 byte, we consider it failed.
+					clearstatcache();
+					$filesize = @filesize($target);
+
+					if ($filesize <= 0)
+					{
+						$result	 = false;
+						$fp		 = @fopen($target, 'wb');
+					}
+				}
+			}
+
+			// If we have no download, close the file pointer
+			if ($result === false)
+			{
+				@fclose($fp);
+			}
+		}
+
+		if ($result === false)
+		{
+			// Delete the target file if it exists
+			if (file_exists($target))
+			{
+				if (!@unlink($target))
+				{
+					JFile::delete($target);
+				}
+			}
+			// Download and write using JFile::write();
+			$result = JFile::write($target, self::downloadAndReturn($url));
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Downloads from a URL and returns the result as a string
+	 *
+	 * @param   string  $url  The URL to download from
+	 *
+	 * @return  mixed  Result string on success, false on failure
+	 */
+	public static function downloadAndReturn($url)
+	{
+		$adapters	 = self::getAdapters();
+		$result		 = false;
+
+		while (!empty($adapters) && ($result === false))
+		{
+			// Run the current download method
+			$method	 = 'get' . strtoupper(array_shift($adapters));
+			$result	 = self::$method($url, null);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Does the server support PHP's cURL extension?
+	 *
+	 * @return   boolean  True if it is supported
+	 */
+	private static function hasCURL()
+	{
+		static $result = null;
+
+		if (is_null($result))
+		{
+			$result = function_exists('curl_init');
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Downloads the contents of a URL and writes them to disk (if $fp is not null)
+	 * or returns them as a string (if $fp is null) using cURL
+	 *
+	 * @param   string    $url  The URL to download from
+	 * @param   resource  $fp   The file pointer to download to. Omit to return the contents.
+	 *
+	 * @return  boolean|string  False on failure, true on success ($fp not null) or the URL contents (if $fp is null)
+	 */
+	private static function &getCURL($url, $fp = null, $nofollow = false)
+	{
+		$result = false;
+
+		$ch		 = curl_init($url);
+		$config	 = new LiveUpdateConfig();
+		$config->applyCACert($ch);
+
+		if (!@curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1) && !$nofollow)
+		{
+			// Safe Mode is enabled. We have to fetch the headers and
+			// parse any redirections present in there.
+			curl_setopt($ch, CURLOPT_AUTOREFERER, true);
+			curl_setopt($ch, CURLOPT_FAILONERROR, true);
+			curl_setopt($ch, CURLOPT_HEADER, true);
+			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+			curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+			curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10);
+			curl_setopt($ch, CURLOPT_TIMEOUT, 30);
+
+			// Get the headers
+			$data = curl_exec($ch);
+			curl_close($ch);
+
+			// Init
+			$newURL = $url;
+
+			// Parse the headers
+			$lines = explode("\n", $data);
+
+			foreach ($lines as $line)
+			{
+				if (substr($line, 0, 9) == "Location:")
+				{
+					$newURL = trim(substr($line, 9));
+				}
+			}
+
+			// Download from the new URL
+			if ($url != $newURL)
+			{
+				return self::getCURL($newURL, $fp);
+			}
+			else
+			{
+				return self::getCURL($newURL, $fp, true);
+			}
+		}
+		else
+		{
+			@curl_setopt($ch, CURLOPT_MAXREDIRS, 20);
+		}
+
+		curl_setopt($ch, CURLOPT_AUTOREFERER, true);
+		curl_setopt($ch, CURLOPT_FAILONERROR, true);
+		curl_setopt($ch, CURLOPT_HEADER, false);
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+		curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10);
+		curl_setopt($ch, CURLOPT_TIMEOUT, 30);
+		// Pretend we are IE7, so that webservers play nice with us
+		curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; .NET CLR 1.0.3705; .NET CLR 1.1.4322; Media Center PC 4.0)');
+
+		if (is_resource($fp))
+		{
+			curl_setopt($ch, CURLOPT_FILE, $fp);
+		}
+
+		$result = curl_exec($ch);
+		curl_close($ch);
+
+		return $result;
+	}
+
+	/**
+	 * Does the server support URL fopen() wrappers?
+	 *
+	 * @return  boolean
+	 */
+	private static function hasFOPEN()
+	{
+		static $result = null;
+
+		if (is_null($result))
+		{
+			// If we are not allowed to use ini_get, we assume that URL fopen is
+			// disabled.
+			if (!function_exists('ini_get'))
+			{
+				$result = false;
+			}
+			else
+			{
+				$result = ini_get('allow_url_fopen');
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Downloads the contents of a URL and writes them to disk (if $fp is not null)
+	 * or returns them as a string (if $fp is null) using fopen() URL wrappers
+	 *
+	 * @param   string    $url  The URL to download from
+	 * @param   resource  $fp   The file pointer to download to. Omit to return the contents.
+	 *
+	 * @return  boolean|string  False on failure, true on success ($fp not null) or the URL contents (if $fp is null)
+	 */
+	private static function &getFOPEN($url, $fp = null)
+	{
+		$result = false;
+
+		// Track errors
+		if (function_exists('ini_set'))
+		{
+			$track_errors = ini_set('track_errors', true);
+		}
+
+		// Open the URL for reading
+		if (function_exists('stream_context_create'))
+		{
+			// PHP 5+ way (best)
+			$httpopts	 = array(
+				'user_agent' => 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; .NET CLR 1.0.3705; .NET CLR 1.1.4322; Media Center PC 4.0)',
+				'timeout'	 => 10.0,
+			);
+			$context	 = stream_context_create(array('http' => $httpopts));
+			$ih			 = @fopen($url, 'r', false, $context);
+		}
+		else
+		{
+			// PHP 4 way (actually, it's just a fallback as we can't run this code in PHP4)
+			if (function_exists('ini_set'))
+			{
+				ini_set('user_agent', 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; .NET CLR 1.0.3705; .NET CLR 1.1.4322; Media Center PC 4.0)');
+			}
+			$ih = @fopen($url, 'r');
+		}
+
+		// If fopen() fails, abort
+		if (!is_resource($ih))
+		{
+			return $result;
+		}
+
+		// Try to download
+		$bytes	 = 0;
+		$result	 = true;
+		$return	 = '';
+		while (!feof($ih) && $result)
+		{
+			$contents = fread($ih, 4096);
+			if ($contents === false)
+			{
+				@fclose($ih);
+				$result = false;
+				return $result;
+			}
+			else
+			{
+				$bytes += strlen($contents);
+				if (is_resource($fp))
+				{
+					$result = @fwrite($fp, $contents);
+				}
+				else
+				{
+					$return .= $contents;
+					unset($contents);
+				}
+			}
+		}
+
+		@fclose($ih);
+
+		if (is_resource($fp))
+		{
+			return $result;
+		}
+		elseif ($result === true)
+		{
+			return $return;
+		}
+		else
+		{
+			return $result;
+		}
+	}
+
+	/**
+	 * Detect and return available download methods
+	 *
+	 * @return  array
+	 */
+	private static function getAdapters()
+	{
+		// Detect available adapters
+		$adapters	 = array();
+		if (self::hasCURL())
+			$adapters[]	 = 'curl';
+		if (self::hasFOPEN())
+			$adapters[]	 = 'fopen';
+		return $adapters;
+	}
+
+	/**
+	 * Change the permissions of a file, optionally using FTP
+	 *
+	 * @param   string  $file  Absolute path to file
+	 * @param   int     $mode  Permissions, e.g. 0755
+	 *
+	 * @return  boolean  Ture if successful
+	 */
+	private static function chmod($path, $mode)
+	{
+		if (is_string($mode))
+		{
+			$mode	 = octdec($mode);
+			if (($mode < 0600) || ($mode > 0777))
+				$mode	 = 0755;
+		}
+
+		// Initialize variables
+		JLoader::import('joomla.client.helper');
+		$ftpOptions = JClientHelper::getCredentials('ftp');
+
+		// Check to make sure the path valid and clean
+		$path = JPath::clean($path);
+
+		if ($ftpOptions['enabled'] == 1)
+		{
+			// Connect the FTP client
+			JLoader::import('joomla.client.ftp');
+			if (version_compare(JVERSION, '3.0', 'ge'))
+			{
+				$ftp = JClientFTP::getInstance(
+						$ftpOptions['host'], $ftpOptions['port'], array(), $ftpOptions['user'], $ftpOptions['pass']
+				);
+			}
+			else
+			{
+				if (version_compare(JVERSION, '3.0', 'ge'))
+				{
+					$ftp = JClientFTP::getInstance(
+							$ftpOptions['host'], $ftpOptions['port'], array(), $ftpOptions['user'], $ftpOptions['pass']
+					);
+				}
+				else
+				{
+					$ftp = JFTP::getInstance(
+							$ftpOptions['host'], $ftpOptions['port'], array(), $ftpOptions['user'], $ftpOptions['pass']
+					);
+				}
+			}
+		}
+
+		if (@chmod($path, $mode))
+		{
+			$ret = true;
+		}
+		elseif ($ftpOptions['enabled'] == 1)
+		{
+			// Translate path and delete
+			JLoader::import('joomla.client.ftp');
+			$path	 = JPath::clean(str_replace(JPATH_ROOT, $ftpOptions['root'], $path), '/');
+			// FTP connector throws an error
+			$ret	 = $ftp->chmod($path, $mode);
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/classes/inihelper.php b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/classes/inihelper.php
new file mode 100644
index 00000000..54354327
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/classes/inihelper.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ *
+ * @package LiveUpdate 2.1.5 - 2.2.1
+ * @copyright Copyright (c)2010-2013 Nicholas K. Dionysopoulos / AkeebaBackup.com
+ * @license GNU LGPLv3 or later <http://www.gnu.org/copyleft/lesser.html>
+ *
+ * @version     3.1.7 2013-08-28
+ * @since       1.2.6
+ */
+
+defined('_JEXEC') or die();
+
+/**
+ * A smart INI file parser with reproducible behaviour among different PHP versions
+ */
+class LiveUpdateINIHelper
+{
+	/**
+	 * Parse an INI file and return an associative array. Since PHP versions before
+	 * 5.1 are bitches with regards to INI parsing, I use a PHP-only solution to
+	 * overcome this obstacle.
+	 * @param	string	$file	The file to process
+	 * @param	bool	$process_sections	True to also process INI sections
+	 * @return	array	An associative array of sections, keys and values
+	 */
+	public static function parse_ini_file( $file, $process_sections, $rawdata = false )
+	{
+		if($rawdata)
+		{
+			return self::parse_ini_file_php($file, $process_sections, $rawdata);
+		}
+		else
+		{
+			if( version_compare(PHP_VERSION, '5.1.0', '>=') && (!$rawdata) )
+			{
+				if( function_exists('parse_ini_file') )
+				{
+					return parse_ini_file($file, $process_sections);
+				}
+				else
+				{
+					return self::parse_ini_file_php($file, $process_sections);
+				}
+			} else {
+				return self::parse_ini_file_php($file, $process_sections, $rawdata);
+			}
+		}
+	}
+
+	/**
+	 * A PHP based INI file parser.
+	 * Thanks to asohn ~at~ aircanopy ~dot~ net for posting this handy function on
+	 * the parse_ini_file page on http://gr.php.net/parse_ini_file
+	 * @param	string	$file	Filename to process
+	 * @param	bool	$process_sections	True to also process INI sections
+	 * @param	bool	$rawdata	If true, the $file contains raw INI data, not a filename
+	 * @return	array	An associative array of sections, keys and values
+	 */
+	static function parse_ini_file_php($file, $process_sections = false, $rawdata = false)
+	{
+		$process_sections = ($process_sections !== true) ? false : true;
+
+		if(!$rawdata)
+		{
+			$ini = file($file);
+		}
+		else
+		{
+			$file = str_replace("\r","",$file);
+			$ini = explode("\n", $file);
+		}
+
+		if (count($ini) == 0) {return array();}
+
+		$sections = array();
+		$values = array();
+		$result = array();
+		$globals = array();
+		$i = 0;
+		foreach ($ini as $line) {
+			$line = trim($line);
+			$line = str_replace("\t", " ", $line);
+
+			// Comments
+			if (!preg_match('/^[a-zA-Z0-9[]/', $line)) {continue;}
+
+			// Sections
+			if ($line{0} == '[') {
+				$tmp = explode(']', $line);
+				$sections[] = trim(substr($tmp[0], 1));
+				$i++;
+				continue;
+			}
+
+			// Key-value pair
+			list($key, $value) = explode('=', $line, 2);
+			$key = trim($key);
+			$value = trim($value);
+			if (strstr($value, ";")) {
+				$tmp = explode(';', $value);
+				if (count($tmp) == 2) {
+					if ((($value{0} != '"') && ($value{0} != "'")) ||
+					preg_match('/^".*"\s*;/', $value) || preg_match('/^".*;[^"]*$/', $value) ||
+					preg_match("/^'.*'\\s*;/", $value) || preg_match("/^'.*;[^']*$/", $value) ){
+						$value = $tmp[0];
+					}
+				} else {
+					if ($value{0} == '"') {
+						$value = preg_replace('/^"(.*)".*/', '$1', $value);
+					} elseif ($value{0} == "'") {
+						$value = preg_replace("/^'(.*)'.*/", '$1', $value);
+					} else {
+						$value = $tmp[0];
+					}
+				}
+			}
+			$value = trim($value);
+			$value = trim($value, "'\"");
+
+			if ($i == 0) {
+				if (substr($line, -1, 2) == '[]') {
+					$globals[$key][] = $value;
+				} else {
+					$globals[$key] = $value;
+				}
+			} else {
+				if (substr($line, -1, 2) == '[]') {
+					$values[$i-1][$key][] = $value;
+				} else {
+					$values[$i-1][$key] = $value;
+				}
+			}
+		}
+
+		for($j = 0; $j < $i; $j++) {
+			if ($process_sections === true) {
+				if( isset($sections[$j]) && isset($values[$j]) )	$result[$sections[$j]] = $values[$j];
+			} else {
+				if( isset($values[$j]) ) $result[] = $values[$j];
+			}
+		}
+
+		return $result + $globals;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/classes/model.php b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/classes/model.php
new file mode 100644
index 00000000..fc76ef57
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/classes/model.php
@@ -0,0 +1,186 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ *
+ * @package LiveUpdate 2.1.5 - 2.2.1
+ * @copyright Copyright (c)2010-2013 Nicholas K. Dionysopoulos / AkeebaBackup.com
+ * @license GNU LGPLv3 or later <http://www.gnu.org/copyleft/lesser.html>
+ *
+ * @version     3.1.7 2013-08-28
+ * @since       1.2.6
+ */
+/**
+ * Specific error message update - iCagenda
+ */
+
+defined('_JEXEC') or die();
+
+JLoader::import('joomla.application.component.model');
+
+if(!class_exists('JoomlaCompatModel')) {
+	if(interface_exists('JModel')) {
+		abstract class JoomlaCompatModel extends JModelLegacy {}
+	} else {
+		class JoomlaCompatModel extends JModel {}
+	}
+}
+
+/**
+ * The Live Update MVC model
+ */
+class LiveUpdateModel extends JoomlaCompatModel
+{
+	public function download()
+	{
+		// Get the path to Joomla!'s temporary directory
+		$jreg = JFactory::getConfig();
+		$tmpdir = $jreg->get('tmp_path');
+
+		JLoader::import('joomla.filesystem.folder');
+		// Make sure the user doesn't use the system-wide tmp directory. You know, the one that's
+		// being erased periodically and will cause a real mess while installing extensions (Grrr!)
+		if(realpath($tmpdir) == '/tmp') {
+			// Someone inform the user that what he's doing is insecure and stupid, please. In the
+			// meantime, I will fix what is broken.
+			$tmpdir = JPATH_SITE.'/tmp';
+		} // Make sure that folder exists (users do stupid things too often; you'd be surprised)
+		elseif(!JFolder::exists($tmpdir)) {
+			// Darn it, user! WTF where you thinking? OK, let's use a directory I know it's there...
+			$tmpdir = JPATH_SITE.'/tmp';
+		}
+
+		// Oki. Let's get the URL of the package
+		$updateInfo = LiveUpdate::getUpdateInformation();
+		$config = LiveUpdateConfig::getInstance();
+		$auth = $config->getAuthorization();
+		$url = $updateInfo->downloadURL;
+
+		// Sniff the package type. If sniffing is impossible, I'll assume a ZIP package
+		$basename = basename($url);
+		if(strstr($basename,'?')) {
+			$basename = substr($basename, strstr($basename,'?')+1);
+		}
+		if(substr($basename,-4) == '.zip') {
+			$type = 'zip';
+		} elseif(substr($basename,-4) == '.tar') {
+			$type = 'tar';
+		} elseif(substr($basename,-4) == '.tgz') {
+			$type = 'tar.gz';
+		} elseif(substr($basename,-7) == '.tar.gz') {
+			$type = 'tar.gz';
+		} else {
+			$type = 'zip';
+		}
+
+		// Cache the path to the package file and the temp installation directory in the session
+		$target = $tmpdir.'/'.$updateInfo->extInfo->name.'.update.'.$type;
+		$tempdir = $tmpdir.'/'.$updateInfo->extInfo->name.'_update';
+
+		$session = JFactory::getSession();
+		$session->set('target', $target, 'liveupdate');
+		$session->set('tempdir', $tempdir, 'liveupdate');
+
+		// Let's download!
+		require_once dirname(__FILE__).'/download.php';
+		return LiveUpdateDownloadHelper::download($url, $target);
+	}
+
+	public function extract()
+	{
+		$session = JFactory::getSession();
+		$target = $session->get('target', '', 'liveupdate');
+		$tempdir = $session->get('tempdir', '', 'liveupdate');
+
+		JLoader::import('joomla.filesystem.archive');
+		return JArchive::extract( $target, $tempdir);
+	}
+
+	public function install()
+	{
+		$session = JFactory::getSession();
+		$tempdir = $session->get('tempdir', '', 'liveupdate');
+
+		JLoader::import('joomla.installer.installer');
+		JLoader::import('joomla.installer.helper');
+		$installer = JInstaller::getInstance();
+		$packageType = JInstallerHelper::detectType($tempdir);
+
+		if(!$packageType) {
+			$msg = JText::_('LIVEUPDATE_INVALID_PACKAGE_TYPE');
+			$result = false;
+		} elseif (!$installer->install($tempdir)) {
+			// There was an error installing the package
+//			$msg = JText::sprintf('LIVEUPDATE_INSTALLEXT', JText::_($packageType), JText::_('LIVEUPDATE_Error'));
+			$msg = JText::sprintf('LIVEUPDATE_INSTALL_ERROR', JText::_('LIVEUPDATE_INSTALL_TYPE_'.strtoupper($packageType)));
+			$result = false;
+		} else {
+			// Package installed sucessfully
+//			$msg = JText::sprintf('LIVEUPDATE_INSTALLEXT', JText::_($packageType), JText::_('LIVEUPDATE_Success'));
+			$msg = JText::sprintf('LIVEUPDATE_INSTALL_SUCCESS', JText::_('LIVEUPDATE_INSTALL_TYPE_'.strtoupper($packageType)));
+			$result = true;
+		}
+
+		$app = JFactory::getApplication();
+		$app->enqueueMessage($msg);
+		$this->setState('result', $result);
+		$this->setState('packageType', $packageType);
+		if($packageType) {
+			$this->setState('name', $installer->get('name'));
+			$this->setState('message', $installer->message);
+			$this->setState('extmessage', $installer->get('extension_message'));
+		}
+
+		return $result;
+	}
+
+	public function cleanup()
+	{
+		$session = JFactory::getSession();
+		$target = $session->get('target', '', 'liveupdate');
+		$tempdir = $session->get('tempdir', '', 'liveupdate');
+
+		JLoader::import('joomla.installer.helper');
+		JInstallerHelper::cleanupInstall($target, $tempdir);
+
+		$session->clear('target','liveupdate');
+		$session->clear('tempdir','liveupdate');
+	}
+
+	public function getSRPURL($return = '')
+	{
+		$session = JFactory::getSession();
+		$tempdir = $session->get('tempdir', '', 'liveupdate');
+
+		JLoader::import('joomla.installer.installer');
+		JLoader::import('joomla.installer.helper');
+		JLoader::import('joomla.filesystem.file');
+
+		$instModelFile = JPATH_ADMINISTRATOR.'/components/com_akeeba/models/installer.php';
+		if(!JFile::exists($instModelFile)) {
+			$instModelFile = JPATH_ADMINISTRATOR.'/components/com_akeeba/plugins/models/installer.php';
+		};
+		if(!JFile::exists($instModelFile)) return false;
+
+		require_once $instModelFile;
+		$model	= JoomlaCompatModel::getInstance('Installer', 'AkeebaModel');
+		$packageType = JInstallerHelper::detectType($tempdir);
+		$name = $model->getExtensionName($tempdir);
+
+		$url = 'index.php?option=com_akeeba&view=backup&tag=restorepoint&type='.$packageType.'&name='.urlencode($name['name']);
+		switch($packageType) {
+			case 'module':
+			case 'template':
+				$url .= '&group='.$name['client'];
+				break;
+			case 'plugin':
+				$url .= '&group='.$name['group'];
+				break;
+		}
+
+		if(!empty($return)) $url .= '&returnurl='.urlencode($return);
+
+		return $url;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/classes/storage/component.php b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/classes/storage/component.php
new file mode 100644
index 00000000..92fc3dde
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/classes/storage/component.php
@@ -0,0 +1,110 @@
+<?php
+
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ *
+ * @package LiveUpdate 2.1.5 - 2.2.1
+ * @copyright Copyright (c)2010-2013 Nicholas K. Dionysopoulos / AkeebaBackup.com
+ * @license GNU LGPLv3 or later <http://www.gnu.org/copyleft/lesser.html>
+ *
+ * @version     3.1.7 2013-08-28
+ * @since       1.2.6
+ */
+defined('_JEXEC') or die();
+
+/**
+ * Live Update Component Storage Class
+ * Allows to store the update data to a component's parameters. This is the most reliable method.
+ * Its configuration options are:
+ * component	string	The name of the component which will store our data. If not specified the extension name will be used.
+ * key			string	The name of the component parameter where the serialized data will be stored. If not specified "liveupdate" will be used.
+ */
+class LiveUpdateStorageComponent extends LiveUpdateStorage
+{
+	private $component = null;
+
+	private $key = null;
+
+	public function __construct()
+	{
+		$this->keyPrefix = '';
+	}
+
+	public function load($config)
+	{
+		if (!array_key_exists('component', $config))
+		{
+			$this->component = $config['extensionName'];
+		}
+		else
+		{
+			$this->component = $config['component'];
+		}
+
+		if (!array_key_exists('key', $config))
+		{
+			$this->key = 'liveupdate';
+		}
+		else
+		{
+			$this->key = $config['key'];
+		}
+
+		// Not using JComponentHelper to avoid conflicts ;)
+		$db			 = JFactory::getDbo();
+		$sql		 = $db->getQuery(true)
+			->select($db->qn('params'))
+			->from($db->qn('#__extensions'))
+			->where($db->qn('type') . ' = ' . $db->q('component'))
+			->where($db->qn('element') . ' = ' . $db->q($this->component));
+		$db->setQuery($sql);
+		$rawparams	 = $db->loadResult();
+		$params		 = new JRegistry();
+		$params->loadString($rawparams, 'JSON');
+
+		$data = $params->get($this->key, '');
+
+		JLoader::import('joomla.registry.registry');
+		$this->registry = new JRegistry('update');
+
+		$this->registry->loadString($data, 'INI');
+	}
+
+	public function save()
+	{
+		$data = $this->registry->toString('INI');
+
+		$db = JFactory::getDBO();
+
+		// An interesting discovery: if your component is manually updating its
+		// component parameters before Live Update is called, then calling Live
+		// Update will reset the modified component parameters because
+		// JComponentHelper::getComponent() returns the old, cached version of
+		// them. So, we have to forget the following code and shoot ourselves in
+		// the feet. Dammit!!!
+		$sql = $db->getQuery(true)
+			->select($db->qn('params'))
+			->from($db->qn('#__extensions'))
+			->where($db->qn('type') . ' = ' . $db->q('component'))
+			->where($db->qn('element') . ' = ' . $db->q($this->component));
+		$db->setQuery($sql);
+		$rawparams	 = $db->loadResult();
+		$params		 = new JRegistry();
+		$params->loadString($rawparams, 'JSON');
+
+		$params->set($this->key, $data);
+
+		$data	 = $params->toString('JSON');
+		$sql	 = $db->getQuery(true)
+			->update($db->qn('#__extensions'))
+			->set($db->qn('params') . ' = ' . $db->q($data))
+			->where($db->qn('type') . ' = ' . $db->q('component'))
+			->where($db->qn('element') . ' = ' . $db->q($this->component));
+
+		$db->setQuery($sql);
+		$db->execute();
+	}
+
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/classes/storage/file.php b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/classes/storage/file.php
new file mode 100644
index 00000000..cc2afe12
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/classes/storage/file.php
@@ -0,0 +1,87 @@
+<?php
+
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ *
+ * @package LiveUpdate 2.1.5 - 2.2.1
+ * @copyright Copyright (c)2010-2013 Nicholas K. Dionysopoulos / AkeebaBackup.com
+ * @license GNU LGPLv3 or later <http://www.gnu.org/copyleft/lesser.html>
+ *
+ * @version     3.1.7 2013-08-28
+ * @since       1.2.6
+ */
+defined('_JEXEC') or die();
+
+/**
+ * Live Update File Storage Class
+ * Allows to store the update data to files on disk. Its configuration options are:
+ * path			string	The absolute path to the directory where the update data will be stored as INI files
+ *
+ */
+class LiveUpdateStorageFile extends LiveUpdateStorage
+{
+	private $filename = null;
+	private $extname = null;
+
+	public function __construct()
+	{
+	}
+
+	public function load($config)
+	{
+		JLoader::import('joomla.registry.registry');
+		JLoader::import('joomla.filesystem.file');
+
+		if (array_key_exists('path', $config))
+		{
+			$path	= $config['path'];
+		}
+		else
+		{
+			$path	= JPATH_CACHE;
+		}
+		$extname	= $config['extensionName'];
+		$filename	= "$path/$extname.updates.php";
+
+		// Kill old files
+		$filenameKill = "$path/$extname.updates.ini";
+		if (JFile::exists($filenameKill))
+		{
+			JFile::delete($filenameKill);
+		}
+
+		$this->filename	 = $filename;
+		$this->extname	 = $extname;
+
+		$this->registry = new JRegistry('update');
+
+		if (JFile::exists($this->filename))
+		{
+			// Workaround for broken JRegistryFormatPHP API...
+			@include_once $this->filename;
+
+			$className = 'LiveUpdate' . ucwords($extname) . 'Cache';
+
+			if (class_exists($className))
+			{
+				$object = new $className;
+				$this->registry->loadObject($object);
+			}
+		}
+	}
+
+	public function save()
+	{
+		JLoader::import('joomla.registry.registry');
+		JLoader::import('joomla.filesystem.file');
+
+		$options = array(
+			'class' => 'LiveUpdate' . ucwords($this->extname) . 'Cache'
+		);
+		$data	 = $this->registry->toString('PHP', $options);
+		JFile::write($this->filename, $data);
+	}
+
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/classes/storage/storage.php b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/classes/storage/storage.php
new file mode 100644
index 00000000..41d2d308
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/classes/storage/storage.php
@@ -0,0 +1,139 @@
+<?php
+
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ *
+ * @package LiveUpdate 2.1.5 - 2.2.1
+ * @copyright Copyright (c)2010-2013 Nicholas K. Dionysopoulos / AkeebaBackup.com
+ * @license GNU LGPLv3 or later <http://www.gnu.org/copyleft/lesser.html>
+ *
+ * @version     3.1.8 2013-08-30
+ * @since       1.2.6
+ */
+/**
+ * Specific PHP 5.3 min control - iCagenda
+ */
+defined('_JEXEC') or die();
+
+/**
+ * Abstract class for the update parameters storage
+ * @author nicholas
+ *
+ */
+abstract class LiveUpdateStorage
+{
+	/**
+	 * @var  JRegistry  The update data registry
+	 */
+	protected $registry = null;
+
+	/**
+	 * @var  string  The key prefix for the registry data
+	 */
+	protected $keyPrefix = 'update.';
+
+	/**
+	 * Singleton implementation
+	 *
+	 * @param   string  $type    Storage tyme (file, component)
+	 * @param   array   $config  Configuration array
+	 *
+	 * @return  LiveUpdateStorage
+	 */
+	public static function getInstance($type, $config)
+	{
+		static $instances = array();
+
+		$sig = md5($type, serialize($config));
+		if (!array_key_exists($sig, $instances))
+		{
+			$className = 'LiveUpdateStorage' . ucfirst($type);
+
+			if (!class_exists($className))
+			{
+				if (version_compare(phpversion(), '5.3.0', '<')) {
+					require_once dirname(__FILE__).'/'.strtolower($type).'.php';
+				} else {
+					require_once __DIR__ . '/' . strtolower($type) . '.php';
+				}
+			}
+
+			$object	= new $className($config);
+			$object->load($config);
+
+			$instances[$sig] = $object;
+		}
+
+		return $instances[$sig];
+	}
+
+	/**
+	 * Set a value to the storage registry. Automatically encodes updatedata.
+	 *
+	 * @param   string  $key    The key to set
+	 * @param   mixed   $value  The value of the key to set
+	 *
+	 * @return  void
+	 */
+	public final function set($key, $value)
+	{
+		if ($key == 'updatedata')
+		{
+			if (function_exists('base64_encode') && function_exists('base64_decode'))
+			{
+				$value = base64_encode(serialize($value));
+			}
+			else
+			{
+				$value = serialize($value);
+			}
+		}
+
+		$this->registry->set($this->keyPrefix . $key, $value);
+	}
+
+	/**
+	 * Read a value from the storage registry
+	 *
+	 * @param   string  $key      The key to read
+	 * @param   mixed   $default  The default value of the key, if the key is not present
+	 *
+	 * @return  mixed  The value of the key
+	 */
+	public final function get($key, $default)
+	{
+		$value = $this->registry->get($this->keyPrefix . $key, $default);
+
+		if ($key == 'updatedata')
+		{
+			if (function_exists('base64_encode') && function_exists('base64_decode'))
+			{
+				$value = unserialize(base64_decode($value));
+			}
+			else
+			{
+				$value = unserialize($value);
+			}
+		}
+
+		return $value;
+	}
+
+	/**
+	 * Save the contents of the registry to the appropriate storage
+	 *
+	 * @return  void
+	 */
+	abstract public function save();
+
+	/**
+	 * Load data from the storage
+	 *
+	 * @param   array  The configuration options
+	 *
+	 * @return  void
+	 */
+	abstract public function load($config);
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/classes/tmpl/install.php b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/classes/tmpl/install.php
new file mode 100644
index 00000000..c9c4eeed
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/classes/tmpl/install.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ *
+ * @package LiveUpdate 2.1.5 - 2.2.1
+ * @copyright Copyright (c)2010-2013 Nicholas K. Dionysopoulos / AkeebaBackup.com
+ * @license GNU LGPLv3 or later <http://www.gnu.org/copyleft/lesser.html>
+ *
+ * @version     3.1.7 2013-08-28
+ * @since       1.2.6
+ */
+
+defined( '_JEXEC' ) or die();
+
+$state			= $this->get('State');
+$message1		= $state->get('message');
+$message2		= $state->get('extmessage');
+?>
+<table class="adminform">
+	<tbody>
+		<?php if($message1) : ?>
+		<tr>
+			<th><?php echo JText::_($message1) ?></th>
+		</tr>
+		<?php endif; ?>
+		<?php if($message2) : ?>
+		<tr>
+			<td><?php echo $message2; ?></td>
+		</tr>
+		<?php endif; ?>
+	</tbody>
+</table>
+
+<p class="liveupdate-poweredby">
+	Powered by <a href="https://www.akeebabackup.com/software/akeeba-live-update.html">Akeeba Live Update</a>
+</p>
+
+<iframe style="width: 0px; height: 0px; border: none;" frameborder="0" marginheight="0" marginwidth="0" height="0" width="0"
+	src="index.php?option=<?php echo JRequest::getCmd('option','')?>&view=<?php echo JRequest::getCmd('view','')?>&task=cleanup"></iframe>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/classes/tmpl/nagscreen.php b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/classes/tmpl/nagscreen.php
new file mode 100644
index 00000000..0cba6ca5
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/classes/tmpl/nagscreen.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ *
+ * @package LiveUpdate 2.1.5 - 2.2.1
+ * @copyright Copyright (c)2010-2013 Nicholas K. Dionysopoulos / AkeebaBackup.com
+ * @license GNU LGPLv3 or later <http://www.gnu.org/copyleft/lesser.html>
+ *
+ * @version     3.4.0 2014-12-21
+ * @since       1.2.6
+ */
+/**
+ * Specific strings iCagenda
+ */
+
+defined('_JEXEC') or die();
+
+$stability = JText::_('LIVEUPDATE_STABILITY_'.$this->updateInfo->stability);
+?>
+
+<div class="liveupdate">
+
+	<div id="nagscreen">
+		<h2><?php echo JText::_('LIVEUPDATE_NAGSCREEN_HEAD_ICAGENDA') ?></h2>
+
+		<p class="nagversioninfo">
+			<?php echo JText::sprintf('LIVEUPDATE_NAGSCREEN_VERSION_ICAGENDA', $this->updateInfo->version, $stability) ?>
+		</p>
+		<?php if (JText::_('LIVEUPDATE_NAGSCREEN_BODY_ICAGENDA') != 'LIVEUPDATE_NAGSCREEN_BODY_ICAGENDA') : ?>
+			<p class="nagtext">
+				<?php echo JText::_('LIVEUPDATE_NAGSCREEN_BODY_ICAGENDA') ?>
+			</p>
+		<?php else : ?>
+			<p class="nagtext">
+				<?php echo JText::_('LIVEUPDATE_NAGSCREEN_BODY_PRE_RELEASES_ALERT_TOP') ?>
+			</p>
+			<p class="nagstability alert alert-danger">
+				<strong><?php echo JText::_('LIVEUPDATE_NAGSCREEN_BODY_PRE_RELEASES_ICAGENDA_ALPHA') ?></strong>:
+				<?php echo JText::_('LIVEUPDATE_NAGSCREEN_BODY_PRE_RELEASES_ALERT_ALPHA') ?>
+			</p>
+			<p class="nagstability alert alert-warning">
+				<strong><?php echo JText::_('LIVEUPDATE_NAGSCREEN_BODY_PRE_RELEASES_ICAGENDA_BETA') ?></strong>:
+				<?php echo JText::_('LIVEUPDATE_NAGSCREEN_BODY_PRE_RELEASES_ALERT_BETA') ?>
+			</p>
+			<p class="nagstability alert alert-info">
+				<strong><?php echo JText::_('LIVEUPDATE_NAGSCREEN_BODY_PRE_RELEASES_ICAGENDA_RC') ?></strong>:
+				<?php echo JText::_('LIVEUPDATE_NAGSCREEN_BODY_PRE_RELEASES_ALERT_RC') ?>
+			</p>
+			<p class="nagtext">
+				<?php echo JText::_('LIVEUPDATE_NAGSCREEN_BODY_PRE_RELEASES_ALERT_BOTTOM') ?>
+			</p>
+		<?php endif; ?>
+		<!--p>
+			<small><?php echo JText::_('LIVEUPDATE_NAGSCREEN_FOOTER_ICAGENDA') ?>
+			<a href="http://www.joomlic.com" target="_blank">www.joomlic.com</a></small>
+		</p-->
+	</div>
+	<p class="liveupdate-buttons">
+		<button class="btn btn-danger btn-large" onclick="window.location='<?php echo $this->runUpdateURL ?>'" ><?php echo JText::_('LIVEUPDATE_NAGSCREEN_BUTTON') ?></button>
+	</p>
+
+	<p class="liveupdate-poweredby">
+		Powered by <a href="https://www.akeebabackup.com/software/akeeba-live-update.html">Akeeba Live Update</a>
+	</p>
+
+</div>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/classes/tmpl/overview.php b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/classes/tmpl/overview.php
new file mode 100644
index 00000000..b2992f12
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/classes/tmpl/overview.php
@@ -0,0 +1,153 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ *
+ * @package LiveUpdate 2.1.5 - 2.2.1
+ * @copyright Copyright (c)2010-2013 Nicholas K. Dionysopoulos / AkeebaBackup.com
+ * @license GNU LGPLv3 or later <http://www.gnu.org/copyleft/lesser.html>
+ *
+ * @version     3.4.0 2014-12-21
+ * @since       1.2.6
+ */
+/**
+ * Specific strings iCagenda
+ */
+
+defined('_JEXEC') or die();
+
+JHtml::_('behavior.framework');
+JHtml::_('behavior.modal');
+?>
+
+<div class="liveupdate">
+
+	<?php if($this->updateInfo->releasenotes): ?>
+	<div style="display:none;">
+		<div id="liveupdate-releasenotes">
+			<div class="liveupdate-releasenotes-text">
+			<?php echo $this->updateInfo->releasenotes ?>
+			</div>
+		</div>
+	</div>
+	<?php endif; ?>
+
+	<?php if(!$this->updateInfo->supported): ?>
+	<div class="liveupdate-notsupported">
+		<h3><?php echo JText::_('LIVEUPDATE_NOTSUPPORTED_HEAD') ?></h3>
+
+		<p><?php echo JText::_('LIVEUPDATE_NOTSUPPORTED_INFO'); ?></p>
+		<p class="liveupdate-url">
+			<?php echo $this->escape($this->updateInfo->extInfo->updateurl) ?>
+		</p>
+		<p><?php echo JText::sprintf('LIVEUPDATE_NOTSUPPORTED_ALTMETHOD', $this->escape($this->updateInfo->extInfo->title)); ?></p>
+		<p class="liveupdate-buttons">
+			<button onclick="window.location='<?php echo $this->requeryURL ?>'" ><?php echo JText::_('LIVEUPDATE_REFRESH_INFO') ?></button>
+		</p>
+	</div>
+
+	<?php elseif($this->updateInfo->stuck):?>
+	<div class="liveupdate-stuck">
+		<h3><?php echo JText::_('LIVEUPDATE_STUCK_HEAD') ?></h3>
+
+		<p><?php echo JText::_('LIVEUPDATE_STUCK_INFO'); ?></p>
+		<p><?php echo JText::sprintf('LIVEUPDATE_NOTSUPPORTED_ALTMETHOD', $this->escape($this->updateInfo->extInfo->title)); ?></p>
+
+		<p class="liveupdate-buttons">
+			<button onclick="window.location='<?php echo $this->requeryURL ?>'" ><?php echo JText::_('LIVEUPDATE_REFRESH_INFO') ?></button>
+		</p>
+	</div>
+
+	<?php else: ?>
+	<?php
+		$class = $this->updateInfo->hasUpdates ? 'hasupdates' : 'noupdates';
+		$auth = $this->config->getAuthorization();
+		$auth = empty($auth) ? '' : '?'.$auth;
+	?>
+	<?php if($this->needsAuth): ?>
+	<p class="liveupdate-error-needsauth">
+		<?php echo JText::_('LIVEUPDATE_ERROR_NEEDS_PRO_ID'); ?>
+	</p>
+	<?php endif; ?>
+	<div class="liveupdate-<?php echo $class?>">
+		<h3><?php echo JText::_('LIVEUPDATE_'.strtoupper($class).'_HEAD') ?><?php if ($class == 'hasupdates') : ?>!<?php endif; ?></h3>
+		<div class="liveupdate-infotable">
+			<div class="liveupdate-row row0">
+				<span class="liveupdate-label"><?php echo JText::_('LIVEUPDATE_CURRENTVERSION') ?></span>
+				<span class="liveupdate-data"><?php echo $this->updateInfo->extInfo->version ?></span>
+			</div>
+			<div class="liveupdate-row row1">
+				<span class="liveupdate-label"><?php echo JText::_('LIVEUPDATE_LATESTVERSION') ?></span>
+				<span class="liveupdate-data"><?php echo $this->updateInfo->version ?></span>
+			</div>
+			<div class="liveupdate-row row0">
+				<span class="liveupdate-label"><?php echo JText::_('LIVEUPDATE_LATESTRELEASED') ?></span>
+				<span class="liveupdate-data"><?php echo $this->updateInfo->date ?></span>
+			</div>
+			<div class="liveupdate-row row1">
+				<span class="liveupdate-label"><?php echo JText::_('LIVEUPDATE_DOWNLOADURL') ?></span>
+				<span class="liveupdate-data"><a href="<?php echo $this->updateInfo->downloadURL.$auth?>"><?php echo $this->escape($this->updateInfo->downloadURL)?></a></span>
+			</div>
+			<?php if(!empty($this->updateInfo->releasenotes) || !empty($this->updateInfo->infoURL)): ?>
+			<div class="liveupdate-row row0">
+				<span class="liveupdate-label"><?php echo JText::_('LIVEUPDATE_RELEASEINFO') ?></span>
+				<span class="liveupdate-data">
+					<?php if($this->updateInfo->releasenotes): ?>
+					<a href="#" id="btnLiveUpdateReleaseNotes" class="btn btn-warning btn-small"><i class="icon-file"></i> <?php echo JText::_('LIVEUPDATE_RELEASENOTES') ?></a>
+					<?php
+					JHTML::_('behavior.framework');
+					JHTML::_('behavior.modal');
+
+					$script = <<<ENDSCRIPT
+					window.addEvent( 'domready' ,  function() {
+						$('btnLiveUpdateReleaseNotes').addEvent('click', showLiveUpdateReleaseNotes);
+					});
+
+					function showLiveUpdateReleaseNotes()
+					{
+						var liveupdateReleasenotes = $('liveupdate-releasenotes').clone();
+
+						SqueezeBox.fromElement(
+							liveupdateReleasenotes, {
+								handler: 'adopt',
+								size: {
+									x: 450,
+									y: 350
+								}
+							}
+						);
+					}
+ENDSCRIPT;
+					$document = JFactory::getDocument();
+					$document->addScriptDeclaration($script,'text/javascript');
+					?>
+					<?php endif; ?>
+					<?php if($this->updateInfo->releasenotes && $this->updateInfo->infoURL): ?>
+					<!-- &nbsp;&bull;&nbsp; -->
+					<?php endif; ?>
+					<?php if($this->updateInfo->infoURL): ?>
+					<!-- a class="btn btn-small" href="http://icagenda.joomlic.com" target="_blank"><?php echo JText::_('LIVEUPDATE_READMOREINFO') ?></a -->
+					<?php endif; ?>
+					<button class="btn btn-info btn-small" onclick="window.location='<?php echo $this->requeryURL ?>'" ><i class="icon-refresh"></i> <?php echo JText::_('LIVEUPDATE_REFRESH_INFO') ?></button>
+				</span>
+			</div>
+			<?php endif; ?>
+		</div>
+
+		<p class="liveupdate-buttons">
+			<?php if($this->updateInfo->hasUpdates):?>
+			<?php $disabled = $this->needsAuth ? 'disabled="disabled"' : ''?>
+			<button class="btn btn-success btn-large" <?php echo $disabled?> onclick="window.location='<?php echo $this->runUpdateURL ?>'" ><i class="icon-download"></i>&nbsp;&nbsp;<?php echo JText::_('LIVEUPDATE_DO_UPDATE') ?></button>
+			<?php endif;?>
+			<!--button class="btn btn-info btn-small" onclick="window.location='<?php echo $this->requeryURL ?>'" ><i class="icon-refresh"></i> <?php echo JText::_('LIVEUPDATE_REFRESH_INFO') ?></button-->
+		</p>
+	</div>
+
+	<?php endif; ?>
+
+	<p class="liveupdate-poweredby">
+		Powered by <a href="https://www.akeebabackup.com/software/akeeba-live-update.html">Akeeba Live Update</a>
+	</p>
+
+</div>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/classes/tmpl/startupdate.php b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/classes/tmpl/startupdate.php
new file mode 100644
index 00000000..beaf1e7e
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/classes/tmpl/startupdate.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ *
+ * @package LiveUpdate 2.1.5 - 2.2.1
+ * @copyright Copyright (c)2010-2013 Nicholas K. Dionysopoulos / AkeebaBackup.com
+ * @license GNU LGPLv3 or later <http://www.gnu.org/copyleft/lesser.html>
+ *
+ * @version     3.1.7 2013-08-28
+ * @since       1.2.6
+ */
+
+defined('_JEXEC') or die();
+?>
+
+<div class="liveupdate">
+	<div class="liveupdate-ftp">
+		<p><?php echo JText::_('LIVEUPDATE_FTP_REQUIRED')?></p>
+		<form name="adminForm" id="adminForm" action="index.php" method="get">
+			<input name="option" value="<?php echo JRequest::getCmd('option','')?>" type="hidden" />
+			<input name="view" value="<?php echo JRequest::getCmd('view','liveupdate')?>" type="hidden" />
+			<input name="task" value="download" type="hidden" />
+			<fieldset>
+				<legend><?php echo JText::_('LIVEUPDATE_FTP') ?></legend>
+
+				<table class="adminform">
+					<tbody>
+						<tr>
+							<td width="120">
+								<label for="username"><?php echo JText::_('LIVEUPDATE_FTPUSERNAME'); ?></label>
+							</td>
+							<td>
+								<input type="text" id="username" name="username" class="input_box" size="70" value="" />
+							</td>
+						</tr>
+						<tr>
+							<td width="120">
+								<label for="password"><?php echo JText::_('LIVEUPDATE_FTPPASSWORD'); ?></label>
+							</td>
+							<td>
+								<input type="password" id="password" name="password" class="input_box" size="70" value="" />
+							</td>
+						</tr>
+					</tbody>
+				</table>
+				<input type="submit" value="<?php echo JText::_('LIVEUPDATE_DOWNLOAD_AND_INSTALL'); ?>" />
+			</fieldset>
+		</form>
+	</div>
+
+	<p class="liveupdate-poweredby">
+		Powered by <a href="https://www.akeebabackup.com/software/akeeba-live-update.html">Akeeba Live Update</a>
+	</p>
+
+</div>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/classes/updatefetch.php b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/classes/updatefetch.php
new file mode 100644
index 00000000..8a879316
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/classes/updatefetch.php
@@ -0,0 +1,357 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ *
+ * @package LiveUpdate 2.1.5 - 2.2.1
+ * @copyright Copyright (c)2010-2013 Nicholas K. Dionysopoulos / AkeebaBackup.com
+ * @license GNU LGPLv3 or later <http://www.gnu.org/copyleft/lesser.html>
+ *
+ * @version     3.1.7 2013-08-28
+ * @since       1.2.6
+ */
+
+defined('_JEXEC') or die();
+
+/**
+ * Fetches the update information from the server or the cache, depending on
+ * whether the cache is fresh or not.
+ */
+class LiveUpdateFetch extends JObject
+{
+	private $cacheTTL = 24;
+
+	private $storage = null;
+
+	/**
+	 * One-stop-shop function which fetches update information and tells you
+	 * if there are updates available or not, or if updates are not supported.
+	 *
+	 * @return int 0 = no updates, 1 = updates available, -1 = updates not supported, -2 = fetching updates crashes the server
+	 */
+	public function hasUpdates($force = false)
+	{
+		$updateInfo = $this->getUpdateInformation($force);
+
+		if($updateInfo->stuck) return -2;
+
+		if(!$updateInfo->supported) return -1;
+
+		$config = LiveUpdateConfig::getInstance();
+		$extInfo = $config->getExtensionInformation();
+
+		// Filter by stability level
+		$minStability = $config->getMinimumStability();
+		$stability = strtolower($updateInfo->stability);
+
+		switch($minStability) {
+			case 'alpha':
+			default:
+				// Reports any stability level as an available update
+				break;
+
+			case 'beta':
+				// Do not report alphas as available updates
+				if(in_array($stability, array('alpha'))) return 0;
+				break;
+
+			case 'rc':
+				// Do not report alphas and betas as available updates
+				if(in_array($stability, array('alpha','beta'))) return 0;
+				break;
+
+			case 'stable':
+				// Do not report alphas, betas and rcs as available updates
+				if(in_array($stability, array('alpha','beta','rc'))) return 0;
+				break;
+		}
+
+		if(empty($updateInfo->version) && empty($updateInfo->date)) return 0;
+
+		// Use the version strategy to determine the availability of an update
+		switch($config->getVersionStrategy()) {
+			case 'newest':
+				JLoader::import('joomla.utilities.date');
+				if(empty($extInfo)) {
+					$mine = new JDate('2000-01-01 00:00:00');
+				} else {
+					try {
+						$mine = new JDate($extInfo['date']);
+					} catch(Exception $e) {
+						$mine = new JDate('2000-01-01 00:00:00');
+					}
+				}
+
+				$theirs = new JDate($updateInfo->date);
+
+				return ($theirs->toUnix() > $mine->toUnix()) ? 1 : 0;
+				break;
+
+			case 'vcompare':
+				$mine = $extInfo['version'];
+				if(empty($mine)) $mine = '0.0.0';
+				$theirs = $updateInfo->version;
+				if(empty($theirs)) $theirs = '0.0.0';
+
+				return (version_compare($theirs, $mine, 'gt')) ? 1 : 0;
+				break;
+
+			case 'different':
+				$mine = $extInfo['version'];
+				if(empty($mine)) $mine = '0.0.0';
+				$theirs = $updateInfo->version;
+				if(empty($theirs)) $theirs = '0.0.0';
+
+				return ($theirs != $mine) ? 1 : 0;
+				break;
+		}
+	}
+
+	/**
+	 * Get the latest version (update) information, either from the cache or
+	 * from the update server.
+	 *
+	 * @param $force bool Set to true to force fetching fresh data from the server
+	 *
+	 * @return stdClass The update information, in object format
+	 */
+	public function getUpdateInformation($force = false)
+	{
+		// Get the Live Update configuration
+		$config = LiveUpdateConfig::getInstance();
+
+		// Get an instance of the storage class
+		$storageOptions = $config->getStorageAdapterPreferences();
+		require_once dirname(__FILE__).'/storage/storage.php';
+		$this->storage = LiveUpdateStorage::getInstance($storageOptions['adapter'], $storageOptions['config']);
+
+		// If we are requested to forcibly reload the information, clear old data first
+		if($force) {
+			$this->storage->set('lastcheck', null);
+			$this->storage->set('updatedata', null);
+			$this->storage->save();
+		}
+
+		// Fetch information from the cache
+		$lastCheck = $this->storage->get('lastcheck', 0);
+		$cachedData = $this->storage->get('updatedata', null);
+
+		if (!is_object($cachedData))
+		{
+			$cachedData = null;
+		}
+
+		if(empty($cachedData)) {
+			$lastCheck = 0;
+		}
+
+		// Check if the cache is at most $cacheTTL hours old
+		$now = time();
+		$maxDifference = $this->cacheTTL * 3600;
+		$difference = abs($now - $lastCheck);
+
+		if(!($force) && ($difference <= $maxDifference)) {
+			// The cache is fresh enough; return cached data
+			return $cachedData;
+		} else {
+			// The cache is stale; fetch new data, cache it and return it to the caller
+			$data = $this->getUpdateData($force);
+			$this->storage->set('lastcheck', $now);
+			$this->storage->set('updatedata', $data);
+			$this->storage->save();
+			return $data;
+		}
+	}
+
+	/**
+	 * Retrieves the update data from the server, unless previous runs indicate
+	 * that the download process gets stuck and ends up in a WSOD.
+	 *
+	 * @param bool $force Set to true to force fetching new data no matter if the process is marked as stuck
+	 * @return stdClass
+	 */
+	private function getUpdateData($force = false)
+	{
+		$ret = array(
+			'supported'		=> false,
+			'stuck'			=> true,
+			'version'		=> '',
+			'date'			=> '',
+			'stability'		=> '',
+			'downloadURL'	=> '',
+			'infoURL'		=> '',
+			'releasenotes'	=> ''
+		);
+
+		// If the process is marked as "stuck", we won't bother fetching data again; well,
+		// unless you really force me to, by setting $force = true.
+		if( ($this->storage->get('stuck',0) != 0) && !$force) return (object)$ret;
+
+		$ret['stuck'] = false;
+
+		require_once dirname(__FILE__).'/download.php';
+
+		// First we mark Live Updates as getting stuck. This way, if fetching the update
+		// fails with a server error, reloading the page will not result to a White Screen
+		// of Death again. Hey, Joomla! core team, are you listening? Some hosts PRETEND to
+		// support cURL or URL fopen() wrappers but using them throws an immediate WSOD.
+		$this->storage->set('stuck', 1);
+		$this->storage->save();
+
+		$config = LiveUpdateConfig::getInstance();
+		$extInfo = $config->getExtensionInformation();
+		$url = $extInfo['updateurl'];
+		$rawData = LiveUpdateDownloadHelper::downloadAndReturn($url);
+
+		// Now that we have some data returned, let's unmark the process as being stuck ;)
+		$this->storage->set('stuck', 0);
+		$this->storage->save();
+
+		// If we didn't get anything, assume Live Update is not supported (communication error)
+		if(empty($rawData) || ($rawData == false)) return (object)$ret;
+
+		// TODO Detect the content type of the returned update stream. For now, I will pretend it's an INI file.
+
+		$data = $this->parseINI($rawData);
+		$ret['supported'] = true;
+
+		return (object)array_merge($ret, $data);
+	}
+
+	/**
+	 * Fetches update information from the server using cURL
+	 * @return string The raw server data
+	 */
+	private function fetchCURL()
+	{
+		$config = LiveUpdateConfig::getInstance();
+		$extInfo = $config->getExtensionInformation();
+		$url = $extInfo['updateurl'];
+
+		$process = curl_init($url);
+		$config = new LiveUpdateConfig();
+		$config->applyCACert($process);
+		curl_setopt($process, CURLOPT_HEADER, 0);
+		// Pretend we are Firefox, so that webservers play nice with us
+		curl_setopt($process, CURLOPT_USERAGENT, 'Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.14) Gecko/20110105 Firefox/3.6.14');
+		curl_setopt($process, CURLOPT_ENCODING, 'gzip');
+		curl_setopt($process, CURLOPT_TIMEOUT, 10);
+		curl_setopt($process, CURLOPT_RETURNTRANSFER, 1);
+		curl_setopt($process, CURLOPT_SSL_VERIFYPEER, false);
+		// The @ sign allows the next line to fail if open_basedir is set or if safe mode is enabled
+		@curl_setopt($process, CURLOPT_FOLLOWLOCATION, 1);
+		@curl_setopt($process, CURLOPT_MAXREDIRS, 20);
+		$inidata = curl_exec($process);
+		curl_close($process);
+		return $inidata;
+	}
+
+	/**
+	 * Fetches update information from the server using file_get_contents, which internally
+	 * uses URL fopen() wrappers.
+	 * @return string The raw server data
+	 */
+	private function fetchFOPEN()
+	{
+		$config = LiveUpdateConfig::getInstance();
+		$extInfo = $config->getExtensionInformation();
+		$url = $extInfo['updateurl'];
+
+		return @file_get_contents($url);
+	}
+
+	/**
+	 * Parses the raw INI data into an array of update information
+	 * @param string $rawData The raw INI data
+	 * @return array The parsed data
+	 */
+	private function parseINI($rawData)
+	{
+		$ret = array(
+			'version'		=> '',
+			'date'			=> '',
+			'stability'		=> '',
+			'downloadURL'	=> '',
+			'infoURL'		=> '',
+			'releasenotes'	=> ''
+		);
+
+		// Get the magic string
+		$magicPos = strpos($rawData, '; Live Update provision file');
+
+		if($magicPos === false) {
+			// That's not an INI file :(
+			return $ret;
+		}
+
+		if($magicPos !== 0) {
+			$rawData = substr($rawData, $magicPos);
+		}
+
+		require_once dirname(__FILE__).'/inihelper.php';
+		$iniData = LiveUpdateINIHelper::parse_ini_file($rawData, false, true);
+
+		// Get the supported platforms
+		$supportedPlatform = false;
+		$versionParts = explode('.',JVERSION);
+		$currentPlatform = $versionParts[0].'.'.$versionParts[1];
+
+		if(array_key_exists('platforms', $iniData)) {
+			$rawPlatforms = explode(',', $iniData['platforms']);
+			foreach($rawPlatforms as $platform) {
+				$platform = trim($platform);
+				if(substr($platform,0,7) != 'joomla/') {
+					continue;
+				}
+				$platform = substr($platform, 7);
+				if($currentPlatform == $platform) {
+					$supportedPlatform = true;
+				}
+			}
+		} else {
+			// Lies, damn lies
+			$supportedPlatform = true;
+		}
+
+		if(!$supportedPlatform) {
+			return $ret;
+		}
+
+		$ret['version'] = array_key_exists('version', $iniData) ? $iniData['version'] : '';
+		$ret['date'] = array_key_exists('date', $iniData) ? $iniData['date'] : '';
+		$config = LiveUpdateConfig::getInstance();
+		$auth = $config->getAuthorization();
+		if(!array_key_exists('link', $iniData)) $iniData['link'] = '';
+		$glue = strpos($iniData['link'],'?') === false ? '?' : '&';
+		$ret['downloadURL'] = $iniData['link'] . (empty($auth) ? '' : $glue.$auth);
+		if(array_key_exists('stability', $iniData)) {
+			$stability = $iniData['stability'];
+		} else {
+			// Stability not defined; guesswork mode enabled
+			$version = $ret['version'];
+			if( preg_match('#^[0-9\.]*a[0-9\.]*#', $version) == 1 ) {
+				$stability = 'alpha';
+			} elseif( preg_match('#^[0-9\.]*b[0-9\.]*#', $version) == 1 ) {
+				$stability = 'beta';
+			} elseif( preg_match('#^[0-9\.]*rc[0-9\.]*#', $version) == 1 ) {
+				$stability = 'rc';
+			} elseif( preg_match('#^[0-9\.]*$#', $version) == 1 ) {
+				$stability = 'stable';
+			} else {
+				$stability = 'svn';
+			}
+		}
+		$ret['stability'] = $stability;
+
+		if(array_key_exists('releasenotes', $iniData)) {
+			$ret['releasenotes'] = $iniData['releasenotes'];
+		}
+
+		if(array_key_exists('infourl', $iniData)) {
+			$ret['infoURL'] = $iniData['infourl'];
+		}
+
+		return $ret;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/classes/view.php b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/classes/view.php
new file mode 100644
index 00000000..49a17f52
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/classes/view.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ *
+ * @package LiveUpdate 2.1.5 - 2.2.1
+ * @copyright Copyright (c)2010-2013 Nicholas K. Dionysopoulos / AkeebaBackup.com
+ * @license GNU LGPLv3 or later <http://www.gnu.org/copyleft/lesser.html>
+ *
+ * @version     3.1.7 2013-08-28
+ * @since       1.2.6
+ */
+
+defined('_JEXEC') or die();
+
+JLoader::import('joomla.application.component.view');
+
+if(!class_exists('JoomlaCompatView')) {
+	if(interface_exists('JView')) {
+		abstract class JoomlaCompatView extends JViewLegacy {}
+	} else {
+		class JoomlaCompatView extends JView {}
+	}
+}
+
+/**
+ * The Live Update MVC view
+ */
+class LiveUpdateView extends JoomlaCompatView
+{
+	public function display($tpl = null)
+	{
+		// Load the CSS
+		$config = LiveUpdateConfig::getInstance();
+		$this->assign('config', $config);
+		if(!$config->addMedia()) {
+			// No custom CSS overrides were set; include our own
+			$document = JFactory::getDocument();
+			$url = JURI::base().'/components/'.JRequest::getCmd('option','').'/liveupdate/assets/liveupdate.css';
+			$document->addStyleSheet($url, 'text/css');
+		}
+
+		$requeryURL = rtrim(JURI::base(),'/').'/index.php?option='.JRequest::getCmd('option','').'&view='.JRequest::getCmd('view','liveupdate').'&force=1';
+		$this->assign('requeryURL', $requeryURL);
+
+		$model = $this->getModel();
+
+		$extInfo = (object)$config->getExtensionInformation();
+		JToolBarHelper::title($extInfo->title.' &ndash; '.JText::_('LIVEUPDATE_TASK_OVERVIEW'),'liveupdate');
+		JToolBarHelper::back('JTOOLBAR_BACK', 'index.php?option='.JRequest::getCmd('option',''));
+
+		if(version_compare(JVERSION, '3.0', 'ge')) {
+			$j3css = <<<ENDCSS
+div#toolbar div#toolbar-back button.btn span.icon-back::before {
+	content: "";
+}
+ENDCSS;
+			JFactory::getDocument()->addStyleDeclaration($j3css);
+		}
+
+		switch(JRequest::getCmd('task','default'))
+		{
+			case 'startupdate':
+				$this->setLayout('startupdate');
+				$this->assign('url','index.php?option='.JRequest::getCmd('option','').'&view='.JRequest::getCmd('view','liveupdate').'&task=download');
+				break;
+
+			case 'install':
+				$this->setLayout('install');
+
+				// Get data from the model
+				$state		= $this->get('State');
+
+				// Are there messages to display ?
+				$showMessage	= false;
+				if ( is_object($state) )
+				{
+					$message1		= $state->get('message');
+					$message2		= $state->get('extension.message');
+					$showMessage	= ( $message1 || $message2 );
+				}
+
+				$this->assign('showMessage',	$showMessage);
+				$this->assignRef('state',		$state);
+
+				break;
+
+			case 'nagscreen':
+				$this->setLayout('nagscreen');
+				$this->assign('updateInfo', LiveUpdate::getUpdateInformation());
+				$this->assign('runUpdateURL','index.php?option='.JRequest::getCmd('option','').'&view='.JRequest::getCmd('view','liveupdate').'&task=startupdate&skipnag=1');
+				break;
+
+			case 'overview':
+			default:
+				$this->setLayout('overview');
+
+				$force = JRequest::getInt('force',0);
+				$this->assign('updateInfo', LiveUpdate::getUpdateInformation($force));
+				$this->assign('runUpdateURL','index.php?option='.JRequest::getCmd('option','').'&view='.JRequest::getCmd('view','liveupdate').'&task=startupdate');
+
+				$needsAuth = !($config->getAuthorization()) && ($config->requiresAuthorization());
+				$this->assign('needsAuth', $needsAuth);
+				break;
+		}
+
+		parent::display($tpl);
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/classes/xmlslurp.php b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/classes/xmlslurp.php
new file mode 100644
index 00000000..f8c00c3f
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/classes/xmlslurp.php
@@ -0,0 +1,376 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ *
+ * @package LiveUpdate 2.1.5 - 2.2.1
+ * @copyright Copyright (c)2010-2013 Nicholas K. Dionysopoulos / AkeebaBackup.com
+ * @license GNU LGPLv3 or later <http://www.gnu.org/copyleft/lesser.html>
+ *
+ * @version     3.1.7 2013-08-28
+ * @since       1.2.6
+ */
+
+defined('_JEXEC') or die();
+
+class LiveUpdateXMLSlurp extends JObject
+{
+	private $_info = array();
+
+	public function getInfo($extensionName, $xmlName)
+	{
+		if(!array_key_exists($extensionName, $this->_info)) {
+			$this->_info[$extensionName] = $this->fetchInfo($extensionName, $xmlName);
+		}
+
+		return $this->_info[$extensionName];
+	}
+
+	/**
+	 * Gets the version information of an extension by reading its XML file
+	 * @param string $extensionName The name of the extension, e.g. com_foobar, mod_foobar, plg_foobar or tpl_foobar.
+	 * @param string $xmlName The name of the XML manifest filename. If empty uses $extensionName.xml
+	 */
+	private function fetchInfo($extensionName, $xmlName)
+	{
+		$type = strtolower(substr($extensionName,0,3));
+		switch($type) {
+			case 'com':
+				return $this->getComponentData($extensionName, $xmlName);
+				break;
+			case 'mod':
+				return $this->getModuleData($extensionName, $xmlName);
+				break;
+			case 'plg':
+				return $this->getPluginData($extensionName, $xmlName);
+				break;
+			case 'tpl':
+				return $this->getTemplateData($extensionName, $xmlName);
+				break;
+			case 'pkg':
+				return $this->getPackageData($extensionName, $xmlName);
+				break;
+			case 'lib':
+				return $this->getPackageData($extensionName, $xmlName);
+				break;
+			default:
+				if(strtolower(substr($extensionName, 0, 4)) == 'file') {
+					return $this->getPackageData($extensionName, $xmlName);
+				} else {
+					return array('version'=>'', 'date'=>'');
+				}
+		}
+	}
+
+	/**
+	 * Gets the version information of a component by reading its XML file
+	 * @param string $extensionName The name of the extension, e.g. com_foobar
+	 * @param string $xmlName The name of the XML manifest filename. If empty uses $extensionName.xml
+	 */
+	private function getComponentData($extensionName, $xmlName)
+	{
+		$extensionName = strtolower($extensionName);
+		$path = JPATH_ADMINISTRATOR.'/components/'.$extensionName;
+		$altExtensionName = substr($extensionName,4);
+
+		JLoader::import('joomla.filesystem.file');
+		if(JFile::exists("$path/$xmlName")) {
+			$filename = "$path/$xmlName";
+		} elseif(JFile::exists("$path/$extensionName.xml")) {
+			$filename = "$path/$extensionName.xml";
+		} elseif(JFile::exists("$path/$altExtensionName.xml")) {
+			$filename = "$path/$altExtensionName.xml";
+		} elseif(JFile::exists("$path/manifest.xml")) {
+			$filename = "$path/manifest.xml";
+		} else {
+			$filename = $this->searchForManifest($path);
+			if($filename === false)	$filename = null;
+		}
+
+		if(empty($filename)) {
+			return array('version' => '', 'date' => '', 'xmlfile' => '');
+		}
+
+		try {
+			$xml = new SimpleXMLElement($filename, LIBXML_NONET, true);
+		} catch(Exception $e) {
+			return array('version' => '', 'date' => '', 'xmlfile' => '');
+		}
+
+		// Need to check for extension (since 1.6) and install (supported through 2.5)
+		if ($xml->getName() != 'extension' && $xml->getName() != 'install') {
+			unset($xml);
+			return array('version' => '', 'date' => '', 'xmlfile' => '');
+		}
+
+		$data['version'] = $xml->version ? (string) $xml->version : '';
+		$data['date'] = $xml->creationDate ? (string) $xml->creationDate : '';
+		$data['xmlfile'] = $filename;
+
+		return $data;
+	}
+
+	/**
+	 * Gets the version information of a module by reading its XML file
+	 * @param string $extensionName The name of the extension, e.g. mod_foobar
+	 * @param string $xmlName The name of the XML manifest filename. If empty uses $extensionName.xml
+	 */
+	private function getModuleData($extensionName, $xmlName)
+	{
+		$extensionName = strtolower($extensionName);
+		$altExtensionName = substr($extensionName,4);
+
+		JLoader::import('joomla.filesystem.folder');
+		JLoader::import('joomla.filesystem.file');
+		$path = JPATH_SITE.'/modules/'.$extensionName;
+		if(!JFolder::exists($path)) {
+			$path = JPATH_ADMINISTRATOR.'/modules/'.$extensionName;
+		}
+		if(!JFolder::exists($path)) {
+			// Joomla! 1.5
+			// 1. Check front-end
+			$path = JPATH_ADMINISTRATOR.'/modules';
+			$filename = "$path/$xmlName";
+			if(!JFile::exists($filename)) {
+				$filename = "$path/$extensionName.xml";
+			}
+			if(!JFile::exists($filename)) {
+				$filename = "$path/$altExtensionName.xml";
+			}
+			// 2. Check front-end
+			if(!JFile::exists($filename)) {
+				$path = JPATH_SITE.'/modules';
+				$filename = "$path/$xmlName";
+				if(!JFile::exists($filename)) {
+					$filename = "$path/$extensionName.xml";
+				}
+				if(!JFile::exists($filename)) {
+					$filename = "$path/$altExtensionName.xml";
+				}
+				if(!JFile::exists($filename)) {
+					return array('version' => '', 'date' => '');
+				}
+			}
+		} else {
+			// Joomla! 1.6
+			$filename = "$path/$xmlName";
+			if(!JFile::exists($filename)) {
+				$filename = "$path/$extensionName.xml";
+			}
+			if(!JFile::exists($filename)) {
+				$filename = "$path/$altExtensionName.xml";
+			}
+			if(!JFile::exists($filename)) {
+				return array('version' => '', 'date' => '');
+			}
+		}
+
+		if(empty($filename)) {
+			return array('version' => '', 'date' => '', 'xmlfile' => '');
+		}
+
+		try {
+			$xml = new SimpleXMLElement($filename, LIBXML_NONET, true);
+		} catch(Exception $e) {
+			return array('version' => '', 'date' => '', 'xmlfile' => '');
+		}
+
+		// Need to check for extension (since 1.6) and install (supported through 2.5)
+		if ($xml->getName() != 'extension' && $xml->getName() != 'install') {
+			unset($xml);
+			return array('version' => '', 'date' => '', 'xmlfile' => '');
+		}
+
+		$data['version'] = $xml->version ? (string) $xml->version : '';
+		$data['date'] = $xml->creationDate ? (string) $xml->creationDate : '';
+		$data['xmlfile'] = $filename;
+
+		return $data;
+	}
+
+	/**
+	 * Gets the version information of a plugin by reading its XML file
+	 * @param string $extensionName The name of the plugin, e.g. plg_foobar
+	 * @param string $xmlName The name of the XML manifest filename. If empty uses $extensionName.xml
+	 */
+	private function getPluginData($extensionName, $xmlName)
+	{
+		$extensionName = strtolower($extensionName);
+		$altExtensionName = substr($extensionName,4);
+
+		JLoader::import('joomla.filesystem.folder');
+		JLoader::import('joomla.filesystem.file');
+
+		$base = JPATH_PLUGINS;
+
+		// Get a list of directories
+		$stack = JFolder::folders($base,'.',true,true);
+		foreach($stack as $path)
+		{
+			$filename = "$path/$xmlName";
+			if(JFile::exists($filename)) break;
+			$filename = "$path/$extensionName.xml";
+			if(JFile::exists($filename)) break;
+			$filename = "$path/$altExtensionName.xml";
+			if(JFile::exists($filename)) break;
+		}
+
+		if(!JFile::exists($filename)) {
+			return array('version' => '', 'date' => '', 'xmlfile' => '');
+		}
+
+		try {
+			$xml = new SimpleXMLElement($filename, LIBXML_NONET, true);
+		} catch(Exception $e) {
+			return array('version' => '', 'date' => '', 'xmlfile' => '');
+		}
+
+		// Need to check for extension (since 1.6) and install (supported through 2.5)
+		if ($xml->getName() != 'extension' && $xml->getName() != 'install') {
+			unset($xml);
+			return array('version' => '', 'date' => '', 'xmlfile' => '');
+		}
+
+		$data['version'] = $xml->version ? (string) $xml->version : '';
+		$data['date'] = $xml->creationDate ? (string) $xml->creationDate : '';
+		$data['xmlfile'] = $filename;
+
+		return $data;
+	}
+
+	/**
+	 * Gets the version information of a template by reading its XML file
+	 * @param string $extensionName The name of the template, e.g. tpl_foobar
+	 * @param string $xmlName The name of the XML manifest filename. If empty uses $extensionName.xml or templateDetails.xml
+	 */
+	private function getTemplateData($extensionName, $xmlName)
+	{
+		$extensionName = strtolower($extensionName);
+		$altExtensionName = substr($extensionName,4);
+
+		JLoader::import('joomla.filesystem.folder');
+		JLoader::import('joomla.filesystem.file');
+
+		// First look for administrator templates
+		$path = JPATH_THEMES.'/'.$altExtensionName;
+		if(!JFolder::exists($path)) {
+			// Then look for front-end templates
+			$path = JPATH_SITE.'/templates/'.$altExtensionName;
+			if(!JFolder::exists($path)) return array('version' => '', 'date' => '');
+		}
+
+		$filename = "$path/$xmlName";
+		if(!JFile::exists($filename)) {
+			$filename = "$path/templateDetails.xml";
+		}
+		if(!JFile::exists($filename)) {
+			$filename = "$path/$extensionName.xml";
+		}
+		if(!JFile::exists($filename)) {
+			$filename = "$path/$altExtensionName.xml";
+		}
+		if(!JFile::exists($filename)) {
+			return array('version' => '', 'date' => '', 'xmlfile' => '');
+		}
+
+		try {
+			$xml = new SimpleXMLElement($filename, LIBXML_NONET, true);
+		} catch(Exception $e) {
+			return array('version' => '', 'date' => '', 'xmlfile' => '');
+		}
+
+		// Need to check for extension (since 1.6) and install (supported through 2.5)
+		if ($xml->getName() != 'extension' && $xml->getName() != 'install') {
+			unset($xml);
+			return array('version' => '', 'date' => '', 'xmlfile' => '');
+		}
+
+		$data['version'] = $xml->version ? (string) $xml->version : '';
+		$data['date'] = $xml->creationDate ? (string) $xml->creationDate : '';
+		$data['xmlfile'] = $filename;
+
+		return $data;
+	}
+
+	/**
+	 * This method parses the manifest information of package, library and file
+	 * extensions. All of those extensions do not store their manifests in the
+	 * extension's directory, but in administrator/manifests. Kudos to @mbabker
+	 * for sharing this method!
+	 *
+	 * @param string $extensionName
+	 * @param string $xmlName
+	 * @return type
+	 */
+	private function getPackageData($extensionName, $xmlName)
+	{
+		$extensionName = strtolower($extensionName);
+		$altExtensionName = substr($extensionName,4);
+
+		JLoader::import('joomla.filesystem.folder');
+		JLoader::import('joomla.filesystem.file');
+		$path = JPATH_ADMINISTRATOR.'/manifests/packages';
+
+		$filename = "$path/$xmlName";
+		if(!JFile::exists($filename)) {
+			$filename = "$path/$extensionName.xml";
+		}
+		if(!JFile::exists($filename)) {
+			$filename = "$path/$altExtensionName.xml";
+		}
+		if(!JFile::exists($filename)) {
+			return array('version' => '', 'date' => '');
+		}
+
+		if(empty($filename)) {
+			return array('version' => '', 'date' => '', 'xmlfile' => '');
+		}
+
+		try {
+			$xml = new SimpleXMLElement($filename, LIBXML_NONET, true);
+		} catch(Exception $e) {
+			return array('version' => '', 'date' => '', 'xmlfile' => '');
+		}
+
+		// Need to check for extension (since 1.6) and install (supported through 2.5)
+		if ($xml->getName() != 'extension') {
+			unset($xml);
+			return array('version' => '', 'date' => '', 'xmlfile' => '');
+		}
+
+		$data['version'] = $xml->version ? (string) $xml->version : '';
+		$data['date'] = $xml->creationDate ? (string) $xml->creationDate : '';
+		$data['xmlfile'] = $filename;
+
+		return $data;
+	}
+
+	/**
+	 * Scans a directory for XML manifest files. The first XML file to be a
+	 * manifest wins.
+	 *
+	 * @var $path string The path to look into
+	 *
+	 * @return string|bool The full path to a manifest file or false if not found
+	 */
+	private function searchForManifest($path)
+	{
+		JLoader::import('joomla.filesystem.folder');
+		$files = JFolder::files($path, '\.xml$', false, true);
+		if(!empty($files)) foreach($files as $filename) {
+			try {
+				$xml = new SimpleXMLElement($filename, LIBXML_NONET, true);
+			} catch(Exception $e) {
+				continue;
+			}
+
+			// Check for extension (since 1.6) and install (supported through 2.5)
+			if(($xml->getName() != 'extension' && $xml->getName() != 'install')) continue;
+			unset($xml);
+			return $filename;
+		}
+
+		return false;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/config.php b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/config.php
new file mode 100644
index 00000000..3aa9664f
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/config.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ *
+ * @package LiveUpdate 2.1.5
+ * @copyright Copyright ©2011-2013 Nicholas K. Dionysopoulos / AkeebaBackup.com
+ * @license GNU LGPLv3 or later <http://www.gnu.org/copyleft/lesser.html>
+ *
+ * @version     3.1.7 2013-08-28
+ * @since       1.2.6
+ */
+
+defined('_JEXEC') or die();
+
+/**
+ * Configuration class for your extension's updates.
+ */
+class LiveUpdateConfig extends LiveUpdateAbstractConfig
+{
+	var $_extensionName			= 'com_icagenda';
+	var $_extensionTitle		= 'iCagenda Release System';
+	var $_updateURL				= 'https://www.joomlic.com/index.php?option=com_ars&view=update&format=ini&id=2';
+	var $_requiresAuthorization	= false;
+	var $_versionStrategy		= 'newest';
+	var $_storageAdapter		= 'file';
+	var $_storageConfig = array('path' => JPATH_CACHE);
+
+	public function __construct() {
+		JLoader::import('joomla.filesystem.file');
+
+		// Should I use our private CA store?
+		if(@file_exists(dirname(__FILE__).'/../assets/cacert.pem')) {
+			$this->_cacerts = dirname(__FILE__).'/../assets/cacert.pem';
+		}
+
+		parent::__construct();
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/index.html b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/index.html
new file mode 100644
index 00000000..a3ac1d48
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/index.html
@@ -0,0 +1 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head><title></title></head><body></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/bg-BG/bg-BG.liveupdate.ini b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/bg-BG/bg-BG.liveupdate.ini
new file mode 100644
index 00000000..98511b6a
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/bg-BG/bg-BG.liveupdate.ini
@@ -0,0 +1,56 @@
+; Akeeba Live Update
+; Copyright (c)2010-2013 Nicholas K. Dionysopoulos / AkeebaBackup.com
+; Licensed under the GNU LGPLv3 or later <http://www.gnu.org/copyleft/lesser.html>
+
+; LIVEUPDATE_TASK_OVERVIEW="Live Update"
+
+; LIVEUPDATE_NOTSUPPORTED_HEAD="Live Update is not supported on this server"
+; LIVEUPDATE_NOTSUPPORTED_INFO="Your server indicates that Live Update is not supported. Please contact your host and ask them to enable the cURL PHP extension or activate the URL fopen() wrappers. If these are already enabled, please ask them to configure their firewall so that it allows access to the following URL:"
+; LIVEUPDATE_NOTSUPPORTED_ALTMETHOD="You can always update <var>%s</var> by visiting our site manually, downloading the latest release and installing it using Joomla!'s extension installer."
+
+; LIVEUPDATE_STUCK_HEAD="Live Update has marked itself as crashed"
+; LIVEUPDATE_STUCK_INFO="Live Update determined that it crashed the last time it tried to contact the update server. This usually indicates a host which actively blocks communications with external sites. If you would like to retry fetching the update information, please click the "_QQ_"Refresh update information"_QQ_" button below. If that results to a blank page, please contact your host and report this issue."
+
+; LIVEUPDATE_ERROR_NEEDSAUTH="You have to supply your username/password or Download ID to the component's parameters before trying to upgrade to the latest release. The upgrade button will remain disabled until you do that."
+; LIVEUPDATE_HASUPDATES_HEAD="A new version is available"
+; LIVEUPDATE_NOUPDATES_HEAD="You already have the latest version"
+LIVEUPDATE_CURRENTVERSION="инсталирана версия"
+LIVEUPDATE_LATESTVERSION="последна налична версия"
+; LIVEUPDATE_LATESTRELEASED="Latest release date"
+LIVEUPDATE_DOWNLOADURL="директно сваляне от URL адрес"
+
+LIVEUPDATE_REFRESH_INFO="актуализиране на информация за актуализацията"
+LIVEUPDATE_DO_UPDATE="актуализиране към последната налична версия"
+
+; LIVEUPDATE_FTP_REQUIRED="Live Update determined that it needs to use FTP in order to download and install your update, but you have not saved your FTP login information in your Joomla! Global Configuration.<br/><br/>Please provide the FTP username and password below to proceed with the update."
+LIVEUPDATE_FTP="FTP информация"
+LIVEUPDATE_FTPUSERNAME="FTP потребителско име"
+LIVEUPDATE_FTPPASSWORD="FTP парола"
+LIVEUPDATE_DOWNLOAD_AND_INSTALL="изтегли и инсталирай актуализацията"
+
+; LIVEUPDATE_DOWNLOAD_FAILED="Downloading the update package failed. Make sure that your temp-directory is writable or that you have enabled Joomla!'s FTP options in your site's Global Configuration."
+; LIVEUPDATE_EXTRACT_FAILED="Extracting the update package failed. Please try updating the extension manually."
+
+; LIVEUPDATE_INVALID_PACKAGE_TYPE="Invalid package type. The update can not proceed."
+LIVEUPDATE_INSTALLEXT="инсталирайте %s %s"
+LIVEUPDATE_ERROR="грешка"
+LIVEUPDATE_SUCCESS="успех"
+
+; LIVEUPDATE_ICON_UNSUPPORTED="Live Update not supported"
+; LIVEUPDATE_ICON_CRASHED="Live Update crashed"
+LIVEUPDATE_ICON_CURRENT="Вие имате последната версия"
+LIVEUPDATE_ICON_UPDATES="НАМЕРЕНА Е АКТУАЛИЗАЦИЯ! ЩРАКНЕТЕ, ЗА ДА АКТУАЛИЗИРАТЕ."
+
+LIVEUPDATE_RELEASEINFO="информация"
+; LIVEUPDATE_RELEASENOTES="Release notes"
+LIVEUPDATE_READMOREINFO="прочети още"
+
+LIVEUPDATE_NAGSCREEN_HEAD="ПРЕДУПРЕЖДЕНИЕ! Вие се опитвате да инсталирате нестабилна версия."
+; LIVEUPDATE_NAGSCREEN_BODY="You are about to install an unstable version (%s - %s). Unstable versions may have undergone minimal or no testing and contain bugs which may have an serious adverse to the stability and functionality of your web site. If you are not sure about what you are about to do, please close this browser window. If you are absolutely certain you understand the risks involved with the installation of unstable releases, please click the button below to continue the installation of this unstable release."
+LIVEUPDATE_NAGSCREEN_BUTTON="разбирам какви са възможните рискове. Продължи с инсталацията."
+
+LIVEUPDATE_STABILITY_ALPHA="алфа версия"
+LIVEUPDATE_STABILITY_BETA="бета версия"
+; LIVEUPDATE_STABILITY_RC="RC"
+LIVEUPDATE_STABILITY_STABLE="стабилна версия"
+; LIVEUPDATE_STABILITY_SVN="SVN"
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/bs-BA/bs-BA.liveupdate.ini b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/bs-BA/bs-BA.liveupdate.ini
new file mode 100644
index 00000000..99213a3f
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/bs-BA/bs-BA.liveupdate.ini
@@ -0,0 +1,56 @@
+; Akeeba Live Update
+; Copyright (c)2010-2013 Nicholas K. Dionysopoulos / AkeebaBackup.com
+; Licensed under the GNU LGPLv3 or later <http://www.gnu.org/copyleft/lesser.html>
+
+LIVEUPDATE_TASK_OVERVIEW="Nadogradnja uživo"
+
+LIVEUPDATE_NOTSUPPORTED_HEAD="Nadogradnaj uživo nije podržana na ovo serveru"
+LIVEUPDATE_NOTSUPPORTED_INFO="Vaš server ukazuje da Nadogradnja uživo nije podržana. Molimo kontaktirajte vaš host i pitajte da omoguće cURL PHP ekstenziju ili aktiviraju URL fopen() omotače. Ako su ove već omogućene, molimo da ih pitate da podese vatreni zid kako bi dozvolio pristup sljedećem URL-u:"
+LIVEUPDATE_NOTSUPPORTED_ALTMETHOD="Možete uvijek nadograditi <var>%s</var> tako što će te ručno posjetiti našu stanicu, gdje možete preuzeti posljednje izdanje i instalirati upotrebom Joomla! instalera za ekstenzije."
+
+LIVEUPDATE_STUCK_HEAD="Nadogradnja uživo se označila kao srušena"
+LIVEUPDATE_STUCK_INFO="Nadogradnja uživo je odredila da se srušila posljednji put pri pokušaju da kontaktira server za nadogradnu. Ovo pretežno ukazuje na host koji aktivno blokira komunikaciju sa eksternim stranicama. Ako želite pokušati povući informacije o nadogradnji, molimo kliknite na "_QQ_"Osvježi informacije o nadogradnji"_QQ_" dugme ispod. Ako to rezultira sa praznom stranicom, molimo kontaktirajte svoj host i prijavite ovaj problem."
+
+LIVEUPDATE_ERROR_NEEDSAUTH="Morate obezbijediti vaše korisničko ime/šifru ili ID za preuzimanje na parametre komponente prije pokušavanja nadogradnej na zadnje izdanje. Dugme za nadogradnju će ostati isključeno sve dok to ne učinite."
+LIVEUPDATE_HASUPDATES_HEAD="Dostupna je nova verzija"
+LIVEUPDATE_NOUPDATES_HEAD="Već posjedujete posljednju verziju"
+LIVEUPDATE_CURRENTVERSION="Instalirana verzija"
+LIVEUPDATE_LATESTVERSION="Posljednja verzija"
+LIVEUPDATE_LATESTRELEASED="Datum posljednjeg izdanja"
+LIVEUPDATE_DOWNLOADURL="Direktan URL za preuzimanje"
+
+LIVEUPDATE_REFRESH_INFO="Osvježi informacije o nadogradnji"
+LIVEUPDATE_DO_UPDATE="Nadogradi na posljednju verziju"
+
+LIVEUPDATE_FTP_REQUIRED="Nadogradnja uživo je odredila da je potrebna upotreba FTP-a kako bi se preuzela i instalirala vaša nadogradnja, ali niste snimili vaše FTP informacije za prijavu u Joomla! globalnoj konfiguraciji.<br/><br/>Molimo da obezbjedite FTP korisničko ime i šifru ispod kako bi nastavili sa nadogradnjom."
+LIVEUPDATE_FTP="FTP informacija"
+LIVEUPDATE_FTPUSERNAME="FTP korisničko ime"
+LIVEUPDATE_FTPPASSWORD="FTP šifra"
+LIVEUPDATE_DOWNLOAD_AND_INSTALL="Preuzmi i instaliraj nadogradnju"
+
+LIVEUPDATE_DOWNLOAD_FAILED="Preuzimanje paketa nadogradnje je neuspješno. Provjerite da li je vaš privremeni direktorij zapisiv ili da li imate uključene Joomla! FTP opcije na vašoj globalnoj konfiguraciji za stranicu."
+LIVEUPDATE_EXTRACT_FAILED="Otpakivanje paketa nadogradnje neuspješno. Molimo da pokušate ručno nadograditi ekstenziju."
+
+LIVEUPDATE_INVALID_PACKAGE_TYPE="Nevažeći tip paketa. Nadogradnja se ne može nastaviti."
+LIVEUPDATE_INSTALLEXT="Instaliraj %s %s"
+LIVEUPDATE_ERROR="Greška"
+LIVEUPDATE_SUCCESS="Uspjeh"
+
+LIVEUPDATE_ICON_UNSUPPORTED="Nadogradnja uživo nije podržana"
+LIVEUPDATE_ICON_CRASHED="Nadogradnja uživo se srušila"
+LIVEUPDATE_ICON_CURRENT="Posjedujete posljednju verziju"
+LIVEUPDATE_ICON_UPDATES="NADOGRADNJA PRONAĐENA! KLIKNITE ZA NADOGRADNJU."
+
+LIVEUPDATE_RELEASEINFO="Informacije"
+LIVEUPDATE_RELEASENOTES="Obavijesti o izdanju"
+LIVEUPDATE_READMOREINFO="Pročitaj više"
+
+LIVEUPDATE_NAGSCREEN_HEAD="UPOZORENJE! Upravo će te instalirati nestabilnu verziju."
+LIVEUPDATE_NAGSCREEN_BODY="Upravo će te instalirati nestabilnu verziju (%s - %s). Nestabilne verzije su prošle minimalno ili nikakvo testiranje i sadrže greške koje štete stabilnosti i funkcionalnosti vaše web-stranice. Ako niste sigurno šta će te raditi, molimo da zatvorite prozor preglednika. Ako se potpuno sigurni da razumijete rizike uključene za instalacijom nestabilnih izdanja, molimo da kliknete dugme ispod kako bi nastavili instalaciju ovog nestabilnog izdanja."
+LIVEUPDATE_NAGSCREEN_BUTTON="Razumijem rizike. Nastavi sa instalacijom."
+
+LIVEUPDATE_STABILITY_ALPHA="Alfa"
+LIVEUPDATE_STABILITY_BETA="Beta"
+LIVEUPDATE_STABILITY_RC="RC"
+LIVEUPDATE_STABILITY_STABLE="Stabilna"
+LIVEUPDATE_STABILITY_SVN="SVN"
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/cs-CZ/cs-CZ.liveupdate.ini b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/cs-CZ/cs-CZ.liveupdate.ini
new file mode 100644
index 00000000..e1db2ab6
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/cs-CZ/cs-CZ.liveupdate.ini
@@ -0,0 +1,56 @@
+; Akeeba Live Update
+; Copyright (c)2010-2013 Nicholas K. Dionysopoulos / AkeebaBackup.com
+; Licensed under the GNU LGPLv3 or later <http://www.gnu.org/copyleft/lesser.html>
+
+LIVEUPDATE_TASK_OVERVIEW="Aktualizace"
+
+LIVEUPDATE_NOTSUPPORTED_HEAD="Tento server nepodporuje kontrolu aktualizací"
+LIVEUPDATE_NOTSUPPORTED_INFO="Nastavení Vašeho serveru nedovoluje spustit aktualizaci. Kontaktujte prosím provozovatele serveru a požádejte ho o zprovoznění PHP rozšíření cUrl nebo o povolení možnosti allow_url_fopen. Pokud je jedna z těchto možností již povolena, požádejte o prověření nastavení firewall, zda je povolena komunikace s následující adresou URL:"
+LIVEUPDATE_NOTSUPPORTED_ALTMETHOD="Aktualizaci rozšíření <var>%s</var> můžete provést ručně, stažením nejnovější verze z našich stránek a instalací ve správci rozšíření."
+
+LIVEUPDATE_STUCK_HEAD="Poslední pokus o získání aktualizace se nezdařil"
+LIVEUPDATE_STUCK_INFO="Poslední pokus o komunikaci se serverem aktualizací se nezdařil. Obvykle je to způsobeno nastavením serveru, které neumožňuje komunikaci s jinými servery. Pro opětovný pokus získání informací o aktualizacích stiskněte tlačítko "_QQ_"Aktualizovat informace"_QQ_". Pokud se Vám po stisknutí tohoto tlačítka zobrazí prázdná bílá stránka, kontaktujte prosím provozovatele serveru."
+
+LIVEUPDATE_ERROR_NEEDSAUTH="Tato aktualizace vyžaduje vyplněné Přihlašovací jméno a Heslo, nebo Klientské ID (Download ID) v nastavení komponenty. Po vyplnění potřebných informací bude povoleno tlačítko Aktualizovat."
+LIVEUPDATE_HASUPDATES_HEAD="Je k dispozici nová verze"
+LIVEUPDATE_NOUPDATES_HEAD="Instalovaná verze je aktuální"
+LIVEUPDATE_CURRENTVERSION="Instalovaná verze"
+LIVEUPDATE_LATESTVERSION="Nejnovější verze"
+LIVEUPDATE_LATESTRELEASED="Datum nejnovější verze"
+LIVEUPDATE_DOWNLOADURL="Adresa pro ruční stažení"
+
+LIVEUPDATE_REFRESH_INFO="Najít aktualizace"
+LIVEUPDATE_DO_UPDATE="Aktualizovat"
+
+LIVEUPDATE_FTP_REQUIRED="Pro dokončení instalace na Vašem serveru je nutné využít vrstvu FTP, v globálním nastavení Joomla! však nejsou vyplněny všechna potřebná nastavení.<br/><br/>Vyplňte prosím informace pro připojení k serveru FTP níže."
+LIVEUPDATE_FTP="Nastavení FTP"
+LIVEUPDATE_FTPUSERNAME="FTP Přihlašovací jméno"
+LIVEUPDATE_FTPPASSWORD="FTP Heslo"
+LIVEUPDATE_DOWNLOAD_AND_INSTALL="Stáhnout a nainstalovat aktualizaci"
+
+LIVEUPDATE_DOWNLOAD_FAILED="Nepodařilo se stáhnout aktualizační balíček. Ověřte prosím, zda je Vaše dočasná složka zapisovatelná, nebo zda máte povolenu Vrstvu FTP v globálním nastavení Joomla!."
+LIVEUPDATE_EXTRACT_FAILED="Nepodařilo se rozbalit aktualizační balíček. Zkuste prosím rozšíření aktualizovat ručně."
+
+LIVEUPDATE_INVALID_PACKAGE_TYPE="Nebyl rozpoznán formát aktualizačního balíčku. V aktualizaci nelze pokračovat."
+LIVEUPDATE_INSTALLEXT="Instalovat %s %s"
+LIVEUPDATE_ERROR="Chyba"
+LIVEUPDATE_SUCCESS="Dokončeno"
+
+LIVEUPDATE_ICON_UNSUPPORTED="Aktualizace není podporována"
+LIVEUPDATE_ICON_CRASHED="Aktualizace skončila chybou"
+LIVEUPDATE_ICON_CURRENT="Vaše verze je aktuální"
+LIVEUPDATE_ICON_UPDATES="NALEZENA NOVÁ VERZE! AKTUALIZOVAT"
+
+LIVEUPDATE_RELEASEINFO="Informace"
+LIVEUPDATE_RELEASENOTES="Poznámky k verzi"
+LIVEUPDATE_READMOREINFO="Podrobnosti"
+
+LIVEUPDATE_NAGSCREEN_HEAD="UPOZORNĚNÍ! Chystáte se instalovat nestabilní verzi."
+LIVEUPDATE_NAGSCREEN_BODY="Chystáte se instalovat nestabilní verzi (%s - %s). Nestabilní verze jsou minimálně, nebo nejsou vůbec testovány a mohou obsahovat chyby, ovlivňující stabilitu a funkčnost Vašich stránek. Pokud si nejste jisti tím co děláte, uzavřete prosím okno prohlížeče. Pokud jste si naprosto jisti a rozumíte rizikům spojeným s instalací nestabilní verze, klikněte na tlačítko níže pro pokračování v instalaci této nestabilní verze."
+LIVEUPDATE_NAGSCREEN_BUTTON="Rozumím rizikům. Pokračovat v instalaci."
+
+LIVEUPDATE_STABILITY_ALPHA="Alfa"
+LIVEUPDATE_STABILITY_BETA="Beta"
+LIVEUPDATE_STABILITY_RC="RC"
+LIVEUPDATE_STABILITY_STABLE="Stable"
+LIVEUPDATE_STABILITY_SVN="SVN"
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/da-DK/da-DK.liveupdate.ini b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/da-DK/da-DK.liveupdate.ini
new file mode 100644
index 00000000..91bd725d
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/da-DK/da-DK.liveupdate.ini
@@ -0,0 +1,56 @@
+; Akeeba Live Update
+; Copyright (c)2010-2013 Nicholas K. Dionysopoulos / AkeebaBackup.com
+; Licensed under the GNU LGPLv3 or later <http://www.gnu.org/copyleft/lesser.html>
+
+LIVEUPDATE_TASK_OVERVIEW="Live Opdatering"
+
+LIVEUPDATE_NOTSUPPORTED_HEAD="Live opdatering understøttes ikke af denne server"
+LIVEUPDATE_NOTSUPPORTED_INFO="Din server indikerer at Live opdatering ikke er understøttet. Kontakt venligst din udbyder og spørg dem om at aktivere cURL PHP udvidelsen eller aktivere URL fopen() wrappers. Hvis disse allerede er aktive, så spørg dem venligst om at konfigurere deres firewall, således at den tillader adgang til følgende :"
+LIVEUPDATE_NOTSUPPORTED_ALTMETHOD="Du kan altid opdatere <var>%s</var> ved at besøge vores hjemmeside manuelt og hente den seneste udgivelse og derefter installere den ved at bruge Joomla!'s udvidelsesinstalleren."
+
+LIVEUPDATE_STUCK_HEAD="Live opdatering melder at den gik ned"
+LIVEUPDATE_STUCK_INFO="Live opdatering opdagede at den gik ned sidste gang den prøvede at kontakte opdateringsserveren. Dette indikerer nomalt en udbyder der aktivt blokerer kommunikation med eksterne sider. Hvis du vil forsøge at hente opdateringsinformationen igen, klik da venligst på "_QQ_"Opdatér opdateringsinformation"_QQ_" herunder. Hvis det resulterer i en blank side, så kontakt venligst din udbyder og rapportér dette problem."
+
+LIVEUPDATE_ERROR_NEEDSAUTH="Du skal angive dit brugernavn/adgangskode eller Overførsel's ID i komponenten's indstillinger, før du kan opdatere til den seneste version. Opdateringsknappen vil forblive inaktiv indtil da."
+LIVEUPDATE_HASUPDATES_HEAD="En ny version er tilgængelig"
+LIVEUPDATE_NOUPDATES_HEAD="Du har allerede den seneste version"
+LIVEUPDATE_CURRENTVERSION="Installeret version"
+LIVEUPDATE_LATESTVERSION="Seneste version"
+LIVEUPDATE_LATESTRELEASED="Seneste udgivelsesdato"
+LIVEUPDATE_DOWNLOADURL="Direkte link"
+
+LIVEUPDATE_REFRESH_INFO="Opdatér opdateringsinformation"
+LIVEUPDATE_DO_UPDATE="Opdatér til seneste version"
+
+LIVEUPDATE_FTP_REQUIRED="Live opdatering har opdaget at den skal bruge FTP for at kunne overføre og installere din opdatering, men du har ikke gemt en FTP log ind information i din Joomla!'s konfiguration.<br/><br/>Angiv venligst FTP brugernavn og adgangskode herunder for at fortsætte med opdateringen."
+LIVEUPDATE_FTP="FTP information"
+LIVEUPDATE_FTPUSERNAME="FTP Brugernavn"
+LIVEUPDATE_FTPPASSWORD="FTP Adgangskode"
+LIVEUPDATE_DOWNLOAD_AND_INSTALL="Overfør og installér opdatering"
+
+LIVEUPDATE_DOWNLOAD_FAILED="Overførsel af opdateringspakken fejlede. Vær venligst sikker på der kan skrives til din midlertidige mappe og at du har aktiveret Joomla!'s FTP mulighed i Joomla!'s konfiguration."
+LIVEUPDATE_EXTRACT_FAILED="Udpakning af opdateringspakken fejlede. Opdatér venligst udvidelsen manuelt."
+
+LIVEUPDATE_INVALID_PACKAGE_TYPE="Ugyldig pakketype. Opdateringen kan ikke fortsætte."
+LIVEUPDATE_INSTALLEXT="Installér %s %s"
+LIVEUPDATE_ERROR="Fejl"
+LIVEUPDATE_SUCCESS="Korrekt"
+
+LIVEUPDATE_ICON_UNSUPPORTED="Live opdatering er ikke understøttet"
+LIVEUPDATE_ICON_CRASHED="Live opdatering gik ned"
+LIVEUPDATE_ICON_CURRENT="Du har den seneste version"
+LIVEUPDATE_ICON_UPDATES="OPDATERING FUNDET! OPDATER NU."
+
+; LIVEUPDATE_RELEASEINFO="Information"
+; LIVEUPDATE_RELEASENOTES="Release notes"
+; LIVEUPDATE_READMOREINFO="Read more"
+
+; LIVEUPDATE_NAGSCREEN_HEAD="WARNING! You are about to install an unstable version."
+; LIVEUPDATE_NAGSCREEN_BODY="You are about to install an unstable version (%s - %s). Unstable versions may have undergone minimal or no testing and contain bugs which may have an serious adverse to the stability and functionality of your web site. If you are not sure about what you are about to do, please close this browser window. If you are absolutely certain you understand the risks involved with the installation of unstable releases, please click the button below to continue the installation of this unstable release."
+; LIVEUPDATE_NAGSCREEN_BUTTON="I understand the risks. Continue with the installation."
+
+; LIVEUPDATE_STABILITY_ALPHA="Alpha"
+; LIVEUPDATE_STABILITY_BETA="Beta"
+; LIVEUPDATE_STABILITY_RC="RC"
+; LIVEUPDATE_STABILITY_STABLE="Stable"
+; LIVEUPDATE_STABILITY_SVN="SVN"
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/de-DE/de-DE.liveupdate.ini b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/de-DE/de-DE.liveupdate.ini
new file mode 100644
index 00000000..524848f1
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/de-DE/de-DE.liveupdate.ini
@@ -0,0 +1,56 @@
+; Akeeba Live Update
+; Copyright (c)2010-2013 Nicholas K. Dionysopoulos / AkeebaBackup.com
+; Licensed under the GNU LGPLv3 or later <http://www.gnu.org/copyleft/lesser.html>
+
+LIVEUPDATE_TASK_OVERVIEW="Echtzeitaktualisierung"
+
+LIVEUPDATE_NOTSUPPORTED_HEAD="Die Echtzeitaktualisierung wird auf diesem Server nicht unterstützt"
+LIVEUPDATE_NOTSUPPORTED_INFO="Ihr Server zeigt an, dass die Echtzeitaktualisierung nicht unterstützt wird. Bitte kontaktieren Sie Ihren Anbieter und bitten ihn, die cURL-PHP-Erweiterung zu aktivieren oder die URL fopen() Wrapper. Sollten diese schon aktviert sein, bitten Sie ihn, die Firewall so zu konfigurieren, dass sie den Zugriff auf folgende URL zulässt:"_QQ_""
+LIVEUPDATE_NOTSUPPORTED_ALTMETHOD="Sie können immer aktualisieren <var>%s</var> indem Sie unsere Internetseite besuchen, die neueste Version herunterladen und ganz normal installieren."
+
+LIVEUPDATE_STUCK_HEAD="Die Echtzeitaktualisierung hat sich selbst als abgestürzt gemeldet"
+LIVEUPDATE_STUCK_INFO="Die Echtzeitaktualisierung hat festgestellt, dass sie beim letzten Versuch den Aktualisierungsserver zu erreichen abgestürzt ist. Dies deutet meist auf einen Anbieter hin, der die Kommunikation mit externen Servern blockiert. Sollten Sie die Aktulalisierungsinformationen nochmals abrufen wollen, klicken Sie bitte auf den Knopf "_QQ_"Aktualisierungsinformationen abrufen"_QQ_". Sollte dieser Versuch auf einer weißen Seite enden, melden Sie diesen Fehler ihrem Anbieter."
+
+LIVEUPDATE_ERROR_NEEDSAUTH="Bevor Sie eine Echtzeitaktualisierung durchführen können, müssen Sie Ihren Benutzernamen, das Passwort bzw. die Download-ID angeben. Der Aktualisierungsknopf wird solange ohne Funktion bleiben."
+LIVEUPDATE_HASUPDATES_HEAD="Es gibt eine neue Version"
+LIVEUPDATE_NOUPDATES_HEAD="Sie haben die aktuelle Version"
+LIVEUPDATE_CURRENTVERSION="Installierte Version"
+LIVEUPDATE_LATESTVERSION="Neueste Version"
+LIVEUPDATE_LATESTRELEASED="Neuestes Veröffentlichungsdatum"
+LIVEUPDATE_DOWNLOADURL="Direkte Download-URL"
+
+LIVEUPDATE_REFRESH_INFO="Aktualisierungsinformationen abrufen"
+LIVEUPDATE_DO_UPDATE="Auf die neueste Version aktualisieren"
+
+LIVEUPDATE_FTP_REQUIRED="Die Echtzeitaktualisierung hat festgestellt, dass FTP für die Aktualisierung und Installation verwednet werden muss. Sie haben aber noch keine FTP-Daten in der Joomla!-Konfiguraton angegeben.<br/><br/>BItte geben Sie Ihre FTP-Daten ein, bevor Sie mit der Aktualisierung fortfahren."
+LIVEUPDATE_FTP="FTP Informationen"
+LIVEUPDATE_FTPUSERNAME="FTP Benutzername"
+LIVEUPDATE_FTPPASSWORD="FTP Passwort"
+LIVEUPDATE_DOWNLOAD_AND_INSTALL="Aktualisierung herunterladen und installieren"
+
+LIVEUPDATE_DOWNLOAD_FAILED="Das Herunterladen des Aktualisierungspakets ist fehlgeschlagen. Bitte stellen Sie sicher, dass Ihr temp-Verzeichnis Schreibrechte besitzt und Sie Ihre FTP-Nutzerdaten in der Joomla!-Konfiguration angegeben haben."
+LIVEUPDATE_EXTRACT_FAILED="Das Auspacken des Aktualisierungspakets ist fehlgeschlagen. Bitte aktualisieren Sie die Erweiterung manuell."
+
+LIVEUPDATE_INVALID_PACKAGE_TYPE="Falscher Aktualisierungspakettyp. Die Aktualisierung kann nicht durchgeführt werden."
+LIVEUPDATE_INSTALLEXT="Installiere %s %s"
+LIVEUPDATE_ERROR="Fehler"
+LIVEUPDATE_SUCCESS="Erfolg"
+
+LIVEUPDATE_ICON_UNSUPPORTED="Echtzeitaktualisierung nicht unterstützt"
+LIVEUPDATE_ICON_CRASHED="Live Update abgestürzt"
+LIVEUPDATE_ICON_CURRENT="Sie haben die aktuelle Version"
+LIVEUPDATE_ICON_UPDATES="AKTUALISIERUNG GEFUNDEN! JETZT AKTUALISIEREN."
+
+LIVEUPDATE_RELEASEINFO="Information"
+LIVEUPDATE_RELEASENOTES="Infos zur Veröffentlichung"
+LIVEUPDATE_READMOREINFO="Weiterlesen"
+
+LIVEUPDATE_NAGSCREEN_HEAD="ACHTUNG! Sie sind dabei, eine instabile Version zu installieren."
+LIVEUPDATE_NAGSCREEN_BODY="Sie sind dabei, eine instabile Version zu installieren (%s - %s). Instabile Versionen sind noch in Entwicklung oder nicht final getestet und können Bugs enthalten, die die Stabilität und Funktionalität Ihrer Webseite beeinträchtigen können. Wenn Sie nicht sicher sind, was Sie tun sollen, dann schließen Sie dieses Browserfenster. Sollten Sie absolut sicher sein, dass Sie das Risiko eingehen und die möglichen Folgen einer unfertigen Version auf eigene Gefahr in Kauf nehmen wollen,  klicken Sie auf den unten stehenden Button um die instabile Version zu installieren."
+LIVEUPDATE_NAGSCREEN_BUTTON="Ich kenne die Risiken. Mit der Installation fortfahren."
+
+; LIVEUPDATE_STABILITY_ALPHA="Alpha"
+; LIVEUPDATE_STABILITY_BETA="Beta"
+; LIVEUPDATE_STABILITY_RC="RC"
+; LIVEUPDATE_STABILITY_STABLE="Stable"
+; LIVEUPDATE_STABILITY_SVN="SVN"
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/el-GR/el-GR.liveupdate.ini b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/el-GR/el-GR.liveupdate.ini
new file mode 100644
index 00000000..4f70c553
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/el-GR/el-GR.liveupdate.ini
@@ -0,0 +1,56 @@
+; Akeeba Live Update
+; Copyright (c)2010-2013 Nicholas K. Dionysopoulos / AkeebaBackup.com
+; Licensed under the GNU LGPLv3 or later <http://www.gnu.org/copyleft/lesser.html>
+
+LIVEUPDATE_TASK_OVERVIEW="Απευθείας Ενημέρωση"
+
+LIVEUPDATE_NOTSUPPORTED_HEAD="Η Απευθείας Ενημέρωση δεν υποστηρίζεται από αυτόν τον διακομιστή"
+LIVEUPDATE_NOTSUPPORTED_INFO="Ο διακομιστής σας δείχνει ότι η Απευθείας Ενημέρωση δεν υποστηρίζεται. Παρακαλώ επικοινωνήστε με τον πάροχο φιλοξενίας σας και ζητήστε του να ενεργοποιήσει την επέκταση cURL της PHP ή τους URL fopen() wrappers. Εάν είναι ήδη ενεργοποιημένα, παρακαλώ ζητήστε του να ανοίξει το τείχος ασφαλείας ώστε να επιτρέπει την πρόσβαση στην παρακάτω διεύθυνση URL:"_QQ_""
+LIVEUPDATE_NOTSUPPORTED_ALTMETHOD="Μπορείτε πάντα να ενημερώστε το λογισμικό <var>%s</var> επισκεπτόμενοι τον ιστότοπό μας, κατεβάζοντας την τελευταία έκδοση και εγκαθιστόντας την με την εγκατάσταση εφαρμογών του Joomla!."
+
+LIVEUPDATE_STUCK_HEAD="Η Απευθείας Ενημέρωση ανίχνευσε αποτυχία λειτουργίας"
+LIVEUPDATE_STUCK_INFO="Η Απευθείας Ενημέρωση εντόπισε ότι η τελευταία απόπειρα επικοινωνίας με τον διακομιστή ενημερώσεων κατέληξε σε κόλλημα. Αυτό συνήθως υποδυκνείει έναν πάροχο φιλοξενίας που μπλοκάρει ενεργά τις προσπάθειες επικοινωνίας με εξωετρικούς ιστοχώρους. Εάν θα θέλατε να δοκιμάσετε να ξαναπροσπαθήσουμε να λάβουμε τις πληροφορίες ενημέρωσεις, παρακαλώ κάντε κλικ στο κουμπί "_QQ_"Ανανέωση πληροφοριών ενημερώσεων"_QQ_" πιο κάτω. Εάν αυτό οδηγήσει σε λευκή σελίδα, παρακαλώ επικοινωνήστε με τον πάροχο φιλοξενίας και αναφέρετε αυτό το πρόβλημα."
+
+LIVEUPDATE_ERROR_NEEDSAUTH="Πρέπει να εισάγετε το όνομα χρήστη και συνθηματικό ή το Αναγνωριστικό Μεταφόρτωσης στις παραμέτρους της εφαρμογής πριν προσπαθήσετε να αναβαθμίσετε στην τελευταία έκδοση. Το κουμπί ενημέρωσης θα παραμείνει ανενεργό έως ότου το κάνετε."
+LIVEUPDATE_HASUPDATES_HEAD="Μια νέα έκδοση είναι διαθέσιμη"
+LIVEUPDATE_NOUPDATES_HEAD="Έχετε ήδη την τελευταία έκδοση"
+LIVEUPDATE_CURRENTVERSION="Εγκατεστημένη έκδοση"
+LIVEUPDATE_LATESTVERSION="Τελευταία έκδοση"
+LIVEUPDATE_LATESTRELEASED="Ημερομηνία έκδοσης"
+LIVEUPDATE_DOWNLOADURL="Διεύθυνση απευθείας μεταφόρτωσης"
+
+LIVEUPDATE_REFRESH_INFO="Ανανέωση πληροφοριών ενημερώσεων"
+LIVEUPDATE_DO_UPDATE="Ενημέρωση στην τελευταία έκδοση"
+
+LIVEUPDATE_FTP_REQUIRED="Η Απευθείας Ενημέρωση εντόπισε ότι απαιτείται η χρήση FTP για να μεταφορτώσει και να εγκαταστήσει την ενημέρωσή σας, αλλά δεν έχετε σώσει τις πληροφορίες εισόδου στο FTP στις Γενικές Ρυθμίσεις του Joomla!.<br/><br/>Παρακαλώ εισάγετε το όνομα χρήστη και το συνθηματικό για το FTP προκειμένου να προχωρήσετε με την ενημέρωση."
+LIVEUPDATE_FTP="Πληροφορίες FTP"
+LIVEUPDATE_FTPUSERNAME="Όνομα Χρήστη FTP"
+LIVEUPDATE_FTPPASSWORD="Συνθηματικό FTP"
+LIVEUPDATE_DOWNLOAD_AND_INSTALL="Μεταφόρτωση και εγκατάσταση ενημέρωσης"
+
+LIVEUPDATE_DOWNLOAD_FAILED="Η μεταφόρτωση του πακέτου ενημέρωσης απέτυχε. Παρακαλώ βεβαιωθείτε ότι ο κάταλογος προσωρινής αποθήκευσης είναι εγγράψιμος ή ότι έχετε ενεργοποιήσει τις επιλογές FTP στις Γενικές Ρυθμίσεις του ιστοχώρου σας."
+LIVEUPDATE_EXTRACT_FAILED="Η αποσυμπίεση του πακέτου αναβάθμισης απέτυχε. Παρακαλώ δοκιμάστε να εγκαταστήσετε την επέκταση χειροκίνητα."
+
+LIVEUPDATE_INVALID_PACKAGE_TYPE="Ο τύπος του πακέτου δεν είναι έγκυρος. Η αναβάθμιση δεν μπορεί να συνεχίσει."
+LIVEUPDATE_INSTALLEXT="Εγκατάσταση %s %s"
+LIVEUPDATE_ERROR="Σφάλμα"
+LIVEUPDATE_SUCCESS="Επιτυχία"
+
+LIVEUPDATE_ICON_UNSUPPORTED="Η Απευθείας Ενημέρωση δεν υποστηρίζεται"
+LIVEUPDATE_ICON_CRASHED="Η Απευθείας Ενημέρωση κόλλησε"
+LIVEUPDATE_ICON_CURRENT="Έχετε την τελευταία έκδοση"
+LIVEUPDATE_ICON_UPDATES="ΒΡΕΘΗΚΕ ΕΝΗΜΕΡΩΣΗ! ΚΑΝΤΕ ΚΛΙΚ ΓΙΑ ΑΝΑΒΑΘΜΙΣΗ."
+
+LIVEUPDATE_RELEASEINFO="Πληροφορίες"
+LIVEUPDATE_RELEASENOTES="Σημειώσεις έκδοσης"
+LIVEUPDATE_READMOREINFO="Διαβάστε περισσότερα"
+
+LIVEUPDATE_NAGSCREEN_HEAD="ΠΡΟΣΟΧΗ! Πρόκειται να εγκαταστήσετε μια ασταθή έκδοση."
+LIVEUPDATE_NAGSCREEN_BODY="Πρόκειται να εγκαταστήσετε μια ασταθή έκδοση (%s - %s). Οι ασταθείς εκδόσεις μπορεί να έχουν υποβληθεί σε ελάχιστο ή περιορισμένο ποιοτικό έλεγχο και να περιέχουν σφάλματα που μπορεί να έχουν σοβαρές παρενέργειες στην σταθερότητα και λειτουργία τουιστοχώρου σας. Εάν δεν είστε βέβαιος για αυτό που πρόκειται να κάνετε, παρακαλώ κλείστε αυτό το παράθυρο του περιηγητή σας. Εάν κατανοείτε πλήρως τους κινδύνους που συνοδεύουν την εγκατάσταση ασταθών εκδόσεων παρακαλώ κάντε κλικ στο παρακάτω κουμπί για να συνεχίσετε την εγκατάσταση αυτής της ασταθούς έκδοσης."
+LIVEUPDATE_NAGSCREEN_BUTTON="Καταννοώ τους κινδύνους. Συνέχισε την εγκατάσταση."
+
+LIVEUPDATE_STABILITY_ALPHA="Άλφα"
+LIVEUPDATE_STABILITY_BETA="Βήτα"
+LIVEUPDATE_STABILITY_RC="Υποψήφια Έκδοσης"
+LIVEUPDATE_STABILITY_STABLE="Σταθερή"
+LIVEUPDATE_STABILITY_SVN="Έκδοση Προγραμματιστή"
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/en-GB/en-GB.liveupdate.ini b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/en-GB/en-GB.liveupdate.ini
new file mode 100644
index 00000000..097f3c4a
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/en-GB/en-GB.liveupdate.ini
@@ -0,0 +1,56 @@
+; Akeeba Live Update
+; Copyright (c)2010-2013 Nicholas K. Dionysopoulos / AkeebaBackup.com
+; Licensed under the GNU LGPLv3 or later <http://www.gnu.org/copyleft/lesser.html>
+
+LIVEUPDATE_TASK_OVERVIEW="Live Update"
+
+LIVEUPDATE_NOTSUPPORTED_HEAD="Live Update is not supported on this server"
+LIVEUPDATE_NOTSUPPORTED_INFO="Your server indicates that Live Update is not supported. Please contact your host and ask them to enable the cURL PHP extension or activate the URL fopen() wrappers. If these are already enabled, please ask them to configure their firewall so that it allows access to the following URL:"
+LIVEUPDATE_NOTSUPPORTED_ALTMETHOD="You can always update <var>%s</var> by visiting our site manually, downloading the latest release and installing it using Joomla!'s extension installer."
+
+LIVEUPDATE_STUCK_HEAD="Live Update has marked itself as crashed"
+LIVEUPDATE_STUCK_INFO="Live Update determined that it crashed the last time it tried to contact the update server. This usually indicates a host which actively blocks communications with external sites. If you would like to retry fetching the update information, please click the "_QQ_"Refresh update information"_QQ_" button below. If that results to a blank page, please contact your host and report this issue."
+
+LIVEUPDATE_ERROR_NEEDSAUTH="You have to supply your username/password or Download ID to the component's parameters before trying to upgrade to the latest release. The upgrade button will remain disabled until you do that."
+LIVEUPDATE_HASUPDATES_HEAD="A new version is available"
+LIVEUPDATE_NOUPDATES_HEAD="You already have the latest version"
+LIVEUPDATE_CURRENTVERSION="Installed version"
+LIVEUPDATE_LATESTVERSION="Latest version"
+LIVEUPDATE_LATESTRELEASED="Latest release date"
+LIVEUPDATE_DOWNLOADURL="Direct download URL"
+
+LIVEUPDATE_REFRESH_INFO="Refresh update information"
+LIVEUPDATE_DO_UPDATE="Update to the latest version"
+
+LIVEUPDATE_FTP_REQUIRED="Live Update determined that it needs to use FTP in order to download and install your update, but you have not saved your FTP login information in your Joomla! Global Configuration.<br/><br/>Please provide the FTP username and password below to proceed with the update."
+LIVEUPDATE_FTP="FTP Information"
+LIVEUPDATE_FTPUSERNAME="FTP Username"
+LIVEUPDATE_FTPPASSWORD="FTP Password"
+LIVEUPDATE_DOWNLOAD_AND_INSTALL="Download and install update"
+
+LIVEUPDATE_DOWNLOAD_FAILED="Downloading the update package failed. Make sure that your temp-directory is writable or that you have enabled Joomla!'s FTP options in your site's Global Configuration."
+LIVEUPDATE_EXTRACT_FAILED="Extracting the update package failed. Please try updating the extension manually."
+
+LIVEUPDATE_INVALID_PACKAGE_TYPE="Invalid package type. The update can not proceed."
+LIVEUPDATE_INSTALLEXT="Install %s %s"
+LIVEUPDATE_ERROR="Error"
+LIVEUPDATE_SUCCESS="Success"
+
+LIVEUPDATE_ICON_UNSUPPORTED="Live Update not supported"
+LIVEUPDATE_ICON_CRASHED="Live Update crashed"
+LIVEUPDATE_ICON_CURRENT="You have the latest version"
+LIVEUPDATE_ICON_UPDATES="UPDATE FOUND! CLICK TO UPDATE."
+
+LIVEUPDATE_RELEASEINFO="Information"
+LIVEUPDATE_RELEASENOTES="Release notes"
+LIVEUPDATE_READMOREINFO="Read more"
+
+LIVEUPDATE_NAGSCREEN_HEAD="WARNING! You are about to install an unstable version."
+LIVEUPDATE_NAGSCREEN_BODY="You are about to install an unstable version (%s - %s). Unstable versions may have undergone minimal or no testing and contain bugs which may have an adverse effect to the stability and functionality of your web site. If you are not sure about what you are about to do, please close this browser window. If you are absolutely certain you understand the risks involved with the installation of unstable releases, please click the button below to continue the installation of this unstable release."
+LIVEUPDATE_NAGSCREEN_BUTTON="I understand the risks. Continue with the installation."
+
+LIVEUPDATE_STABILITY_ALPHA="Alpha"
+LIVEUPDATE_STABILITY_BETA="Beta"
+LIVEUPDATE_STABILITY_RC="RC"
+LIVEUPDATE_STABILITY_STABLE="Stable"
+LIVEUPDATE_STABILITY_SVN="SVN"
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/es-ES/es-ES.liveupdate.ini b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/es-ES/es-ES.liveupdate.ini
new file mode 100644
index 00000000..de2549e8
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/es-ES/es-ES.liveupdate.ini
@@ -0,0 +1,56 @@
+; Akeeba Live Update
+; Copyright (c)2010-2013 Nicholas K. Dionysopoulos / AkeebaBackup.com
+; Licensed under the GNU LGPLv3 or later <http://www.gnu.org/copyleft/lesser.html>
+
+LIVEUPDATE_TASK_OVERVIEW="Actualización automática"
+
+LIVEUPDATE_NOTSUPPORTED_HEAD="Este servidor no soporta la Actualización automática"
+LIVEUPDATE_NOTSUPPORTED_INFO="Su servidor indica que no soporta la Actualización automática. Por favor, contacte con su proveedor de hosting y pídale que active la función cURL de PHP, o bien que active los wrappers de URL fopen(). Si alguna de las opciones anteriores ya está activada, por favor pídale que que configure su cortafuegos de manera que permita el acceso a la siguiente URL:"_QQ_""
+LIVEUPDATE_NOTSUPPORTED_ALTMETHOD="Siempre puede actualizar <var>%s</var> manualmente visitando nuestro sitio, descargando la última versión e instalándola mediante el instalador del gestor de extensiones de Joomla!"_QQ_""
+
+LIVEUPDATE_STUCK_HEAD="La actualización automática informa de un fallo"
+LIVEUPDATE_STUCK_INFO="La actualización automática determinó que hubo un fallo la última vez que intentó contactar con el servidor de actualizaciones. Esto habitualmente ocurre cuando un host bloquea activamente las comunicaciones con sitios externos. Si desea trata de obtener de nuevo la información sobre nuevas actualizaciones, por favor haga clic en el botón "_QQ_"Refrescar la información sobre actualizaciones"_QQ_" que hay a continuación. Si tras hacerlo obtiene una página en blanco, por favor contacte con su proveedor de hosting y coméntele el problema."
+
+LIVEUPDATE_ERROR_NEEDSAUTH="Debe introducir su nombre de usuario/contraseña su ID de Descarga (Download ID) en los parámetros de configuración del componente antes de intentar actualizar a la última versión. El botón de actualización permanecerá deshabilitado hasta que lo haga."
+LIVEUPDATE_HASUPDATES_HEAD="Hay disponible una nueva versión"
+LIVEUPDATE_NOUPDATES_HEAD="Ya tiene instalada la última vesión"
+LIVEUPDATE_CURRENTVERSION="Versión instalada"
+LIVEUPDATE_LATESTVERSION="Última versión"
+LIVEUPDATE_LATESTRELEASED="Fecha de la última versión"
+LIVEUPDATE_DOWNLOADURL="URL de descarga directa"
+
+LIVEUPDATE_REFRESH_INFO="Refrescar la información de actualización"
+LIVEUPDATE_DO_UPDATE="Actualizar a la última versión"
+
+LIVEUPDATE_FTP_REQUIRED="La actualización automática determinó que es necesario usar FTP para poder descargar e instalar su actualización, pero usted aún no ha guardado la información de inicio de sesión FTP en la configuración global de Joomla!.<br/><br/>Por favor introduzca el nombre de usuario y la contraseña de su cuenta FTP a continuación para proceder con la actualización."
+LIVEUPDATE_FTP="Información FTP"
+LIVEUPDATE_FTPUSERNAME="Usuario FTP"
+LIVEUPDATE_FTPPASSWORD="Contraseña FTP"
+LIVEUPDATE_DOWNLOAD_AND_INSTALL="Descargar e instalar la actualización"
+
+LIVEUPDATE_DOWNLOAD_FAILED="La descarga del paquete de actualización no se pudo completar. Asegúrese de que su directorio temporal (temp) tiene permisos de escritura o de que ha habilitado la configuración de FTP en la configuración global de su sitio."
+LIVEUPDATE_EXTRACT_FAILED="La extracción de los archivos del paquete de actualización falló. Por favor, trate de actualizar la extensión manualmente."
+
+LIVEUPDATE_INVALID_PACKAGE_TYPE="Tipo de paquete erróneo. No se puede proceder con la actualización."
+LIVEUPDATE_INSTALLEXT="Instalando %s %s"
+LIVEUPDATE_ERROR="Error"
+LIVEUPDATE_SUCCESS="Éxito"
+
+LIVEUPDATE_ICON_UNSUPPORTED="La actualización automática no está soportada"
+LIVEUPDATE_ICON_CRASHED="La actualización automática falló"
+LIVEUPDATE_ICON_CURRENT="Ya tiene la última versión"
+LIVEUPDATE_ICON_UPDATES="¡ACTUALIZACIÓN DISPONIBLE! CLIC PARA INSTALAR."
+
+LIVEUPDATE_RELEASEINFO="Información"
+LIVEUPDATE_RELEASENOTES="Notas de la versión"
+LIVEUPDATE_READMOREINFO="Leer más"
+
+LIVEUPDATE_NAGSCREEN_HEAD="ATENCIÓN! Usted está a punto de instalar una versión inestable."
+LIVEUPDATE_NAGSCREEN_BODY="Usted está a punto de instalar una versión inestable (%s - %s). Las versiones inestables pueden tener mínimos o ningún test y contener errores que pueden causar serios problemas a la estabilidad y funcionalidad de su sitio web. Si usted no está seguro sobre qué hacer, por favor cierre esta ventana del explorador. Si usted está totalmente seguro de entender los riesgos involucrados con la instalación de versiones inestables, por favor pulse el botón de abajo para continuar con la instalación de esta versión inestable."
+LIVEUPDATE_NAGSCREEN_BUTTON="Entiendo los riesgos. Continuar con la instalación"
+
+LIVEUPDATE_STABILITY_ALPHA="Alfa"
+LIVEUPDATE_STABILITY_BETA="Beta"
+LIVEUPDATE_STABILITY_RC="RC"
+LIVEUPDATE_STABILITY_STABLE="Estable"
+LIVEUPDATE_STABILITY_SVN="SVN"
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/et-EE/et-EE.liveupdate.ini b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/et-EE/et-EE.liveupdate.ini
new file mode 100644
index 00000000..cac25ab6
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/et-EE/et-EE.liveupdate.ini
@@ -0,0 +1,56 @@
+; Akeeba Live Update
+; Copyright (c)2010-2013 Nicholas K. Dionysopoulos / AkeebaBackup.com
+; Licensed under the GNU LGPLv3 or later <http://www.gnu.org/copyleft/lesser.html>
+
+; LIVEUPDATE_TASK_OVERVIEW="Live Update"
+
+; LIVEUPDATE_NOTSUPPORTED_HEAD="Live Update is not supported on this server"
+; LIVEUPDATE_NOTSUPPORTED_INFO="Your server indicates that Live Update is not supported. Please contact your host and ask them to enable the cURL PHP extension or activate the URL fopen() wrappers. If these are already enabled, please ask them to configure their firewall so that it allows access to the following URL:"
+; LIVEUPDATE_NOTSUPPORTED_ALTMETHOD="You can always update <var>%s</var> by visiting our site manually, downloading the latest release and installing it using Joomla!'s extension installer."
+
+; LIVEUPDATE_STUCK_HEAD="Live Update has marked itself as crashed"
+; LIVEUPDATE_STUCK_INFO="Live Update determined that it crashed the last time it tried to contact the update server. This usually indicates a host which actively blocks communications with external sites. If you would like to retry fetching the update information, please click the "_QQ_"Refresh update information"_QQ_" button below. If that results to a blank page, please contact your host and report this issue."
+
+; LIVEUPDATE_ERROR_NEEDSAUTH="You have to supply your username/password or Download ID to the component's parameters before trying to upgrade to the latest release. The upgrade button will remain disabled until you do that."
+; LIVEUPDATE_HASUPDATES_HEAD="A new version is available"
+; LIVEUPDATE_NOUPDATES_HEAD="You already have the latest version"
+; LIVEUPDATE_CURRENTVERSION="Installed version"
+; LIVEUPDATE_LATESTVERSION="Latest version"
+; LIVEUPDATE_LATESTRELEASED="Latest release date"
+; LIVEUPDATE_DOWNLOADURL="Direct download URL"
+
+; LIVEUPDATE_REFRESH_INFO="Refresh update information"
+; LIVEUPDATE_DO_UPDATE="Update to the latest version"
+
+; LIVEUPDATE_FTP_REQUIRED="Live Update determined that it needs to use FTP in order to download and install your update, but you have not saved your FTP login information in your Joomla! Global Configuration.<br/><br/>Please provide the FTP username and password below to proceed with the update."
+; LIVEUPDATE_FTP="FTP Information"
+; LIVEUPDATE_FTPUSERNAME="FTP Username"
+; LIVEUPDATE_FTPPASSWORD="FTP Password"
+; LIVEUPDATE_DOWNLOAD_AND_INSTALL="Download and install update"
+
+; LIVEUPDATE_DOWNLOAD_FAILED="Downloading the update package failed. Make sure that your temp-directory is writable or that you have enabled Joomla!'s FTP options in your site's Global Configuration."
+; LIVEUPDATE_EXTRACT_FAILED="Extracting the update package failed. Please try updating the extension manually."
+
+; LIVEUPDATE_INVALID_PACKAGE_TYPE="Invalid package type. The update can not proceed."
+; LIVEUPDATE_INSTALLEXT="Install %s %s"
+; LIVEUPDATE_ERROR="Error"
+; LIVEUPDATE_SUCCESS="Success"
+
+; LIVEUPDATE_ICON_UNSUPPORTED="Live Update not supported"
+; LIVEUPDATE_ICON_CRASHED="Live Update crashed"
+; LIVEUPDATE_ICON_CURRENT="You have the latest version"
+; LIVEUPDATE_ICON_UPDATES="UPDATE FOUND! CLICK TO UPDATE."
+
+; LIVEUPDATE_RELEASEINFO="Information"
+; LIVEUPDATE_RELEASENOTES="Release notes"
+; LIVEUPDATE_READMOREINFO="Read more"
+
+; LIVEUPDATE_NAGSCREEN_HEAD="WARNING! You are about to install an unstable version."
+; LIVEUPDATE_NAGSCREEN_BODY="You are about to install an unstable version (%s - %s). Unstable versions may have undergone minimal or no testing and contain bugs which may have an serious adverse to the stability and functionality of your web site. If you are not sure about what you are about to do, please close this browser window. If you are absolutely certain you understand the risks involved with the installation of unstable releases, please click the button below to continue the installation of this unstable release."
+; LIVEUPDATE_NAGSCREEN_BUTTON="I understand the risks. Continue with the installation."
+
+; LIVEUPDATE_STABILITY_ALPHA="Alpha"
+; LIVEUPDATE_STABILITY_BETA="Beta"
+; LIVEUPDATE_STABILITY_RC="RC"
+; LIVEUPDATE_STABILITY_STABLE="Stable"
+; LIVEUPDATE_STABILITY_SVN="SVN"
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/fa-IR/fa-IR.liveupdate.ini b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/fa-IR/fa-IR.liveupdate.ini
new file mode 100644
index 00000000..7a897c84
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/fa-IR/fa-IR.liveupdate.ini
@@ -0,0 +1,56 @@
+; Akeeba Live Update
+; Copyright (c)2010-2013 Nicholas K. Dionysopoulos / AkeebaBackup.com
+; Licensed under the GNU LGPLv3 or later <http://www.gnu.org/copyleft/lesser.html>
+
+LIVEUPDATE_TASK_OVERVIEW="به روز رسانی آنلاین"
+
+LIVEUPDATE_NOTSUPPORTED_HEAD="به روز رسانی آنلاین در این سرور پشتیبانی نمی شود"
+LIVEUPDATE_NOTSUPPORTED_INFO="سرور شما نشان می دهد که به روز رسانی آنلاین پشتیبانی نمی شود. لطفا با میزبان خود تماس بگیرید و از آن ها بخواهید که افزونه cURL یا URL fopen() wrapper را در PHP فعال نمایند. اگر این در حال حاضر فعال است، لطفا از آن ها بخواهید که پیکربندی فایروال خود را به طوری که اجازه دسترسی به این آدرس را بدهد تنظیم نمایند:"
+LIVEUPDATE_NOTSUPPORTED_ALTMETHOD="شما همچنین می توانید با مراجعه به سایت ما و دانلود آخرین نسخه و نصب آن از طریق نصب کننده جوملا اقدام به به روز رسانی <var>%s</var> نمایید."
+
+LIVEUPDATE_STUCK_HEAD="به روز رسانی آنلاین با مشکل مواجه شد."
+LIVEUPDATE_STUCK_INFO="به روز رسانی آنلاین در آخرین باری که تلاش برای ارتباط با سرور به روز رسانی نموده است، با مشکل مواجه شد. این معمولا در مورد میزبان هایی به وجود می آید که ارتباط با سایت های دیگر را مسدود می نمایند. در صورتی که می خواهید اطلاعات به روز رسانی را مجددا دریافت نمایید، روی دکمه "_QQ_"بازیابی مجدد اطلاعات به روز رسانی"_QQ_" در زیر کلیک نمایید. در صورتی که با صفحه ی خالی مواجه شدید، با میزبان خود تماس حاصل نموده و مشکل را گزارش دهید."
+
+LIVEUPDATE_ERROR_NEEDSAUTH="شما می بایستی نام کاربری/رمز عبور یا شناسه دانلود خود را قبل از تلاش برای به روز رسانی به نسخه نهایی در تنظیمات کامپوننت وارد نمایید. دکمه به روز رسانی تا وقتی که شما این کار را انجام دهید غیرفعال خواهد ماند."
+LIVEUPDATE_HASUPDATES_HEAD="نسخه جدیدی موجود می باشد"
+LIVEUPDATE_NOUPDATES_HEAD="نسخه شما به روز می باشد"
+LIVEUPDATE_CURRENTVERSION="نسخه نصب شده"
+LIVEUPDATE_LATESTVERSION="آخرین نسخه"
+LIVEUPDATE_LATESTRELEASED="تاریخ آخرین نسخه"
+LIVEUPDATE_DOWNLOADURL="آدرس دانلود مستقیم"
+
+LIVEUPDATE_REFRESH_INFO="بارگزاری مجدد اطلاعات به روز رسانی"
+LIVEUPDATE_DO_UPDATE="به روز رسانی به آخرین نسخه"
+
+LIVEUPDATE_FTP_REQUIRED="به روز رسانی آنلاین تشخیص داده است که شما برای دانلود و نصب به روز رسانی، می بایستی از FTP استفاده نمایید، ولی شما اطلاعات ورود FTP را در تنظیمات سراسری جوملا وارد نکرده اید.<br/><br/>لطفا نام کاربری و رمز عبور FTP را جهت اجرای عملیات به روز رسانی در قسمت های زیر وارد نمایید."
+LIVEUPDATE_FTP="اطلاعات FTP"
+LIVEUPDATE_FTPUSERNAME="نام کاربری FTP"
+LIVEUPDATE_FTPPASSWORD="رمز عبور FTP"
+LIVEUPDATE_DOWNLOAD_AND_INSTALL="دانلود و نصب به روز رسانی"
+
+LIVEUPDATE_DOWNLOAD_FAILED="دانلود فایل به روز رسانی با شکست مواجه شد. جهت رفع این مشکل بررسی نمایید که پوشه موقت سایتتان (temp) قابل نوشتن بوده و یا تنظیمات FTP جوملا را در تنظیمات سراسری سایت فعال کرده باشید."
+LIVEUPDATE_EXTRACT_FAILED="استخراج فایل به روز رسانی از حالت فشرده با شکست مواجه شد. لطفا افزونه را به طور دستی به روز رسانی نمایید."
+
+LIVEUPDATE_INVALID_PACKAGE_TYPE="نوع فایل نامعتبر می باشد. عملیات به روز رسانی قابل اجرا نمی باشد."
+LIVEUPDATE_INSTALLEXT="نصب %s %s"
+LIVEUPDATE_ERROR="خطا"
+LIVEUPDATE_SUCCESS="انجام شد"
+
+LIVEUPDATE_ICON_UNSUPPORTED="به روز رسانی آنلاین پشتیبانی نمی شود"
+LIVEUPDATE_ICON_CRASHED="به روز رسانی آنلاین به خطا مواجه شد"
+LIVEUPDATE_ICON_CURRENT="نسخه شما به روز می باشد"
+LIVEUPDATE_ICON_UPDATES="به روز رسانی جدیدی یافت شد! جهت به روز رسانی کلیک نمایید."
+
+LIVEUPDATE_RELEASEINFO="اطلاعات"
+LIVEUPDATE_RELEASENOTES="اطلاعات نسخه"
+LIVEUPDATE_READMOREINFO="مطالعه بیشتر"
+
+LIVEUPDATE_NAGSCREEN_HEAD="اخطار! شما در حال نصب نسخه ای ناپایدار هستید."
+LIVEUPDATE_NAGSCREEN_BODY="شما در حال نصب نسخه ای ناپایدار هستید (%s - %s). نسخه های ناپایدار ممکن است تحت آزمایش کم و یا هیچ بوده باشند و عوارض جانبی جدی برای پایداری سایت شما داشته باشند. در صورتی که اطلاعاتی در این مورد ندارید، لطفا این صفحه را ببندید. و در صورتی که از ریسک این موضوع مطلع هستید و می خواهید ادامه دهید، روی دکمه زیر جهت ادامه نصب این نسخه ناپایدار کلیک نمایید."
+LIVEUPDATE_NAGSCREEN_BUTTON="از خطرات این عمل آگاه هستم. عملیات نصب را ادامه بده."
+
+LIVEUPDATE_STABILITY_ALPHA="آلفا"
+LIVEUPDATE_STABILITY_BETA="بتا"
+LIVEUPDATE_STABILITY_RC="کاندید"
+LIVEUPDATE_STABILITY_STABLE="پایدار"
+LIVEUPDATE_STABILITY_SVN="svn"
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/fi-FI/fi-FI.liveupdate.ini b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/fi-FI/fi-FI.liveupdate.ini
new file mode 100644
index 00000000..67f08a1f
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/fi-FI/fi-FI.liveupdate.ini
@@ -0,0 +1,56 @@
+; Akeeba Live Update
+; Copyright (c)2010-2013 Nicholas K. Dionysopoulos / AkeebaBackup.com
+; Licensed under the GNU LGPLv3 or later <http://www.gnu.org/copyleft/lesser.html>
+
+LIVEUPDATE_TASK_OVERVIEW="Live Update"
+
+LIVEUPDATE_NOTSUPPORTED_HEAD="Live Update ei ole tuettu tällä palvelimella"
+LIVEUPDATE_NOTSUPPORTED_INFO="Palvelimesi mukaan Live Update ei ole tuettu. Ota yhteyttä palveluntarjoajaasi ja pyydä heitä ottamaan cURL PHP laajennus tai URL fopen() lisätoiminnot käyttöön. Jos nämä ovat jo käytössä, pyydä heitä muuttamaan palomuurinsa asetuksia niin, että se sallii yhteydet seuraavaan osoitteeseen:"_QQ_""
+LIVEUPDATE_NOTSUPPORTED_ALTMETHOD="Voit aina päivittää <var>%s</var> lisäosan käymällä sivustollamme, lataamalla viimeisimmän version ja asentamalla sen Joomla! lisäosien asennuksella."
+
+LIVEUPDATE_STUCK_HEAD="Live Update on havainnut kaatuneensa"
+LIVEUPDATE_STUCK_INFO="Live Update on havainnut, että se kaatui edellisellä kerralla päivitystä hakiessaan. Yleensä tämä johtuu palvelimestä, joka pyrkii estämään yhteydet muille palvelimille. Jos haluat yrittää päivitystietojen hakemista uudelleen, napsauta "_QQ_"Päivitä päivitystiedot"_QQ_" painiketta. Jos tästä seuraa tyhjä sivu, ota yhteyttä palveluntarjoajaasi ja ilmoita ongelmasta."
+
+LIVEUPDATE_ERROR_NEEDSAUTH="Sinun täytyy syöttää pyydetty käyttäjätunniste komponentin asetuksissa ennenkuin voit päivittää viimeisimpään versioon. Päivityspainike pysyy estettynä siihen asti."
+LIVEUPDATE_HASUPDATES_HEAD="Uusi versio on saatavilla"
+LIVEUPDATE_NOUPDATES_HEAD="Sinulla on jo uusin versio"
+LIVEUPDATE_CURRENTVERSION="Asennettu versio"
+LIVEUPDATE_LATESTVERSION="Uusin versio"
+LIVEUPDATE_LATESTRELEASED="Uusimman julkaisupäivä"
+LIVEUPDATE_DOWNLOADURL="Suora latauslinkki"
+
+LIVEUPDATE_REFRESH_INFO="Päivitä päivitystiedot"
+LIVEUPDATE_DO_UPDATE="Päivitä uusimpaan versioon"
+
+LIVEUPDATE_FTP_REQUIRED="Live Update havaitsi, että se tarvitsee FTP yhteyden ladatakseen päivityksesi, mutta FTP tietoja ei ole asetettu Joomla! asetuksissa.<br/><br/>Syötä FTP tunnus ja salasana päivittääksesi."
+LIVEUPDATE_FTP="FTP tiedot"
+LIVEUPDATE_FTPUSERNAME="FTP käyttäjänimi"
+LIVEUPDATE_FTPPASSWORD="FTP salasana"
+LIVEUPDATE_DOWNLOAD_AND_INSTALL="Lataa ja asenna päivitys"
+
+LIVEUPDATE_DOWNLOAD_FAILED="Päivityspaketin lataaminen epäonnistui. Varmista, että temp-kansioom voi kirjoittaa tai Joomla! FTP toiminnot on sallittu sivuston asetuksissa."
+LIVEUPDATE_EXTRACT_FAILED="Päivityspaketin purkaminen epäonnistui. Yritä päivittää lisäosa manuaalisesti."
+
+LIVEUPDATE_INVALID_PACKAGE_TYPE="Paketin tyyppi ei kelpaa. Päivitystä ei voida tehdä."
+LIVEUPDATE_INSTALLEXT="Asenna %s %s"
+LIVEUPDATE_ERROR="Virhe"
+LIVEUPDATE_SUCCESS="Onnistui"
+
+LIVEUPDATE_ICON_UNSUPPORTED="Live Update ei tuettu"
+LIVEUPDATE_ICON_CRASHED="Live Update kaatui"
+LIVEUPDATE_ICON_CURRENT="Sinulla on uusin versio"
+LIVEUPDATE_ICON_UPDATES="Päivitys löydetty! Napsauta päivittääksesi."
+
+LIVEUPDATE_RELEASEINFO="Tietoja"
+LIVEUPDATE_RELEASENOTES="Julkaisutiedot"
+LIVEUPDATE_READMOREINFO="Lue lisää"
+
+LIVEUPDATE_NAGSCREEN_HEAD="Varoitus. Olet asentamassa mahdollisesti epävakaata versiota."
+LIVEUPDATE_NAGSCREEN_BODY="Olet asentamassa epävakaata versiota (%s - %s). Epävakaita versiota ei ole testattu riittävästi ja ne voivat sisältää ohjelmointivirheitä jotka voivat vahingoittaa sivustosi vakautta ja toimintaa. Jos et ole varma siitä mitä olet tekemässä, sulje tämä selain ikkuna. Jos olet aivan varma, että ymmärrät epävakaiden versioiden asentamiseen liittyvät riskit, napsauta alla olevaa painiketta jatkaaksesi asennusta."
+; LIVEUPDATE_NAGSCREEN_BUTTON="I understand the risks. Continue with the installation."
+
+LIVEUPDATE_STABILITY_ALPHA="Alpha"
+LIVEUPDATE_STABILITY_BETA="Beta"
+LIVEUPDATE_STABILITY_RC="RC"
+; LIVEUPDATE_STABILITY_STABLE="Stable"
+LIVEUPDATE_STABILITY_SVN="SVN"
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/fr-FR/fr-FR.liveupdate.ini b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/fr-FR/fr-FR.liveupdate.ini
new file mode 100644
index 00000000..00333d4d
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/fr-FR/fr-FR.liveupdate.ini
@@ -0,0 +1,79 @@
+; Akeeba Live Update
+; Copyright (c)2010-2012 Nicholas K. Dionysopoulos / AkeebaBackup.com
+; Licensed under the GNU LGPLv3 or later <http://www.gnu.org/copyleft/lesser.html>
+;
+; ADMIN [com_icagenda/liveupdate]	: liveupdate.ini
+; Translation on Transifex			: https://www.transifex.com/projects/p/icagenda/
+; iCagenda Version					: Copyright (c) 2013 JoomliC.com
+
+
+LIVEUPDATE_TASK_OVERVIEW="Live Update"
+
+LIVEUPDATE_NOTSUPPORTED_HEAD="Live Update n'est pas pris en charge sur ce serveur"
+LIVEUPDATE_NOTSUPPORTED_INFO="Votre serveur indique que Live Update n'est pas supporté. Veuillez contactez votre hébergeur et lui demander d'activer l'extension PHP cURL ou activer la fonction fopen URL (). Si ceux-ci sont déjà activés, veuillez lui demander d'adapter le pare-feu pour qu'il autorise l'accès à l'URL suivante:";
+LIVEUPDATE_NOTSUPPORTED_ALTMETHOD="Vous pouvez toujours mettre à jour <var>%s</ var> à partir de notre site internet, après avoir télécharger la dernière version et effectuer son installation via la gestion des extensions de Joomla!"
+
+LIVEUPDATE_STUCK_HEAD="Live Update a échoué !"
+LIVEUPDATE_STUCK_INFO="Live Update a échoué la dernière fois qu'il a essayé de se connecter au serveur de mise à jour. Cela signifie généralement que votre hébergeur bloque activement les communications avec des sites externes. Si vous souhaitez réessayer de récupérer les informations de mise à jour, cliquez sur le bouton " Rafraichir les informations de mise à jour ". S'il en résulte une page blanche, veuillez contactez votre hébergeur et lui signaler ce problème."
+
+LIVEUPDATE_ERROR_NEEDSAUTH="Pour activer le bouton de mise à jour, vous devez indiquer vos identifiant/mot de passe ou votre Download ID dans les paramètres du composant. Le bouton de mise à niveau restera désactivé jusqu'à ce que vous le faites."
+LIVEUPDATE_HASUPDATES_HEAD="Une nouvelle version est disponible"
+LIVEUPDATE_NOUPDATES_HEAD="Vous avez la dernière version"
+LIVEUPDATE_CURRENTVERSION="Version installée"
+LIVEUPDATE_LATESTVERSION="Dernière version"
+LIVEUPDATE_LATESTRELEASED="Date de la dernière version "
+LIVEUPDATE_DOWNLOADURL="URL de téléchargement direct"
+
+LIVEUPDATE_REFRESH_INFO="Rafraîchir les informations de mise à jour"
+LIVEUPDATE_DO_UPDATE="Mettre à jour vers la dernière version"
+
+LIVEUPDATE_FTP_REQUIRED="Live Update a besoin d'utiliser la couche FTP pour télécharger et installer la mise à jour, mais vous n'avez pas sauvegardé vos informations de connexion FTP dans la 'Configuration' de Joomla!<br/><br/>Veuillez fournir ci-dessous votre nom d'utilisateur et votre mot de passe FTP afin de procéder à la mise à jour."
+LIVEUPDATE_FTP="Informations FTP"
+LIVEUPDATE_FTPUSERNAME="Nom d'utilisateur FTP"
+LIVEUPDATE_FTPPASSWORD="Mot de passe FTP"
+LIVEUPDATE_DOWNLOAD_AND_INSTALL="Télécharger et installer la mise à jour"
+
+LIVEUPDATE_DOWNLOAD_FAILED="Le téléchargement du package de mise à jour a échoué. Assurez-vous que votre répertoire temporaire (tmp) est accessible en écriture et que vous avez activé les options FTP dans la configuration globale de Joomla!."
+LIVEUPDATE_EXTRACT_FAILED="L'extraction du package de mise à jour a échoué. Veuillez mettre à jour l'extension manuellement."
+
+LIVEUPDATE_INVALID_PACKAGE_TYPE="Le type du package n'est pas valide. La mise à jour ne peut pas être effectuée."
+LIVEUPDATE_INSTALLEXT="Installation %s %s"
+LIVEUPDATE_ERROR="Erreur"
+LIVEUPDATE_SUCCESS="effectuée avec succès"
+
+; Added iCagenda
+LIVEUPDATE_INSTALL_ERROR="Erreur à l'installation %s"
+LIVEUPDATE_INSTALL_SUCCESS="Installation %s effectuée avec succès."
+LIVEUPDATE_INSTALL_TYPE_COMPONENT="du composant iCagenda"
+LIVEUPDATE_INSTALL_TYPE_FILE="du fichier"
+LIVEUPDATE_INSTALL_TYPE_LANGUAGE="de la langue"
+LIVEUPDATE_INSTALL_TYPE_LIBRARY="de la bibliothèque"
+LIVEUPDATE_INSTALL_TYPE_MODULE="du module"
+LIVEUPDATE_INSTALL_TYPE_PACKAGE="du paquet"
+LIVEUPDATE_INSTALL_TYPE_PLUGIN="du plug-in"
+LIVEUPDATE_INSTALL_TYPE_TEMPLATE="du template"
+
+LIVEUPDATE_ICON_UNSUPPORTED="Live Update n'est pas pris en charge"
+LIVEUPDATE_ICON_CRASHED="Live Update a échoué!"
+LIVEUPDATE_ICON_CURRENT="Vous avez la dernière version"
+LIVEUPDATE_ICON_UPDATES="Mise à jour disponible! Cliquez pour mettre à jour."
+
+LIVEUPDATE_RELEASEINFO="Informations"
+LIVEUPDATE_RELEASENOTES="Notes de version"
+LIVEUPDATE_READMOREINFO="Plus d'infos"
+
+LIVEUPDATE_NAGSCREEN_HEAD="ATTENTION! Vous êtes sur le point d'installer une version instable."
+LIVEUPDATE_NAGSCREEN_BODY="Vous êtes sur le point d'installer une version dite instable (%s - %s). Les versions instables sont des versions ayant subi peu de tests, voir aucun, et qui peuvent contenir des bugs avec une conséquence importante sur la stabilité et la fonctionnalité de votre site internet. Si vous n'êtes pas sûr de ce que vous êtes sur le point de faire, merci de fermer cette fenêtre et de revenir en arrière. Si vous comprenez parfaitement les risques liés à l'utilisation d'une version instable, vous pouvez cliquer sur le bouton ci-dessous pour continuer l'installation de cette version."
+LIVEUPDATE_NAGSCREEN_BUTTON="Je comprends les risques. Poursuivre l'installation."
+
+LIVEUPDATE_STABILITY_ALPHA="Alpha"
+LIVEUPDATE_STABILITY_BETA="Bêta"
+LIVEUPDATE_STABILITY_RC="RC"
+LIVEUPDATE_STABILITY_STABLE="Stable"
+
+; Added iCagenda
+LIVEUPDATE_ERROR_NEEDS_PRO_ID="Pour activer le bouton de mise à jour, vous devez indiquer dans les paramètres d'iCagenda votre licence Pro ID de mise à jour."
+LIVEUPDATE_NAGSCREEN_HEAD_ICAGENDA = "ATTENTION! Vous êtes sur le point d'installer une version beta-test d'iCagenda."
+LIVEUPDATE_NAGSCREEN_VERSION_ICAGENDA = "Version de test et de développement(iCagenda %s - %s)."
+LIVEUPDATE_NAGSCREEN_BODY_ICAGENDA = "Le cycle de vie d'une version d'un logiciel est la somme des phases de développement, de tests et de maturité.<br/><b>Alpha :</b>peut être instable et peut causer des accidents ou des pertes de données.<br/><b>Beta :</b>a généralement plus de bugs que le logiciel terminée, cette version est destinée aux sites de tests uniquement.<br/><b>RC (Release Candidate) :</b> version bêta avec le potentiel pour être un produit final, qui est prête à être libérée à moins que des bugs importants émergent.<br/>Si vous n'êtes pas sûr de ce que vous êtes sur le point de faire, merci de fermer cette fenêtre et de revenir en arrière. Si vous êtes absolument certain que vous comprenez les risques liés à l'installation des versions instables, vous pouvez cliquer sur le bouton ci-dessous pour continuer l'installation de cette version.<br/>"
+LIVEUPDATE_NAGSCREEN_FOOTER_ICAGENDA = "info:"
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/hu-HU/hu-HU.liveupdate.ini b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/hu-HU/hu-HU.liveupdate.ini
new file mode 100644
index 00000000..9cdf7f80
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/hu-HU/hu-HU.liveupdate.ini
@@ -0,0 +1,56 @@
+; Akeeba Live Update
+; Copyright (c)2010-2013 Nicholas K. Dionysopoulos / AkeebaBackup.com
+; Licensed under the GNU LGPLv3 or later <http://www.gnu.org/copyleft/lesser.html>
+
+LIVEUPDATE_TASK_OVERVIEW="Live Update"
+
+LIVEUPDATE_NOTSUPPORTED_HEAD="Ez a szerver nem támogatja a Live Update-ot"
+LIVEUPDATE_NOTSUPPORTED_INFO="A szerver nem támogatja a Live Update-et. Lépj kapcsolatba a szolgáltatóddal és kérd a cURL PHP bővítmény vagy az URL fopen() aktiválását. Ha ezek már engedélyezve vannak, akkor kérd meg őket, hogy úgy állítsák be a tűzfalukat, hogy hozzáférhető legyen a következő URL:"_QQ_""
+LIVEUPDATE_NOTSUPPORTED_ALTMETHOD="Bármikor frissítheted a(z) <var>%s</var> úgy, hogy meglátogatod a webhelyünket, letöltöd a legfrissebb verziót és a Joomla! bővítmény telepítőjével felrakod."
+
+LIVEUPDATE_STUCK_HEAD="A saját jelzése szerint a Live Update összeomlott"
+LIVEUPDATE_STUCK_INFO="Az utolsó használat során a Live Update összeomlott amikor kapcsolatot próbált létesíteni a frissítő szerverrel. Ez általában azt jelzi, hogy a szolgáltató aktívan blokkolja a külső webhelyekkel való kommunikációt. Ha meg akarod ismételni a frissítési információk lekérését, akkor kattints alul a "_QQ_"Frissítési információk újra letöltése"_QQ_" gombra. Ha ez üres oldalt eredményez, akkor lépj kapcsolatba a szolgáltatóddal és jelezd nekik ezt a problémát"
+
+LIVEUPDATE_ERROR_NEEDSAUTH="Mielőtt frissíteni szeretnél, meg kell adnod a felhasználói neved/jelszavad vagy a letöltési AZ-t a komponens paraméterekben. A frissítés gomb addig nem lesz aktív, amíg ezeket nem adod meg."
+LIVEUPDATE_HASUPDATES_HEAD="Elérhető az új verzió"
+LIVEUPDATE_NOUPDATES_HEAD="Már a legújabb verzióval rendelkezel"
+LIVEUPDATE_CURRENTVERSION="Telepített verzió"
+LIVEUPDATE_LATESTVERSION="Legújabb verzió"
+LIVEUPDATE_LATESTRELEASED="A legújabb verzió kiadási időpontja"
+LIVEUPDATE_DOWNLOADURL="Direkt letöltési URL"
+
+LIVEUPDATE_REFRESH_INFO="Frissítési információk újratöltése"
+LIVEUPDATE_DO_UPDATE="Frissítés a legújabb verzióra"
+
+LIVEUPDATE_FTP_REQUIRED="A Live Update-nek szüksége van az FTP használatára, hogy le tudja tölteni és feltelepíteni a frissítést, de te nem adtál meg FTP elérési adatokat a Joomla! globális beállításaiban.<br/><br/>Kérjük, hogy add meg az FTP felhasználói nevet és jelszót, hogy folytatni lehessen a frissítést."
+LIVEUPDATE_FTP="FTP információk"
+LIVEUPDATE_FTPUSERNAME="FTP felhasználói név"
+LIVEUPDATE_FTPPASSWORD="FTP jelszó"
+LIVEUPDATE_DOWNLOAD_AND_INSTALL="A frissítés letöltése és telepítése"
+
+LIVEUPDATE_DOWNLOAD_FAILED="A frissítési csomag letöltése sikertelen. Ellenőrizd az átmeneti (temp) könyvtár írhatóságát vagy a globális beállításoknál engedélyezd a Joomla! FTP feltöltést."
+LIVEUPDATE_EXTRACT_FAILED="A frissítési csomag kitömörítése sikertelen. Kérjük, hogy a frissítést próbáld meg manuális módban."
+
+LIVEUPDATE_INVALID_PACKAGE_TYPE="Hibás csomagtípus. A frissítés nem folytatható."
+LIVEUPDATE_INSTALLEXT="Telepítés %s %s"
+LIVEUPDATE_ERROR="Hiba"
+LIVEUPDATE_SUCCESS="Sikeres"
+
+LIVEUPDATE_ICON_UNSUPPORTED="A Live Update nem támogatott"
+LIVEUPDATE_ICON_CRASHED="A Live Update összeomlott"
+LIVEUPDATE_ICON_CURRENT="A legfrissebb verzióval rendelkezel"
+LIVEUPDATE_ICON_UPDATES="FRISSÍTÉST TALÁLTAM! KATTINTS IDE."
+
+LIVEUPDATE_RELEASEINFO="Információk"
+LIVEUPDATE_RELEASENOTES="Kiadási megjegyzések"
+LIVEUPDATE_READMOREINFO="Bővebben"
+
+; LIVEUPDATE_NAGSCREEN_HEAD="WARNING! You are about to install an unstable version."
+; LIVEUPDATE_NAGSCREEN_BODY="You are about to install an unstable version (%s - %s). Unstable versions may have undergone minimal or no testing and contain bugs which may have an serious adverse to the stability and functionality of your web site. If you are not sure about what you are about to do, please close this browser window. If you are absolutely certain you understand the risks involved with the installation of unstable releases, please click the button below to continue the installation of this unstable release."
+; LIVEUPDATE_NAGSCREEN_BUTTON="I understand the risks. Continue with the installation."
+
+; LIVEUPDATE_STABILITY_ALPHA="Alpha"
+; LIVEUPDATE_STABILITY_BETA="Beta"
+; LIVEUPDATE_STABILITY_RC="RC"
+; LIVEUPDATE_STABILITY_STABLE="Stable"
+; LIVEUPDATE_STABILITY_SVN="SVN"
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/it-IT/it-IT.liveupdate.ini b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/it-IT/it-IT.liveupdate.ini
new file mode 100644
index 00000000..a1bea52a
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/it-IT/it-IT.liveupdate.ini
@@ -0,0 +1,56 @@
+; Akeeba Live Update
+; Copyright (c)2010-2013 Nicholas K. Dionysopoulos / AkeebaBackup.com
+; Licensed under the GNU LGPLv3 or later <http://www.gnu.org/copyleft/lesser.html>
+
+LIVEUPDATE_TASK_OVERVIEW="Live Update"
+
+LIVEUPDATE_NOTSUPPORTED_HEAD="La funzionalità di Live Update non è supportata su questo server"
+LIVEUPDATE_NOTSUPPORTED_INFO="Il vostro server indica che la funzionalità di Live Update non è supportata. Contattate il fornitore e chiedete di abilitare l'estensione PHP cURL oppure attivare le funzionalità di URL fopen(). Se queste opzioni sono già attive, fate verificare la configurazione del firewall per permettere l'accesso al seguente URL:"_QQ_""
+LIVEUPDATE_NOTSUPPORTED_ALTMETHOD="E' sempre possibile aggiornare <var>%s</var> visitando il nostro sito, scaricando l'ultima versione disponibile ed installandola in Joomla usando i normali comando di installazione delle estensioni."
+
+LIVEUPDATE_STUCK_HEAD="Live Update ha rilevato un precedente crash"
+LIVEUPDATE_STUCK_INFO="Live Update ha determinato che, nell'ultimo tentativo di contattare il server di aggiornamento, l'operazione è fallita con un crash. Generalmente questo indica la presenza di un servizio che blocca la comunicazione con siti esterni. Se volete riprovare a recuperare le informazioni di aggiornamento utilizzate il pulsante "_QQ_"Verifica disponibilità aggiornamenti"_QQ_" più sotto. Se il risultato è una pagina vuota, contattate il vostro fornitore per segnalare il problema."
+
+LIVEUPDATE_ERROR_NEEDSAUTH="E' necessario inserire Username e Password oppure il proprio Download ID tra i parametri di configurazione del componente prima di tentare l'aggiornamento all'ultima versione. Il pulsante di aggiornamento sarà attivato solamente dopo l'inserimento di tali informazioni."
+LIVEUPDATE_HASUPDATES_HEAD="E' disponibile una nuova versione"
+LIVEUPDATE_NOUPDATES_HEAD="Non sono disponibili nuovi aggiornamenti"
+LIVEUPDATE_CURRENTVERSION="Versione installata"
+LIVEUPDATE_LATESTVERSION="Ultima versione"
+LIVEUPDATE_LATESTRELEASED="Data rilascio ultima versione"
+LIVEUPDATE_DOWNLOADURL="URL di scaricamento diretto"
+
+LIVEUPDATE_REFRESH_INFO="Verifica disponibilità aggiornamenti"
+LIVEUPDATE_DO_UPDATE="Aggiorna all'ultima versione"
+
+LIVEUPDATE_FTP_REQUIRED="Live Update ha determinato che è necessario l'utilizzo di FTP per scaricamente ed installare l'aggiornamento, tuttavia non sono state impostate correttamente le informazioni di configurazione in Joomla. Inserite qui sotto Username e Password per il servizio FTP per proseguire con l'aggiornamento."
+LIVEUPDATE_FTP="Informazioni FTP"
+LIVEUPDATE_FTPUSERNAME="Username FTP"
+LIVEUPDATE_FTPPASSWORD="Password FTP"
+LIVEUPDATE_DOWNLOAD_AND_INSTALL="Scarica ed installa aggiornamento"
+
+LIVEUPDATE_DOWNLOAD_FAILED="Lo scaricamento dell'aggiornamento è fallito. Verificate che la cartella temporanea sia scrivibile e che siano abilitate le opzioni FTP di Joomla all'interno della sezione di Configurazione Globale del sito."
+LIVEUPDATE_EXTRACT_FAILED="L'estrazione del pacchetto di aggiornamento è fallita. Sarà necessario effettuare l'aggiornamento tramite procedura manuale."
+
+LIVEUPDATE_INVALID_PACKAGE_TYPE="Formato del pacchetto di aggiornamento non riconosciuto. L'aggiornamento non può essere effettuato."
+LIVEUPDATE_INSTALLEXT="Installazione %s %s"
+LIVEUPDATE_ERROR="Errore"
+LIVEUPDATE_SUCCESS="Completato"
+
+LIVEUPDATE_ICON_UNSUPPORTED="Live Update non supportato"
+LIVEUPDATE_ICON_CRASHED="Live Update non funziona correttamente"
+LIVEUPDATE_ICON_CURRENT="Non sono disponibili nuovi aggiornamenti"
+LIVEUPDATE_ICON_UPDATES="INSTALLA NUOVO AGGIORNAMENTO!"
+
+; LIVEUPDATE_RELEASEINFO="Information"
+; LIVEUPDATE_RELEASENOTES="Release notes"
+; LIVEUPDATE_READMOREINFO="Read more"
+
+; LIVEUPDATE_NAGSCREEN_HEAD="WARNING! You are about to install an unstable version."
+; LIVEUPDATE_NAGSCREEN_BODY="You are about to install an unstable version (%s - %s). Unstable versions may have undergone minimal or no testing and contain bugs which may have an serious adverse to the stability and functionality of your web site. If you are not sure about what you are about to do, please close this browser window. If you are absolutely certain you understand the risks involved with the installation of unstable releases, please click the button below to continue the installation of this unstable release."
+; LIVEUPDATE_NAGSCREEN_BUTTON="I understand the risks. Continue with the installation."
+
+; LIVEUPDATE_STABILITY_ALPHA="Alpha"
+; LIVEUPDATE_STABILITY_BETA="Beta"
+; LIVEUPDATE_STABILITY_RC="RC"
+; LIVEUPDATE_STABILITY_STABLE="Stable"
+; LIVEUPDATE_STABILITY_SVN="SVN"
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/lt-LT/lt-LT.liveupdate.ini b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/lt-LT/lt-LT.liveupdate.ini
new file mode 100644
index 00000000..9d45fa94
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/lt-LT/lt-LT.liveupdate.ini
@@ -0,0 +1,56 @@
+; Akeeba Live Update
+; Copyright (c)2010-2013 Nicholas K. Dionysopoulos / AkeebaBackup.com
+; Licensed under the GNU LGPLv3 or later <http://www.gnu.org/copyleft/lesser.html>
+
+LIVEUPDATE_TASK_OVERVIEW="Automatinis atnaujinimas"
+
+LIVEUPDATE_NOTSUPPORTED_HEAD="Šiame serveryje automatinis atnaujinimas negalimas"
+LIVEUPDATE_NOTSUPPORTED_INFO="Jūsų serveris rodo, kad automatinis atnaujinimas yra negalimas. Prašome susisiekti su savo tinklapio talpintojais ir paprašyti įgalinti cURL PHP plėtinį arba aktyvuoti URL fopen(). Jei šie plėtiniai jau yra įgalinti, paprašykite jų sukonfigūruoti savo ugniasienę taip, kad ji leistų prieigą prie šios URL:"
+LIVEUPDATE_NOTSUPPORTED_ALTMETHOD="Jūs visada galite atnaujinti <var>%s</var> rankiniu būdu, aplankydami mūsų tinklapį, parsisiųsdami naujausią programos laidą ir įdiegdami standartiniu Joomla! Būdu."
+
+LIVEUPDATE_STUCK_HEAD="Automatinis atnaujinimas nurodė, kad įvyko programinė klaida"
+LIVEUPDATE_STUCK_INFO="Automatinis atnaujinimas nurodė, kad bandant susisiekti su atnaujinimų serveriu įvyko programinė klaida. Paprastai tai rodo, kad tinklapio talpintojas aktyviai blokuoja ryšius su išorinėmis svetainėmis. Jei norite pabandyti iš naujo parsisiųsti atnaujinimo informaciją, prašome spragtelėti žemiau esantį mygtuką "_QQ_"Atnaujinti informaciją"_QQ_". Jei parodomas tuščias puslapis, norint išspręsti šią problemą turėsite kreiptis į savo tinklapio talpintoją."
+
+LIVEUPDATE_ERROR_NEEDSAUTH="Norėdami atsinaujinti į naujausią programos versiją, turite nurodyti savo prisijungimo vardą/slaptažodį arba Parsisiuntimo ID komponento parametruose. Kol to nepadarysite, atnaujinimo mygtukas išliks neaktyvus."
+LIVEUPDATE_HASUPDATES_HEAD="Yra nauja versija"
+LIVEUPDATE_NOUPDATES_HEAD="Jūs turite naujausią programos versiją."
+LIVEUPDATE_CURRENTVERSION="Įdiegta versija"
+LIVEUPDATE_LATESTVERSION="Naujausia versija"
+LIVEUPDATE_LATESTRELEASED="Naujausios versijos išleidimo data"
+LIVEUPDATE_DOWNLOADURL="Tiesioginė parsisiuntimo nuoroda"
+
+LIVEUPDATE_REFRESH_INFO="Atnaujinti informaciją"
+LIVEUPDATE_DO_UPDATE="Atnaujinti į naujausią versiją"
+
+LIVEUPDATE_FTP_REQUIRED="Automatinis atnaujinimas nustatė, kad norint atsisiųsti ir įdiegti atnaujinimą turi būti naudojamas FTP sluoksnis, tačiau Jūs nenurodėte savo FTP prisijungimo duomenų globaliose savo tinklapio Joomla! nuostatose.<br/><br/>Jei norite įdiegti naujinimą, nurodykite FTP prisijungimo duomenis."
+LIVEUPDATE_FTP="FTP informacija"
+LIVEUPDATE_FTPUSERNAME="FTP naudotojo vardas"
+LIVEUPDATE_FTPPASSWORD="FTP slaptažodis"
+LIVEUPDATE_DOWNLOAD_AND_INSTALL="Atsisiųsti ir įdiegti naujinimą"
+
+LIVEUPDATE_DOWNLOAD_FAILED="Nepavyko atsisiųsti atnaujinimo paketo. Įsitikinkite, kad į tinklapio laikinąjį aplanką leidžiama rašyti ir tai, kad Jūsų tinklapio globaliose Joomla! nuostatose įgalintas FTP naudojimas."
+LIVEUPDATE_EXTRACT_FAILED="Nepavyko išpakuoti atnaujinimo paketo. Prašome bandyti atsinaujinti rankiniu būdu."
+
+LIVEUPDATE_INVALID_PACKAGE_TYPE="Neteisingas paketo tipas. Atnaujinimas negalimas"
+LIVEUPDATE_INSTALLEXT="Įdiegti %s %s"
+LIVEUPDATE_ERROR="Klaida"
+LIVEUPDATE_SUCCESS="Pavyko"
+
+LIVEUPDATE_ICON_UNSUPPORTED="Automatinis atnaujinimas nepalaikomas"
+LIVEUPDATE_ICON_CRASHED="Įvyko automatinio atnaujinimo programinis lūžis"
+LIVEUPDATE_ICON_CURRENT="Jūs turite naujausią programos versiją."
+LIVEUPDATE_ICON_UPDATES="GALIMAS ATNAUJINIMAS! NORĖDAMI ATSINAUJINTI SPRAGTELĖKITE ČIA"
+
+; LIVEUPDATE_RELEASEINFO="Information"
+; LIVEUPDATE_RELEASENOTES="Release notes"
+; LIVEUPDATE_READMOREINFO="Read more"
+
+; LIVEUPDATE_NAGSCREEN_HEAD="WARNING! You are about to install an unstable version."
+; LIVEUPDATE_NAGSCREEN_BODY="You are about to install an unstable version (%s - %s). Unstable versions may have undergone minimal or no testing and contain bugs which may have an serious adverse to the stability and functionality of your web site. If you are not sure about what you are about to do, please close this browser window. If you are absolutely certain you understand the risks involved with the installation of unstable releases, please click the button below to continue the installation of this unstable release."
+; LIVEUPDATE_NAGSCREEN_BUTTON="I understand the risks. Continue with the installation."
+
+; LIVEUPDATE_STABILITY_ALPHA="Alpha"
+; LIVEUPDATE_STABILITY_BETA="Beta"
+; LIVEUPDATE_STABILITY_RC="RC"
+; LIVEUPDATE_STABILITY_STABLE="Stable"
+; LIVEUPDATE_STABILITY_SVN="SVN"
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/nb-NO/nb-NO.liveupdate.ini b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/nb-NO/nb-NO.liveupdate.ini
new file mode 100644
index 00000000..192b5abe
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/nb-NO/nb-NO.liveupdate.ini
@@ -0,0 +1,56 @@
+; Akeeba Live Update
+; Copyright (c)2010-2013 Nicholas K. Dionysopoulos / AkeebaBackup.com
+; Licensed under the GNU LGPLv3 or later <http://www.gnu.org/copyleft/lesser.html>
+
+LIVEUPDATE_TASK_OVERVIEW="Direkteoppdatering"
+
+LIVEUPDATE_NOTSUPPORTED_HEAD="Direkteoppdatering støttes ikke på denne serveren."
+LIVEUPDATE_NOTSUPPORTED_INFO="Din server indikerer at direkteoppdatering ikke støttes. Kontakt din leverandør og spør om de kan aktivere cURL PHP eller aktivere URL fopen(). Dersom disse allerede er aktivert kan du spørre om de kan konfigurere sin brannmur slik at den gir tilgang til følgende URL:"
+LIVEUPDATE_NOTSUPPORTED_ALTMETHOD="Du kan alltid oppdatere <var>%s</var> manuelt ved å besøke vår side. Laste ned og installer den nyeste versjonen ved hjelp av Joomlas installasjonsfunksjon."
+
+LIVEUPDATE_STUCK_HEAD="Direkteoppdateringen har merket seg selv som krasjet."
+LIVEUPDATE_STUCK_INFO="Direkteoppdatering avdekket at den krasjet forrige gang den forsøkte å kontakte oppdateringsserveren. Dette betyr vanligvis at du benytter en leverandør av netthotell som aktivt blokkerer kommunikasjon med eksterne nettsteder. Hvis du ønsker å forsøke på nytt å hente oppdateringsinformasjonen, klikk på knappen "_QQ_"Oppdater informasjon"_QQ_" nedenfor. Dersom dette resulterer i en blank side bør du kontakte din leverandør av netthotell for å melde fra om dette problemet."
+
+LIVEUPDATE_ERROR_NEEDSAUTH="Du må oppgi ditt brukernavn/passord eller nedlastnings-id i komponentens innstillinger før du forsøker å oppdatere til siste versjon. Oppdateringsknappen vil forbli deaktivert inntil du gjøre dette."
+LIVEUPDATE_HASUPDATES_HEAD="En ny versjon er tilgjengelig"
+LIVEUPDATE_NOUPDATES_HEAD="Du har allerede den nyeste versjonen"
+LIVEUPDATE_CURRENTVERSION="Installert versjon"
+LIVEUPDATE_LATESTVERSION="Nyeste versjon"
+LIVEUPDATE_LATESTRELEASED="Siste utgivelsesdato"
+LIVEUPDATE_DOWNLOADURL="Nedlastingsadresse"
+
+LIVEUPDATE_REFRESH_INFO="Oppdater informasjon"
+LIVEUPDATE_DO_UPDATE="Oppdater til siste versjon"
+
+LIVEUPDATE_FTP_REQUIRED="Direkteoppdatering har avdekket at den må bruke FTP, for å laste ned og installere oppdateringen, men du har ikke angitt og lagret FTP-informasjonen under nettstedets globale konfigurasjon .<br /><br />Du må oppgi FTP-brukernavn og passord nedenfor for å kunne fortsette med oppdateringen."
+LIVEUPDATE_FTP="FTP-informasjon"
+LIVEUPDATE_FTPUSERNAME="FTP-brukernavn"
+LIVEUPDATE_FTPPASSWORD="FTP-passord"
+LIVEUPDATE_DOWNLOAD_AND_INSTALL="Last ned og installer oppdateringen"
+
+LIVEUPDATE_DOWNLOAD_FAILED="Nedlasting av oppdateringspakke mislyktes. Påse at temp-mappen er skrivbar, eller at du har aktivert Joomlas FTP-innstillinger under nettstedets globale konfigurasjon."
+LIVEUPDATE_EXTRACT_FAILED="Utpakking av oppdateringspakken mislyktes. Forsøk å oppdatere utvidelsen manuelt."
+
+LIVEUPDATE_INVALID_PACKAGE_TYPE="Ugyldig pakketype. Oppdateringen kan ikke fortsette."
+LIVEUPDATE_INSTALLEXT="Installer %s %s"
+LIVEUPDATE_ERROR="Feil"
+LIVEUPDATE_SUCCESS="Vellykket"
+
+LIVEUPDATE_ICON_UNSUPPORTED="Direkteoppdatering støttes ikke."
+LIVEUPDATE_ICON_CRASHED="Direkteoppdatering krasjet."
+LIVEUPDATE_ICON_CURRENT="Du har den nyeste versjonen."
+LIVEUPDATE_ICON_UPDATES="OPPDATERING FUNNET! KLIKK FOR Å OPPDATERE."
+
+; LIVEUPDATE_RELEASEINFO="Information"
+; LIVEUPDATE_RELEASENOTES="Release notes"
+; LIVEUPDATE_READMOREINFO="Read more"
+
+; LIVEUPDATE_NAGSCREEN_HEAD="WARNING! You are about to install an unstable version."
+; LIVEUPDATE_NAGSCREEN_BODY="You are about to install an unstable version (%s - %s). Unstable versions may have undergone minimal or no testing and contain bugs which may have an serious adverse to the stability and functionality of your web site. If you are not sure about what you are about to do, please close this browser window. If you are absolutely certain you understand the risks involved with the installation of unstable releases, please click the button below to continue the installation of this unstable release."
+; LIVEUPDATE_NAGSCREEN_BUTTON="I understand the risks. Continue with the installation."
+
+; LIVEUPDATE_STABILITY_ALPHA="Alpha"
+; LIVEUPDATE_STABILITY_BETA="Beta"
+; LIVEUPDATE_STABILITY_RC="RC"
+; LIVEUPDATE_STABILITY_STABLE="Stable"
+; LIVEUPDATE_STABILITY_SVN="SVN"
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/nl-NL/nl-NL.liveupdate.ini b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/nl-NL/nl-NL.liveupdate.ini
new file mode 100644
index 00000000..881bd206
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/nl-NL/nl-NL.liveupdate.ini
@@ -0,0 +1,56 @@
+; Akeeba Live Update
+; Copyright (c)2010-2013 Nicholas K. Dionysopoulos / AkeebaBackup.com
+; Licensed under the GNU LGPLv3 or later <http://www.gnu.org/copyleft/lesser.html>
+
+LIVEUPDATE_TASK_OVERVIEW="Live Update"
+
+LIVEUPDATE_NOTSUPPORTED_HEAD="Live Update wordt op deze server niet ondersteund"
+LIVEUPDATE_NOTSUPPORTED_INFO="De server geeft aan dat Live Update niet wordt ondersteund. Neem contact op met de hoster en vraag de cURL PHP extensie of om de URL fopen() wrappers te activeren. Vraag, als ze al geactiveerd zijn, de firewall zo in te stellen dat er toegang tot de volgende URL is:"_QQ_""
+LIVEUPDATE_NOTSUPPORTED_ALTMETHOD="U kunt <var>%s</var> altijd updaten door onze site te bezoeken, de laatste versie te downloaden en doormiddel van Joomla!'s extensiebeheer te installeren."
+
+LIVEUPDATE_STUCK_HEAD="Live Update is gecrasht"
+LIVEUPDATE_STUCK_INFO="Live Update stelt vast dat het, de laatste keer dat het de update-server trachtte te bereiken, gecrasht is. Dit betekent meestal dat de host actief de communicatie met externe sites blokkeert. Klik, als u de update informatie opnieuw wilt ophalen, op de "_QQ_"Ververs update informatie"_QQ_" knop hieronder. Als dat leidt tot een blanco pagina, neem dan contact op met uw hoster en meld dit."
+
+LIVEUPDATE_ERROR_NEEDSAUTH="U moet uw gebruikersnaam / wachtwoord of download ID opgegeven in de parameters van de component om naar de laatste release te upgraden. De upgrade knop zal geblokkeerd blijven tot dit gedaan is."
+LIVEUPDATE_HASUPDATES_HEAD="Er is een nieuwe versie beschikbaar"
+LIVEUPDATE_NOUPDATES_HEAD="U heeft de laatste versie al"
+LIVEUPDATE_CURRENTVERSION="Geïnstalleerde versie"
+LIVEUPDATE_LATESTVERSION="Nieuwste versie"
+LIVEUPDATE_LATESTRELEASED="Datum laatste release"
+LIVEUPDATE_DOWNLOADURL="URL voor directe download"
+
+LIVEUPDATE_REFRESH_INFO="Ververs update-informatie"
+LIVEUPDATE_DO_UPDATE="Update naar de laatste versie"
+
+LIVEUPDATE_FTP_REQUIRED="Live Update stelt vast dat het FTP moet gebruiken om de updates te downloaden en installeren, maar uw FTP logingegevens zijn bij de Joomla algemene instellingen niet opgeslagen.<br/><br/>Vul a.u.b. hieronder de FTP gebruikersnaam en het wachtwoord in om verder te gaan met updaten."
+LIVEUPDATE_FTP="FTP informatie"
+LIVEUPDATE_FTPUSERNAME="FTP gebruikersnaam"
+LIVEUPDATE_FTPPASSWORD="FTP wachtwoord"
+LIVEUPDATE_DOWNLOAD_AND_INSTALL="Download en installeer de update"
+
+LIVEUPDATE_DOWNLOAD_FAILED="Het downloaden van het updatepakket is mislukt. Zorg dat de temp map beschrijfbaar is of dat de FTP opties bij de algemene instellingen goed ingevuld zijn."
+LIVEUPDATE_EXTRACT_FAILED="Uitpakken van het pakket mislukt. Probeer de extensie handmatig bij te werken."
+
+LIVEUPDATE_INVALID_PACKAGE_TYPE="Verkeerd pakkettype. Updaten kan niet verder gaan."
+LIVEUPDATE_INSTALLEXT="Installeer %s %s"
+LIVEUPDATE_ERROR="Fout"
+LIVEUPDATE_SUCCESS="Succesvol"
+
+LIVEUPDATE_ICON_UNSUPPORTED="Live Update niet ondersteund"
+LIVEUPDATE_ICON_CRASHED="Live Update gecrasht"
+LIVEUPDATE_ICON_CURRENT="U heeft de laatste versie"
+LIVEUPDATE_ICON_UPDATES="UPDATE GEVONDEN! KLIK OM TE UPDATEN."
+
+; LIVEUPDATE_RELEASEINFO="Information"
+; LIVEUPDATE_RELEASENOTES="Release notes"
+; LIVEUPDATE_READMOREINFO="Read more"
+
+; LIVEUPDATE_NAGSCREEN_HEAD="WARNING! You are about to install an unstable version."
+; LIVEUPDATE_NAGSCREEN_BODY="You are about to install an unstable version (%s - %s). Unstable versions may have undergone minimal or no testing and contain bugs which may have an serious adverse to the stability and functionality of your web site. If you are not sure about what you are about to do, please close this browser window. If you are absolutely certain you understand the risks involved with the installation of unstable releases, please click the button below to continue the installation of this unstable release."
+; LIVEUPDATE_NAGSCREEN_BUTTON="I understand the risks. Continue with the installation."
+
+; LIVEUPDATE_STABILITY_ALPHA="Alpha"
+; LIVEUPDATE_STABILITY_BETA="Beta"
+; LIVEUPDATE_STABILITY_RC="RC"
+; LIVEUPDATE_STABILITY_STABLE="Stable"
+; LIVEUPDATE_STABILITY_SVN="SVN"
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/pl-PL/pl-PL.liveupdate.ini b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/pl-PL/pl-PL.liveupdate.ini
new file mode 100644
index 00000000..63e4044d
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/pl-PL/pl-PL.liveupdate.ini
@@ -0,0 +1,56 @@
+; Akeeba Live Update
+; Copyright (c)2010-2013 Nicholas K. Dionysopoulos / AkeebaBackup.com
+; Licensed under the GNU LGPLv3 or later <http://www.gnu.org/copyleft/lesser.html>
+
+LIVEUPDATE_TASK_OVERVIEW="Aktualizacja"
+
+LIVEUPDATE_NOTSUPPORTED_HEAD="Aktualizacja nie jest obsługiwana na tym serwerze"
+LIVEUPDATE_NOTSUPPORTED_INFO="Twój serwer sygnalizuje, że Aktualizacja nie jest obsługiwana. Proszę skontaktować się administratorem hosta i poprosić o włączenie rozszerzenia cURL PHP albo aktywowanie URL fopen() wrappers. Jeżeli te są już włączone, poproś o skonfigurowanie firewalla tak, by umożliwił dostęp do następującego adresu URL:"_QQ_""
+LIVEUPDATE_NOTSUPPORTED_ALTMETHOD="Zawsze można zaktualizować <var>%s</var> odwiedzając naszeą witrynę ręcznie, pobranie najnowszej wersji i instalacji za pomocą instalatora rozszerzeń Joomla!."
+
+LIVEUPDATE_STUCK_HEAD="Aktualizacja oznaczona jako niepowodzenie"
+LIVEUPDATE_STUCK_INFO="Aktualizacja zaznacza o niepowodzeniu podczas ostatniej próby kontaktu z serwerem aktualizacji. To zwykle wskazuje na hosta, który aktywnie blokuje komunikacje z zewnętrznymi stronami. Jeśli chcesz ponowić próbę pobierania informacje o aktualizacji, kliknij przycisk "_QQ_"Odśwież informacje o aktualizacji"_QQ_" poniżej. Jeśli wynikiem jest pusta strona, proszę skontaktować się z administracją hosta i zgłosić ten problem."
+
+LIVEUPDATE_ERROR_NEEDSAUTH="Musisz podać swój login/hasło lub Download ID w parametrach komponentu przed próbą aktualizacji do najnowszej wersji. Przycisk aktualizacji pozostanie wyłączony do czasu aż to zrobisz."
+LIVEUPDATE_HASUPDATES_HEAD="Nowa wersja jest dostępna"
+LIVEUPDATE_NOUPDATES_HEAD="Masz już najnowszą wersję"
+LIVEUPDATE_CURRENTVERSION="Zainstalowana wersja"
+LIVEUPDATE_LATESTVERSION="Najnowsza wersja"
+LIVEUPDATE_LATESTRELEASED="Data najnowszej wersji"
+LIVEUPDATE_DOWNLOADURL="URL bezpośredniego pobierania"
+
+LIVEUPDATE_REFRESH_INFO="Odśwież informacje o aktualizacji"
+LIVEUPDATE_DO_UPDATE="Aktualizacja do najnowszej wersji"
+
+LIVEUPDATE_FTP_REQUIRED="Aktualizacja zaznacza, że musi korzystać z protokołu FTP w celu pobrania i zainstalowania aktualizacji, ale nie zostały wcześniej zapisane dane logowania FTP w twojej Konfiguracji Globalnej Joomla!.<br/><br/>Prosimy o podanie nazwy użytkownika i hasła FTP poniżej, aby kontynuować aktualizację."
+LIVEUPDATE_FTP="Informacje FTP"
+LIVEUPDATE_FTPUSERNAME="Login FTP"
+LIVEUPDATE_FTPPASSWORD="Hasło FTP"
+LIVEUPDATE_DOWNLOAD_AND_INSTALL="Pobierz i zainstaluj aktualizację"
+
+LIVEUPDATE_DOWNLOAD_FAILED="Pobranie pakietu aktualizacji nie powiodło się. Upewnij się, że katalog tymczasowy jest zapisywalny lub, że masz włączoną opcję FTP Joomla! w Konfiguracji Globalnej twojej witryny."
+LIVEUPDATE_EXTRACT_FAILED="Rozpakowanie pakietu aktualizacji nie powiodło się. Proszę spróbować aktualizacji rozszerzenia ręcznie."
+
+LIVEUPDATE_INVALID_PACKAGE_TYPE="Nieprawidłowy typ pakietu. Aktualizacja nie może być kontynuowana."
+LIVEUPDATE_INSTALLEXT="Instalacja %s %s"
+LIVEUPDATE_ERROR="Błąd"
+LIVEUPDATE_SUCCESS="Powodzenie"
+
+LIVEUPDATE_ICON_UNSUPPORTED="Aktualizacja nie jest obsługiwana"
+LIVEUPDATE_ICON_CRASHED="Aktualizacja nie powiodła się"
+LIVEUPDATE_ICON_CURRENT="Masz najnowszą wersję"
+LIVEUPDATE_ICON_UPDATES="ZNALEZIONO AKTUALIZACJĘ! Kliknij!."
+
+; LIVEUPDATE_RELEASEINFO="Information"
+; LIVEUPDATE_RELEASENOTES="Release notes"
+; LIVEUPDATE_READMOREINFO="Read more"
+
+; LIVEUPDATE_NAGSCREEN_HEAD="WARNING! You are about to install an unstable version."
+; LIVEUPDATE_NAGSCREEN_BODY="You are about to install an unstable version (%s - %s). Unstable versions may have undergone minimal or no testing and contain bugs which may have an serious adverse to the stability and functionality of your web site. If you are not sure about what you are about to do, please close this browser window. If you are absolutely certain you understand the risks involved with the installation of unstable releases, please click the button below to continue the installation of this unstable release."
+; LIVEUPDATE_NAGSCREEN_BUTTON="I understand the risks. Continue with the installation."
+
+; LIVEUPDATE_STABILITY_ALPHA="Alpha"
+; LIVEUPDATE_STABILITY_BETA="Beta"
+; LIVEUPDATE_STABILITY_RC="RC"
+; LIVEUPDATE_STABILITY_STABLE="Stable"
+; LIVEUPDATE_STABILITY_SVN="SVN"
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/pt-BR/pt-BR.liveupdate.ini b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/pt-BR/pt-BR.liveupdate.ini
new file mode 100644
index 00000000..65c7564a
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/pt-BR/pt-BR.liveupdate.ini
@@ -0,0 +1,56 @@
+; Akeeba Live Update
+; Copyright (c)2010-2013 Nicholas K. Dionysopoulos / AkeebaBackup.com
+; Licensed under the GNU LGPLv3 or later <http://www.gnu.org/copyleft/lesser.html>
+
+LIVEUPDATE_TASK_OVERVIEW="Actualização ao vivo"
+
+LIVEUPDATE_NOTSUPPORTED_HEAD="A atualização ao vivo não esta suportada neste servidor"
+LIVEUPDATE_NOTSUPPORTED_INFO="O servidor indica que Atualização ao Vivo não é compatível. Entre em contato com seu Hosting e solicite que permitam a extensão  cURL PHP ou desativem o URL fopen(). Se estão já desabilitadas, por favor, solicite que configurem seu firewall para que permita o acesso do seguinte endereço URL:"_QQ_""
+LIVEUPDATE_NOTSUPPORTED_ALTMETHOD="Sempre é possível atualizar <var>%s</var>, visite nosso site manualmente, baixe a última versão e instale usando o instalador de extensões Joomla!."
+
+LIVEUPDATE_STUCK_HEAD="Actualização ao Vivo marcou como se danificou"
+LIVEUPDATE_STUCK_INFO="Live Update determinou que foi danificado a última vez que tratou de contatar com o servidor de atualizações. Isto d emodo geral indica uma série de bloqueios ativos de comunicação com sites externos. Se deseja voltar a tentar buscar a informação de atualização, por favor clique em 'Atualizar informação de atualização' no botão abaixo. Em caso de ontér uma página em branco como resultado, por favor contate com seu Hosting e informe sobre este tema."
+
+LIVEUPDATE_ERROR_NEEDSAUTH="Tem que facilitar seu nome de usuário/senha ou ID de download nos parâmetros do componente antes de tentar atualizar a última versão. O botão de atualização permanecerá desativado até que não realize esta ação."
+LIVEUPDATE_HASUPDATES_HEAD="Existe uma versão nova disponível"
+LIVEUPDATE_NOUPDATES_HEAD="Você já tem a última versão"
+LIVEUPDATE_CURRENTVERSION="Versão instalada"
+LIVEUPDATE_LATESTVERSION="Última versão"
+LIVEUPDATE_LATESTRELEASED="Data do último lançamento"
+LIVEUPDATE_DOWNLOADURL="URL de download direto"
+
+LIVEUPDATE_REFRESH_INFO="Refrescar a informação de atualização"
+LIVEUPDATE_DO_UPDATE="Atualizar a última versão"
+
+LIVEUPDATE_FTP_REQUIRED="Live Update determina que é necessário o uso de FTP para baixar e instalar a atualização, mas não guardou sua informação de acesso FTP em seu site Joomla!, em Configuração Global. <br/><br/> Indique o nome de usuário FTP e senha para continuar com a atualização."
+LIVEUPDATE_FTP="Informação FTP"
+LIVEUPDATE_FTPUSERNAME="Usuário FTP"
+LIVEUPDATE_FTPPASSWORD="Senha FTP"
+LIVEUPDATE_DOWNLOAD_AND_INSTALL="Baixar e instalar a atualização"
+
+LIVEUPDATE_DOWNLOAD_FAILED="O download do pacote de atualização falhou. Assegure-se que seu diretório  /tmp pode escrever ou que habilitou as opções de FTP na Configuração Global do seu site Joomla!"
+LIVEUPDATE_EXTRACT_FAILED="Falhou a descompressão do pacote de atualização. Por favor, tente atualizar a extensão manualmente."
+
+LIVEUPDATE_INVALID_PACKAGE_TYPE="Tipo de pacote não é válido. A atualização não pode continuar."
+LIVEUPDATE_INSTALLEXT="Instale %s %s"
+LIVEUPDATE_ERROR="Erro"
+LIVEUPDATE_SUCCESS="Êxito"
+
+LIVEUPDATE_ICON_UNSUPPORTED="Atualização ao Vivo não suportadactualización en Vivo no soportada"
+LIVEUPDATE_ICON_CRASHED="Atualização ao Vivo foi danificada"
+LIVEUPDATE_ICON_CURRENT="Você tem a última versão"
+LIVEUPDATE_ICON_UPDATES="ATUALIZAÇÃO ENCONTRADA! CLIQUE PARA ATUALIZAR."
+
+LIVEUPDATE_RELEASEINFO="Informações"
+LIVEUPDATE_RELEASENOTES="Notas de lançamento"
+LIVEUPDATE_READMOREINFO="Leia mais"
+
+; LIVEUPDATE_NAGSCREEN_HEAD="WARNING! You are about to install an unstable version."
+; LIVEUPDATE_NAGSCREEN_BODY="You are about to install an unstable version (%s - %s). Unstable versions may have undergone minimal or no testing and contain bugs which may have an serious adverse to the stability and functionality of your web site. If you are not sure about what you are about to do, please close this browser window. If you are absolutely certain you understand the risks involved with the installation of unstable releases, please click the button below to continue the installation of this unstable release."
+; LIVEUPDATE_NAGSCREEN_BUTTON="I understand the risks. Continue with the installation."
+
+; LIVEUPDATE_STABILITY_ALPHA="Alpha"
+; LIVEUPDATE_STABILITY_BETA="Beta"
+; LIVEUPDATE_STABILITY_RC="RC"
+; LIVEUPDATE_STABILITY_STABLE="Stable"
+; LIVEUPDATE_STABILITY_SVN="SVN"
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/pt-PT/pt-PT.liveupdate.ini b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/pt-PT/pt-PT.liveupdate.ini
new file mode 100644
index 00000000..5959d2d5
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/pt-PT/pt-PT.liveupdate.ini
@@ -0,0 +1,56 @@
+; Akeeba Live Update
+; Copyright (c)2010-2013 Nicholas K. Dionysopoulos / AkeebaBackup.com
+; Licensed under the GNU LGPLv3 or later <http://www.gnu.org/copyleft/lesser.html>
+
+LIVEUPDATE_TASK_OVERVIEW="Atualizações"
+
+LIVEUPDATE_NOTSUPPORTED_HEAD="Atualizações diretas não são suportadas neste servidor"
+LIVEUPDATE_NOTSUPPORTED_INFO="O seu servidor indica que a atualização direta não é suportada. Por favor contate o seu alojamento e peça-lhes para ativar a extensão cURL do PHP ou ativar a função fopen(). Se estas já estiverem ativadas, por favor peça-lhes para configurar o firewall para permitir o acesso à seguinte URL:"
+LIVEUPDATE_NOTSUPPORTED_ALTMETHOD="Pode sempre atualizar pelo processo normal <var>%s</var> visita o nosso sítio, descarrega a última versão e instala pelo instalador de extensões do Joomla."
+
+LIVEUPDATE_STUCK_HEAD="O atualizador direto marcou-se a si mesmo como defeituoso"
+LIVEUPDATE_STUCK_INFO="O atualizador direto indica que bloqueou na última vez que tentou entrar em contato com o servidor de atualização. Isso geralmente indica um alojamento que bloqueia ativamente as comunicações com sites externos. Se quiser tentar novamente obter as informações de atualização, por favor clique no botão ATUALIZAR INFORMAÇÕES DE ATUALIZAÇÃO. Se isto resultar numa página em branco, carrtegue no botão voltar e depois contate seu gestor de alojamento e relate este problema."
+
+LIVEUPDATE_ERROR_NEEDSAUTH="Deve indicar um nome de utilizador/senha ou Download ID para os parâmetros do componente antes de tentar fazer a atualização para a última versão. O botão de atualização continuará desativado até que faça isso."
+LIVEUPDATE_HASUPDATES_HEAD="Está disponível uma nova versão"
+LIVEUPDATE_NOUPDATES_HEAD="Existe uma nova versão disponível"
+LIVEUPDATE_CURRENTVERSION="Versão instalada"
+LIVEUPDATE_LATESTVERSION="Última versão"
+LIVEUPDATE_LATESTRELEASED="Data da última versão"
+LIVEUPDATE_DOWNLOADURL="URL de transferência direta"
+
+LIVEUPDATE_REFRESH_INFO="Atualizar as informações de atualização"
+LIVEUPDATE_DO_UPDATE="Atualizar para versão mais recente"
+
+LIVEUPDATE_FTP_REQUIRED="O atualizador direto indica necessitar de utilizar o FTP para descarregar e instalar a sua atualização, mas você não indicou as suas informações de autenticação FTP na Configuração Global do Joomla!.<br/><br/>Por favor, indique abaixo o nome de utilizador e senha FTP para prosseguir com a atualização."
+LIVEUPDATE_FTP="Informação de FTP"
+LIVEUPDATE_FTPUSERNAME="Nome de utilizador FTP"
+LIVEUPDATE_FTPPASSWORD="Senha FTP"
+LIVEUPDATE_DOWNLOAD_AND_INSTALL="Transferir e instalar atualização"
+
+LIVEUPDATE_DOWNLOAD_FAILED="A transferência do pacote de atualização falhou. Certifique-se de que a pasta TEMP é editável ou que ativou as opções de FTP do Joomla nas configurações globais de seu sítio."
+LIVEUPDATE_EXTRACT_FAILED="A extração do pacote de atualização falhou. Por favor tente atualizar a extensão manualmente."
+
+LIVEUPDATE_INVALID_PACKAGE_TYPE="Tipo de pacote inválido. A atualização não pode continuar."
+LIVEUPDATE_INSTALLEXT="Instalar %s %s"
+LIVEUPDATE_ERROR="Erro"
+LIVEUPDATE_SUCCESS="Sucesso"
+
+LIVEUPDATE_ICON_UNSUPPORTED="Atualização direta não suportada"
+LIVEUPDATE_ICON_CRASHED="Atualização direta bloqueou"
+LIVEUPDATE_ICON_CURRENT="Tem a versão mais recente"
+LIVEUPDATE_ICON_UPDATES="ATUALIZAÇÃO ENCONTRADA! Clique para atualizar."
+
+LIVEUPDATE_RELEASEINFO="Informação"
+LIVEUPDATE_RELEASENOTES="Notas da versão"
+LIVEUPDATE_READMOREINFO="Ver mais"
+
+LIVEUPDATE_NAGSCREEN_HEAD="ATENÇÃO: Está prestes a instalar uma versão não estável!"
+LIVEUPDATE_NAGSCREEN_BODY="Está prestes a instalar uma versão instável (%s - %s). Versões instáveis destinam-se a programadores avançados já que podem ​​podem ter sofrido testes mínimos ou mesmo nenhuns e conter falhas desconhecidas que podem ter um efeito adverso grave à estabilidade e funcionalidade do seu sítio. Se não tiver a certeza sobre o que está prestes a fazer, por favor, feche esta janela. Se estiver certo dos riscos envolvidos com a instalação de versões instáveis​​, então clique no botão abaixo para continuar a instalação desta versão instável."
+LIVEUPDATE_NAGSCREEN_BUTTON="Compreendo os riscos. Continuar com a instalação."
+
+LIVEUPDATE_STABILITY_ALPHA="Alfa"
+LIVEUPDATE_STABILITY_BETA="Beta"
+LIVEUPDATE_STABILITY_RC="RC"
+LIVEUPDATE_STABILITY_STABLE="Estável"
+LIVEUPDATE_STABILITY_SVN="SVN"
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/ru-RU/ru-RU.liveupdate.ini b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/ru-RU/ru-RU.liveupdate.ini
new file mode 100644
index 00000000..8f35a41b
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/ru-RU/ru-RU.liveupdate.ini
@@ -0,0 +1,56 @@
+; Akeeba Live Update
+; Copyright (c)2010-2013 Nicholas K. Dionysopoulos / AkeebaBackup.com
+; Licensed under the GNU LGPLv3 or later <http://www.gnu.org/copyleft/lesser.html>
+
+LIVEUPDATE_TASK_OVERVIEW="Автоматическое обновление"
+
+LIVEUPDATE_NOTSUPPORTED_HEAD="Автоматическое обновление не поддерживается на этом сервере"
+LIVEUPDATE_NOTSUPPORTED_INFO="Ваш сервер сообщает, что автоматическое обновление не поддерживается. Пожалуйста, обратитесь к Вашему хостеру и попросите его разрешить CURL расширение для PHP или включить функцию URL FOPEN(). Если они уже включены, пожалуйста, попросите его настроить их сетевой экран так, чтобы она позволяла получить доступ к следующему адресу:"_QQ_""
+LIVEUPDATE_NOTSUPPORTED_ALTMETHOD="Вы всегда сможете обновить <var>%s</var> посетив наш сайт, вручную, загрузив последнюю версию и установив ее с помощью Joomla!."
+
+LIVEUPDATE_STUCK_HEAD="Автоматическое обновление обнаружило ошибку"
+LIVEUPDATE_STUCK_INFO="Автоматическое обновление обнаружило, что произошла ошибка при последнем сеансе связи с сервером обновлений. Обычно это означает, что хост блокирует связи с внешними сайтами. Если Вы желаете снова получить информацию об обновлении, пожалуйста, нажмите кнопку "_QQ_"Освежить информацию об обновлении"_QQ_" , расположенную ниже. Если это приводит к появлению пустой страницы, пожалуйста, свяжитесь с Вашим хостером и сообщите об этой проблеме."
+
+LIVEUPDATE_ERROR_NEEDSAUTH="Перед попыткой обновления до последней версии, Вы должны ввести Ваше имя пользователя/пароль или ID загрузки в параметры компонента. Кнопка обновления будет оставаться неактивной, пока Вы этого не сделаете."
+LIVEUPDATE_HASUPDATES_HEAD="Доступна новая версия"
+LIVEUPDATE_NOUPDATES_HEAD="У Вас уже установлена последняя версия"
+LIVEUPDATE_CURRENTVERSION="Установленная версия"
+LIVEUPDATE_LATESTVERSION="Последняя версия"
+LIVEUPDATE_LATESTRELEASED="Дата выхода последней версии"
+LIVEUPDATE_DOWNLOADURL="Ссылка для прямой загрузки"
+
+LIVEUPDATE_REFRESH_INFO="Освежить информацию об обновлении"
+LIVEUPDATE_DO_UPDATE="Обновить до последней версии"
+
+LIVEUPDATE_FTP_REQUIRED="Автоматическое обновление определило, что необходимо использовать FTP для загрузки и установки обновления, но Вы не сохранили данные для авторизации на FTP в общих настройках Joomla!.<br/><br/>Просьба ввести свое имя пользователя и пароль FTP для продолжения обновления."
+LIVEUPDATE_FTP="Информация FTP"
+LIVEUPDATE_FTPUSERNAME="Имя пользователя FTP"
+LIVEUPDATE_FTPPASSWORD="Пароль пользователя FTP"
+LIVEUPDATE_DOWNLOAD_AND_INSTALL="Загрузить и установить обновление"
+
+LIVEUPDATE_DOWNLOAD_FAILED="Загрузка пакета обновления не удалась. Убедитесь, что временный каталог доступен для записи или что Вы включили и настроили FTP в общих настройках Joomla!."
+LIVEUPDATE_EXTRACT_FAILED="Извлечение пакета обновления не удалось. Пожалуйста, попробуйте обновить компонент вручную."
+
+LIVEUPDATE_INVALID_PACKAGE_TYPE="Неверный тип пакета. Обновление не может продолжаться."
+LIVEUPDATE_INSTALLEXT="Установлено %s %s"
+LIVEUPDATE_ERROR="Ошибка"
+LIVEUPDATE_SUCCESS="Успешно"
+
+LIVEUPDATE_ICON_UNSUPPORTED="Автоматическое обновление не поддерживается"
+LIVEUPDATE_ICON_CRASHED="Автоматическое обновление не удалось!"
+LIVEUPDATE_ICON_CURRENT="У Вас последняя версия"
+LIVEUPDATE_ICON_UPDATES="НАЙДЕНА НОВАЯ ВЕРСИЯ! НАЖМИТЕ ДЛЯ ОБНОВЛЕНИЯ."
+
+; LIVEUPDATE_RELEASEINFO="Information"
+; LIVEUPDATE_RELEASENOTES="Release notes"
+; LIVEUPDATE_READMOREINFO="Read more"
+
+; LIVEUPDATE_NAGSCREEN_HEAD="WARNING! You are about to install an unstable version."
+; LIVEUPDATE_NAGSCREEN_BODY="You are about to install an unstable version (%s - %s). Unstable versions may have undergone minimal or no testing and contain bugs which may have an serious adverse to the stability and functionality of your web site. If you are not sure about what you are about to do, please close this browser window. If you are absolutely certain you understand the risks involved with the installation of unstable releases, please click the button below to continue the installation of this unstable release."
+; LIVEUPDATE_NAGSCREEN_BUTTON="I understand the risks. Continue with the installation."
+
+; LIVEUPDATE_STABILITY_ALPHA="Alpha"
+; LIVEUPDATE_STABILITY_BETA="Beta"
+; LIVEUPDATE_STABILITY_RC="RC"
+; LIVEUPDATE_STABILITY_STABLE="Stable"
+; LIVEUPDATE_STABILITY_SVN="SVN"
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/sk-SK/sk-SK.liveupdate.ini b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/sk-SK/sk-SK.liveupdate.ini
new file mode 100644
index 00000000..cac25ab6
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/sk-SK/sk-SK.liveupdate.ini
@@ -0,0 +1,56 @@
+; Akeeba Live Update
+; Copyright (c)2010-2013 Nicholas K. Dionysopoulos / AkeebaBackup.com
+; Licensed under the GNU LGPLv3 or later <http://www.gnu.org/copyleft/lesser.html>
+
+; LIVEUPDATE_TASK_OVERVIEW="Live Update"
+
+; LIVEUPDATE_NOTSUPPORTED_HEAD="Live Update is not supported on this server"
+; LIVEUPDATE_NOTSUPPORTED_INFO="Your server indicates that Live Update is not supported. Please contact your host and ask them to enable the cURL PHP extension or activate the URL fopen() wrappers. If these are already enabled, please ask them to configure their firewall so that it allows access to the following URL:"
+; LIVEUPDATE_NOTSUPPORTED_ALTMETHOD="You can always update <var>%s</var> by visiting our site manually, downloading the latest release and installing it using Joomla!'s extension installer."
+
+; LIVEUPDATE_STUCK_HEAD="Live Update has marked itself as crashed"
+; LIVEUPDATE_STUCK_INFO="Live Update determined that it crashed the last time it tried to contact the update server. This usually indicates a host which actively blocks communications with external sites. If you would like to retry fetching the update information, please click the "_QQ_"Refresh update information"_QQ_" button below. If that results to a blank page, please contact your host and report this issue."
+
+; LIVEUPDATE_ERROR_NEEDSAUTH="You have to supply your username/password or Download ID to the component's parameters before trying to upgrade to the latest release. The upgrade button will remain disabled until you do that."
+; LIVEUPDATE_HASUPDATES_HEAD="A new version is available"
+; LIVEUPDATE_NOUPDATES_HEAD="You already have the latest version"
+; LIVEUPDATE_CURRENTVERSION="Installed version"
+; LIVEUPDATE_LATESTVERSION="Latest version"
+; LIVEUPDATE_LATESTRELEASED="Latest release date"
+; LIVEUPDATE_DOWNLOADURL="Direct download URL"
+
+; LIVEUPDATE_REFRESH_INFO="Refresh update information"
+; LIVEUPDATE_DO_UPDATE="Update to the latest version"
+
+; LIVEUPDATE_FTP_REQUIRED="Live Update determined that it needs to use FTP in order to download and install your update, but you have not saved your FTP login information in your Joomla! Global Configuration.<br/><br/>Please provide the FTP username and password below to proceed with the update."
+; LIVEUPDATE_FTP="FTP Information"
+; LIVEUPDATE_FTPUSERNAME="FTP Username"
+; LIVEUPDATE_FTPPASSWORD="FTP Password"
+; LIVEUPDATE_DOWNLOAD_AND_INSTALL="Download and install update"
+
+; LIVEUPDATE_DOWNLOAD_FAILED="Downloading the update package failed. Make sure that your temp-directory is writable or that you have enabled Joomla!'s FTP options in your site's Global Configuration."
+; LIVEUPDATE_EXTRACT_FAILED="Extracting the update package failed. Please try updating the extension manually."
+
+; LIVEUPDATE_INVALID_PACKAGE_TYPE="Invalid package type. The update can not proceed."
+; LIVEUPDATE_INSTALLEXT="Install %s %s"
+; LIVEUPDATE_ERROR="Error"
+; LIVEUPDATE_SUCCESS="Success"
+
+; LIVEUPDATE_ICON_UNSUPPORTED="Live Update not supported"
+; LIVEUPDATE_ICON_CRASHED="Live Update crashed"
+; LIVEUPDATE_ICON_CURRENT="You have the latest version"
+; LIVEUPDATE_ICON_UPDATES="UPDATE FOUND! CLICK TO UPDATE."
+
+; LIVEUPDATE_RELEASEINFO="Information"
+; LIVEUPDATE_RELEASENOTES="Release notes"
+; LIVEUPDATE_READMOREINFO="Read more"
+
+; LIVEUPDATE_NAGSCREEN_HEAD="WARNING! You are about to install an unstable version."
+; LIVEUPDATE_NAGSCREEN_BODY="You are about to install an unstable version (%s - %s). Unstable versions may have undergone minimal or no testing and contain bugs which may have an serious adverse to the stability and functionality of your web site. If you are not sure about what you are about to do, please close this browser window. If you are absolutely certain you understand the risks involved with the installation of unstable releases, please click the button below to continue the installation of this unstable release."
+; LIVEUPDATE_NAGSCREEN_BUTTON="I understand the risks. Continue with the installation."
+
+; LIVEUPDATE_STABILITY_ALPHA="Alpha"
+; LIVEUPDATE_STABILITY_BETA="Beta"
+; LIVEUPDATE_STABILITY_RC="RC"
+; LIVEUPDATE_STABILITY_STABLE="Stable"
+; LIVEUPDATE_STABILITY_SVN="SVN"
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/sl-SI/sl-SI.liveupdate.ini b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/sl-SI/sl-SI.liveupdate.ini
new file mode 100644
index 00000000..4e2d136e
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/sl-SI/sl-SI.liveupdate.ini
@@ -0,0 +1,56 @@
+; Akeeba Live Update
+; Copyright (c)2010-2013 Nicholas K. Dionysopoulos / AkeebaBackup.com
+; Licensed under the GNU LGPLv3 or later <http://www.gnu.org/copyleft/lesser.html>
+
+LIVEUPDATE_TASK_OVERVIEW="Posodobljanje v živo"
+
+LIVEUPDATE_NOTSUPPORTED_HEAD="Posodabljanje v živo ni podprto na tem strežniku"
+LIVEUPDATE_NOTSUPPORTED_INFO="Vaš server ne podpira Live Posodobitev. Obrnite se na svojega gostitelja in ga prosite, da se omogoči razširitev CURL PHP ali aktivira URL fopen () ovoje. Če so ti že omogočeno, ga prosite, naj svoje požarni zid konfigurirate tako, da omogoča dostop do naslednjih URL:"
+LIVEUPDATE_NOTSUPPORTED_ALTMETHOD="Vedno lahko posodobite <var>%s</var> tako, da obiščete našo spletno stran, ročno prenesete najnovejše sprostitve in jih namestite z Joomla! 's namestitev razširitve."
+
+LIVEUPDATE_STUCK_HEAD="Posodobitev v živo je označena kot spodletelo"
+LIVEUPDATE_STUCK_INFO="Posodobitev v živo je določila, da se je zrušila v zadnjem času, ko je poskušala stopiti v stik strežnika za posodabljanje. To ponavadi pomeni, gostitelja, ki aktivno blokira komunikacijo z zunanjimi spletnimi stranmi. Če želite ponoviti ljubek posodabljanje informacij, prosimo, kliknite "_QQ_"Osvežite informacije posodabljanja"_QQ_" spodnji gumb. Če bo rezultat prazna stran, prosimo, obrnite se na gostitelja, in poročajte o tej zadevi."
+
+LIVEUPDATE_ERROR_NEEDSAUTH="Morate predloži svoje uporabniško ime / geslo ali ID Prenosa s parametri sestavnega dela, preden poskušate nadgraditi na najnovejšo različico. Gumb Nadgradnja bo ostal onemogočen."
+LIVEUPDATE_HASUPDATES_HEAD="Nova različica je na voljo"
+LIVEUPDATE_NOUPDATES_HEAD="Že imate zadnjo verzijo"
+LIVEUPDATE_CURRENTVERSION="Nameščena različica"
+LIVEUPDATE_LATESTVERSION="Zadnja različica"
+LIVEUPDATE_LATESTRELEASED="Zadnji Datum izdaje"
+LIVEUPDATE_DOWNLOADURL="Direktni prenos URL"
+
+LIVEUPDATE_REFRESH_INFO="Osveži informacij posodobitev"
+LIVEUPDATE_DO_UPDATE="Posodobitev na najnovejšo različico"
+
+LIVEUPDATE_FTP_REQUIRED="Posodobitev v živo določa, da morate uporabiti FTP, da prenesete in namestite posodobitev, vendar niste shranili FTP podatke za prijavo v vaši Joomla! Globalne Konfiguracije.<br/><br/>Prosimo, za FTP uporabniško ime in geslo za nadaljevanje posodobitve."
+LIVEUPDATE_FTP="FTP Informacije"
+LIVEUPDATE_FTPUSERNAME="FTP Uporabniško ime"
+LIVEUPDATE_FTPPASSWORD="FTP Geslo"
+LIVEUPDATE_DOWNLOAD_AND_INSTALL="Prenesite in namestite posodobitev"
+
+LIVEUPDATE_DOWNLOAD_FAILED="Nalaganje posodobitvenega paketa ni uspela. Prepričajte se, da je vaš temp-imenik zapisljiv ali da ste omogočili Joomla! 'S FTP možnosti v vaše strani Globalne Konfiguracije."
+LIVEUPDATE_EXTRACT_FAILED="Pridobivanja posodobitvenega paketa ni uspela. Poskusite posodabljanje razširitve ročno."
+
+LIVEUPDATE_INVALID_PACKAGE_TYPE="Neveljavna vrsta paketa.Posodobitev ne morem nadaljevati."
+LIVEUPDATE_INSTALLEXT="Nameščeno %s %s"
+LIVEUPDATE_ERROR="Napaka"
+LIVEUPDATE_SUCCESS="Uspešno"
+
+LIVEUPDATE_ICON_UNSUPPORTED="Posodabljanje v živo ni podprto"
+LIVEUPDATE_ICON_CRASHED="Posodabljanje v živo je spodletelo"
+LIVEUPDATE_ICON_CURRENT="Imate najnovejšo različico"
+LIVEUPDATE_ICON_UPDATES="POSODOBITEV NA VOLJO! KLIKNITE ZA POSODOBITEV."
+
+LIVEUPDATE_RELEASEINFO="Informacije"
+LIVEUPDATE_RELEASENOTES="Opombe ob izdaji"
+LIVEUPDATE_READMOREINFO="Preberite več"
+
+LIVEUPDATE_NAGSCREEN_HEAD="OPOZORILO! Ste pred tem namestiti nestabilno različico."
+LIVEUPDATE_NAGSCREEN_BODY="Ste pred tem namestili nestabilno različico (%s - %s). Nestabilne različice so lahko opravili minimalno ali brez testiranja in vsebujejo napake, ki imajo lahko resno škodljivost za stabilnost in funkcionalnost vaše spletne strani. Če niste prepričani o tem, kaj si o tem narediti, zaprite to okno brskalnika. Če ste popolnoma prepričani, da razumete tveganja, povezana z namestitvijo nestabilnih izdaj, kliknite na spodnji gumb, da nadaljujte z namestitvijo te nestabilne izdaje."
+LIVEUPDATE_NAGSCREEN_BUTTON="Razumem tveganja. Nadaljujte z namestitvijo."
+
+LIVEUPDATE_STABILITY_ALPHA="Alfa"
+LIVEUPDATE_STABILITY_BETA="Beta"
+LIVEUPDATE_STABILITY_RC="RC"
+LIVEUPDATE_STABILITY_STABLE="Stabilna"
+LIVEUPDATE_STABILITY_SVN="SVN"
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/sv-SE/sv-SE.liveupdate.ini b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/sv-SE/sv-SE.liveupdate.ini
new file mode 100644
index 00000000..cd903f80
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/sv-SE/sv-SE.liveupdate.ini
@@ -0,0 +1,56 @@
+; Akeeba Live Update
+; Copyright (c)2010-2013 Nicholas K. Dionysopoulos / AkeebaBackup.com
+; Licensed under the GNU LGPLv3 or later <http://www.gnu.org/copyleft/lesser.html>
+
+LIVEUPDATE_TASK_OVERVIEW="Live Update"
+
+LIVEUPDATE_NOTSUPPORTED_HEAD="Live Update stöds inte på denna server"
+LIVEUPDATE_NOTSUPPORTED_INFO="Din server indikerar att Live Update inte stöds. Kontakta ditt webbhotell och be dem aktivera PHP-tillägget cURL och att aktivera URL fopen() wrappers. Om detta redan är aktiverat skall du be dem konfiurera brandväggen så att den accepterar anslutningar från följande URL:"_QQ_""
+LIVEUPDATE_NOTSUPPORTED_ALTMETHOD="Du kan alltid uppdatera <var>%s</var> manuellt genom att vår webbplats och ladda ned senaste utgåvan och installera via Joomla som vanligt."
+
+LIVEUPDATE_STUCK_HEAD="Live Update har markerat sig själv som krashad"
+LIVEUPDATE_STUCK_INFO="Live Update har indikerat att den kraschade förra gången den försökte kontakta uppdateringsservern. Detta händer vanligen om kommunikationen med externa webbplatser aktivt har blockerats. Om du vill fortsätta hämta uppdateringsinformation, klicka på knappen "_QQ_"Hämta uppdateringsinfo på nytt"_QQ_" här nedan. Om detta resluterar i en blank sida skall du kontakta ditt webbhotell och rapportera ärendet."
+
+LIVEUPDATE_ERROR_NEEDSAUTH="Du måste ange användarnamn/lösenord eller Nedladdnings-ID i komponentens Inställningar innan du försöker uppdatera till senaste version. Uppgraderingsknappen kommer att vara inaktiv till dess detta är gjort."
+LIVEUPDATE_HASUPDATES_HEAD="Det finns en ny version tillgänglig"
+LIVEUPDATE_NOUPDATES_HEAD="Du har den senatste versionen"
+LIVEUPDATE_CURRENTVERSION="Installerad version"
+LIVEUPDATE_LATESTVERSION="Senaste version"
+LIVEUPDATE_LATESTRELEASED="Senaste utgåvodatum"
+LIVEUPDATE_DOWNLOADURL="Direkt nedladdnings-URL"
+
+LIVEUPDATE_REFRESH_INFO="Hämta uppdateringsinformation"
+LIVEUPDATE_DO_UPDATE="Uppdatera till senaste version"
+
+LIVEUPDATE_FTP_REQUIRED="Live Update har upptäckt att den behöver använda FTP för att kunna ladda ned och installera uppdateringen. Du har inte sparat din FTP-inloggningsinfo i Joomlas globala inställningar.<br/><br/>Ange ditt FTP användarnamn och lösenord nedan för att fortsätta med uppdateringen."
+LIVEUPDATE_FTP="FTP-Information"
+LIVEUPDATE_FTPUSERNAME="FTP användarnamn"
+LIVEUPDATE_FTPPASSWORD="FTP Lösenord"
+LIVEUPDATE_DOWNLOAD_AND_INSTALL="Ladda ned och installera uppdateringen"
+
+LIVEUPDATE_DOWNLOAD_FAILED="Nedladdningen av uppdateringen misslyckades. Kontrollera att temp-mappen är skrivbar och att du aktiverat Joomla!s FTP-lager i de globala inställningarna för din webbplats."
+LIVEUPDATE_EXTRACT_FAILED="Uppackningen av uppdaterinspaketet misslyckades. Försök att uppdatera tillägget manuellt."
+
+LIVEUPDATE_INVALID_PACKAGE_TYPE="Ogiltig pakettyp. Uppdateringen kan inte fortsätta."
+LIVEUPDATE_INSTALLEXT="Installera %s %s"
+LIVEUPDATE_ERROR="FEL!"
+LIVEUPDATE_SUCCESS="Klart"
+
+LIVEUPDATE_ICON_UNSUPPORTED="Live Update stöds inte"
+LIVEUPDATE_ICON_CRASHED="Live Update krashade"
+LIVEUPDATE_ICON_CURRENT="Du har den senaste versionen"
+LIVEUPDATE_ICON_UPDATES="UPPDATERING HITTAD! KLICKA FÖR ATT UPPDATERA."
+
+LIVEUPDATE_RELEASEINFO="Information"
+LIVEUPDATE_RELEASENOTES="Release notes"
+LIVEUPDATE_READMOREINFO="Läs mer"
+
+; LIVEUPDATE_NAGSCREEN_HEAD="WARNING! You are about to install an unstable version."
+; LIVEUPDATE_NAGSCREEN_BODY="You are about to install an unstable version (%s - %s). Unstable versions may have undergone minimal or no testing and contain bugs which may have an serious adverse to the stability and functionality of your web site. If you are not sure about what you are about to do, please close this browser window. If you are absolutely certain you understand the risks involved with the installation of unstable releases, please click the button below to continue the installation of this unstable release."
+; LIVEUPDATE_NAGSCREEN_BUTTON="I understand the risks. Continue with the installation."
+
+; LIVEUPDATE_STABILITY_ALPHA="Alpha"
+; LIVEUPDATE_STABILITY_BETA="Beta"
+; LIVEUPDATE_STABILITY_RC="RC"
+; LIVEUPDATE_STABILITY_STABLE="Stable"
+; LIVEUPDATE_STABILITY_SVN="SVN"
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/tr-TR/tr-TR.liveupdate.ini b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/tr-TR/tr-TR.liveupdate.ini
new file mode 100644
index 00000000..0b97ffcd
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/tr-TR/tr-TR.liveupdate.ini
@@ -0,0 +1,56 @@
+; Akeeba Live Update
+; Copyright (c)2010-2013 Nicholas K. Dionysopoulos / AkeebaBackup.com
+; Licensed under the GNU LGPLv3 or later <http://www.gnu.org/copyleft/lesser.html>
+
+LIVEUPDATE_TASK_OVERVIEW="Canlı Güncelleme"
+
+LIVEUPDATE_NOTSUPPORTED_HEAD="Canlı Güncelleme bu sunucu üzerinde desteklenmiyor"
+LIVEUPDATE_NOTSUPPORTED_INFO="Sunucunuz Canlı Güncellemeyi desteklemiyor. Lütfen sunucu yöneticinizle görüşerek cURL PHP ekini ya da URL fopen() sarıcılarını etkinleştirmelerini isteyin. Bu ekler zaten etkinleştirilmişse, güvenlik duvarını şu İnternet adresine izin verecek şekilde ayarlamalarını isteyin:"
+LIVEUPDATE_NOTSUPPORTED_ALTMETHOD="<var>%s</var> güncellemelerini istediğiniz zaman el ile kurmak için, sitemizden en son sürümü indirip Joomla! bileşen kurucusu ile yükleyebilirsiniz."
+
+LIVEUPDATE_STUCK_HEAD="Canlı güncellemede bir sorun çıkmış"
+LIVEUPDATE_STUCK_INFO="Canlı Güncelleme, güncelleme sunucusuna son kez bağlanmaya çalıştığında bir sorun çıkmış. Bu duruma genellikle dışarıdaki sunuculara yapılan bağlantıları engelleyen bir ayar yol açar. Güncelleme bilgisini yeniden almak isterseniz lütfen aşağıdaki "_QQ_"Güncelleme bilgisini alın"_QQ_" düğmesine tıklayın. Boş beyaz bir sayfa ile karşılaşırsanız bu durumu sunucu yöneticinize iletin."
+
+LIVEUPDATE_ERROR_NEEDSAUTH="Son sürüme güncellemeyi denemeden önce, bileşen ayarları bölümüne kullanıcı adınızı/parolanızı ya da indirme kodunuzu yazmalısınız. Bu bilgileri yazana kadar Güncelleyin düğmesi devre dışı kalır."
+LIVEUPDATE_HASUPDATES_HEAD="Yeni bir sürüm var"
+LIVEUPDATE_NOUPDATES_HEAD="Son sürümü kullanıyorsunuz"
+LIVEUPDATE_CURRENTVERSION="Kullandığınız sürüm"
+LIVEUPDATE_LATESTVERSION="Son sürüm"
+LIVEUPDATE_LATESTRELEASED="Son yayın tarihi"
+LIVEUPDATE_DOWNLOADURL="Doğrudan indirme adresi"
+
+LIVEUPDATE_REFRESH_INFO="Güncelleme bilgisini alın"
+LIVEUPDATE_DO_UPDATE="Son sürüme güncelleyin"
+
+LIVEUPDATE_FTP_REQUIRED="Canlı Güncelleme, güncellemeyi indirip kurmak yerine FTP kullanmaya gerek duyuyor, ancak FTP bilgilerinizi Joomla! Genel Ayarlarına kaydetmemişsiniz.<br/><br/>Bu güncellemeyi yapabilmek için FTP kullanıcı adı ve parolanızı aşağıya yazın."
+LIVEUPDATE_FTP="FTP Bilgileri"
+LIVEUPDATE_FTPUSERNAME="FTP Kullanıcı Adı"
+LIVEUPDATE_FTPPASSWORD="FTP Parolası"
+LIVEUPDATE_DOWNLOAD_AND_INSTALL="Güncellemeyi indirin ve yükleyin"
+
+LIVEUPDATE_DOWNLOAD_FAILED="Güncelleme paketi indirilemedi. Geçici klasörünüzün yazılabilir olduğundan ya da Joomla! Genel Ayarlarından FTP seçeneğini etkinleştirdiğinizden emin olun."
+LIVEUPDATE_EXTRACT_FAILED="Güncelleme paketi ayıklanamadı. Lütfen bileşeni el ile güncellemeyi deneyin."
+
+LIVEUPDATE_INVALID_PACKAGE_TYPE="Geçersiz paket tipi. Güncelleme yapılamıyor."
+LIVEUPDATE_INSTALLEXT="%s %s yükleyin"
+LIVEUPDATE_ERROR="Hata"
+LIVEUPDATE_SUCCESS="Başarılı"
+
+LIVEUPDATE_ICON_UNSUPPORTED="Canlı Güncelleme desteklenmiyor"
+LIVEUPDATE_ICON_CRASHED="Canlı Güncelleme hata verdi"
+LIVEUPDATE_ICON_CURRENT="Son sürümü kullanıyorsunuz"
+LIVEUPDATE_ICON_UPDATES="GÜNCELLEME VAR! YÜKLEMEK İÇİN TIKLAYIN."
+
+LIVEUPDATE_RELEASEINFO="Bilgiler"
+LIVEUPDATE_RELEASENOTES="Yayın Notları"
+LIVEUPDATE_READMOREINFO="Devamını okuyun"
+
+LIVEUPDATE_NAGSCREEN_HEAD="DİKKAT! Kararsız bir sürüm yüklemek üzeresiniz."
+LIVEUPDATE_NAGSCREEN_BODY="Kararsız bir sürüm yüklemek üzeresiniz (%s - %s). Kararsız sürümler çok az denendiği ya da hiç denenmediği için hatalar içerir ve web sitenizin düzgün çalışmasını engelleyebilir. Ne yaptığınızdan emin değilseniz bu tarayıcı penceresini kapatın. Kararsız sürümleri yüklemekle alacağınız risklerin farkındaysanız, yüklemeye devam etmek için aşağıdaki düğmeye tıklayın."
+LIVEUPDATE_NAGSCREEN_BUTTON="Riskleri anladım. Yüklemeye devam edeceğim."
+
+LIVEUPDATE_STABILITY_ALPHA="Alfa"
+LIVEUPDATE_STABILITY_BETA="Beta"
+LIVEUPDATE_STABILITY_RC="Yayın adayı"
+LIVEUPDATE_STABILITY_STABLE="Kararlı"
+LIVEUPDATE_STABILITY_SVN="SVN"
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/uk-UA/uk-UA.liveupdate.ini b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/uk-UA/uk-UA.liveupdate.ini
new file mode 100644
index 00000000..ea4c9a04
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/language/uk-UA/uk-UA.liveupdate.ini
@@ -0,0 +1,56 @@
+; Akeeba Live Update
+; Copyright (c)2010-2013 Nicholas K. Dionysopoulos / AkeebaBackup.com
+; Licensed under the GNU LGPLv3 or later <http://www.gnu.org/copyleft/lesser.html>
+
+LIVEUPDATE_TASK_OVERVIEW="Live Update"
+
+LIVEUPDATE_NOTSUPPORTED_HEAD="Live Update не підтримується на цьому сервері"
+LIVEUPDATE_NOTSUPPORTED_INFO="Ваш сервер сигналізує, що Live Update не підтримується. Будь ласка, зв’яжіться з вашим постачальником послуг хостингу і попросіть його ввімкнути розширення PHP cURL або активувати пакувальники URL fopen(). Якщо вони вже ввімкнені, будь ласка, попросіть його сконфігурувати  мережеві екрани так, щоб вони дозволяли доступ до цих URL:"_QQ_""
+LIVEUPDATE_NOTSUPPORTED_ALTMETHOD="Ви можете завжди оновити <var>%s</var> відвідавши наш сайт персонально, завантажити останній випуск та встановити його, використовуючи інсталятор розширень Joomla!."
+
+LIVEUPDATE_STUCK_HEAD="Live Update позначив себе таким, що зазнав краху"
+LIVEUPDATE_STUCK_INFO="Live Update визначив, що він зазнав краху останнього разу, коли намагався зв’язатися з сервером оновлень. Це зазвичай означає, що хост активно блокує комунікацію з зовнішніми сайтами. Якщо ви ви захочете спробувати знову отримати інформацію про оновлення, будь ласка, натисніть на кнопку "_QQ_"Оновити інформацію "_QQ_" нижче. Якщо це видасть пусту сторінку, будь ласка, зв’яжіться з постачальником послуг хостингу і опишіть цю проблему."
+
+LIVEUPDATE_ERROR_NEEDSAUTH="Ви повинні надати ваше ім’я користувача/пароль або ID завантаження в параметрах компоненту перед тим, як намагатися оновитися до останнього випуску. Кнопка оновлення буде залишатися неактивною, доки ви цього не зробите."
+LIVEUPDATE_HASUPDATES_HEAD="Доступна нова версія"
+LIVEUPDATE_NOUPDATES_HEAD="У вас уже встановлена остання версія"
+LIVEUPDATE_CURRENTVERSION="Встановлена версія"
+LIVEUPDATE_LATESTVERSION="Остання версія"
+LIVEUPDATE_LATESTRELEASED="Дата останнього випуску"
+LIVEUPDATE_DOWNLOADURL="URL для безпосереднього завантаження"
+
+LIVEUPDATE_REFRESH_INFO="Оновити інформацію"
+LIVEUPDATE_DO_UPDATE="Оновити до останньої версії"
+
+LIVEUPDATE_FTP_REQUIRED="Live Update визначив, що йому потрібно використовувати FTP для завантаження та встановлення вашого оновлення, але ви не зберегли  інформацію вашого логіну FTP на сторінці Загальної Конфігурації Joomla! .<br/><br/>Будь ласка, надайте ім’я користувача і пароль FTP нижче, щоб продовжити процес оновлення."
+LIVEUPDATE_FTP="Інформація FTP"
+LIVEUPDATE_FTPUSERNAME="Ім’я користувача FTP"
+LIVEUPDATE_FTPPASSWORD="Пароль FTP"
+LIVEUPDATE_DOWNLOAD_AND_INSTALL="Завантажити і встановити оновлення"
+
+LIVEUPDATE_DOWNLOAD_FAILED="Завантаження пакету оновлень не вдалося. Переконайтесь, що ваш тимчасовий каталог доступний для запису або що ви ввімкнули налаштування FTP в Загальній Конфігурації Joomla!."
+LIVEUPDATE_EXTRACT_FAILED="Видобування пакету оновлень не вдалося. Будь ласка, спробуйте оновити розширення вручну."
+
+LIVEUPDATE_INVALID_PACKAGE_TYPE="Неправильний тип пакету. Оновлення не може бути продовжено."
+LIVEUPDATE_INSTALLEXT="Встановлення %s %s"
+LIVEUPDATE_ERROR="Помилка"
+LIVEUPDATE_SUCCESS="Успішно"
+
+LIVEUPDATE_ICON_UNSUPPORTED="Live Update не підтримується"
+LIVEUPDATE_ICON_CRASHED="Live Update зазнало краху"
+LIVEUPDATE_ICON_CURRENT="У вас остання версія"
+LIVEUPDATE_ICON_UPDATES="ЗНАЙДЕНО ОНОВЛЕННЯ! НАТИСНІТЬ ДЛЯ ЗАПУСКУ ОНОВЛЕННЯ."
+
+; LIVEUPDATE_RELEASEINFO="Information"
+; LIVEUPDATE_RELEASENOTES="Release notes"
+; LIVEUPDATE_READMOREINFO="Read more"
+
+; LIVEUPDATE_NAGSCREEN_HEAD="WARNING! You are about to install an unstable version."
+; LIVEUPDATE_NAGSCREEN_BODY="You are about to install an unstable version (%s - %s). Unstable versions may have undergone minimal or no testing and contain bugs which may have an serious adverse to the stability and functionality of your web site. If you are not sure about what you are about to do, please close this browser window. If you are absolutely certain you understand the risks involved with the installation of unstable releases, please click the button below to continue the installation of this unstable release."
+; LIVEUPDATE_NAGSCREEN_BUTTON="I understand the risks. Continue with the installation."
+
+; LIVEUPDATE_STABILITY_ALPHA="Alpha"
+; LIVEUPDATE_STABILITY_BETA="Beta"
+; LIVEUPDATE_STABILITY_RC="RC"
+; LIVEUPDATE_STABILITY_STABLE="Stable"
+; LIVEUPDATE_STABILITY_SVN="SVN"
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/liveupdate/liveupdate.php b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/liveupdate.php
new file mode 100644
index 00000000..cdb1f3a8
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/liveupdate/liveupdate.php
@@ -0,0 +1,163 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ *
+ * @package LiveUpdate 2.1.5 - 2.2.1
+ * @copyright Copyright (c)2010-2013 Nicholas K. Dionysopoulos / AkeebaBackup.com
+ * @license GNU LGPLv3 or later <http://www.gnu.org/copyleft/lesser.html>
+ *
+ * One-click updater for Joomla! extensions
+ * Copyright (C) 2011-2013  Nicholas K. Dionysopoulos / AkeebaBackup.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @version     3.6.0 2016-03-08
+ * @since       1.2.6
+ */
+
+defined('_JEXEC') or die();
+
+require_once dirname(__FILE__).'/classes/abstractconfig.php';
+require_once dirname(__FILE__).'/config.php';
+
+class LiveUpdate
+{
+	/** @var string The current version of Akeeba Live Update */
+	public static $version = '1.1';
+
+	/**
+	 * Loads the translation strings -- this is an internal function, called automatically
+	 */
+	private static function loadLanguage()
+	{
+		// Load translations
+		$basePath = dirname(__FILE__);
+		$jlang = JFactory::getLanguage();
+		$jlang->load('liveupdate', $basePath, 'en-GB', true); // Load English (British)
+		$jlang->load('liveupdate', $basePath, $jlang->getDefault(), true); // Load the site's default language
+		$jlang->load('liveupdate', $basePath, null, true); // Load the currently selected language
+	}
+
+	/**
+	 * Handles requests to the "liveupdate" view which is used to display
+	 * update information and perform the live updates
+	 */
+	public static function handleRequest()
+	{
+		// Load language strings
+		self::loadLanguage();
+
+		// Load the controller and let it run the show
+		require_once dirname(__FILE__).'/classes/controller.php';
+		$controller = new LiveUpdateController();
+		$controller->execute(JRequest::getCmd('task','overview'));
+		$controller->redirect();
+	}
+
+	/**
+	 * Returns update information about your extension, based on your configuration settings
+	 * @return stdClass
+	 */
+	public static function getUpdateInformation($force = false)
+	{
+		require_once dirname(__FILE__).'/classes/updatefetch.php';
+		$update = new LiveUpdateFetch();
+		$info = $update->getUpdateInformation($force);
+		$hasUpdates = $update->hasUpdates($force);
+		$info->hasUpdates = $hasUpdates;
+
+		$config = LiveUpdateConfig::getInstance();
+		$extInfo = $config->getExtensionInformation();
+
+		$info->extInfo = (object)$extInfo;
+
+		return $info;
+	}
+
+	public static function getIcon($config=array())
+	{
+		// Load language strings
+		self::loadLanguage();
+
+		// Initialize the array of button options
+		$button = array();
+
+		$defaultConfig = array(
+			'option'			=> JRequest::getCmd('option',''),
+			'view'				=> 'liveupdate',
+			'mediaurl'			=> JURI::base().'components/'.JRequest::getCmd('option','').'/liveupdate/assets/'
+		);
+		$c = array_merge($defaultConfig, $config);
+
+		$button['link'] = 'index.php?option='.$c['option'].'&view='.$c['view'];
+		$button['image'] = $c['mediaurl'];
+
+		$updateInfo = self::getUpdateInformation();
+		if(!$updateInfo->supported) {
+			// Unsupported
+			$button['icon'] = 'liveupdate-icon-notsupported';
+			$button['class'] = version_compare(JVERSION, '3.0', 'lt') ? 'liveupdate-icon-notsupported' : '';
+			$button['suffix'] = version_compare(JVERSION, '3.0', 'lt') ? '' : '';
+			$button['image'] .= 'nosupport-32.png';
+			$button['text'] = JText::_('LIVEUPDATE_ICON_UNSUPPORTED');
+		} elseif($updateInfo->stuck) {
+			// Stuck
+			$button['icon'] = 'liveupdate-icon-crashed';
+			$button['class'] = version_compare(JVERSION, '3.0', 'lt') ? 'liveupdate-icon-crashed' : '';
+			$button['suffix'] = version_compare(JVERSION, '3.0', 'lt') ? '' : '';
+			$button['image'] .= 'nosupport-32.png';
+			$button['text'] = JText::_('LIVEUPDATE_ICON_CRASHED');
+		}
+
+		// Has updates
+		elseif($updateInfo->hasUpdates)
+		{
+			$button['icon'] = version_compare(JVERSION, '3.0', 'lt') ? 'liveupdate-icon-updates' : 'icon-upload';
+			$button['class'] = version_compare(JVERSION, '3.0', 'lt') ? 'liveupdate-icon-updates' : 'btn btn-danger';
+			$button['suffix'] = version_compare(JVERSION, '3.0', 'lt') ? '' : 'danger';
+			$button['text'] = '<strong>' . JText::_('LIVEUPDATE_ICON_UPDATES') . '</strong>';
+		}
+
+		// Already in the latest release
+		else
+		{
+			$button['icon'] = 'liveupdate-icon-noupdates';
+			$button['class'] = version_compare(JVERSION, '3.0', 'lt') ? 'liveupdate-icon-noupdates' : '';
+			$button['suffix'] = version_compare(JVERSION, '3.0', 'lt') ? '' : '';
+			$button['image'] .= 'current-32.png';
+			$button['text'] = JText::_('LIVEUPDATE_ICON_CURRENT');
+		}
+
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			$iCupdate = '<div class="icon"><a href="'.$button['link'].'">'.
+			'<div style="text-align: center;"><img src="'.$button['image'].'" alt="" width="32" height="32" border="0" align="middle" style="float: none" /></div>'.
+			'<span class="'.$button['class'].'">'.$button['text'].'</span></a></div>';
+		}
+		else
+		{
+			$iCupdate = '<div class="icon ' . $button['suffix'] . '"><a href="' . $button['link'] . '">';
+			$iCupdate.= '<div class="' . $button['class'] . '">';
+			$iCupdate.= (isset($button['image']) && $button['image'] != $c['mediaurl'])
+						? '<img src="' . $button['image'] . '" alt="" width="32" height="32" border="0" align="middle" style="float: none" />'
+						: '<big><span class="' . $button['icon'] . '"></span></big>';
+			$iCupdate.= '<br />' . $button['text'] . '</div>';
+			$iCupdate.= '</a></div>';
+		}
+
+		return $iCupdate;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/categories.php b/deployed/icagenda/administrator/components/com_icagenda/models/categories.php
new file mode 100644
index 00000000..3b9c263f
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/categories.php
@@ -0,0 +1,163 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-20
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+jimport('joomla.application.component.modellist'); // Joomla 2.5
+
+/**
+ * Categories Model.
+ */
+class iCagendaModelcategories extends JModelList
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @since   1.0
+	 * @see     JControllerLegacy
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'id', 'a.id',
+				'ordering', 'a.ordering',
+				'state', 'a.state',
+				'title', 'a.title',
+				'color', 'a.color',
+				'desc', 'a.desc',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 */
+	protected function populateState($ordering = null, $direction = null)
+	{
+		// Initialise variables.
+		$app = JFactory::getApplication('administrator');
+
+		// Load the filter state.
+		$search = $app->getUserStateFromRequest($this->context . '.filter.search', 'filter_search');
+		$this->setState('filter.search', $search);
+
+		$published = $app->getUserStateFromRequest($this->context . '.filter.state', 'filter_published', '', 'string');
+		$this->setState('filter.state', $published);
+
+		// Load the parameters.
+		$params = JComponentHelper::getParams('com_icagenda');
+		$this->setState('params', $params);
+
+		// List state information.
+		parent::populateState('a.title', 'asc');
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id.
+	 *
+	 * @return  string  A store id.
+	 *
+	 * @since   1.0
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id.= ':' . $this->getState('filter.search');
+		$id.= ':' . $this->getState('filter.state');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Build an SQL query to load the list data.
+	 *
+	 * @return  JDatabaseQuery
+	 * @since   1.0
+	 */
+	protected function getListQuery()
+	{
+		$db    = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		// Select the required fields from the table.
+		$query->select(
+			$this->getState(
+				'list.select',
+				'a.*'
+			)
+		);
+		$query->from('#__icagenda_category AS a');
+
+		// Join over the users for the checked out user.
+		$query->select('uc.name AS editor')
+			->join('LEFT', '#__users AS uc ON uc.id = a.checked_out');
+
+		// Filter by published state
+		$published = $this->getState('filter.state');
+
+		if (is_numeric($published))
+		{
+			$query->where('a.state = ' . (int) $published);
+		}
+		elseif ($published === '')
+		{
+			$query->where('(a.state IN (0, 1))');
+		}
+
+		// Filter by search in title
+		$search = $this->getState('filter.search');
+
+		if ( ! empty($search))
+		{
+			if (stripos($search, 'id:') === 0)
+			{
+				$query->where('a.id = ' . (int) substr($search, 3));
+			}
+			else
+			{
+				$search = $db->Quote('%' . $db->escape($search, true) . '%');
+				$query->where('( a.title LIKE ' . $search . '  OR  a.color LIKE ' . $search . '  OR  a.desc LIKE ' . $search . ' )');
+			}
+		}
+
+		// Add the list ordering clause.
+		$orderCol  = $this->state->get('list.ordering');
+		$orderDirn = $this->state->get('list.direction');
+
+		if ($orderCol && $orderDirn)
+		{
+			$query->order($db->escape($orderCol . ' ' . $orderDirn));
+		}
+
+		return $query;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/category.php b/deployed/icagenda/administrator/components/com_icagenda/models/category.php
new file mode 100644
index 00000000..a1071750
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/category.php
@@ -0,0 +1,179 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.6.0 2016-06-03
+ * @since		1.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+jimport('joomla.application.component.modeladmin');
+
+
+/**
+ * iCagenda model.
+ */
+class iCagendaModelCategory extends JModelAdmin
+{
+	/**
+	 * @var		string	The prefix to use with controller messages.
+	 * @since	1.6
+	 */
+	protected $text_prefix = 'COM_ICAGENDA';
+
+
+	/**
+	 * Returns a reference to the a Table object, always creating it.
+	 *
+	 * @param	type	The table type to instantiate
+	 * @param	string	A prefix for the table class name. Optional.
+	 * @param	array	Configuration array for model. Optional.
+	 * @return	JTable	A database object
+	 * @since	1.6
+	 */
+	public function getTable($type = 'Category', $prefix = 'iCagendaTable', $config = array())
+	{
+		return JTable::getInstance($type, $prefix, $config);
+	}
+
+	/**
+	 * Method to get the record form.
+	 *
+	 * @param	array	$data		An optional array of data for the form to interogate.
+	 * @param	boolean	$loadData	True if the form is to load its own data (default case), false if not.
+	 * @return	JForm	A JForm object on success, false on failure
+	 * @since	1.6
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		// Get the form.
+		$form = $this->loadForm('com_icagenda.category', 'category',
+								array('control' => 'jform', 'load_data' => $loadData));
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return	mixed	The data for the form.
+	 * @since	1.6
+	 */
+	protected function loadFormData()
+	{
+		// Check the session for previously entered form data.
+		$data = JFactory::getApplication()->getUserState('com_icagenda.edit.category.data', array());
+
+		if (empty($data)) {
+			$data = $this->getItem();
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Method to get a single record.
+	 *
+	 * @param	integer	The id of the primary key.
+	 *
+	 * @return	mixed	Object on success, false on failure.
+	 * @since	1.6
+	 */
+	public function getItem($pk = null)
+	{
+		if ($item = parent::getItem($pk)) {
+
+			//Do any procesing on fields here if needed
+
+		}
+
+		return $item;
+	}
+
+	/**
+	 * Prepare and sanitise the table prior to saving.
+	 *
+	 * @since	1.0
+	 */
+
+	protected function prepareTable( $table )
+	{
+		if (empty($table->id)) {
+
+			// Set ordering to the last item if not set
+			if (@$table->ordering === '') {
+				$db = JFactory::getDbo();
+				$db->setQuery('SELECT MAX(ordering) FROM #__icagenda_category');
+				$max = $db->loadResult();
+				$table->ordering = $max+1;
+			}
+
+		}
+	}
+
+	/**
+	 * Method to save the form data.
+	 *
+	 * @param   array  $data  The form data.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.4.0
+	 */
+	public function save($data)
+	{
+		$jinput	= JFactory::getApplication()->input;
+		$date	= JFactory::getDate();
+
+		// Fix version before 3.4.0 to set a created date (will use last modified date if exists, or current date)
+		if (empty($data['created']))
+		{
+			$data['created'] = ! empty($data['modified']) ? $data['modified'] : $date->toSql();
+		}
+
+		// Automatic handling of alias if empty
+		if (in_array($jinput->get('task'), array('apply', 'save', 'save2new')) && $data['alias'] == null)
+		{
+			if (JFactory::getConfig()->get('unicodeslugs') == 1)
+			{
+				$data['alias'] = JFilterOutput::stringURLUnicodeSlug($data['title']);
+			}
+			else
+			{
+				$data['alias'] = JFilterOutput::stringURLSafe($data['title']);
+			}
+		}
+
+		// Use created date in case alias is still empty
+		if ($data['alias'] == null || empty($data['alias']))
+		{
+			$data['alias'] = JFilterOutput::stringURLSafe($data['created']);
+		}
+
+		// Force to not add unicode characters if unicodeslugs is not enabled
+		if (JFactory::getConfig()->get('unicodeslugs') != 1)
+		{
+			$data['alias'] = JFilterOutput::stringURLSafe($data['alias']);
+		}
+
+		$return = parent::save($data);
+
+		return $return;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/customfield.php b/deployed/icagenda/administrator/components/com_icagenda/models/customfield.php
new file mode 100644
index 00000000..64201094
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/customfield.php
@@ -0,0 +1,183 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.6.0 2016-07-07
+ * @since		3.4.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+jimport('joomla.application.component.modeladmin');
+
+
+/**
+ * iCagenda model.
+ */
+class iCagendaModelCustomfield extends JModelAdmin
+{
+	/**
+	 * @var		string	The prefix to use with controller messages.
+	 * @since	3.4.0
+	 */
+	protected $text_prefix = 'COM_ICAGENDA';
+
+	/**
+	 * Returns a reference to the a Table object, always creating it.
+	 *
+	 * @param	type	The table type to instantiate
+	 * @param	string	A prefix for the table class name. Optional.
+	 * @param	array	Configuration array for model. Optional.
+	 * @return	JTable	A database object
+	 * @since	3.4.0
+	 */
+	public function getTable($type = 'Customfield', $prefix = 'iCagendaTable', $config = array())
+	{
+		return JTable::getInstance($type, $prefix, $config);
+	}
+
+	/**
+	 * Method to get the record form.
+	 *
+	 * @param	array	$data		An optional array of data for the form to interogate.
+	 * @param	boolean	$loadData	True if the form is to load its own data (default case), false if not.
+	 * @return	JForm	A JForm object on success, false on failure
+	 * @since	3.4.0
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		// Get the form.
+		$form = $this->loadForm('com_icagenda.customfield', 'customfield',
+								array('control' => 'jform', 'load_data' => $loadData));
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return	mixed	The data for the form.
+	 * @since	3.4.0
+	 */
+	protected function loadFormData()
+	{
+		// Check the session for previously entered form data.
+		$data = JFactory::getApplication()->getUserState('com_icagenda.edit.customfield.data', array());
+
+		if (empty($data))
+		{
+			$data = $this->getItem();
+		}
+
+		// Set Options to placeholder, and unset options (if input type with hint)
+		$hintFields = array('text', 'url', 'tel', 'email', 'core_name', 'core_email', 'core_phone');
+
+		if (isset($data->options)
+			&& in_array($data->type, $hintFields))
+		{
+			$data->placeholder = $data->options;
+			unset($data->options);
+		}
+
+		// Set Options to spacer_class, and unset options (if input type is spacer)
+		$spacerFields = array('spacer_label', 'spacer_description');
+
+		if (isset($data->options)
+			&& in_array($data->type, $spacerFields))
+		{
+			$data->spacer_class = $data->options;
+			unset($data->options);
+		}
+
+		// If not array, creates array with custom forms data
+		if ( ! is_array($data->groups))
+		{
+			$data->groups = explode(',', $data->groups);
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Method to get a single record.
+	 *
+	 * @param	integer	The id of the primary key.
+	 *
+	 * @return	mixed	Object on success, false on failure.
+	 * @since	3.4.0
+	 */
+	public function getItem($pk = null)
+	{
+		if ($item = parent::getItem($pk))
+		{
+			// Get custom forms
+//			$registry = new JRegistry;
+//			$registry->loadString($item->groups);
+//			$item->groups = $registry->toArray();
+		}
+
+		return $item;
+	}
+
+	/**
+	 * Prepare and sanitise the table prior to saving.
+	 *
+	 * @since	3.4.0
+	 */
+	protected function prepareTable($table)
+	{
+		$app = JFactory::getApplication();
+
+		$date = JFactory::getDate();
+		$user = JFactory::getUser();
+
+		if (empty($table->id))
+		{
+			// Set the values
+			$table->created = $date->toSql();
+
+			// Set ordering to the last item if not set
+			if (empty($table->ordering))
+			{
+				$db = JFactory::getDbo();
+				$query = $db->getQuery(true)
+					->select('MAX(ordering)')
+					->from($db->quoteName('#__icagenda_customfields'));
+				$db->setQuery($query);
+				$max = $db->loadResult();
+
+				$table->ordering = $max + 1;
+			}
+		}
+		else
+		{
+			// Set the values
+			$table->modified = $date->toSql();
+			$table->modified_by = $user->get('id');
+		}
+
+		// Alter the title for save as copy
+		if ($app->input->get('task') == 'save2copy')
+		{
+			$table->title = iCString::increment($table->title);
+			$table->alias = iCString::increment($table->alias, 'dash');
+			$table->slug = iCString::increment($table->slug, 'underscore');
+			$table->state = '0';
+		}
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/customfields.php b/deployed/icagenda/administrator/components/com_icagenda/models/customfields.php
new file mode 100644
index 00000000..164fc342
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/customfields.php
@@ -0,0 +1,309 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-24
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.4.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+jimport('joomla.application.component.modellist'); // Joomla 2.5
+
+/**
+ * Custom Fields Model.
+ */
+class iCagendaModelcustomfields extends JModelList
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @since   3.4.0
+	 * @see     JControllerLegacy
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'id', 'cf.id',
+				'ordering', 'cf.ordering',
+				'state', 'cf.state',
+				'title', 'cf.title',
+				'slug', 'cf.slug',
+				'parent_form', 'cf.parent_form',
+				'type', 'cf.type',
+				'required', 'cf.required',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @since   3.4.0
+	 */
+	protected function populateState($ordering = null, $direction = null)
+	{
+		// Initialise variables.
+		$app = JFactory::getApplication('administrator');
+
+		// Load the filter state.
+		$search = $app->getUserStateFromRequest($this->context . '.filter.search', 'filter_search');
+		$this->setState('filter.search', $search);
+
+		$published = $app->getUserStateFromRequest($this->context . '.filter.state', 'filter_published', '', 'string');
+		$this->setState('filter.state', $published);
+
+		// Filter (dropdown) parent form
+		$parent_form = $this->getUserStateFromRequest($this->context . '.filter.parent_form', 'filter_parent_form', '', 'string');
+		$this->setState('filter.parent_form', $parent_form);
+
+		// Filter (dropdown) field type
+		$type = $this->getUserStateFromRequest($this->context . '.filter.type', 'filter_type', '', 'string');
+		$this->setState('filter.type', $type);
+
+		// Filter (dropdown) custom field group
+		$group = $this->getUserStateFromRequest($this->context . '.filter.group', 'filter_group', '', 'string');
+		$this->setState('filter.group', $group);
+
+		// Load the parameters.
+		$params = JComponentHelper::getParams('com_icagenda');
+		$this->setState('params', $params);
+
+		// List state information.
+		parent::populateState('cf.ordering', 'asc');
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id.
+	 *
+	 * @return  string  A store id.
+	 *
+	 * @since   3.4.0
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id.= ':' . $this->getState('filter.search');
+		$id.= ':' . $this->getState('filter.state');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Build an SQL query to load the list data.
+	 *
+	 * @return  JDatabaseQuery
+	 *
+	 * @since   3.4.0
+	 */
+	protected function getListQuery()
+	{
+		// Create a new query object.
+		$db    = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		// Select the required fields from the table.
+		$query->select(
+			$this->getState(
+				'list.select',
+				'cf.*'
+			)
+		);
+		$query->from('#__icagenda_customfields AS cf');
+
+		// Join over the users for the checked out user.
+		$query->select('uc.name AS editor');
+		$query->join('LEFT', '#__users AS uc ON uc.id = cf.checked_out');
+
+		// Filter by published state
+		$published = $this->getState('filter.state');
+
+		if (is_numeric($published))
+		{
+			$query->where($db->qn('cf.state') . ' = ' . (int) $published);
+		}
+		elseif ($published === '')
+		{
+			$query->where($db->qn('cf.state') . ' IN (0, 1)');
+		}
+
+		// Filter by Parent Form
+		$parent_form = $db->escape($this->getState('filter.parent_form'));
+
+		if ( ! empty($parent_form))
+		{
+			$query->where($db->qn('cf.parent_form') . ' = ' . (int) $parent_form);
+		}
+
+		// Filter by Group
+		$group = $db->escape($this->getState('filter.group'));
+
+		if ( ! empty($group))
+		{
+			$query->where($db->qn('cf.groups') . ' LIKE "%' . $group . '%"');
+		}
+
+		// Filter by Field Type
+		$type = $db->escape($this->getState('filter.type'));
+
+		if ( ! empty($type))
+		{
+			$query->where($db->qn('cf.type') . ' = ' . (string) $db->q($type));
+		}
+
+		// Search Filters
+		$search = $this->getState('filter.search');
+
+		if ( ! empty($search))
+		{
+			if (stripos($search, 'id:') === 0)
+			{
+				$query->where($db->qn('cf.id') . ' = ' . (int) substr($search, 3));
+			}
+			else
+			{
+				$search = $db->Quote('%' . $db->escape($search, true) . '%');
+				$query->where('( cf.title LIKE ' . $search . '  OR  cf.slug LIKE ' . $search . '  OR  cf.type LIKE ' . $search . ' )');
+			}
+		}
+
+		// Add the list ordering clause.
+		$orderCol  = $this->state->get('list.ordering');
+		$orderDirn = $this->state->get('list.direction');
+
+		if ($orderCol && $orderDirn)
+		{
+			$query->order($db->escape($orderCol . ' ' . $orderDirn));
+		}
+
+		return $query;
+	}
+
+	/**
+	 * Gets a list of Parent Forms.
+	 *
+	 * @since   3.4.0
+	 */
+	function getParentForm()
+	{
+		$list['1'] = JText::_('COM_ICAGENDA_CUSTOMFIELD_PARENT_REGISTRATION_FORM');
+		$list['2'] = JText::_('COM_ICAGENDA_CUSTOMFIELD_PARENT_EVENT_EDIT');
+
+		return $list;
+	}
+
+	/**
+	 * Gets list of Custom Field Groups.
+	 *
+	 * @since   3.6.0
+	 */
+	function getGroups()
+	{
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+		$query->select('f.value, f.option');
+		$query->from('#__icagenda_filters AS f');
+		$query->where('f.type = "customfield"');
+		$query->where('f.filter = "groups"');
+		$query->order('f.option ASC');
+		$db->setQuery($query);
+		$groups = $db->loadObjectList();
+
+		$list = array();
+
+		foreach ($groups AS $g)
+		{
+			$list[$g->value] = $g->option;
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Gets a list of Field Types.
+	 *
+	 * @since   3.4.0
+	 */
+	function getFieldTypes()
+	{
+		$type['text']               = JText::_('COM_ICAGENDA_CUSTOMFIELD_TYPE_TEXT');
+		$type['list']               = JText::_('COM_ICAGENDA_CUSTOMFIELD_TYPE_LIST');
+		$type['radio']              = JText::_('COM_ICAGENDA_CUSTOMFIELD_TYPE_RADIO');
+		$type['calendar']           = JText::_('COM_ICAGENDA_CUSTOMFIELD_TYPE_DATE');
+		$type['url']                = JText::_('COM_ICAGENDA_CUSTOMFIELD_TYPE_URL');
+		$type['email']              = JText::_('COM_ICAGENDA_CUSTOMFIELD_TYPE_EMAIL');
+		$type['spacer_label']       = JText::_('COM_ICAGENDA_CUSTOMFIELD_TYPE_SPACER_LABEL');
+		$type['spacer_description'] = JText::_('COM_ICAGENDA_CUSTOMFIELD_TYPE_SPACER_DESCRIPTION');
+		$type['core_name']          = JText::_('COM_ICAGENDA_LABEL_OVERRIDE') . ': ' . JText::_('COM_ICAGENDA_REGISTRATION_NAME');
+		$type['core_email']         = JText::_('COM_ICAGENDA_LABEL_OVERRIDE') . ': ' . JText::_('COM_ICAGENDA_REGISTRATION_EMAIL');
+		$type['core_phone']         = JText::_('COM_ICAGENDA_LABEL_OVERRIDE') . ': ' . JText::_('COM_ICAGENDA_REGISTRATION_PHONE');
+		$type['core_date']          = JText::_('COM_ICAGENDA_LABEL_OVERRIDE') . ': ' . JText::_('COM_ICAGENDA_REGISTRATION_DATE');
+		$type['core_people']        = JText::_('COM_ICAGENDA_LABEL_OVERRIDE') . ': ' . JText::_('COM_ICAGENDA_REGISTRATION_TICKETS');
+
+		return $type;
+	}
+
+	/**
+	 * Method to get an array of data items.
+	 *
+	 * @return  mixed  An array of data items on success, false on failure.
+	 *
+	 * @since   3.6.0
+	 */
+	public function getItems()
+	{
+		if ($items = parent::getItems())
+		{
+			// Do any procesing on fields here if needed
+			foreach ($items AS $item)
+			{
+			}
+		}
+
+		return $items;
+	}
+
+	/**
+	 * Gets list of Custom Field Groups.
+	 *
+	 * @since   3.6.0
+	 */
+	function getCustomFieldGroups()
+	{
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+		$query->select('f.value, f.option');
+		$query->from('#__icagenda_filters AS f');
+		$query->where('f.type = "customfield"');
+		$query->where('f.filter = "groups"');
+		$query->order('f.option ASC');
+		$db->setQuery($query);
+		$groups = $db->loadObjectList();
+
+		return $groups;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/download.php b/deployed/icagenda/administrator/components/com_icagenda/models/download.php
new file mode 100644
index 00000000..23298149
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/download.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-27
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.5.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+// Joomla 2.5 import
+jimport('joomla.application.component.modelform');
+
+/**
+ * Download Model.
+ */
+class icagendaModelDownload extends JModelForm
+{
+	protected $_context = 'com_icagenda.registrations';
+
+	/**
+	 * Auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.5.0
+	 */
+	protected function populateState()
+	{
+		$input = JFactory::getApplication()->input;
+
+		$basename = $input->cookie->getString(JApplicationHelper::getHash($this->_context . '.basename'), '__SITE__');
+		$this->setState('basename', $basename);
+
+		$compressed = $input->cookie->getInt(JApplicationHelper::getHash($this->_context . '.compressed'), 1);
+		$this->setState('compressed', $compressed);
+	}
+
+	/**
+	 * Method to get the record form.
+	 *
+	 * @param   array    $data      Data for the form.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  mixed  A JForm object on success, false on failure
+	 *
+	 * @since   3.5.0
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		// Get the form.
+		$form = $this->loadForm('com_icagenda.download', 'download', array('control' => 'jform', 'load_data' => $loadData));
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return  mixed  The data for the form.
+	 *
+	 * @since   3.5.0
+	 */
+	protected function loadFormData()
+	{
+		$data = array(
+			'basename'   => $this->getState('basename'),
+			'compressed' => $this->getState('compressed')
+		);
+
+		// Joomla 3
+		if (version_compare(JVERSION, '3.0', 'ge'))
+		{
+			$this->preprocessData('com_icagenda.download', $data);
+		}
+
+		return $data;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/event.php b/deployed/icagenda/administrator/components/com_icagenda/models/event.php
new file mode 100644
index 00000000..3849e07f
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/event.php
@@ -0,0 +1,942 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.12 2020-03-25
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2020 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+jimport('joomla.application.component.modeladmin');
+jimport('joomla.filesystem.file');
+jimport('joomla.filesystem.folder');
+
+/**
+ * Event Model.
+ */
+class iCagendaModelEvent extends JModelAdmin
+{
+	/**
+	 * @var     string  The prefix to use with controller messages.
+	 * @since   1.0
+	 */
+	protected $text_prefix = 'COM_ICAGENDA';
+
+	/**
+	 * Method to test whether a record can be deleted.
+	 *
+	 * @param   object  $record  A record object.
+	 *
+	 * @return  boolean  True if allowed to delete the record. Defaults to the permission set in the component.
+	 *
+	 * @since   3.5.6
+	 */
+	protected function canDelete($record)
+	{
+		if ( ! empty($record->id))
+		{
+			if ($record->state != -2)
+			{
+				return false;
+			}
+
+			$user = JFactory::getUser();
+
+			if ($user->authorise('core.delete'))
+			{
+				icagendaCustomfields::deleteData($record->id, 2);
+				icagendaCustomfields::cleanData(2);
+
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Prepare and sanitise the table prior to saving.
+	 *
+	 * @param   JTable  $table  A JTable object.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	protected function prepareTable( $table )
+	{
+		$date = JFactory::getDate();
+		$user = JFactory::getUser();
+
+		$table->name = htmlspecialchars_decode($table->name, ENT_QUOTES);
+
+		if (empty($table->id))
+		{
+			// Set the values
+			$table->created = $date->toSql();
+
+			// Set ordering to the last item if not set
+			if (empty($table->ordering))
+			{
+				$db = JFactory::getDbo();
+				$query = $db->getQuery(true)
+					->select('MAX(ordering)')
+					->from($db->quoteName('#__icagenda_events'));
+				$db->setQuery($query);
+				$max = $db->loadResult();
+
+				$table->ordering = $max + 1;
+			}
+		}
+		else
+		{
+			// Set the values
+			$table->modified = $date->toSql();
+			$table->modified_by = $user->get('id');
+		}
+	}
+
+	/**
+	 * Returns a Table object, always creating it.
+	 *
+	 * @param   string  $type    The table type to instantiate
+	 * @param   string  $prefix  A prefix for the table class name. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JTable    A database object
+	 *
+	 * @since   1.0
+	 */
+	public function getTable($type = 'Event', $prefix = 'iCagendaTable', $config = array())
+	{
+		return JTable::getInstance($type, $prefix, $config);
+	}
+
+	/**
+	 * Method to get a single record.
+	 *
+	 * @param   integer $pk The id of the primary key.
+	 *
+	 * @return  mixed   Object on success, false on failure.
+	 *
+	 * @since   1.0
+	 */
+	public function getItem($pk = null)
+	{
+		if ($item = parent::getItem($pk))
+		{
+			// Do any procesing on fields here if needed
+		}
+
+		return $item;
+	}
+
+	/**
+	 * Method to get the record form.
+	 *
+	 * @param   array    $data      Data for the form.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  mixed  A JForm object on success, false on failure
+	 *
+	 * @since   1.0
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		// Get the form.
+		$form = $this->loadForm('com_icagenda.event', 'event',
+								array('control' => 'jform', 'load_data' => $loadData));
+		if (empty($form))
+		{
+			return false;
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return  mixed  The data for the form.
+	 *
+	 * @since   1.0
+	 */
+	protected function loadFormData()
+	{
+		// Check the session for previously entered form data.
+		$app = JFactory::getApplication();
+		$data_array = $app->getUserState('com_icagenda.edit.event.data', array());
+
+		if (empty($data_array))
+		{
+			$data = $this->getItem();
+		}
+		else
+		{
+			$data = new JObject;
+			$data->setProperties($data_array);
+		}
+
+//		if (JFactory::getUser($data->created_by)->get('name') == false)
+//		{
+//			JLog::add(JText::_('The author of this event is no longer a user on this site'), JLog::WARNING, 'jerror');
+//		}
+
+		// Set correctly param 'first_published_and_approved' if not set (for frontend submitted and approved events)
+		if ($data->state == 1
+			&& $data->approval == 0)
+		{
+			$data->params['first_published_and_approved'] = 1;
+		}
+		
+		// If not array, creates array with week days data
+		if ( ! is_array($data->weekdays))
+		{
+			$data->weekdays = explode(',', $data->weekdays);
+		}
+
+		// Retrieves data, to display selected week days
+		$arrayWeekDays = $data->weekdays;
+
+		foreach ($arrayWeekDays as $allTest)
+		{
+			if ($allTest == '')
+			{
+				$data->weekdays = '0,1,2,3,4,5,6';
+			}
+		}
+
+		// Set displaytime default value
+		if ( ! isset($data->displaytime))
+		{
+			$data->displaytime = JComponentHelper::getParams('com_icagenda')->get('displaytime', '1');
+		}
+
+		// Set Features
+		$data->features = $this->getFeatures($data->id);
+
+		// Convert features into an array so that the form control can be set
+		if ( ! isset($data->features))
+		{
+			$data->features = array();
+		}
+
+		if ( ! is_array($data->features))
+		{
+			$data->features = explode(',', $data->features);
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Method to save the form data.
+	 *
+	 * @param   array  $data  The form data.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.4.0
+	 */
+	public function save($data)
+	{
+		$jinput = JFactory::getApplication()->input;
+		$date   = JFactory::getDate();
+		$user   = JFactory::getUser();
+
+		// Fix version before 3.4.0 to set a created date (will use last modified date if exists, or current date)
+		if (empty($data['created']))
+		{
+			$data['created'] = ( ! empty($data['modified'])) ? $data['modified'] : $date->toSql();
+		}
+
+		// Event cancelled date
+		if (empty($data['params']['event_cancelled_date']) && $data['params']['event_cancelled'] == 1)
+		{
+			$data['params']['event_cancelled_date'] = $date->toSql();
+		}
+		elseif ($data['params']['event_cancelled'] == 0)
+		{
+			unset($data['params']['event_cancelled_date']);
+		}
+
+		// Check first published and approved
+		if ($data['state'] == 1
+			&& $data['approval'] == 0
+			&& $data['params']['first_published_and_approved'] == 0)
+		{
+			$data['params']['first_published_and_approved'] = 1;
+			$first_published_and_approved = true;
+		}
+		else
+		{
+			$first_published_and_approved = false;
+		}
+
+		// Alter the title for save as copy
+		if ($jinput->get('task') == 'save2copy')
+		{
+			$origTable = clone $this->getTable();
+			$origTable->load($jinput->getInt('id'));
+
+			if ($data['title'] == $origTable->title)
+			{
+				list($title, $alias) = $this->generateNewTitle($data['catid'], $data['alias'], $data['title']);
+				$data['title'] = $title;
+				$data['alias'] = $alias;
+			}
+			else
+			{
+				if ($data['alias'] == $origTable->alias)
+				{
+					$data['alias'] = '';
+				}
+			}
+			$data['state'] = 0;
+		}
+
+		// Automatic handling of alias if empty
+		if (in_array($jinput->get('task'), array('apply', 'save', 'save2new')) && $data['alias'] == null)
+		{
+			if (JFactory::getConfig()->get('unicodeslugs') == 1)
+			{
+				$data['alias'] = JFilterOutput::stringURLUnicodeSlug($data['title']);
+			}
+			else
+			{
+				$data['alias'] = JFilterOutput::stringURLSafe($data['title']);
+			}
+		}
+
+		// Use created date in case alias is still empty
+		if ($data['alias'] == null || empty($data['alias']))
+		{
+			$data['alias'] = JFilterOutput::stringURLSafe($data['created']);
+		}
+
+		// Force to not add unicode characters if unicodeslugs is not enabled
+		if (JFactory::getConfig()->get('unicodeslugs') != 1)
+		{
+			$data['alias'] = JFilterOutput::stringURLSafe($data['alias']);
+		}
+
+		// Check start and end date format (am/pm to sql date)
+		$data['startdate'] = iCDate::isDate($data['startdate']) ? date('Y-m-d H:i:s', strtotime($data['startdate'])) : $data['startdate'];
+		$data['enddate']   = iCDate::isDate($data['enddate'])   ? date('Y-m-d H:i:s', strtotime($data['enddate']))   : $data['enddate'];
+		
+		// Set File Uploaded
+		if ( ! isset($data['file']))
+		{
+			$files        = $jinput->files->get('jform', null);
+			$fileUrl      = ! empty($files['file']['name']) ? $this->upload($files['file']) : '';
+			$data['file'] = $fileUrl;
+		}
+
+		// Set Creator infos
+		$userId	= $user->get('id');
+		$userName = $user->get('name');
+
+		// Event created in admin, set current logged-in user as creator
+		if (empty($data['created_by']) && empty($data['username']))
+		{
+			$data['created_by'] = (int) $userId;
+			$data['username'] = $userName;
+		}
+
+		// Event edited in admin, created_by not empty, but creator is not the current logged-in user
+		elseif ( ! empty($data['created_by']) && $data['created_by'] != $userId)
+		{
+			$data['username'] = JFactory::getUser($data['created_by'])->get('name', '');
+		}
+
+		// Set Params
+		if (isset($data['params']) && is_array($data['params']))
+		{
+			// Keep params for later control
+			$params = $data['params'];
+
+			// Convert the params field to a string.
+			$parameter = new JRegistry;
+			$parameter->loadArray($data['params']);
+
+			$data['params'] = (string)$parameter;
+		}
+
+		// Get Event ID from the result back to the Table after saving.
+		$table = $this->getTable();
+
+		if ($table->save($data) === true)
+		{
+			$data['id'] = $table->id;
+		}
+		else
+		{
+			$data['id'] = null;
+		}
+
+		if (parent::save($data))
+		{
+			// Save Features to database
+			$this->maintainFeatures($data);
+
+			// Save Custom Fields to database
+			if (isset($data['custom_fields']) && is_array($data['custom_fields']))
+			{
+				icagendaCustomfields::saveToData($data['custom_fields'], $data['id'], 2);
+			}
+
+			// ====================================
+			// START : HACK FOR A FEW PRO USERS !!!
+			// ====================================
+
+			$mail_new_event = JComponentHelper::getParams('com_icagenda')->get('mail_new_event', '0');
+
+			if ($mail_new_event == 1)
+			{
+				$new_event = $jinput->get('new_event');
+
+				// Send notification email if new event
+				if ($new_event == '1' && $data['id'] && $data['state'] == '1' && $data['approval'] == '0')
+				{
+					self::notificationNewEvent($data);
+				}
+			}
+
+			// ====================================
+			// END : HACK FOR A FEW PRO USERS !!!
+			// ====================================
+
+			// Plugin Event handler 'iCagendaOnNewEvent'
+			if ($first_published_and_approved)
+			{
+				// JOOMLA 3.x/2.5 SWITCH
+				if (version_compare(JVERSION, '3.0', 'ge'))
+				{
+					$dispatcher = JEventDispatcher::getInstance();
+				}
+				else
+				{
+					$dispatcher = JDispatcher::getInstance();
+				}
+
+				JPluginHelper::importPlugin('icagenda');
+
+				$dispatcher->trigger('iCagendaOnNewEvent', array((object) $data));
+			}
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Upload File
+	 *
+	 * @since   3.5.3
+	 */
+	protected function upload($file)
+	{
+		// Get Joomla Images PATH setting
+		$image_path = JComponentHelper::getParams('com_media')->get('image_path', 'images');
+
+		// Get filename (name + ext)
+		$filename = $file['name'];
+
+		// Get file extension
+		$fileExtension = JFile::getExt($filename);
+
+		// Clean up file name to url safe string
+		$fileTitle = iCFilterOutput::stringToSlug(JFile::stripExt($filename), '-');
+
+		// If slug generated is empty, new slug based on current date/time
+		if ( ! $fileTitle)
+		{
+			$fileTitle = JFactory::getDate()->format("YmdHis");
+		}
+
+		// Return new filename
+		$filename = $fileTitle . '.' . $fileExtension;
+
+		// Increment file name if filename already exists
+		while (JFile::exists(JPATH_SITE . '/' . $image_path . '/icagenda/files/' . $filename))
+		{
+			// Get file extension
+			$fileExtension = JFile::getExt($filename);
+
+			// Get file title
+			$fileTitle = JFile::stripExt($filename);
+
+			// Increment file title (eg. filename-3.jpg)
+			$fileTitle = iCString::increment($fileTitle, 'dash');
+
+			$filename = $fileTitle . '.' . $fileExtension;
+		}
+
+		// Save file
+		if ($filename != '')
+		{
+			// Set up the temporary source and destination of the file
+			$src  = $file['tmp_name'];
+			$dest = JPATH_SITE . '/' . $image_path . '/icagenda/files/' . $filename;
+
+			// Create folder 'files' in ROOT/IMAGES_PATH/icagenda/ if does not exist
+			$folder[0][0] = 'icagenda/files/' ;
+			$folder[0][1] = JPATH_SITE . '/' . $image_path . '/' . $folder[0][0];
+
+			$error = array();
+
+			foreach ($folder as $key => $value)
+			{
+				if ( ! JFolder::exists( $value[1]))
+				{
+					if (JFolder::create( $value[1], 0755 ))
+					{
+						$this->data = "<html>\n<body bgcolor=\"#FFFFFF\">\n</body>\n</html>";
+						JFile::write($value[1] . "/index.html", $this->data);
+						$error[] = 0;
+					}
+					else
+					{
+						$error[] = 1;
+					}
+				}
+				else //Folder exist
+				{
+					$error[] = 0;
+				}
+			}
+
+			// Return file path on success
+			if ( JFile::upload($src, $dest, false) )
+			{
+				return $image_path . '/icagenda/files/' . $filename;
+			}
+		}
+	}
+
+	/**
+	 * Maintain features to data
+	 *
+	 * @since   3.4.0
+	 */
+	protected function maintainFeatures($data)
+	{
+		// Get the list of feature ids to be linked to the event
+		$features = isset($data['features']) && is_array($data['features']) ? implode(',', $data['features']) : '';
+
+		$db = JFactory::getDbo();
+
+		// Write any new feature records to the icagenda_feature_xref table
+		if ( ! empty($features))
+		{
+			// Get a list of the valid features already present for this event
+			$query = $db->getQuery(true);
+
+			$query->select('feature_id')
+				->from($db->qn('#__icagenda_feature_xref'));
+
+			$query->where('event_id = ' . (int) $data['id']);
+			$query->where('feature_id IN (' . $features . ')');
+
+			$db->setQuery($query);
+
+			$existing_features = $db->loadColumn(0);
+
+			// Identify the insert list
+			if (empty($existing_features))
+			{
+				$new_features = $data['features'];
+			}
+			else
+			{
+				$new_features = array();
+
+				foreach ($data['features'] as $feature)
+				{
+					if ( ! in_array($feature, $existing_features))
+					{
+						$new_features[] = $feature;
+					}
+				}
+			}
+			// Write the needed xref records
+			if ( ! empty($new_features))
+			{
+				$xref = new JObject;
+				$xref->set('event_id', $data['id']);
+
+				foreach ($new_features as $feature)
+				{
+					$xref->set('feature_id', $feature);
+					$db->insertObject('#__icagenda_feature_xref', $xref);
+					$db->setQuery($query);
+
+					if ( ! $db->execute())
+					{
+						return false;
+					}
+				}
+			}
+		}
+
+		// Delete any unwanted feature records from the icagenda_feature_xref table
+		$query = $db->getQuery(true);
+		$query->delete($db->qn('#__icagenda_feature_xref'));
+		$query->where('event_id = ' . (int) $data['id']);
+
+		if ( ! empty($features))
+		{
+			// Delete only unwanted features
+			$query->where('feature_id NOT IN (' . $features . ')');
+		}
+
+		$db->setQuery($query);
+		$db->execute($query);
+
+		if ( ! $db->execute())
+		{
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Extracts the list of Feature IDs linked to the event and returns an array
+	 *
+	 * @param   integer  $event_id
+	 *
+	 * @return  array/integer  Set of Feature IDs
+	 *
+	 * @since   3.5.3
+	 */
+	protected function getFeatures($event_id)
+	{
+		// Write any new feature records to the icagenda_feature_xref table
+		if (empty($event_id))
+		{
+			return '';
+		}
+		else
+		{
+			$db = JFactory::getDbo();
+
+			// Get a comma separated list of the ids of features present for this event
+			// Note: Direct extraction of a comma separated list is avoided because each db type uses proprietary syntax
+			$query = $db->getQuery(true);
+			$query->select('fx.feature_id')
+				->from($db->qn('#__icagenda_events', 'e'))
+				->innerJoin('#__icagenda_feature_xref AS fx ON e.id=fx.event_id')
+				->innerJoin('#__icagenda_feature AS f ON fx.feature_id=f.id AND f.state=1');
+			$query->where('e.id = ' . (int) $event_id);
+			$db->setQuery($query);
+			$features = $db->loadColumn(0);
+
+			// Return a comma separated list
+			return implode(',', $features);
+		}
+	}
+
+	/**
+	 * Approve Function.
+	 *
+	 * @since   3.2.0
+	 */
+	function approve($cid, $approval = 0)
+	{
+		if (count($cid))
+		{
+			JArrayHelper::toInteger($cid);
+			$cids = implode( ',', $cid );
+			$query = 'UPDATE #__icagenda_events'
+					. ' SET approval = ' . (int) $approval
+					. ' WHERE id IN (' . $cids . ')';
+					$this->_db->setQuery( $query );
+
+			if ( ! $this->_db->query())
+			{
+				$this->setError($this->_db->getErrorMsg());
+
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to test whether a record can be deleted.
+	 *
+	 * @param   object  $record  A record object.
+	 *
+	 * @return  boolean  True if allowed to delete the record. Defaults to the permission set in the component.
+	 *
+	 * @since   3.6.0
+	 */
+//	protected function canDelete($record)
+//	{
+//		if ( ! empty($record->id))
+//		{
+//			if ($record->state != -2)
+//			{
+//				return false;
+//			}
+
+//			$user = JFactory::getUser();
+
+//			return $user->authorise('core.delete', 'com_icagenda.event.' . (int) $record->id);
+//		}
+
+//		return false;
+//	}
+
+	/**
+	 * Method to test whether a record can have its state edited.
+	 *
+	 * @param   object  $record  A record object.
+	 *
+	 * @return  boolean  True if allowed to change the state of the record. Defaults to the permission set in the component.
+	 *
+	 * @since   3.6.0
+	 */
+//	protected function canEditState($record)
+//	{
+//		$user = JFactory::getUser();
+
+		// Check for existing event.
+//		if (!empty($record->id))
+//		{
+//			return $user->authorise('core.edit.state', 'com_icagenda.event.' . (int) $record->id);
+//		}
+		// New event, so check against the category.
+//		elseif (!empty($record->catid))
+//		{
+//			return $user->authorise('core.edit.state', 'com_icagenda.event.' . (int) $record->catid);
+//		}
+		// Default to component settings if neither event nor category known.
+//		else
+//		{
+//			return parent::canEditState('com_icagenda');
+//		}
+//	}
+
+
+
+	/**
+	 * HACK FOR A FEW PRO USERS !!!
+	 *
+	 * Will be removed when creation of a notification plugin
+	 *
+	 */
+	function notificationNewEvent($data)
+	{
+		$eventID		= $data['id'];
+		$title			= $data['title'];
+		$description	= $data['desc'];
+
+		$venue = '';
+		$venue.= $data['place'] ? $data['place'] . ' - ' : '';
+		$venue.= $data['city'] ?: '';
+		$venue.= ($data['city'] && $data['country']) ? ', ' : '';
+		$venue.= $data['country'] ?: '';
+
+		// Set Date
+		$date = strtotime($data['startdate'])
+			? 'Du ' . $data['startdate'] . ' au ' . $data['startdate']
+			: $data['next'];
+
+		// Set Image tag if exists
+		$baseURL = JURI::base();
+		$baseURL = str_replace('/administrator', '', $baseURL);
+		$baseURL = ltrim($baseURL, '/');
+
+		$image = $data['image'] ? '<img src="' . $baseURL . '/' . $data['image'] . '" alt="' . $data['image'] . '" />' : '';
+
+		// Load iCagenda Global Options
+		$iCparams = JComponentHelper::getParams('com_icagenda');
+
+		// Load Joomla Config
+		$config = JFactory::getConfig();
+
+		// Switch Joomla 3.x / 2.5
+		if (version_compare(JVERSION, '3.0', 'ge'))
+		{
+			// Get the site name
+			$sitename = $config->get('sitename');
+
+			// Get Global Joomla Contact Infos
+			$mailfrom = $config->get('mailfrom');
+			$fromname = $config->get('fromname');
+
+			// Get default language
+			$langdefault = $config->get('language');
+		}
+		else
+		{
+			// Get the site name
+			$sitename = $config->getValue('config.sitename');
+
+			// Get Global Joomla Contact Infos
+			$mailfrom = $config->getValue('config.mailfrom');
+			$fromname = $config->getValue('config.fromname');
+
+			// Get default language
+			$langdefault = $config->getValue('config.language');
+		}
+
+		$siteURL = JURI::base();
+		$siteURL = rtrim($siteURL,'/');
+
+		$iCmenuitem = false;
+
+		// Itemid Request (automatic detection of the first iCagenda menu-link, by menuID, and depending of current language)
+
+		$langFrontend = $langdefault;
+		$db = JFactory::getDbo();
+		$query	= $db->getQuery(true);
+		$query->select('id AS idm')
+				->from('#__menu')
+				->where( "(link = 'index.php?option=com_icagenda&view=list') AND (published > 0) AND (language = '$langFrontend')" );
+		$db->setQuery($query);
+		$idm = $db->loadResult();
+		$mItemid = $idm;
+
+		if ($mItemid == NULL)
+		{
+				$db = JFactory::getDbo();
+				$query	= $db->getQuery(true);
+				$query->select('id AS noidm')
+						->from('#__menu')
+						->where( "(link = 'index.php?option=com_icagenda&view=list') AND (published > 0) AND (language = '*')" );
+				$db->setQuery($query);
+				$noidm = $db->loadResult();
+		}
+
+		$nolink = '';
+
+		if ($noidm == NULL && $mItemid == NULL)
+		{
+				$nolink = 1;
+		}
+
+		if (is_numeric($iCmenuitem))
+		{
+				$lien = $iCmenuitem;
+		}
+		else
+		{
+			if ($mItemid == NULL)
+			{
+					$lien = $noidm;
+			}
+			else
+			{
+					$lien = $mItemid;
+			}
+		}
+
+		// Set Notification Email to each User groups allowed to receive a notification email when a new event created
+		$groupid = $iCparams->get('newevent_Groups', array("8"));
+
+		jimport( 'joomla.access.access' );
+		$newevent_Groups_Array = array();
+
+		foreach ($groupid AS $gp)
+		{
+			$GroupUsers = JAccess::getUsersByGroup($gp, False);
+			$newevent_Groups_Array = array_merge($newevent_Groups_Array, $GroupUsers);
+		}
+
+		$db = JFactory::getDbo();
+		$query	= $db->getQuery(true);
+
+		$matches = implode(',', $newevent_Groups_Array);
+		$query->select('ui.username AS username, ui.email AS email, ui.password AS passw, ui.block AS block, ui.activation AS activation')
+			->from('#__users AS ui')
+			->where( "ui.id IN ($matches) ");
+		$db->setQuery($query);
+		$users = $db->loadObjectList();
+
+		foreach ($users AS $user)
+		{
+			// Create Notification Mailer
+			$new_mailer = JFactory::getMailer();
+
+			// Set Sender of Notification Email
+			$new_mailer->setSender(array( $mailfrom, $fromname ));
+
+			$username = $user->username;
+			$passw = $user->passw;
+			$email = $user->email;
+
+			// Set Recipient of Notification Email
+			$new_recipient = $email;
+			$new_mailer->addRecipient($email);
+
+			// Set Subject of New Event Notification Email
+			$new_subject = 'Nouvel évènement, '.$sitename;
+			$new_mailer->setSubject($new_subject);
+
+			// Set Url to preview new event
+			$baseURL = JURI::base();
+			$baseURL = str_replace('/administrator', '', $baseURL);
+
+			$urlpreview = str_replace('&amp;','&', JRoute::_($baseURL . 'index.php?option=com_icagenda&view=event&id=' . (int) $eventID . '&Itemid=' . (int) $lien));
+
+			// Set Body of User Notification Email
+			$new_body_hello = 'Bonjour,';
+			$new_bodycontent = $new_body_hello.'<br /><br />';
+			$new_body_text = $sitename.' vous propose un nouvel évènement :';
+			$new_bodycontent.= $new_body_text.'<br /><br />';
+
+			// Event Details
+			$new_bodycontent.= $title ? 'Titre: '.$title.'<br />' : '';
+			$new_bodycontent.= $description ? 'Description: '.$description.'<br />' : '';
+			$new_bodycontent.= $venue ? 'Lieu: '.$venue.'<br />' : '';
+			$new_bodycontent.= $date ? 'Date: '.$date.'<br /><br />' : '';
+			$new_bodycontent.= $image.'<br /><br />';
+
+			// Link to event details view
+			$new_bodycontent.= '<a href="'.$urlpreview.'">'.$urlpreview.'</a><br /><br />';
+
+			// Footer
+			$new_body_footer = 'Do not answer to this e-mail notification as it is a generated e-mail. You are receiving this email message because you are registered at '.$sitename.'.';
+			$new_bodycontent.= '<hr><small>'.$new_body_footer.'<small>';
+
+			// Removes spaces (leading, ending) from Body
+			$new_body = rtrim($new_bodycontent);
+
+			// Authorizes HTML
+			$new_mailer->isHTML(true);
+
+			// JDocs: When sending HTML emails you should normally set the Encoding to base64
+			//        in order to avoid unwanted characters in the output.
+			//        See https://docs.joomla.org/Sending_email_from_extensions
+			$new_mailer->Encoding = 'base64'; // JDocs Sending HTML Email
+
+			// Set Body
+			$new_mailer->setBody($new_body);
+
+			// Send User Notification Email
+			if (isset($email))
+			{
+				if ($user->block == '0' && empty($user->activation))
+				{
+					$send = $new_mailer->Send();
+				}
+			}
+		}
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/events.php b/deployed/icagenda/administrator/components/com_icagenda/models/events.php
new file mode 100644
index 00000000..8c7d4b6b
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/events.php
@@ -0,0 +1,452 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.15 2020-05-27
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2020 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+jimport('joomla.application.component.modellist'); // Joomla 2.5
+
+/**
+ * Events Model.
+ */
+class iCagendaModelEvents extends JModelList
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @since   1.0
+	 * @see     JControllerLegacy
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'id', 'e.id',
+				'ordering', 'e.ordering',
+				'state', 'e.state',
+				'approval', 'e.approval',
+				'created', 'e.created',
+				'title', 'e.title',
+				'username', 'e.username',
+				'email', 'e.email',
+				'category', 'category',
+				'image', 'e.image',
+				'file', 'e.file',
+				'next', 'e.next',
+				'place', 'e.place',
+				'city', 'e.city',
+				'country', 'e.country',
+				'desc', 'e.desc',
+				'params', 'e.params',
+//				'location', 'e.location',
+				'category_id',
+				'site_itemid', 'e.site_itemid',
+				'language', 'e.language',
+				'hits', 'e.hits',
+				'author_username', 'author_name',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 * @since   1.0
+	 */
+	protected function populateState($ordering = null, $direction = null)
+	{
+		// Initialise variables.
+		$app = JFactory::getApplication('administrator');
+
+		// Load the filter search.
+		$search = $app->getUserStateFromRequest($this->context . '.filter.search', 'filter_search');
+		$this->setState('filter.search', $search);
+
+		// Load the filter state.
+		$published = $app->getUserStateFromRequest($this->context . '.filter.state', 'filter_published', '', 'string');
+		$this->setState('filter.state', $published);
+
+		// Load the filter approval.
+		$approval = $app->getUserStateFromRequest($this->context . '.filter.approval', 'filter_approval');
+		$this->setState('filter.approval', $approval);
+
+		// Filter (dropdown) category
+		$category = $this->getUserStateFromRequest($this->context . '.filter.category', 'filter_category');
+		$this->setState('filter.category', $category);
+
+		// Filter categoryId
+		$categoryId = $this->getUserStateFromRequest($this->context . '.filter.category_id', 'filter_category_id');
+		$this->setState('filter.category_id', $categoryId);
+
+		// Filter (dropdown) upcoming
+		$upcoming = $this->getUserStateFromRequest($this->context . '.filter.upcoming', 'filter_upcoming', '', 'string');
+		$this->setState('filter.upcoming', $upcoming);
+
+		// Filter (dropdown) Frontend Menu Itemid
+		$site_itemid = $this->getUserStateFromRequest($this->context . '.filter.site_itemid', 'filter_site_itemid', '', 'string');
+		$this->setState('filter.site_itemid', $site_itemid);
+
+		// Load the parameters.
+		$params = JComponentHelper::getParams('com_icagenda');
+		$this->setState('params', $params);
+
+		// List state information.
+		parent::populateState('e.id', 'desc');
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id.
+	 *
+	 * @return  string  A store id.
+	 *
+	 * @since   1.0
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id.= ':' . $this->getState('filter.search');
+		$id.= ':' . $this->getState('filter.state');
+		$id.= ':' . $this->getState('filter.approval');
+		$id.= ':' . $this->getState('filter.category_id');
+		$id.= ':' . $this->getState('filter.site_itemid');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Build an SQL query to load the list data.
+	 *
+	 * @return  JDatabaseQuery
+	 *
+	 * @since   1.0
+	 */
+	protected function getListQuery()
+	{
+		// Create a new query object.
+		$db    = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		// Select the required fields from the table.
+		$query->select(
+			$this->getState(
+				'list.select',
+				'e.*'
+			)
+		);
+		$query->from('#__icagenda_events AS e');
+
+		// Join over the users for the checked out user.
+		$query->select('uc.name AS editor');
+		$query->join('LEFT', '#__users AS uc ON uc.id = e.checked_out');
+
+		// Join over the asset groups.
+		$query->select('ag.title AS access_level')
+			->join('LEFT', '#__viewlevels AS ag ON ag.id = e.access');
+
+		// Join the category
+		$query->select('c.title AS category');
+		$query->join('LEFT', '#__icagenda_category AS c ON c.id = e.catid');
+
+		// Join over the users for the author.
+		$query->select('CASE WHEN e.created_by = "0" THEN e.username ELSE ua.name END AS author_name, ua.username AS author_username')
+			->join('LEFT', '#__users AS ua ON ua.id = e.created_by');
+
+		// Filter by published state
+		$published = $this->getState('filter.state');
+
+		if (is_numeric($published))
+		{
+			$query->where('e.state = ' . (int) $published);
+		}
+		elseif ($published === '')
+		{
+			$query->where('(e.state IN (0, 1))');
+		}
+
+		// Filter by approval state
+		$approval = $this->getState('filter.approval');
+
+		if ($approval == '1')
+		{
+			$query->where('e.approval = "1"');
+		}
+		elseif ($approval == '0')
+		{
+			$query->where('e.approval = "0"');
+		}
+
+		// Filter by search in title
+		$search = $this->getState('filter.search');
+
+		if ( ! empty($search))
+		{
+			if (stripos($search, 'id:') === 0)
+			{
+				$query->where('e.id = ' . (int) substr($search, 3));
+			}
+			else
+			{
+				if (iCDate::isDate($search))
+				{
+					$search = $db->quote('%' . $db->escape($search, true) . '%');
+
+					$query->where('( e.startdate LIKE ' . $search .
+							' OR e.enddate LIKE ' . $search .
+							' OR e.period LIKE ' . $search .
+							' OR e.dates LIKE ' . $search . ')');
+				}
+				else
+				{
+					$search = $db->quote('%' . $db->escape($search, true) . '%');
+
+					$query->where('( e.title LIKE ' . $search .
+								' OR e.username LIKE ' . $search .
+								' OR e.id LIKE ' . $search .
+								' OR e.email LIKE ' . $search .
+								' OR e.file LIKE ' . $search .
+								' OR e.place LIKE ' . $search .
+								' OR e.city LIKE ' . $search .
+								' OR e.country LIKE ' . $search .
+								' OR e.desc LIKE ' . $search .
+								' OR e.period LIKE ' . $search .
+								' OR e.dates LIKE ' . $search .
+								' OR c.title LIKE ' . $search . ')');
+				}
+			}
+		}
+
+		// Filter category (admin)
+		$category = $db->escape($this->getState('filter.category'));
+
+		if (!empty($category))
+		{
+			$query->where('(e.catid = ' . $category . ')');
+		}
+
+		// Filter Frontend Menu Itemid (admin)
+		$site_itemid = $db->escape($this->getState('filter.site_itemid'));
+
+		if ($site_itemid == '0')
+		{
+			$query->where('(e.site_itemid = "0")');
+		}
+		elseif ($site_itemid)
+		{
+			$query->where('(e.site_itemid = ' . (int) $site_itemid . ')');
+		}
+
+		// Filter by categories. (NOT USED (multiple-categories filter))
+		$categoryId = $this->getState('filter.category_id');
+
+		if (is_numeric($categoryId) && ! empty($categoryId))
+		{
+			$query->where('e.catid = ' . (int) $categoryId . '');
+		}
+		elseif (is_array($categoryId) && ! empty($categoryId))
+		{
+			JArrayHelper::toInteger($categoryId);
+			$categoryId = implode(',', $categoryId);
+			$query->where('e.catid IN (' . $categoryId . ')');
+		}
+
+
+		// Filter Upcoming Dates
+		$upcoming = $db->escape($this->getState('filter.upcoming'));
+
+		if ( ! empty($upcoming))
+		{
+			if ($upcoming == '1')
+			{
+				$query->where(' e.next >= CURDATE()');
+			}
+			elseif ($upcoming == '2')
+			{
+				$query->where(' e.next < CURDATE() ');
+			}
+			elseif ($upcoming == '3')
+			{
+				$query->where(' e.next >= NOW() ');
+			}
+			elseif ($upcoming == '4')
+			{
+				$query->where(' e.next >= CURDATE() AND e.next < ( CURDATE() + INTERVAL 1 DAY ) ');
+			}
+		}
+
+		// Add the list ordering clause.
+		$orderCol  = $this->state->get('list.ordering');
+		$orderDirn = $this->state->get('list.direction');
+
+		if ($orderCol && $orderDirn)
+		{
+			$query->order($db->escape($orderCol.' '.$orderDirn));
+		}
+
+		return $query;
+	}
+
+
+	/**
+	 * Method to get an array of data items.
+	 *
+	 * @return  mixed  An array of data items on success, false on failure.
+	 *
+	 * @since   3.6.0
+	 */
+	public function getItems()
+	{
+		// Since Joomla 3.6.0, need to check if user ID exists to prevent alert message in list
+		$usersTable = JUser::getTable();
+
+		if ($items = parent::getItems())
+		{
+			// Do any procesing on fields here if needed
+			foreach ($items AS $item)
+			{
+				if ($item->created_by && $usersTable->load($item->created_by))
+				{
+					$item->username = JFactory::getUser($item->created_by)->get('name');
+				}
+
+				// Check Next Date
+				$item->next = icagendaEvent::getNextDate($item);
+			}
+		}
+
+		return $items;
+	}
+
+	/**
+	 * Build an SQL query to load the list of all categories.
+	 *
+	 * @return  JDatabaseQuery
+	 * @since   3.3.0
+	 */
+	function getCategories()
+	{
+		// Create a new query object.
+		$db    = JFactory::getDBO();
+		$query = $db->getQuery(true);
+
+		// Select the required fields from the table.
+		$query->select('c.id AS catid, c.title AS category');
+		$query->from('#__icagenda_category AS c');
+
+		// Filter by published state
+		$query->where('(c.state IN (0,1))');
+
+		// Order Ordering ASC
+		$query->order('c.ordering ASC');
+
+		$db->setQuery($query);
+		$categories = $db->loadObjectList();
+
+		if (count($categories) > 0)
+		{
+			foreach ($categories as $cat)
+			{
+				$list[$cat->catid] = $cat->category;
+			}
+
+			return $list;
+		}
+		else
+		{
+			return array();
+		}
+	}
+
+	/**
+	 * Build an SQL query to load the list of menu item itemid.
+	 *
+	 * @return  JDatabaseQuery
+	 * @since   3.3.0
+	 */
+	function getMenuItemID()
+	{
+		// Create a new query object.
+		$db    = JFactory::getDBO();
+		$query = $db->getQuery(true);
+
+		// Select the required fields from the table.
+		$query->select('m.id AS itemid, m.link AS menu_link, m.title AS menu_title');
+		$query->from('#__menu AS m');
+
+		// Filter by published state
+		$query->where('(m.link = "index.php?option=com_icagenda&view=submit")');
+		$query->where('(m.published IN (0,1))');
+
+		$db->setQuery($query);
+		$itemids = $db->loadObjectList();
+
+		$list['0'] = 'Created in admin';
+
+		if (count($itemids) > 0)
+		{
+			foreach ($itemids as $itemid)
+			{
+				$list[$itemid->itemid] = $itemid->itemid . ' - ' . $itemid->menu_title;
+			}
+
+			return $list;
+		}
+		else
+		{
+			return array();
+		}
+	}
+
+	/**
+	 * Gets a list of options for Upcoming (Events) Filter.
+	 *
+	 * @since   3.3.0
+	 */
+	function getUpcoming()
+	{
+		$list['1'] = JText::_('COM_ICAGENDA_OPTION_TODAY_AND_UPCOMING');
+		$list['2'] = JText::_('COM_ICAGENDA_OPTION_PAST_EVENTS');
+		$list['3'] = JText::_('COM_ICAGENDA_OPTION_UPCOMING_EVENTS');
+		$list['4'] = JText::_('COM_ICAGENDA_OPTION_TODAY');
+
+		return $list;
+	}
+
+	/**
+	 * Gets a list of options for Approval Filter.
+	 *
+	 * @since   3.6.12
+	 */
+	function getApprovalOptions()
+	{
+		$list['0'] = JText::_('COM_ICAGENDA_APPROVED');
+		$list['1'] = JText::_('COM_ICAGENDA_UNAPPROVED');
+
+		return $list;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/feature.php b/deployed/icagenda/administrator/components/com_icagenda/models/feature.php
new file mode 100644
index 00000000..32123607
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/feature.php
@@ -0,0 +1,172 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      doorknob
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.4.0 2014-12-05
+ * @since       3.4.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+jimport('joomla.application.component.modeladmin');
+
+/**
+ * iCagenda model.
+ */
+class iCagendaModelfeature extends JModelAdmin
+{
+	/**
+	 * @var		string	The prefix to use with controller messages.
+	 * @since	3.4.0
+	 */
+	protected $text_prefix = 'COM_ICAGENDA';
+
+	/**
+	 * Returns a reference to the a Table object, always creating it.
+	 *
+	 * @param	type	The table type to instantiate
+	 * @param	string	A prefix for the table class name. Optional.
+	 * @param	array	Configuration array for model. Optional.
+	 * @return	JTable	A database object
+	 * @since	3.4.0
+	 */
+	public function getTable($type = 'Feature', $prefix = 'iCagendaTable', $config = array())
+	{
+		return JTable::getInstance($type, $prefix, $config);
+	}
+
+	/**
+	 * Method to get the record form.
+	 *
+	 * @param	array	$data		An optional array of data for the form to interogate.
+	 * @param	boolean	$loadData	True if the form is to load its own data (default case), false if not.
+	 * @return	JForm	A JForm object on success, false on failure
+	 * @since	3.4.0
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		// Initialise variables.
+		$app	= JFactory::getApplication();
+
+		// Get the form.
+		$form = $this->loadForm('com_icagenda.feature', 'feature', array('control' => 'jform', 'load_data' => $loadData));
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return	mixed	The data for the form.
+	 * @since	3.4.0
+	 */
+	protected function loadFormData()
+	{
+		// Check the session for previously entered form data.
+		$data = JFactory::getApplication()->getUserState('com_icagenda.edit.feature.data', array());
+
+		if (empty($data))
+		{
+			$data = $this->getItem();
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Method to get a single record.
+	 *
+	 * @param	integer	The id of the primary key.
+	 *
+	 * @return	mixed	Object on success, false on failure.
+	 * @since	3.4.0
+	 */
+	public function getItem($pk = null)
+	{
+		if ($item = parent::getItem($pk))
+		{
+			//Do any procesing on fields here if needed
+		}
+
+		return $item;
+	}
+
+	/**
+	 * Prepare and sanitise the table prior to saving.
+	 *
+	 * @since	3.4.0
+	 */
+	protected function prepareTable($table)
+	{
+		jimport('joomla.filter.output');
+
+		if (empty($table->id))
+		{
+			// Set ordering to the last item if not set
+			if (@$table->ordering === '')
+			{
+				$db = JFactory::getDbo();
+				$db->setQuery('SELECT MAX(ordering) FROM #__icagenda_feature');
+				$max = $db->loadResult();
+				$table->ordering = $max+1;
+			}
+		}
+	}
+
+	/**
+	 * Method to save the form data.
+	 *
+	 * @param   array  $data  The form data.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.4.0
+	 */
+	public function save($data)
+	{
+		$date = JFactory::getDate();
+
+		if (empty($data['created']))
+		{
+			$data['created'] = !empty($data['created']) ? $data['created'] : $date->toSql();
+		}
+
+		// Generates Alias if empty
+		// Alias is not generated if non-latin characters, so we fix it by using created date, or title if unicode is activated, as alias
+		if ($data['alias'] == null || empty($data['alias']))
+		{
+			$data['alias'] = JFilterOutput::stringURLSafe($data['title']);
+
+			if ($data['alias'] == null || empty($data['alias']))
+			{
+				if (JFactory::getConfig()->get('unicodeslugs') == 1)
+				{
+					$data['alias'] = JFilterOutput::stringURLUnicodeSlug($data['title']);
+				}
+				else
+				{
+					$data['alias'] = JFilterOutput::stringURLSafe($data['created']);
+				}
+			}
+		}
+
+		$return = parent::save($data);
+
+		return $return;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/features.php b/deployed/icagenda/administrator/components/com_icagenda/models/features.php
new file mode 100644
index 00000000..689ea891
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/features.php
@@ -0,0 +1,164 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      doorknob & Cyril Rezé
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.4.0 2014-07-02
+ * @since       3.4.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+jimport('joomla.application.component.modellist');
+
+/**
+ * Methods supporting a list of iCagenda records.
+ */
+class iCagendaModelfeatures extends JModelList
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param	array		An optional associative array of configuration settings.
+	 * @see		JController
+	 * @since	3.4.0
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'id', 'a.id',
+				'ordering', 'a.ordering',
+				'state', 'a.state',
+				'desc', 'a.desc',
+				'icon', 'a.icon',
+				'icon_alt', 'a.icon_alt',
+				'show_filter', 'a.show_filter',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @since	3.4.0
+	 */
+	protected function populateState($ordering = null, $direction = null)
+	{
+		// Initialise variables.
+		$app = JFactory::getApplication('administrator');
+
+		// Load the filter state.
+		$search = $app->getUserStateFromRequest($this->context.'.filter.search', 'filter_search');
+		$this->setState('filter.search', $search);
+
+		$published = $app->getUserStateFromRequest($this->context.'.filter.state', 'filter_published', '', 'string');
+		$this->setState('filter.state', $published);
+
+		// Load the parameters.
+		$params = JComponentHelper::getParams('com_icagenda');
+		$this->setState('params', $params);
+
+		// List state information.
+		parent::populateState('a.title', 'asc');
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param	string		$id	A prefix for the store id.
+	 * @return	string		A store id.
+	 * @since	3.4.0
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id.= ':' . $this->getState('filter.search');
+		$id.= ':' . $this->getState('filter.state');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Build an SQL query to load the list data.
+	 *
+	 * @return	JDatabaseQuery
+	 * @since	3.4.0
+	 */
+	protected function getListQuery()
+	{
+		// Create a new query object.
+		$db		= $this->getDbo();
+		$query	= $db->getQuery(true);
+
+		// Select the required fields from the table.
+		$query->select(
+			$this->getState(
+				'list.select',
+				'a.*'
+			)
+		);
+		$query->from('#__icagenda_feature AS a');
+
+		// Join over the users for the checked out user.
+		$query->select('uc.name AS editor');
+		$query->leftJoin('#__users AS uc ON uc.id=a.checked_out');
+
+		// Filter by published state
+		$published = $this->getState('filter.state');
+		if (is_numeric($published))
+		{
+			$query->where('a.state=' . (int) $published);
+		}
+		elseif ($published === '')
+		{
+			$query->where('(a.state IN (0, 1))');
+		}
+
+		// Filter by search in title
+		$search = $this->getState('filter.search');
+
+		if (!empty($search))
+		{
+			if (stripos($search, 'id:') === 0)
+			{
+				$query->where('a.id = ' . (int) substr($search, 3));
+			}
+			else
+			{
+				$search = $db->Quote('%'.$db->escape($search, true).'%');
+				$query->where("(a.title LIKE $search OR a.desc LIKE $search)");
+			}
+		}
+
+		// Add the list ordering clause.
+		$orderCol	= $this->state->get('list.ordering');
+		$orderDirn	= $this->state->get('list.direction');
+
+		if ($orderCol && $orderDirn)
+		{
+			$query->order($db->escape("$orderCol $orderDirn"));
+		}
+
+		return $query;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields.php
new file mode 100644
index 00000000..d8e27763
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields.php
@@ -0,0 +1,26 @@
+<?php
+/** 
+ *	iCagenda
+ *----------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright	Copyright (C) 2012 JOOMLIC - All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Jooml!C - http://www.joomlic.com
+ * 
+ * @since		1.2.6
+ *----------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined( '_JEXEC' ) or die( 'Restricted access' );
+
+jimport('joomla.application.component.modellist');
+
+/**
+ * Methods supporting a list of iCagenda records.
+ */
+class iCagendaModelfields extends JModelList
+{
+	
+
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/iclist/globalization.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/iclist/globalization.php
new file mode 100644
index 00000000..d8bb92d2
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/iclist/globalization.php
@@ -0,0 +1,315 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.5.7 2015-07-12
+ * @since       2.1.7
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+jimport( 'joomla.filesystem.path' );
+jimport('joomla.form.formfield');
+
+class JFormFieldiClist_globalization extends JFormField
+{
+	protected $type='iclist_globalization';
+
+	protected function getInput()
+	{
+		$lang		= JFactory::getLanguage();
+		$langTag	= $lang->getTag();
+		$langName	= $lang->getName();
+
+		if ( ! file_exists(JPATH_LIBRARIES . '/ic_library/globalize/culture/' . $langTag . '.php'))
+		{
+			$langTag = 'en-GB';
+			$currentText = JTEXT::_('COM_ICAGENDA_DATE_FORMAT_DEFAULT') . ' [' . $langTag . '] :';
+
+		}
+		else
+		{
+			$currentText = JTEXT::_('COM_ICAGENDA_DATE_FORMAT_CURRENT') . ' [' . $langTag . '] :';
+		}
+
+		$globalize		= JPATH_LIBRARIES . '/ic_library/globalize/culture/' . $langTag . '.php';
+		$iso			= JPATH_LIBRARIES . '/ic_library/globalize/culture/iso.php';
+
+		require_once $globalize;
+		require_once $iso;
+
+		$class		= isset($class) ? ' class="' . $class . '"' : '';
+		$selected	= ' selected="selected" style="background:#D4D4D4;"';
+
+		// Start Select List of Date Formats
+		$html = '<select id="' . $this->id . '_id"' . $class . ' name="' . $this->name . '" style="width:250px;" >';
+
+		if ($this->name != 'jform[format]' && $this->name != 'format')
+		{
+			$html.= '<option value="" style="text-align:center;">- ' . JTEXT::_('COM_ICAGENDA_SELECT_FORMAT') . ' -</option>';
+		}
+
+		// Date Formats in Current Language of User (admin)
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			$html.= '<optgroup label="&nbsp;"></optgroup>';
+			$html.= '<optgroup label="' . $currentText . '" style="font-style:normal; color:#333333;"></optgroup>';
+		}
+		else
+		{
+			$html.= '<optgroup label="' . $currentText . '">';
+		}
+
+		$dateglobalize_array[] = array();
+		$dateglobalize_array[] = $dateglobalize_1;
+		$dateglobalize_array[] = $dateglobalize_2;
+		$dateglobalize_array[] = $dateglobalize_3;
+		$dateglobalize_array[] = $dateglobalize_4;
+		$dateglobalize_array[] = isset($dateglobalize_5) ? $dateglobalize_5 : ''; // en-GB, en-US
+		$dateglobalize_array[] = $dateglobalize_6;
+		$dateglobalize_array[] = $dateglobalize_7;
+		$dateglobalize_array[] = $dateglobalize_8;
+		$dateglobalize_array[] = isset($dateglobalize_9) ? $dateglobalize_9 : ''; // en-GB
+		$dateglobalize_array[] = isset($dateglobalize_10) ? $dateglobalize_10 : ''; // en-GB
+		$dateglobalize_array[] = $dateglobalize_11;
+		$dateglobalize_array[] = $dateglobalize_12;
+
+		foreach ($dateglobalize_array as $format => $label)
+		{
+			if (isset($label) && $label)
+			{
+				$html.= '<option value="' . $format . '"';
+				$html.= ($this->value == $format) ? $selected : '';
+				$html.= '>' . $label . '</option>';
+			}
+		}
+
+		if (version_compare(JVERSION, '3.0', 'ge'))
+		{
+			$html.= '</optgroup>';
+		}
+
+
+		// Other date format in English (if 'en-GB' is current language)
+		if ($langTag == 'en-GB')
+		{
+			// Extra en-US
+			if (version_compare(JVERSION, '3.0', 'lt'))
+			{
+				$html.= '<optgroup label="&nbsp;"></optgroup>';
+				$html.= '<optgroup label="Other date format in English" style="font-style:normal; color:#333333;"></optgroup>';
+				$html.= '<optgroup label="en-US (more formats if current language) :" style="font-weight:normal; color:#777777;"></optgroup>';
+			}
+			else
+			{
+				$html.= '<optgroup label="en-US (more formats if current language) :">';
+			}
+
+			$extra_array = array(
+					$extravalue_1 => $extra_1,
+					$extravalue_2 => $extra_2,
+					$extravalue_3 => $extra_3,
+					$extravalue_4 => $extra_4,
+					$extravalue_5 => $extra_5,
+				);
+
+			foreach ($extra_array as $format => $label)
+			{
+				$html.= '<option value="' . $format . '"';
+				$html.= ($this->value == $format) ? $selected : '';
+				$html.= '>' . $label . '</option>';
+			}
+
+			if (version_compare(JVERSION, '3.0', 'ge'))
+			{
+				$html.= '</optgroup>';
+			}
+
+			// Extra en-CA
+			if (version_compare(JVERSION, '3.0', 'lt'))
+			{
+				$html.= '<optgroup label="en-CA :" style="font-weight:normal; color:#777777;"></optgroup>';
+			}
+			else
+			{
+				$html.= '<optgroup label="en-CA :">';
+			}
+
+			$html.= '<option value="' . $extravalue_6 . '"';
+			$html.= ($this->value == $extravalue_6) ? $selected : '';
+			$html.= '>' . $extra_6 . '</option>';
+
+			if (version_compare(JVERSION, '3.0', 'ge'))
+			{
+				$html.= '</optgroup>';
+			}
+
+			// Extra en-SG
+			if (version_compare(JVERSION, '3.0', 'lt'))
+			{
+				$html.= '<optgroup label="en-SG :" style="font-weight:normal; color:#777777;"></optgroup>';
+			}
+			else
+			{
+				$html.= '<optgroup label="en-SG :">';
+			}
+
+			$html.= '<option value="' . $extravalue_7 . '"';
+			$html.= ($this->value == $extravalue_7) ? $selected : '';
+			$html.= '>' . $extra_7 . '</option>';
+
+			if (version_compare(JVERSION, '3.0', 'ge'))
+			{
+				$html.= '</optgroup>';
+			}
+		}
+
+
+		// International Date Format (ISO)
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			$html.= '<optgroup label="&nbsp;"></optgroup>';
+			$html.= '<optgroup label="' . JTEXT::_('COM_ICAGENDA_DATE_FORMAT_ISO') . '" style="font-style:normal; color:#333333;"></optgroup>';
+		}
+		else
+		{
+			$html.= '<optgroup label="' . JTEXT::_('COM_ICAGENDA_DATE_FORMAT_ISO') . '">';
+		}
+
+		$html.= '<option value="' . $iso . '"';
+		$html.= ($this->value == $iso) ? $selected : '';
+		$html.= '>1993-04-30</option>';
+
+		if (version_compare(JVERSION, '3.0', 'ge'))
+		{
+			$html.= '</optgroup>';
+		}
+
+
+		// Global date formats with separator
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			$html.= '<optgroup label="&nbsp;"></optgroup>';
+			$html.= '<optgroup label="' . JTEXT::_('COM_ICAGENDA_DATE_FORMAT_SEPARATOR') . '" style="font-style:normal; color:#333333;"></optgroup>';
+		}
+
+
+		// DMY Little-endian (day, month, year), e.g. 22.04.96 or 22/04/96
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			$html.= '<optgroup label="' . JTEXT::_('COM_ICAGENDA_DATE_FORMAT_DMY') . ' :" style="font-weight:normal; color:#777777;"></optgroup>';
+		}
+		else
+		{
+			$html.= '<optgroup label="' . JTEXT::_('COM_ICAGENDA_DATE_FORMAT_DMY') . '">';
+		}
+
+		$dmy_array = array(
+				$dmy_1 => '30␣04␣1993',
+				$dmy_2 => '30␣04␣93',
+				$dmy_3 => '30␣04',
+				$dmy_4 => '04␣93',
+				$dmy_5 => isset($dmy_text_5) ? $dmy_text_5 : '',
+				$dmy_6 => isset($dmy_text_6) ? $dmy_text_6 : ''
+			);
+
+		foreach ($dmy_array as $format => $label)
+		{
+			if ($label)
+			{
+				$html.= '<option value="' . $format . '"';
+				$html.= ($this->value == $format) ? $selected : '';
+				$html.= '>' . $label . '</option>';
+			}
+		}
+
+		if (version_compare(JVERSION, '3.0', 'ge'))
+		{
+			$html.= '</optgroup>';
+		}
+
+
+		// MDY Middle-endian (month, day, year), e.g. 04/22/96
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			$html.= '<optgroup label="' . JTEXT::_('COM_ICAGENDA_DATE_FORMAT_MDY') . ' :" style="font-weight:normal; color:#777777;"></optgroup>';
+		}
+		else
+		{
+			$html.= '<optgroup label="' . JTEXT::_('COM_ICAGENDA_DATE_FORMAT_MDY') . '">';
+		}
+
+		$mdy_array = array(
+				$mdy_1 => '04␣30␣1993',
+				$mdy_2 => '04␣30␣93',
+				$mdy_3 => '04␣30',
+				$mdy_4 => '04␣93',
+				$mdy_5 => isset($mdy_text_5) ? $mdy_text_5 : '',
+				$mdy_6 => isset($mdy_text_6) ? $mdy_text_6 : ''
+			);
+
+		foreach ($mdy_array as $format => $label)
+		{
+			if ($label)
+			{
+				$html.= '<option value="' . $format . '"';
+				$html.= ($this->value == $format) ? $selected : '';
+				$html.= '>' . $label . '</option>';
+			}
+		}
+
+		if (version_compare(JVERSION, '3.0', 'ge'))
+		{
+			$html.= '</optgroup>';
+		}
+
+
+		// YMD Big-endian (year, month, day), e.g. 1996-04-22
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			$html.= '<optgroup label="' . JTEXT::_('COM_ICAGENDA_DATE_FORMAT_YMD') . ' :" style="font-weight:normal; color:#777777;"></optgroup>';
+		}
+		else
+		{
+			$html.= '<optgroup label="' . JTEXT::_('COM_ICAGENDA_DATE_FORMAT_YMD') . '">';
+		}
+
+		$ymd_array = array(
+				$ymd_1 => '1993␣04␣30',
+				$ymd_2 => '93␣04␣30',
+				$ymd_3 => '04␣30',
+				$ymd_4 => '93␣04',
+				$ymd_5 => isset($ymd_text_5) ? $ymd_text_5 : '',
+				$ymd_6 => isset($ymd_text_6) ? $ymd_text_6 : ''
+			);
+
+		foreach ($ymd_array as $format => $label)
+		{
+			if ($label)
+			{
+				$html.= '<option value="' . $format . '"';
+				$html.= ($this->value == $format) ? $selected : '';
+				$html.= '>' . $label . '</option>';
+			}
+		}
+
+		if (version_compare(JVERSION, '3.0', 'ge'))
+		{
+			$html.= '</optgroup>';
+		}
+
+		$html.= '</select>';
+
+		return $html;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/iclist/index.html b/deployed/icagenda/administrator/components/com_icagenda/models/fields/iclist/index.html
new file mode 100644
index 00000000..42682b47
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/iclist/index.html
@@ -0,0 +1 @@
+<html><body></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/icmap/city.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/icmap/city.php
new file mode 100644
index 00000000..2ded61ed
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/icmap/city.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.5.0 2015-02-25
+ * @since       1.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+jimport( 'joomla.filesystem.path' );
+jimport('joomla.form.formfield');
+
+/**
+ * Returns City from Google Maps address auto-complete field.
+ */
+class JFormFieldiCmap_city extends JFormField
+{
+	protected $type='icmap_city';
+
+	protected function getInput()
+	{
+		$session = JFactory::getSession();
+		$ic_submit_city = $session->get('ic_submit_city', '');
+
+		$city_value = $ic_submit_city ? $ic_submit_city : $this->value;
+
+		$class = isset($this->class) ? ' class="' . $this->class . '"' : '';
+
+		$html = '<div class="clr"></div>';
+		$html.= '<label class="icmap-label">' . JText::_('COM_ICAGENDA_FORM_LBL_EVENT_CITY') . '</label> <input name="' . $this->name . '" id="locality" type="text"' . $class . ' value="' . $city_value . '"/>';
+
+		// clear the data so we don't process it again
+		$session->clear('ic_submit_city');
+
+		return $html;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/icmap/country.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/icmap/country.php
new file mode 100644
index 00000000..a98e63ca
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/icmap/country.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.5.0 2015-02-25
+ * @since       1.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+jimport( 'joomla.filesystem.path' );
+jimport('joomla.form.formfield');
+
+/**
+ * Returns Country from Google Maps address auto-complete field.
+ */
+class JFormFieldiCmap_country extends JFormField
+{
+	protected $type='icmap_country';
+
+	protected function getInput()
+	{
+		$session = JFactory::getSession();
+		$ic_submit_country = $session->get('ic_submit_country', '');
+
+		$country_value = $ic_submit_country ? $ic_submit_country : $this->value;
+
+		$class = isset($this->class) ? ' class="' . $this->class . '"' : '';
+
+		$html = '<div class="clr"></div>';
+		$html.= '<label class="icmap-label">' . JText::_('COM_ICAGENDA_FORM_LBL_EVENT_COUNTRY') . '</label> <input name="' . $this->name . '" id="country" type="text"' . $class . ' value="' . $country_value . '" />';
+
+		// clear the data so we don't process it again
+		$session->clear('ic_submit_country');
+
+		return $html;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/icmap/index.html b/deployed/icagenda/administrator/components/com_icagenda/models/fields/icmap/index.html
new file mode 100644
index 00000000..42682b47
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/icmap/index.html
@@ -0,0 +1 @@
+<html><body></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/icmap/lat.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/icmap/lat.php
new file mode 100644
index 00000000..670da032
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/icmap/lat.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-26
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+jimport( 'joomla.filesystem.path' );
+jimport('joomla.form.formfield');
+
+/**
+ * Returns Latitude from Google Maps address auto-complete field.
+ */
+class JFormFieldiCmap_lat extends JFormField
+{
+	protected $type = 'icmap_lat';
+
+	protected function getInput()
+	{
+		$session = JFactory::getSession();
+
+		// Check if coords set (deprecated)
+		$id = JFactory::getApplication()->input->getInt('id');
+
+		$class = isset($this->class) ? ' class="' . $this->class . '"' : '';
+
+		if (isset($id))
+		{
+			$db = JFactory::getDbo();
+			$db->setQuery(
+				'SELECT a.coordinate' .
+				' FROM #__icagenda_events AS a' .
+				' WHERE a.id = ' . (int) $id
+			);
+
+			$coords = $db->loadResult();
+		}
+		else
+		{
+			$coords = NULL;
+		}
+
+		$ic_submit_lat = $session->get('ic_submit_lat', '');
+
+		$lat_value = $ic_submit_lat ? $ic_submit_lat : $this->value;
+
+		if ($coords != NULL
+			&& $lat_value == '0.0000000000000000')
+		{
+			$ex        = explode(', ', $coords);
+			$lat_value = $ex[0];
+		}
+		elseif ($lat_value != '0.0000000000000000')
+		{
+			$lat_value = $lat_value;
+		}
+		else
+		{
+			$lat_value = NULL;
+		}
+
+		$html = '<div class="clr"></div>';
+		$html.= '<label class="icmap-label">' . JText::_('COM_ICAGENDA_GOOGLE_MAPS_LATITUDE_LBL') . '</label> <input name="' . $this->name . '" id="lat" type="text"' . $class . ' value="' . $lat_value . '"/>';
+
+		// clear the data so we don't process it again
+		$session->clear('ic_submit_lat');
+
+		return $html;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/icmap/lng.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/icmap/lng.php
new file mode 100644
index 00000000..0b0b9eaa
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/icmap/lng.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-26
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+jimport( 'joomla.filesystem.path' );
+jimport('joomla.form.formfield');
+
+/**
+ * Returns Latitude from Google Maps address auto-complete field.
+ */
+class JFormFieldiCmap_lng extends JFormField
+{
+	protected $type = 'icmap_lng';
+
+	protected function getInput()
+	{
+		$session = JFactory::getSession();
+
+		// Check if coords set (deprecated)
+		$id = JFactory::getApplication()->input->getInt('id');
+
+		$class = isset($this->class) ? ' class="' . $this->class . '"' : '';
+
+		if (isset($id))
+		{
+			$db = JFactory::getDbo();
+			$db->setQuery(
+				'SELECT a.coordinate' .
+				' FROM #__icagenda_events AS a' .
+				' WHERE a.id = ' . (int) $id
+			);
+
+			$coords = $db->loadResult();
+		}
+		else
+		{
+			$coords = NULL;
+		}
+
+		$ic_submit_lng = $session->get('ic_submit_lng', '');
+
+		$lng_value = $ic_submit_lng ? $ic_submit_lng : $this->value;
+
+		if ($coords != NULL
+			&& $lng_value == '0.0000000000000000')
+		{
+			$ex        = explode(', ', $coords);
+			$lng_value = $ex[1];
+		}
+		elseif ($lng_value != '0.0000000000000000')
+		{
+			$lng_value = $lng_value;
+		}
+		else
+		{
+			$lng_value = NULL;
+		}
+
+		$html = '<div class="clr"></div>';
+		$html.= '<label class="icmap-label">' . JText::_('COM_ICAGENDA_GOOGLE_MAPS_LONGITUDE_LBL') . '</label> <input name="' . $this->name . '" id="lng" type="text"' . $class . ' value="' . $lng_value . '"/>';
+
+		// clear the data so we don't process it again
+		$session->clear('ic_submit_lng');
+
+		return $html;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/index.html b/deployed/icagenda/administrator/components/com_icagenda/models/fields/index.html
new file mode 100644
index 00000000..42682b47
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/index.html
@@ -0,0 +1 @@
+<html><body></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/list.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/list.php
new file mode 100644
index 00000000..74205e8c
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/list.php
@@ -0,0 +1,263 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *------------------------------------------------------------------------------
+ * @package     iCagenda.Admin
+ * @subpackage  Form
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        https://www.joomlic.com
+ *
+ * @version     3.6.9 2017-06-29
+ * @since       3.6.9
+ *------------------------------------------------------------------------------
+*/
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Override core Joomla list form field to integrate 'useglobal' feature (since Joomla 3.7.0)
+ * Form Field class for the Joomla Platform.
+ * Supports a generic list of options.
+ *
+ * @since  11.1
+ */
+class JFormFieldList extends JFormField
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $type = 'List';
+
+	/**
+	 * Method to get the field input markup for a generic list.
+	 * Use the multiple attribute to enable multiselect.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   3.7.0
+	 */
+	protected function getInput()
+	{
+		$html = array();
+		$attr = '';
+
+		// Initialize some field attributes.
+		$attr .= !empty($this->class) ? ' class="' . $this->class . '"' : '';
+		$attr .= !empty($this->size) ? ' size="' . $this->size . '"' : '';
+		$attr .= $this->multiple ? ' multiple' : '';
+		$attr .= $this->required ? ' required aria-required="true"' : '';
+		$attr .= $this->autofocus ? ' autofocus' : '';
+
+		// To avoid user's confusion, readonly="true" should imply disabled="true".
+		if ((string) $this->readonly == '1' || (string) $this->readonly == 'true' || (string) $this->disabled == '1'|| (string) $this->disabled == 'true')
+		{
+			$attr .= ' disabled="disabled"';
+		}
+
+		// Initialize JavaScript field attributes.
+		$attr .= $this->onchange ? ' onchange="' . $this->onchange . '"' : '';
+
+		// Get the field options.
+		$options = (array) $this->getOptions();
+
+		// Create a read-only list (no name) with hidden input(s) to store the value(s).
+		if ((string) $this->readonly == '1' || (string) $this->readonly == 'true')
+		{
+			$html[] = JHtml::_('select.genericlist', $options, '', trim($attr), 'value', 'text', $this->value, $this->id);
+
+			// E.g. form field type tag sends $this->value as array
+			if ($this->multiple && is_array($this->value))
+			{
+				if (!count($this->value))
+				{
+					$this->value[] = '';
+				}
+
+				foreach ($this->value as $value)
+				{
+					$html[] = '<input type="hidden" name="' . $this->name . '" value="' . htmlspecialchars($value, ENT_COMPAT, 'UTF-8') . '"/>';
+				}
+			}
+			else
+			{
+				$html[] = '<input type="hidden" name="' . $this->name . '" value="' . htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8') . '"/>';
+			}
+		}
+		else
+		// Create a regular list.
+		{
+			$html[] = JHtml::_('select.genericlist', $options, $this->name, trim($attr), 'value', 'text', $this->value, $this->id);
+		}
+
+		return implode($html);
+	}
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   3.7.0
+	 */
+	protected function getOptions()
+	{
+		$fieldname = preg_replace('/[^a-zA-Z0-9_\-]/', '_', $this->fieldname);
+		$options   = array();
+
+		foreach ($this->element->xpath('option') as $option)
+		{
+			// Filter requirements
+			if ($requires = explode(',', (string) $option['requires']))
+			{
+				// Requires multilanguage
+				if (in_array('multilanguage', $requires) && !JLanguageMultilang::isEnabled())
+				{
+					continue;
+				}
+
+				// Requires associations
+				if (in_array('associations', $requires) && !JLanguageAssociations::isEnabled())
+				{
+					continue;
+				}
+			}
+
+			$value = (string) $option['value'];
+			$text  = trim((string) $option) != '' ? trim((string) $option) : $value;
+
+			$disabled = (string) $option['disabled'];
+			$disabled = ($disabled == 'true' || $disabled == 'disabled' || $disabled == '1');
+			$disabled = $disabled || ($this->readonly && $value != $this->value);
+
+			$checked = (string) $option['checked'];
+			$checked = ($checked == 'true' || $checked == 'checked' || $checked == '1');
+
+			$selected = (string) $option['selected'];
+			$selected = ($selected == 'true' || $selected == 'selected' || $selected == '1');
+
+			$tmp = array(
+					'value'    => $value,
+					'text'     => JText::alt($text, $fieldname),
+					'disable'  => $disabled,
+					'class'    => (string) $option['class'],
+					'selected' => ($checked || $selected),
+					'checked'  => ($checked || $selected),
+			);
+
+			// Set some event handler attributes. But really, should be using unobtrusive js.
+			$tmp['onclick']  = (string) $option['onclick'];
+			$tmp['onchange'] = (string) $option['onchange'];
+
+			// Add the option object to the result set.
+			$options[] = (object) $tmp;
+		}
+
+		if ($this->element['useglobal'])
+		{
+			$tmp        = new stdClass;
+			$tmp->value = '';
+			$tmp->text  = JText::_('JGLOBAL_USE_GLOBAL');
+			$component  = JFactory::getApplication()->input->getCmd('option');
+
+			// Get correct component for menu items
+			if (version_compare(JVERSION, '3.2', 'ge')
+				&& $component == 'com_menus')
+			{
+				$link      = $this->form->getData()->get('link');
+				$uri       = new JUri($link);
+				$component = $uri->getVar('option', 'com_menus');
+			}
+
+			$params = JComponentHelper::getParams($component);
+			$value  = $params->get($this->fieldname);
+
+			// Try with global configuration
+			if (is_null($value))
+			{
+				$value = JFactory::getConfig()->get($this->fieldname);
+			}
+
+			// Try with menu configuration
+			if (is_null($value) && JFactory::getApplication()->input->getCmd('option') == 'com_menus')
+			{
+				$value = JComponentHelper::getParams('com_menus')->get($this->fieldname);
+			}
+
+			if (!is_null($value))
+			{
+				$value = (string) $value;
+
+				foreach ($options as $option)
+				{
+					if ($option->value === $value)
+					{
+						$value = $option->text;
+
+						break;
+					}
+				}
+
+				$tmp->text  = (version_compare(JVERSION, '3.7', 'lt'))
+							? JText::_('JGLOBAL_USE_GLOBAL') . ' (' . $value . ')'
+							: JText::sprintf('JGLOBAL_USE_GLOBAL_VALUE', $value);
+			}
+
+			array_unshift($options, $tmp);
+		}
+
+		reset($options);
+
+		return $options;
+	}
+
+	/**
+	 * Method to add an option to the list field.
+	 *
+	 * @param   string  $text        Text/Language variable of the option.
+	 * @param   array   $attributes  Array of attributes ('name' => 'value' format)
+	 *
+	 * @return  JFormFieldList  For chaining.
+	 *
+	 * @since   3.7.0
+	 */
+	public function addOption($text, $attributes = array())
+	{
+		if ($text && $this->element instanceof SimpleXMLElement)
+		{
+			$child = $this->element->addChild('option', $text);
+
+			foreach ($attributes as $name => $value)
+			{
+				$child->addAttribute($name, $value);
+			}
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to the the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   3.7.0
+	 */
+	public function __get($name)
+	{
+		if ($name == 'options')
+		{
+			return $this->getOptions();
+		}
+
+		return parent::__get($name);
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/cat.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/cat.php
new file mode 100644
index 00000000..d22ef28d
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/cat.php
@@ -0,0 +1,140 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.5.19 2016-06-21
+ * @since       1.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+jimport('joomla.filesystem.path');
+jimport('joomla.form.formfield');
+
+class JFormFieldModal_cat extends JFormField
+{
+	protected $type='modal_cat';
+
+	protected function getInput()
+	{
+		$app		= JFactory::getApplication();
+		$session	= JFactory::getSession();
+
+		// Initialize some field attributes.
+		$class		= !empty($this->class) ? ' class="' . $this->class . '"' : '';
+
+		if ($app->isAdmin())
+		{
+			$iCparams = JComponentHelper::getParams('com_icagenda');
+		}
+		else
+		{
+			$iCparams = $app->getParams();
+		}
+
+		$orderby_catlist		= $iCparams->get('orderby_catlist', 'alpha');
+		$default_catlist		= $iCparams->get('default_catlist', '');
+
+		$admin_status_catlist	= $iCparams->get('admin_status_catlist', '1');
+		$site_status_catlist	= $iCparams->get('site_status_catlist', '1');
+
+		$admin_status_array		= is_array($admin_status_catlist) ? $admin_status_catlist : array($admin_status_catlist);
+		$site_status_array		= is_array($site_status_catlist) ? $site_status_catlist : array($site_status_catlist);
+
+		$admin_status			= implode(',', $admin_status_array);
+		$site_status			= implode(',', $site_status_array);
+
+		$catid = $session->get('ic_submit_catid', '');
+
+		// Query List of Categories
+		$db		= JFactory::getDbo();
+		$query	= $db->getQuery(true);
+		$query->select('c.ordering, c.title, c.state, c.id');
+		$query->from($db->qn('#__icagenda_category') . ' AS c');
+
+		// Not display Trashed Categories
+		$query->where($db->qn('c.state') . ' <> -2');
+
+		if ($app->isAdmin())
+		{
+			$query->where($db->qn('c.state') . ' IN (' . $admin_status . ') ');
+		}
+		else
+		{
+			$query->where($db->qn('c.state') . ' IN (' . $site_status . ') ');
+		}
+
+		if ($orderby_catlist == 'alpha')
+		{
+			$query->order('c.title ASC');
+		}
+		elseif ($orderby_catlist == 'ralpha')
+		{
+			$query->order('c.title DESC');
+		}
+		elseif ($orderby_catlist == 'order')
+		{
+			$query->order('c.ordering ASC');
+		}
+
+		$db->setQuery($query);
+		$categories = $db->loadObjectList();
+
+		$html = '<select id="' . $this->id . '" name="' . $this->name . '"' . $class . '>';
+
+		$html.= ' <option value="">' . JTEXT::_('JOPTION_SELECT_CATEGORY') . '</option>';
+
+		foreach ($categories as $c)
+		{
+			$html.= '<option value="' . $c->id . '"';
+
+			if ($c->state == '0')
+			{
+				$html.= ' style="color:red"';
+//				$c->title = '[' . $c->title . '] (' . JTEXT::_('JUNPUBLISHED') . ')';
+				$c->title = '[' . $c->title . ']';
+			}
+			elseif ($c->state == '2')
+			{
+				$html.= ' style="color:orange"';
+//				$c->title = $c->title . ' (' . JTEXT::_('JARCHIVED') . ')';
+				$c->title = '[' . $c->title . ']';
+			}
+
+			if ($this->value == $c->id)
+			{
+				$html.= ' selected="selected"';
+			}
+
+			if ($catid == $c->id)
+			{
+				$html.= ' selected="selected"';
+			}
+
+			if (empty($this->value) && empty($catid)
+				&& ($c->id == $default_catlist))
+			{
+				$html.= ' selected="selected"';
+			}
+
+			$html.= '>' . $c->title . '</option>';
+		}
+
+		$html.= '</select>';
+
+		// clear the data so we don't process it again
+		$session->clear('ic_submit_catid');
+
+		return $html;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/checkdnsrr.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/checkdnsrr.php
new file mode 100644
index 00000000..0b5498e0
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/checkdnsrr.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.6.0 2015-10-14
+ * @since       3.1.7
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+jimport( 'joomla.filesystem.path' );
+jimport('joomla.form.formfield');
+
+class JFormFieldModal_checkdnsrr extends JFormField
+{
+	protected $type='modal_checkdnsrr';
+
+	protected function getInput()
+	{
+		if ( ! function_exists('checkdnsrr'))
+		{
+			if (version_compare(JVERSION, '3.0', 'lt'))
+			{
+				$html = '<label style="color:red"><b> ' . JText::_('COM_ICAGENDA_REGISTRATION_EMAIL_CHECKDNSRR_NOT_PRESENT_1') . '</b><br/>' . JText::_('COM_ICAGENDA_REGISTRATION_EMAIL_CHECKDNSRR_NOT_PRESENT_2') . '</label><br/>';
+			}
+			else
+			{
+				$html = '<div class="alert alert-error"><span class="icon-warning"></span><b> ' . JText::_('COM_ICAGENDA_REGISTRATION_EMAIL_CHECKDNSRR_NOT_PRESENT_1') . '</b><br/>' . JText::_('COM_ICAGENDA_REGISTRATION_EMAIL_CHECKDNSRR_NOT_PRESENT_2') . '</div>';
+			}
+		}
+		else
+		{
+			$html = '<script>document.getElementById("jform_Checkdnsrr-lbl").style.display = "none"; document.getElementById("jform_Checkdnsrr-lbl").style.display = "none";</script>';
+		}
+
+		return $html;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/color.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/color.php
new file mode 100644
index 00000000..c1df1bb3
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/color.php
@@ -0,0 +1,40 @@
+<?php
+/** 
+ *	iCagenda
+ *----------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright	Copyright (C) 2012 JOOMLIC - All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Jooml!C - http://www.joomlic.com
+ * 
+ * @update		2.0.4
+ *----------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined( '_JEXEC' ) or die( 'Restricted access' );
+
+jimport( 'joomla.filesystem.path' );
+jimport('joomla.form.formfield');
+
+
+class JFormFieldModal_color extends JFormField
+{
+	protected $type='modal_color';
+	
+	protected function getInput()
+	{
+		$html= '
+		<div class="color">
+			<div class="form-item">
+				<input type="text" id="'.$this->id.'" name="'.$this->name.'" value="'.$this->value.'" />
+			</div>
+			<div id="picker"></div>
+			<div class="clr"></div>
+		</div>
+		<div class="clr"></div>
+		';
+
+		return $html;
+	}
+}
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/coordinate.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/coordinate.php
new file mode 100644
index 00000000..4e9f2f05
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/coordinate.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-26
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+jimport( 'joomla.filesystem.path' );
+jimport('joomla.form.formfield');
+
+class JFormFieldModal_coordinate extends JFormField
+{
+	protected $type = 'modal_coordinate';
+	
+	protected function getInput()
+	{
+		$def = JFactory::getApplication()->input->get('def');
+
+		if ($def == '') $def = $this->value;
+
+		$html = '
+			<!--div class="clr"></div>
+			<div id="map_canvas" style="width:100%; height:300px"></div><br/>
+			<label>' . JText::_('COM_ICAGENDA_FORM_LBL_EVENT_GPS') . '</label>&nbsp;<input name="' . $this->name . '" id="jform_coordinate" type="text" size="41" value="' . $def . '"/-->
+			<div class="clr"></div>
+			<!--input name="latitude" id="lat" type="text"/>
+			<input name="longitude" id="lng" type="text"/-->';
+
+		$html.= '<input name="' . $this->name . '" id="lat" type="text" size="41" value="' . $this->value . '"/>
+			<!--script>
+				document.getElementById("coords").value=document.getElementById("lat").value+", "+document.getElementById("lng").value;
+			</script-->';
+
+		return $html;
+	}
+}
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/date.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/date.php
new file mode 100644
index 00000000..255dff96
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/date.php
@@ -0,0 +1,176 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-26
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+jimport('joomla.filesystem.path');
+jimport('joomla.form.formfield');
+
+/**
+ * Supports unlimited modal datetime picker (add / delete).
+ *
+ * @since   1.0
+ */
+class JFormFieldModal_date extends JFormField
+{
+	protected $type = 'modal_date';
+
+	protected function getInput()
+	{
+		$lang = JFactory::getLanguage();
+
+		$id_suffix = ($lang->getTag() == 'fa-IR') ? '_jalali' : '';
+
+		if ($lang->getTag() == 'fa-IR')
+		{
+			// Including fallback code for HTML5 non supported browsers.
+			JHtml::_('jquery.framework');
+			JHtml::_('script', 'system/html5fallback.js', false, true);
+		}
+
+		$id = JFactory::getApplication()->input->getInt('id');
+
+		$class = !empty($this->class) ? ' ' . $this->class : '';
+
+		$session = JFactory::getSession();
+		$datesDB = $session->get('ic_submit_dates', '');
+
+		if ($id && empty($datesDB))
+		{
+			$db	= JFactory::getDBO();
+			$db->setQuery(
+				'SELECT a.dates' .
+				' FROM #__icagenda_events AS a' .
+				' WHERE a.id = ' . (int) $id
+			);
+			$datesDB = $db->loadResult();
+		}
+
+		$dates = iCString::isSerialized($datesDB) ? unserialize($datesDB) : false;
+
+		if ($dates)
+		{
+			foreach ($dates as $key => $date)
+			{
+				if ( ! iCDate::isDate($date))
+				{
+					unset($dates[$key]);
+				}
+			}
+		}
+
+//		if ($lang->getTag() == 'fa-IR'
+//			&& $dates
+//			&& $dates != array('0000-00-00 00:00'))
+//		{
+//			$dates_to_sql = array();
+
+//			foreach ($dates AS $date)
+//			{
+//				if (iCDate::isDate($date))
+//				{
+//					$year  = date('Y', strtotime($date));
+//					$month = date('m', strtotime($date));
+//					$day   = date('d', strtotime($date));
+//					$time  = date('H:i', strtotime($date));
+
+//					$dates_to_sql[] = iCGlobalizeConvert::gregorianToJalali($year, $month, $day, true) . ' ' . $time;
+//				}
+//			}
+
+//			$dates = $dates_to_sql;
+//		}
+
+		$html = '<table id="dTable' . $id_suffix . '" style="border:0px">';
+
+		$html.= '<thead>';
+		$html.= '<tr>';
+		$html.= '<th width="70%">';
+		$html.= JText::_('COM_ICAGENDA_TB_DATE');
+		$html.= '</th>';
+		$html.= '<th width="30%">';
+//		$html.= JText::_('COM_ICAGENDA_TB_ACT');
+		$html.= '</th>';
+		$html.= '</tr>';
+		$html.= '</thead>';
+
+		$add_counter = 0;
+
+		if ($dates
+			&& $dates != array('0000-00-00 00:00'))
+		{
+			foreach ($dates as $date)
+			{
+				$html.= '<tr>';
+				$html.= '<td>';
+
+				if ($lang->getTag() == 'fa-IR')
+				{
+					$add_counter = $add_counter+1;
+//					$this_number = $add_counter ? $add_counter : '';
+					$html.= JHtml::_('calendar', $date, 'd', 'date_jalali' . $add_counter, '%Y-%m-%d %H:%M', ' class="ic-date-input' . $id_suffix . '"');
+				}
+				else
+				{
+					$html.= '<input class="ic-date-input' . $id_suffix . '" type="text" name="d" value="' . $date . '" />';
+				}
+
+				$html.= '</td>';
+				$html.= '<td>';
+				$html.= '<a class="del btn btn-danger btn-mini" href="#">' . JText::_('COM_ICAGENDA_DELETE_DATE') . '</a>';
+				$html.= '</td>';
+				$html.= '</tr>';
+			}
+
+			// clear the data so we don't process it again
+			$session->clear('ic_submit_dates');
+		}
+		else
+		{
+			$html.= '<tr>';
+			$html.= '<td>';
+
+			if ($lang->getTag() == 'fa-IR')
+			{
+				$html.= JHtml::_('calendar', '0000-00-00 00:00', 'd', 'date_jalali', '%Y-%m-%d %H:%M', ' class="ic-date-input' . $id_suffix . '"');
+			}
+			else
+			{
+				$html.= '<input class="ic-date-input' . $id_suffix . '" type="text" name="d" value="0000-00-00 00:00" />';
+			}
+			$html.= '</td>';
+			$html.= '<td>';
+			$html.= '<a class="del btn btn-danger btn-mini" href="#">' . JText::_('COM_ICAGENDA_DELETE_DATE') . '</a>';
+			$html.= '</td>';
+			$html.= '</tr>';
+		}
+
+		$html.= '</table>';
+
+		$html.= '<a id="add" href="#"><span class="btn btn-success btn-small input-medium" style="float:left"><strong>' . JText::_('COM_ICAGENDA_ADD_DATE') . '</strong></span></a><br/>';
+
+		$html.= '<input type="hidden"';
+		$html.= ' class="date' . $class . '"';
+		$html.= ' id="' . $this->id . '_id"';
+		$html.= ' name="' . $this->name . '"';
+		$html.= ' value=\''.$datesDB.'\'';
+		$html.= '/>';
+
+		return $html;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/enddate.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/enddate.php
new file mode 100644
index 00000000..b331e06d
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/enddate.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.5.10 2015-08-13
+ * @since       2.0.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined( '_JEXEC' ) or die( 'Restricted access' );
+
+jimport( 'joomla.filesystem.path' );
+jimport('joomla.form.formfield');
+
+/**
+ * Form Field to load a enddate datetime picker input
+ *
+ * @since	2.0.0
+ */
+class JFormFieldModal_enddate extends JFormField
+{
+	protected $type = 'modal_enddate';
+
+	protected function getInput()
+	{
+		$class = ! empty($this->class) ? ' class="' . $this->class . '"' : '';
+
+		$lang = JFactory::getLanguage();
+
+		if ($lang->getTag() == 'fa-IR')
+		{
+			// Including fallback code for HTML5 non supported browsers.
+			JHtml::_('jquery.framework');
+			JHtml::_('script', 'system/html5fallback.js', false, true);
+
+			$attributes = '';
+
+			$html = JHtml::_('calendar', $this->value, $this->name, 'enddate_jalali', '%Y-%m-%d %H:%M:%S', $attributes);
+		}
+		else
+		{
+			$html ='<input type="text" id="enddate"' . $class . ' name="' . $this->name . '" value="' . $this->value . '"/>';
+		}
+
+		return $html;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/evt.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/evt.php
new file mode 100644
index 00000000..95381a7d
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/evt.php
@@ -0,0 +1,351 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.13 2018-04-06
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.3.3
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+jimport( 'joomla.filesystem.path' );
+jimport('joomla.form.formfield');
+
+class JFormFieldModal_evt extends JFormField
+{
+	protected $type = 'modal_evt';
+
+	protected function getInput()
+	{
+		$jinput		= JFactory::getApplication()->input;
+		$view		= $jinput->get('view');
+		$id			= $jinput->get('id', null);
+		$eventid	= $jinput->get('eventid', $this->value);
+
+		$class		= isset($this->class) ? ' class="' . $this->class . '"' : '';
+
+		$typeReg = $db_date = $db_period = $db_date_is_valid = '';
+
+		$db		= JFactory::getDbo();
+		$query	= $db->getQuery(true);
+		$query->select('e.title, e.state, e.id, e.weekdays, e.params')
+			->from('`#__icagenda_events` AS e');
+
+		if ($view == 'mail')
+		{
+			// Join Total of registrations
+			$query->select('r.count AS registered');
+			$sub_query = $db->getQuery(true);
+			$sub_query->select('r.state, r.date AS reg_date, r.period AS reg_period, r.eventid, sum(r.people) AS count');
+			$sub_query->from('`#__icagenda_registration` AS r');
+			$sub_query->where('r.state = 1');
+			$sub_query->where('r.email <> ""');
+			$sub_query->group('r.eventid');
+			$query->leftJoin('(' . (string) $sub_query . ') AS r ON (e.id = r.eventid)');
+			$query->where('r.count > 0');
+		}
+
+		$query->order('e.title ASC');
+
+		$db->setQuery($query);
+		$events	= $db->loadObjectList();
+
+		if ($eventid != 0 && $id && $view == 'registration')
+		{
+			$query	= $db->getQuery(true);
+			$query->select('r.date AS reg_date, r.period AS reg_period')
+				->from('`#__icagenda_registration` AS r');
+			$query->where('r.eventid = ' . (int) $eventid);
+			$query->where('r.id = ' . (int) $id);
+			$db->setQuery($query);
+			$reg	= $db->loadObject();
+
+			if ($reg)
+			{
+				$db_date			= $reg->reg_date;
+				$db_date_is_valid	= iCDate::isDate($db_date);
+				$db_period			= $reg->reg_period;
+			}
+		}
+
+		// User state used in Newsletter
+		$data				= JFactory::getApplication()->getUserState('com_icagenda.mail.data', array());
+		$session_eventid	= isset($data['eventid']) ? $data['eventid'] : $eventid;
+		$session_date		= isset($data['date']) ? $data['date'] : '';
+
+		$html = '<div style="margin-bottom: 10px">';
+		$html.= '<select id="' . $this->id . '_id"' . $class . ' name="' .
+			$this->name . '">';
+
+		$value = isset($this->value) ? $this->value : '';
+
+		$html.= '<option value=""';
+
+		if ( ! $id || ! $this->value)
+		{
+			$html.= ' selected="selected"';
+		}
+
+		$html.= '>' . JText::_('COM_ICAGENDA_SELECT_EVENT') . '</option>';
+
+		foreach ($events as $e)
+		{
+			if ($e->state == '1')
+			{
+				$html.= '<option value="' . $e->id . '"';
+
+				if ($eventid == $e->id)
+				{
+					$evtParams  = new JRegistry($e->params);
+					$typeReg    = $evtParams->get('typeReg', 1);
+					$weekdays   = $e->weekdays;
+
+					$html.= ' selected="selected"';
+				}
+
+				if ($view == 'registration')
+				{
+					$html.= '>' . $e->title . ' (id:' . $e->id . ')</option>';
+				}
+				else
+				{
+					$html.= '>' . $e->title . ' (&#10003;' . $e->registered . ' - id:' . $e->id . ')</option>';
+				}
+			}
+			elseif ($eventid == $e->id)
+			{
+				$html.= '<option value="' . $value . '"';
+				$html.= ' selected="selected"';
+				$html.= '>' . JText::_('COM_ICAGENDA_REGISTRATION_EVENT_NOT_PUBLISHED') . '</option>';
+			}
+		}
+
+		$html.= '</select>';
+		$html.= '</div>';
+
+		$id_display = $id ? '&id=' . (int) $id : '';
+
+		if ($view == 'registration')
+		{
+			// Info message with 'Registration Type' option setting, if the saved date is not in the list of dates for selected event.
+			if ($typeReg == 1)
+			{
+				$reg_type = JText::_('COM_ICAGENDA_REG_BY_INDIVIDUAL_DATE');
+			}
+			elseif ($typeReg == 2)
+			{
+				$reg_type = JText::_('COM_ICAGENDA_REG_FOR_ALL_DATES');
+			}
+			else
+			{
+				$reg_type = JText::_('COM_ICAGENDA_REG_BY_DATE_OR_PERIOD');
+			}
+
+			$registration_type = '<strong>' . $reg_type . '</strong>';
+
+			$alert_reg_type = '<div class="alert alert-info">';
+			$alert_reg_type.= '<small>' . JText::sprintf('COM_ICAGENDA_REGISTRATION_TYPE_FOR_THIS_EVENT', $registration_type) . '</small>';
+			$alert_reg_type.= '</div>';
+			$alert_reg_type = addslashes($alert_reg_type);
+
+			// Alert message for a date saved with a version before 3.3.3 (date not formatted as expected in sql format)
+			$date_no_longer_exists = '<strong>"' . $db_date . '"</strong>';
+			$alert_date_format = '<div class="ic-alert ic-alert-note"><span class="iCicon-info"></span> <strong>' . JText::_('NOTICE') . '</strong><br />' . JText::sprintf('COM_ICAGENDA_REGISTRATION_ERROR_DATE_CONTROL', $date_no_longer_exists) . '</div>';
+			$alert_date_format = addslashes($alert_date_format);
+
+			// Alert message if a date does not exist anymore for the selected event
+			$alert_date_no_longer_exists = '<div class="alert alert-error"><strong>' . JText::_('COM_ICAGENDA_FORM_WARNING') . '</strong><br /><small>' . JText::sprintf('COM_ICAGENDA_REGISTRATION_DATE_NO_LONGER_EXISTS', $date_no_longer_exists) . '</small></div>';
+			$alert_date_no_longer_exists = addslashes($alert_date_no_longer_exists);
+
+			// Alert message if a date does not exist anymore for the selected event
+			$alert_full_period_no_longer_exists = '<div class="alert alert-error"><strong>' . JText::_('COM_ICAGENDA_FORM_WARNING') . '</strong><br /><small>' . JText::sprintf('COM_ICAGENDA_REGISTRATION_PERIOD_NO_LONGER_EXISTS', $date_no_longer_exists) . '</small></div>';
+			$alert_full_period_no_longer_exists = addslashes($alert_full_period_no_longer_exists);
+
+			// Alert message if a date or period is set for the registration, but event registration type is now 'for all dates of the event'
+			$for_all_dates = '<strong>' . JText::_('COM_ICAGENDA_ADMIN_REGISTRATION_FOR_ALL_DATES') . '</strong>';
+			$alert_by_date_no_longer_possible = '<div class="alert alert-error"><strong>' . JText::_('COM_ICAGENDA_FORM_WARNING') . '</strong><br /><small>' . JText::sprintf('COM_ICAGENDA_REGISTRATION_BY_DATE_NO_LONGER_POSSIBLE', $for_all_dates, $for_all_dates) . '</small></div>';
+			$alert_by_date_no_longer_possible = addslashes($alert_by_date_no_longer_possible);
+
+			// Alert message if registration for all dates of the event, but event registration type is now 'select list of dates'
+			$by_date = '<strong>' . JText::_('COM_ICAGENDA_ADMIN_REGISTRATION_BY_INDIVIDUAL_DATE') . '</strong>';
+			$alert_for_all_dates_no_longer_possible = '<div class="alert alert-error"><strong>' . JText::_('COM_ICAGENDA_FORM_WARNING') . '</strong><br /><small>' . JText::sprintf('COM_ICAGENDA_REGISTRATION_FOR_ALL_DATES_NO_LONGER_POSSIBLE', $by_date) . '</small></div>';
+			$alert_for_all_dates_no_longer_possible = addslashes($alert_for_all_dates_no_longer_possible);
+
+			$html.= '<div id="date-alert">';
+			$html.= '</div>';
+
+			if ($typeReg == '1')
+			{
+				?>
+				<script type="text/javascript">
+					jQuery(document).ready(function($) {
+						var value = $('#jform_date_id').val(),
+							reg_id = '<?php echo $id; ?>',
+							db_date = '<?php echo $db_date; ?>',
+							db_period = '<?php echo $db_period; ?>',
+							db_weekdays = '<?php echo $weekdays; ?>',
+							db_date_is_valid = '<?php echo $db_date_is_valid; ?>',
+							alert_reg_type = '<?php echo $alert_reg_type; ?>',
+							alert_date_format = '<?php echo $alert_date_format; ?>',
+							alert_date_no_longer_exists = '<?php echo $alert_date_no_longer_exists; ?>',
+							alert_full_period_no_longer_exists = '<?php echo $alert_full_period_no_longer_exists; ?>',
+							alert_for_all_dates_no_longer_possible = '<?php echo $alert_for_all_dates_no_longer_possible; ?>';
+
+						if (reg_id) {
+							if ( db_date == '' && db_period == '1' ) {
+								// Registration for all dates, not possible if registration type is per date
+								$('#date-alert').html(alert_reg_type+alert_for_all_dates_no_longer_possible);
+							}
+							else if ( !db_date_is_valid && db_date !== '' ) {
+								// Date is not empty, but not a valid sql format (registration before release 3.3.3)
+								$('#date-alert').html(alert_reg_type+alert_date_format);
+							}
+							else if ( db_date !== value && db_period !== '0') {
+								// Date is not empty, but date is not anymore set for this event
+								$('#date-alert').html(alert_date_no_longer_exists);
+							}
+							else if ( db_date == '' && db_period == '0' &&
+								db_weekdays !== '' && db_weekdays !== '0') {
+								// Date is not empty, but date is not anymore set for this event
+								$('#date-alert').html(alert_full_period_no_longer_exists);
+							}
+						}
+
+						$('#jform_date_id').change(function(e) {
+							$('#jform_period').val('0');
+							$('#date-alert').html('');
+						});
+					});
+				</script>
+				<?php
+			}
+			elseif ($typeReg == '2')
+			{
+				?>
+				<script type="text/javascript">
+					jQuery(document).ready(function($) {
+						var value = $('#jform_date_id').val(),
+							db_date = '<?php echo $db_date; ?>',
+							db_period = '<?php echo $db_period; ?>',
+							alert_reg_type = '<?php echo $alert_reg_type; ?>',
+							alert_by_date_no_longer_possible = '<?php echo $alert_by_date_no_longer_possible; ?>';
+
+						$('#date-alert').html(alert_reg_type);
+
+						if ( db_period !== '1' ) {
+							// Date is empty, not possible if registration type is per date
+							$('#date-alert').html(alert_reg_type+alert_by_date_no_longer_possible);
+						}
+
+//						if ( value == 'period' ) {
+//							$('#jform_period').val('1');
+//							$('#date-alert').html('');
+//						}
+
+						$('#jform_date_id').change(function(e) {
+//							if ( value == 'update' ) {
+								$('#jform_period').val('1');
+								$('#date-alert').html('');
+//							}
+						});
+					});
+				</script>
+			<?php
+			}
+		}
+		?>
+		<script type="text/javascript">
+		jQuery(document).ready(function($) {
+			var view = '<?php echo $view; ?>',
+				regid = '<?php echo $id; ?>',
+				eventid = '<?php echo $session_eventid; ?>',
+				date = '<?php echo $session_date; ?>',
+				list_target_id = 'jform_date_id',
+				list_select_id = '<?php echo $this->id; ?>_id',
+				initial_target_html = '<option value=""><?php echo JText::_("COM_ICAGENDA_SELECT_NO_EVENT_SELECTED"); ?>...</option>',
+				loading = '<?php echo JText::_("IC_LOADING"); ?>';
+
+			if (eventid > 0) {
+				$('#'+list_target_id).removeAttr('readonly');
+				$('#'+list_target_id).val(date);
+
+				$.ajax({url: 'index.php?option=com_icagenda&task='+view+'.dates&eventid='+eventid+'&regid='+regid,
+					success: function(output) {
+							$('#'+list_target_id).html(output);
+					},
+					error: function (xhr, ajaxOptions, thrownError) {
+							alert(xhr.status + " "+ thrownError);
+					}
+				});
+
+				$('#'+list_select_id).change(function(e) {
+					$('#'+list_target_id).removeAttr('readonly');
+
+					var selectvalue = $(this).val();
+
+					$('#'+list_target_id).html('<option value="">'+loading+'</option>');
+
+					if (selectvalue == "") {
+						$('#'+list_target_id).attr('readonly', 'true');
+						$('#'+list_target_id).html(initial_target_html);
+					} else {
+						$.ajax({url: 'index.php?option=com_icagenda&task='+view+'.dates&eventid='+selectvalue+'&regid='+regid,
+							success: function(output) {
+									$('#'+list_target_id).html(output);
+							},
+							error: function (xhr, ajaxOptions, thrownError) {
+									alert(xhr.status + " "+ thrownError);
+							}
+						});
+					}
+				});
+			} else {
+				$('#'+list_target_id).attr('readonly', 'true');
+				$('#'+list_target_id).html(initial_target_html);
+
+				$('#'+list_select_id).change(function(e) {
+					$('#'+list_target_id).removeAttr('readonly');
+
+					var selectvalue = $(this).val();
+
+					$('#'+list_target_id).html('<option value="">'+loading+'</option>');
+
+					if (selectvalue == "") {
+						$('#'+list_target_id).attr('readonly', 'true');
+						$('#'+list_target_id).html(initial_target_html);
+					} else {
+						$.ajax({url: 'index.php?option=com_icagenda&task='+view+'.dates&eventid='+selectvalue+'&regid='+regid,
+							success: function(output) {
+									$('#'+list_target_id).html(output);
+							},
+							error: function (xhr, ajaxOptions, thrownError) {
+									alert(xhr.status + " "+ thrownError);
+							}
+						});
+					}
+				});
+				$('#jform_date_id').change(function(e) {
+					var new_value = $('#jform_date_id').val();
+					if ( new_value == 'period' ) {
+						$('#jform_period').val('1');
+						$('#date-alert').html('');
+					}
+				});
+			}
+		});
+		</script>
+		<?php
+
+		return $html;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/evt_date.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/evt_date.php
new file mode 100644
index 00000000..6c602de6
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/evt_date.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-26
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.3.3
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+jimport( 'joomla.filesystem.path' );
+jimport('joomla.form.formfield');
+
+class JFormFieldModal_evt_date extends JFormField
+{
+	protected $type = 'modal_evt_date';
+
+	protected function getInput()
+	{
+		$jinput = JFactory::getApplication()->input;
+		$view   = $jinput->get('view');
+
+		$id = ($view == 'mail') ? $jinput->getInt('eventid', '0') : $jinput->getInt('id', '0');
+
+		if ($id != 0)
+		{
+			$db    = JFactory::getDbo();
+			$query = $db->getQuery(true);
+			$query->select('r.id as reg_id, r.date AS reg_date, r.period AS reg_period, r.eventid AS reg_eventid, sum(r.people) AS reg_count')
+				->from('#__icagenda_registration AS r');
+
+			if ($view == 'mail')
+			{
+				$query->where('r.state = 1');
+				$query->group('r.date');
+			}
+
+			$query->where('r.eventid = ' . (int) $id);
+
+			$db->setQuery($query);
+
+			if ($view == 'mail')
+			{
+				$result = $db->loadObjectList();
+			}
+			else
+			{
+				$result    = $db->loadObject();
+				$event_id  = $result->reg_eventid;
+				$saveddate = $result->reg_date;
+			}
+		}
+		elseif ($view == 'registration')
+		{
+			$event_id  = '';
+			$saveddate = '';
+		}
+
+		if ($view == 'registration')
+		{
+			// Test if date saved in in datetime data format
+			$date_is_datetime_sql = false;
+			$array_ex_date        = array('-', ' ', ':');
+			$d_ex                 = str_replace($array_ex_date, '-', $saveddate);
+			$d_ex                 = explode('-', $d_ex);
+
+			if (count($d_ex) > 4)
+			{
+				if (   strlen($d_ex[0]) == 4
+					&& strlen($d_ex[1]) == 2
+					&& strlen($d_ex[2]) == 2
+					&& strlen($d_ex[3]) == 2
+					&& strlen($d_ex[4]) == 2   )
+				{
+					$date_is_datetime_sql = true;
+				}
+			}
+
+			// Test if registered date before 3.3.3 could be converted
+			// Control if new date format (Y-m-d H:i:s)
+			$input    = trim($saveddate);
+			$is_valid = date('Y-m-d H:i:s', strtotime($input)) == $input;
+
+			if ($is_valid
+				&& strtotime($saveddate))
+			{
+				$date_get     = explode (' ', $saveddate);
+				$saved_date   = $date_get['0'];
+				$saved_time   = date('H:i:s', strtotime($date_get['1']));
+			}
+			else
+			{
+				// Explode to test if stored in old format in database
+				$ex_saveddate = explode (' - ', $saveddate);
+				$saved_date   = isset($ex_saveddate['0']) ? trim($ex_saveddate['0']) : '';
+				$saved_time   = isset($ex_saveddate['1']) ? trim(date('H:i:s', strtotime($ex_saveddate['1']))) : '';
+			}
+
+			$data_eventid = $event_id;
+
+			$eventid_url = $jinput->getInt('eventid', '');
+
+			if ( ! $date_is_datetime_sql && $saveddate )
+			{
+				$saveddate_text = '"<b>' . $saveddate . '</b>"';
+				echo '<div class="ic-alert ic-alert-note"><span class="iCicon-info"></span> <strong>' . JText::_('NOTICE') . '</strong><br />'
+					. JText::sprintf('COM_ICAGENDA_REGISTRATION_ERROR_DATE_CONTROL', $saveddate_text) . '</div>';
+			}
+
+			$event_id = isset($event_id) ? $eventid_url : '';
+
+			$html = '<select name="' . $this->name . '" id="' . $this->id . '_id" data-chosen="true"></select>';
+		}
+		else
+		{
+			$html = '<select name="' . $this->name . '" id="' . $this->id . '_id" data-chosen="true"></select>';
+		}
+
+		return $html;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/ic_editor.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/ic_editor.php
new file mode 100644
index 00000000..ff9940a7
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/ic_editor.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.6.0 2015-10-14
+ * @since       3.3.7
+ *
+ * @deprecated  4.0.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+jimport( 'joomla.filesystem.path' );
+jimport('joomla.form.formfield');
+
+class JFormFieldModal_iC_editor extends JFormField
+{
+	/**
+	 * The form field type.
+	 */
+	protected $type = 'modal_iC_editor';
+
+	/**
+	 * Method to get the field input markup.
+	 */
+	protected function getInput()
+	{
+		$icBody = $this->value;
+
+		if (strpos($icBody,'\n') !== false)
+		{
+			$array_newline = array('\\n', '\n');
+			$icBody = str_replace($array_newline, '<br />', $icBody);
+		}
+
+		$editor = JFactory::getEditor();
+
+		$html	= array();
+
+		$html[] = '<div id="'.$this->name.'_ic_editor"><fieldset class="span9 iCleft">';
+		$html[] = $editor->display($this->name, $icBody, "100%", "300", "300", "20", 1, null, null, null, array('mode' => 'advanced'));
+		$html[] = '</fieldset></div>';
+
+		return implode("\n", $html);
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/ic_password.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/ic_password.php
new file mode 100644
index 00000000..45e29d07
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/ic_password.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-30
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.4.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+jimport('joomla.filesystem.path');
+jimport('joomla.form.formfield');
+
+class JFormFieldModal_ic_password extends JFormField
+{
+	protected $type = 'modal_ic_password';
+
+	protected function getInput()
+	{
+		$_pass = str_replace('/', '.', $this->value);
+		$pass_ex = explode('.', $_pass);
+
+		if (isset($pass_ex[1]))
+		{
+			$value = base64_decode($pass_ex[1]); // Decode password data stored
+		}
+		else
+		{
+			$value = $this->value;
+		}
+
+		$html = '<input type="password" id="' . $this->id . '" name="' . $this->name . '" value="' . $value . '" />';
+
+		return $html;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/icalert_msg.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/icalert_msg.php
new file mode 100644
index 00000000..482dc414
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/icalert_msg.php
@@ -0,0 +1,192 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.3.3 2014-04-12
+ * @since       3.2.8
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+jimport( 'joomla.filesystem.path' );
+jimport('joomla.form.formfield');
+
+class JFormFieldModal_icalert_msg extends JFormField
+{
+	protected $type='modal_icalert_msg';
+
+	protected function getLabel()
+	{
+		return ' ';
+	}
+
+	protected function getInput()
+	{
+		$replace = array("jform", "params", "[", "]");
+		$name_input = str_replace($replace, "", $this->name);
+		$get_error = explode('_', $name_input);
+		$error = $get_error['1'];
+		$name = $get_error['0'];
+
+		$url=JPATH_SITE.'/components/com_icagenda/themes/packs';
+
+		// Set Function to condition to be checked
+		$events_php=$this->getList($url);
+		$cal_date=$this->getCalDate($url);
+
+		if ($name == 'eventsfile')
+		{
+			$list = $events_php;
+			$doc_url = 'http://www.icagenda.com/theme-pack-upgrade/3-2-8-new-option-all-dates';
+			$parent_field = 'datesDisplay';
+			$action_value = '1';
+		}
+		elseif ($name == 'caldate')
+		{
+			$list = $cal_date;
+			$doc_url = 'http://www.icagenda.com/theme-pack-upgrade/3-3-3-change-cal-date-to-data-cal-date';
+			$parent_field = 'setTodayTimezone';
+			$action_value = '';
+		}
+
+		$span_style	= 'input-xlarge';
+
+		if (version_compare(JVERSION, '3.0', 'lt')) {
+			$listP		= implode('<br /> - ', $list);
+			$setlist	= ' - '.$listP.' ';
+		} else {
+			$listP		= implode('</li><li>', $list);
+			$setlist	= '<ul><li>'.$listP.'</li></ul>';
+//			$span_style	= 'span8';
+		}
+
+		$html	= array();
+
+		if (count($list) >= 1)
+		{
+			$html[]	= '<div id="icalert_'.$this->id.'" class="'.$span_style.' alert alert-error" style="clear:both">';
+			$html[]	=  '<b>'.JText::_( $this->title ).'</b>';
+			$html[]	= '<p>';
+			$html[]	=  JText::_( $this->description ) . ' <a class="modal" rel="{size: {x: 700, y: 500}, handler:\'iframe\'}" href="'.$doc_url.'">' .JText::_( 'IC_MORE_INFORMATION' ). '</a>';
+			$html[]	= '</p>';
+
+			if ($this->id == 'jform_params_'.$name.'_error')
+			{
+				$html[]	= '<p>';
+				$html[]	= '<b><i>'.JText::_( 'COM_ICAGENDA_EVENTS_PHPFILE_MISSING_PACKS_LIST' ).'</i></b><br />';
+				$html[]	= $setlist;
+				$html[]	= '</p>';
+			}
+			$html[]	= '</div>';
+
+			$html[] = '<script type="text/javascript">';
+			$html[]	= '		var icdisplay = document.getElementById("jform_params_'.$parent_field.'").value;';
+			$html[] = '		document.getElementById("icalert_'.$this->id.'").style.display = "none";';
+			$html[] = '		if (icdisplay == "'.$action_value.'") {';
+			$html[] = '			document.getElementById("icalert_'.$this->id.'").style.display = "block";';
+			$html[] = '		}';
+			$html[]	= '	function icalert()';
+			$html[]	= '	{';
+			$html[]	= '		var icdisplay = document.getElementById("jform_params_'.$parent_field.'").value;';
+			$html[] = '		document.getElementById("icalert_'.$this->id.'").style.display = "none";';
+			$html[] = '		if (icdisplay == "'.$action_value.'") {';
+			$html[] = '			document.getElementById("icalert_'.$this->id.'").style.display = "block";';
+			$html[] = '		}';
+			$html[]	= '	}';
+			$html[] = '</script>';
+		}
+
+		return implode("\n", $html);
+	}
+
+	/**
+	 * Function to check if the file 'THEME_events.php' exists in each Theme Pack
+	 */
+	function getList($dirname)
+	{
+		$arrayfiles = Array();
+
+		if(file_exists($dirname))
+		{
+			$handle = opendir($dirname);
+
+			while (false !== ($file = readdir($handle)))
+			{
+				if ( !is_file($dirname.$file)
+					&& $file!= '.'
+					&& $file!='..'
+					&& $file!='index.php'
+					&& $file!='index.html'
+					&& $file!='.DS_Store'
+					&& $file!='.thumbs' )
+				{
+					if (!file_exists($dirname.'/'.$file.'/'.$file.'_events.php'))
+					{
+						array_push($arrayfiles,$file);
+					}
+				}
+			}
+			$handle = closedir($handle);
+		}
+		sort($arrayfiles);
+
+		return $arrayfiles;
+	}
+
+	/**
+	 * Function to check if 'data-cal-date' is defined inside the file 'THEME_day.php' for each Theme Pack.
+	 * Returns an alert if deprecated 'cal_date' found.
+	 */
+	function getCalDate($dirname)
+	{
+		$arrayfiles = Array();
+
+		if (ini_get('allow_url_fopen'))
+		{
+			if (file_exists($dirname))
+			{
+				$handle = opendir($dirname);
+
+				while (false !== ($file = readdir($handle)))
+				{
+					if ( !is_file($dirname.$file)
+						&& $file!= '.'
+						&& $file!='..'
+						&& $file!='index.php'
+						&& $file!='index.html'
+						&& $file!='.DS_Store'
+						&& $file!='.thumbs' )
+					{
+						$t_day = $dirname.'/'.$file.'/'.$file.'_day.php';
+						$file_t_day = file_get_contents($t_day);
+
+						if (!strpos($file_t_day, "cal_date")
+							&& !strpos($file_t_day, "data-cal-date"))
+						{
+							array_push($arrayfiles,$file);
+						}
+						elseif (strpos($file_t_day, "cal_date"))
+						{
+							array_push($arrayfiles,$file);
+						}
+					}
+				}
+			}
+			$handle = closedir($handle);
+		}
+		sort($arrayfiles);
+
+		return $arrayfiles;
+	}
+
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/icfile.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/icfile.php
new file mode 100644
index 00000000..90166360
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/icfile.php
@@ -0,0 +1,145 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-26
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+jimport('joomla.form.formfield');
+
+class JFormFieldModal_icfile extends JFormField
+{
+	public $type = 'modal_icfile';
+
+	protected static $initialised = false;
+
+	/**
+	 * Method to get the field input markup for a media selector.
+	 * Use attributes to identify specific created_by and asset_id fields
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   11.1
+	 */
+	protected function getInput()
+	{
+		$assetField  = $this->element['asset_field'] ? (string) $this->element['asset_field'] : 'asset_id';
+		$authorField = $this->element['created_by_field'] ? (string) $this->element['created_by_field'] : 'created_by';
+		$asset       = $this->form->getValue($assetField) ? $this->form->getValue($assetField) : (string) $this->element['asset_id'];
+
+		if ($asset == '')
+		{
+			$asset = JFactory::getApplication()->input->get('option');
+		}
+
+		$link = (string) $this->element['link'];
+
+		if ( ! self::$initialised)
+		{
+			// Load the modal behavior script.
+			JHtml::_('behavior.modal');
+
+			// Build the script.
+			$script = array();
+			$script[] = '	function jInsertFieldValue(value, id) {';
+			$script[] = '		var old_id = document.id(id).value;';
+			$script[] = '		if (old_id != id) {';
+			$script[] = '			var elem = document.id(id)';
+			$script[] = '			elem.value = value;';
+			$script[] = '			elem.fireEvent("change");';
+			$script[] = '		}';
+			$script[] = '	}';
+
+			// Add the script to the document head.
+			JFactory::getDocument()->addScriptDeclaration(implode("\n", $script));
+
+			self::$initialised = true;
+		}
+
+		// Initialize variables.
+		$html = array();
+		$attr = '';
+
+		// Initialize some field attributes.
+		$attr .= $this->element['class'] ? ' class="' . (string) $this->element['class'] . '"' : '';
+		$attr .= $this->element['size'] ? ' size="' . (int) $this->element['size'] . '"' : '';
+		$attr .= $this->element['accept'] ? ' accept="' . (string) $this->element['accept'] . '"' : '';
+		$attr .= ((string) $this->element['disabled'] == 'true') ? ' disabled="disabled"' : '';
+
+		// Initialize JavaScript field attributes.
+		$attr .= $this->element['onchange'] ? ' onchange="' . (string) $this->element['onchange'] . '"' : '';
+
+		// The text field.
+		if ($this->value == NULL)
+		{
+			$html[] = '<span>';
+			$html[] = '	<input type="file" style="cursor: pointer" name="' . $this->name . '" id="' . $this->id . '"' . ' value="'
+				. htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8') . '"' . ' ' . $attr . ' />';
+			$html[] = '</span>';
+		}
+		else
+		{
+			$html[] = '<span>';
+			$html[] = '	<input type="text" name="' . $this->name . '" id="' . $this->id . '"' . ' value="'
+				. htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8') . '"' . ' readonly="readonly"' . $attr . ' />';
+			$html[] = '</span>';
+		}
+
+//		$folder = 'icagenda_doc';
+
+		// The button.
+//		$html[] = '<div class="button2-left">';
+//		$html[] = '	<div class="blank">';
+//		$html[] = '		<a class="modal" title="' . JText::_('JLIB_FORM_BUTTON_SELECT') . '"' . ' href="'
+//			. ($this->element['readonly'] ? ''
+//			: ($link ? $link
+//				: 'index.php?option=com_media&amp;view=images&amp;tmpl=component&amp;asset=' . $asset . '&amp;author='
+//				. $this->form->getValue($authorField)) . '&amp;fieldid=' . $this->id . '&amp;folder=' . $folder) . '"'
+//			. ' rel="{handler: \'iframe\', size: {x: 800, y: 500}}">';
+//		$html[] = JText::_('JLIB_FORM_BUTTON_SELECT') . '</a>';
+//		$html[] = '	</div>';
+//		$html[] = '</div>';
+
+		if ($this->value == NULL)
+		{
+			$html[] = '<div class="button2-left">';
+			$html[] = '	<div class="blank">';
+			$html[] = '		<a title="' . JText::_('JLIB_FORM_BUTTON_CLEAR') . '"' . ' href="#" onclick="';
+			$html[] = 'document.id(\'' . $this->id . '\').value=\'\';';
+			$html[] = 'document.id(\'' . $this->id . '\').fireEvent(\'change\');';
+			$html[] = 'return false;';
+			$html[] = '">';
+			$html[] = JText::_('JLIB_FORM_BUTTON_CLEAR') . '</a>';
+			$html[] = '</div>';
+			$html[] = '</div>';
+		}
+		else
+		{
+			$html[] = '<div class="button2-left">';
+			$html[] = '	<div class="blank">';
+			$html[] = '		<a title="' . JText::_('JLIB_FORM_BUTTON_CLEAR') . '"' . ' href="#" onclick="';
+			$html[] = 'document.id(\'' . $this->id . '\').value=\'\';';
+			$html[] = 'document.id(\'' . $this->id . '\').fireEvent(\'change\');';
+			$html[] = 'return false;';
+			$html[] = '">';
+			$html[] = JText::_('JLIB_FORM_BUTTON_CLEAR') . '</a>';
+			$html[] = '</div>';
+			$html[] = '</div>';
+		}
+
+		return implode("\n", $html);
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/iclink_article.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/iclink_article.php
new file mode 100644
index 00000000..d1b37b7e
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/iclink_article.php
@@ -0,0 +1,195 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-26
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.3.3
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+jimport( 'joomla.filesystem.path' );
+jimport('joomla.form.formfield');
+
+/**
+ * Supports a modal article picker.
+ */
+class JFormFieldModal_iclink_article extends JFormField
+{
+	/**
+	 * The form field type.
+	 */
+	protected $type = 'modal_iclink_article';
+
+	/**
+	 * Method to get the field input markup.
+	 */
+	protected function getInput()
+	{
+		jimport('joomla.application.component.helper');
+
+		$icagendaParams = JComponentHelper::getParams('com_icagenda');
+
+		$Explode  = explode('_', $this->name);
+		$TypeName = $Explode[0] . ']';
+
+		$replace  = array("jform", "params", "[", "]");
+		$name     = str_replace($replace, "", $TypeName);
+
+		$allowEdit  = ((string) $this->element['edit'] == 'true') ? true : false;
+		$allowClear = ((string) $this->element['clear'] != 'false') ? true : false;
+
+		// Load language
+		JFactory::getLanguage()->load('com_content', JPATH_ADMINISTRATOR);
+
+		// Load the modal behavior script.
+		JHtml::_('behavior.modal', 'a.modal');
+
+		// Build the script.
+		$script = array();
+
+		// Select button script
+		$script[] = '	function jSelectArticle_' . $this->id . '(id, title, catid, object) {';
+		$script[] = '		document.getElementById("' . $this->id . '_id").value = id;';
+		$script[] = '		document.getElementById("' . $this->id . '_name").value = title;';
+
+		if ($allowEdit)
+		{
+			$script[] = '		jQuery("#' . $this->id . '_edit").removeClass("hidden");';
+		}
+
+		if ($allowClear)
+		{
+			$script[] = '		jQuery("#' . $this->id . '_clear").removeClass("hidden");';
+		}
+
+		$script[] = '		SqueezeBox.close();';
+		$script[] = '	}';
+
+		// Clear button script
+		static $scriptClear;
+
+		if ($allowClear && !$scriptClear)
+		{
+			$scriptClear = true;
+
+			$script[] = '	function jClearArticle(id) {';
+			$script[] = '		document.getElementById(id + "_id").value = "";';
+			$script[] = '		document.getElementById(id + "_name").value = "' . htmlspecialchars(JText::_('COM_CONTENT_SELECT_AN_ARTICLE', true), ENT_COMPAT, 'UTF-8') . '";';
+			$script[] = '		jQuery("#"+id + "_clear").addClass("hidden");';
+			$script[] = '		if (document.getElementById(id + "_edit")) {';
+			$script[] = '			jQuery("#"+id + "_edit").addClass("hidden");';
+			$script[] = '		}';
+			$script[] = '		return false;';
+			$script[] = '	}';
+		}
+
+		// Add the script to the document head.
+		JFactory::getDocument()->addScriptDeclaration(implode("\n", $script));
+
+		// Setup variables for display.
+		$html = array();
+		$link = 'index.php?option=com_content&amp;view=articles&amp;layout=modal&amp;tmpl=component&amp;function=jSelectArticle_' . $this->id;
+
+		if (isset($this->element['language']))
+		{
+			$link .= '&amp;forcedLanguage=' . $this->element['language'];
+		}
+
+		$db = JFactory::getDbo();
+		$db->setQuery(
+			'SELECT title' .
+			' FROM #__content' .
+			' WHERE id = ' . (int) $this->value
+		);
+
+		try
+		{
+			$title = $db->loadResult();
+		}
+		catch (RuntimeException $e)
+		{
+			throw new Exception($e->getMessage(), 500, $e);
+		}
+
+		if (empty($title))
+		{
+			$title = JText::_('COM_CONTENT_SELECT_AN_ARTICLE');
+		}
+		$title = htmlspecialchars($title, ENT_QUOTES, 'UTF-8');
+
+		// The active article id field.
+		if (0 == (int) $this->value)
+		{
+			$value = '';
+		}
+		else
+		{
+			$value = (int) $this->value;
+		}
+
+		// The current article display field.
+		$html[] = '<div id="' . $name . '_article"><fieldset class="span9 iCleft"><div>&nbsp;</div><span class="input-append">';
+		$html[] = '<input type="text" class="input-medium" style="margin:0px" id="' . $this->id . '_name" value="' . $title . '" disabled="disabled" size="35" />';
+
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			$html[] = '<a class="modal btn hasTooltip" title="' . JText::_('COM_CONTENT_CHANGE_ARTICLE') . '"  href="' . $link . '&amp;' . JSession::getFormToken() . '=1" rel="{handler: \'iframe\', size: {x: 800, y: 450}}">' . JText::_('JSELECT') . '</a>';
+		}
+		else
+		{
+			$html[] = '<a class="modal btn hasTooltip" title="' . JHtml::tooltipText('COM_CONTENT_CHANGE_ARTICLE') . '"  href="' . $link . '&amp;' . JSession::getFormToken() . '=1" rel="{handler: \'iframe\', size: {x: 800, y: 450}}"><i class="icon-file"></i> ' . JText::_('JSELECT') . '</a>';
+		}
+
+		// Edit article button
+		if ($allowEdit)
+		{
+			if (version_compare(JVERSION, '3.0', 'lt'))
+			{
+				$html[] = '<a class="btn hasTooltip' . ($value ? '' : ' hidden') . '" href="index.php?option=com_content&view=article&layout=edit&id=' . $value . '" target="_blank" title="' . JText::_('COM_CONTENT_EDIT_ARTICLE') . '" alt="' . JText::_('COM_CONTENT_EDIT_ARTICLE') . '" >' . JText::_('JACTION_EDIT') . '</a>';
+			}
+			else
+			{
+				$html[] = '<a class="btn hasTooltip' . ($value ? '' : ' hidden') . '" href="index.php?option=com_content&layout=modal&tmpl=component&task=article.edit&id=' . $value . '" target="_blank" title="' . JHtml::tooltipText('COM_CONTENT_EDIT_ARTICLE') . '" ><span class="icon-edit"></span> ' . JText::_('JACTION_EDIT') . '</a>';
+			}
+		}
+
+		// Clear article button
+		if ($allowClear)
+		{
+			if (version_compare(JVERSION, '3.0', 'lt'))
+			{
+				$html[] = '<a id="' . $this->id . '_clear" class="btn' . ($value ? '' : ' hidden') . '" onclick="return jClearArticle(\'' . $this->id . '\')">' . JText::_('JCLEAR') . '</a>';
+			}
+			else
+			{
+				$html[] = '<button id="' . $this->id . '_clear" class="btn' . ($value ? '' : ' hidden') . '" onclick="return jClearArticle(\'' . $this->id . '\')"><span class="icon-remove"></span> ' . JText::_('JCLEAR') . '</button>';
+			}
+		}
+
+		$html[] = '</span>';
+
+		// class='required' for client side validation
+		$class = '';
+
+		if ($this->required)
+		{
+			$class = ' class="required modal-value"';
+		}
+
+
+		$html[] = '<input type="hidden" id="' . $this->id . '_id"' . $class . ' name="' . $this->name . '" value="' . $value . '" /></fieldset></div>';
+
+		return implode("\n", $html);
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/iclink_type.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/iclink_type.php
new file mode 100644
index 00000000..65294aa3
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/iclink_type.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-26
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.3.3
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+jimport( 'joomla.filesystem.path' );
+jimport('joomla.form.formfield');
+
+/**
+ * Link type selector (Default, Article, URL).
+ */
+class JFormFieldModal_iclink_type extends JFormField
+{
+	/**
+	 * The form field type.
+	 */
+	protected $type = 'modal_iclink_type';
+
+	protected function getInput()
+	{
+		jimport('joomla.application.component.helper');
+
+		$jinput = JFactory::getApplication()->input;
+
+		$location = $jinput->get('option', 'com_config');
+
+		if ($location != 'com_config')
+		{
+			$default_text = JText::_('JGLOBAL_USE_GLOBAL');
+		}
+		else
+		{
+			$default_text = JText::_('IC_DEFAULT');
+		}
+
+		// Get Type value
+		$Type = isset($this->value) ? $this->value : '';
+
+		// Clean jform name
+		$replace = array("jform", "params", "[", "]");
+		$name    = str_replace($replace, "", $this->name);
+
+		$Type_default = $name . '_default';
+		$Type_article = $name . '_article';
+		$Type_url     = $name . '_url';
+
+		// Set Var type, to get selected option
+		$jinput->set('type', $Type);
+
+		// Article
+		if ($Type == '1')
+		{
+			$class_default   = '';
+			$class_article   = 'btn-success';
+			$class_url       = '';
+			$checked_default = '';
+			$checked_article = ' checked="checked"';
+			$checked_url     = '';
+		}
+
+		// URL
+		elseif ($Type == '2')
+		{
+			$class_default   = '';
+			$class_article   = '';
+			$class_url       = 'btn-success';
+			$checked_default = '';
+			$checked_article = '';
+			$checked_url     = ' checked="checked"';
+		}
+
+		// iCagenda default
+		else
+		{
+			$class_default   = 'btn-primary';
+			$class_article   = '';
+			$class_url       = '';
+			$checked_default = ' checked="checked"';
+			$checked_article = '';
+			$checked_url     = '';
+		}
+
+		$html   = array();
+		$html[] = '<fieldset class="radio btn-group">';
+		$html[] = '<label class="' . $class_default . '">' . $default_text . '<input type="radio"  id="' . $name . '_0" name="' . $this->name . '" value=""  onClick="icdefault_' . $name . '();"' . $checked_default . ' /></label>';
+		$html[] = '<label class="' . $class_article . '">' . JText::_( 'COM_ICAGENDA_REGISTRATION_LINK_ARTICLE' ) . '<input type="radio"  id="' . $name . '_1" name="' . $this->name . '" value="1"  onClick="icarticle_' . $name . '();"' . $checked_article . ' /></label>';
+		$html[] = '<label class="' . $class_url . '">' . JText::_( 'COM_ICAGENDA_REGISTRATION_LINK_URL' ) . '<input type="radio"  id="' . $name . '_2" name="' . $this->name . '" value="2"  onClick="icurl_' . $name . '();"' . $checked_url . ' /></label>';
+		$html[] = '</fieldset>';
+
+		// Script
+		$html[] = '<script type="text/javascript">';
+		$html[] = 'function icdefault_' . $name . '()';
+		$html[] = '{';
+		$html[] = 'document.getElementById("' . $Type_article . '").style.display = "none";';
+		$html[] = 'document.getElementById("' . $Type_url . '").style.display = "none";';
+//		$html[] = '$("#'.$name.'_0").attr("checked", "checked");';
+		$html[] = '}';
+		$html[] = 'function icarticle_' . $name . '()';
+		$html[] = '{';
+		$html[] = 'document.getElementById("' . $Type_article . '").style.display = "block";';
+		$html[] = 'document.getElementById("' . $Type_url . '").style.display = "none";';
+//		$html[] = '$("#'.$name.'_1").attr("checked", "checked");';
+		$html[] = '}';
+		$html[] = 'function icurl_' . $name . '()';
+		$html[] = '{';
+		$html[] = 'document.getElementById("' . $Type_article . '").style.display = "none";';
+		$html[] = 'document.getElementById("' . $Type_url . '").style.display = "block";';
+//		$html[] = '$("#'.$name.'_2").attr("checked", "checked");';
+		$html[] = '}';
+		$html[] = '</script>';
+
+		return implode("\n", $html);
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/iclink_url.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/iclink_url.php
new file mode 100644
index 00000000..c40c49b6
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/iclink_url.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-26
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.3.3
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+jimport('joomla.filesystem.path');
+jimport('joomla.form.formfield');
+
+/**
+ * Supports a url type field.
+ */
+class JFormFieldModal_iclink_url extends JFormField
+{
+	/**
+	 * The form field type.
+	 */
+	protected $type = 'modal_iclink_url';
+
+	/**
+	 * Method to get the field input markup.
+	 */
+	protected function getInput()
+	{
+		jimport('joomla.application.component.helper');
+
+		$icagendaParams = JComponentHelper::getParams('com_icagenda');
+
+		$Explode  = explode('_', $this->name);
+		$TypeName = $Explode[0] . ']';
+
+		$replace  = array("jform", "params", "[", "]");
+		$name     = str_replace($replace, "", $TypeName);
+
+		$Type = JFactory::getApplication()->input->get('type');
+
+		$Type_default = $name . '_default';
+		$Type_article = $name . '_article';
+		$Type_url     = $name . '_url';
+
+		$editor = JFactory::getEditor();
+
+		$html = array();
+
+		$html[] = '<div id="' . $Type_url . '"><fieldset class="span9 iCleft">';
+		$html[] = '<input type="url" name="' . $this->name . '" value="' . $this->value . '" />';
+		$html[] = '</fieldset></div>';
+
+		// Article
+		if ($Type == '1')
+		{
+			$html[] = '<script type="text/javascript">';
+			$html[] = 'document.getElementById("' . $Type_article . '").style.display = "block";';
+			$html[] = 'document.getElementById("' . $Type_url . '").style.display = "none";';
+			$html[] = '</script>';
+		}
+
+		// URL
+		elseif ($Type == '2')
+		{
+			$html[] = '<script type="text/javascript">';
+			$html[] = 'document.getElementById("' . $Type_article . '").style.display = "none";';
+			$html[] = 'document.getElementById("' . $Type_url . '").style.display = "block";';
+			$html[] = '</script>';
+		}
+
+		// iCagenda default
+		else
+		{
+			$html[] = '<script type="text/javascript">';
+			$html[] = 'document.getElementById("' . $Type_article . '").style.display = "none";';
+			$html[] = 'document.getElementById("' . $Type_url . '").style.display = "none";';
+			$html[] = '</script>';
+		}
+
+		return implode("\n", $html);
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/icmulti_checkbox.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/icmulti_checkbox.php
new file mode 100644
index 00000000..1c4b230d
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/icmulti_checkbox.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.2.6 2013-11-21
+ * @since       3.2.6
+ * @TODO        refactory OR to be removed for 3.7.0 (J3 support only)
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+jimport( 'joomla.filesystem.path' );
+jimport('joomla.form.formfield');
+
+class JFormFieldModal_icmulti_checkbox extends JFormField
+{
+	protected $type='modal_icmulti_checkbox';
+
+	protected function getLabel()
+	{
+	   return ' ';
+	}
+
+	protected function getInput()
+	{
+
+		$Explode = explode('_', $this->name);
+		$TypeName = $Explode[0].']';
+
+		$replace = array("jform", "[params]", "[", "]");
+		$name = str_replace($replace, "", $TypeName);
+
+		$selected = $this->value;
+		if (!is_array($selected)) $selected = array();
+
+		$check_1 = ' checked="checked"';
+		$check_2 = ' checked="checked"';
+
+		if (in_array('1', $selected)) {
+			$check_1 = ' checked="checked"';
+		} else {
+			$check_1 = '';
+		}
+		if (in_array('2', $selected)) {
+			$check_2 = ' checked="checked"';
+		} else {
+			$check_2 = '';
+		}
+
+		$Type_none = $name.'_none';
+		$Type_checkbox = $name.'_checkbox';
+
+		$html	= array();
+
+		$html[] = '<div id="'.$Type_checkbox.'"><fieldset class="span9 iCleft">';
+//		$html[] = '<input type="text" value="'.$this->value.'" name="'.$this->name.'"/>';
+		$html[] = '<div style="display: inline-block"><input type="checkbox" value="1" name="'.$this->name.'[]"'.$check_1.'/>&nbsp;'.JText::_( 'ICTITLE' ).'</div>';
+		$html[] = '<div style="display: inline-block"><input type="checkbox" value="2" name="'.$this->name.'[]"'.$check_2.'/>&nbsp;'.JText::_( 'ICDESC' ).'</div>';
+		$html[] = '</fieldset></div>';
+
+		$html[] = '<script type="text/javascript">';
+		$html[] = 'document.getElementById("'.$Type_checkbox.'").style.display = "none";';
+		$html[] = 'if (typeset == 1) {';
+		$html[] = 'document.getElementById("'.$Type_checkbox.'").style.display = "block";';
+		$html[] = '}';
+//		$html[] = 'if (typeset == 0) {';
+//		$html[] = 'document.getElementById("'.$Type_checkbox.'").style.display = "none";';
+//		$html[] = '}';
+		$html[] = '</script>';
+
+		return implode("\n", $html);
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/icmulti_opt.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/icmulti_opt.php
new file mode 100644
index 00000000..93221fe8
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/icmulti_opt.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.6.2 2016-09-19
+ * @since       3.2.6
+ * @TODO        refactory OR to be removed for 3.7.0 (J3 support only)
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+jimport( 'joomla.filesystem.path' );
+jimport('joomla.form.formfield');
+
+class JFormFieldModal_icmulti_opt extends JFormField
+{
+	protected $type='modal_icmulti_opt';
+
+	protected function getInput()
+	{
+		$replace = array("jform", "params", "[", "]");
+		$name_input = str_replace($replace, "", $this->name);
+		$get_location = explode('_', $name_input);
+		$location = $get_location['1'];
+		$name = $get_location['0'];
+
+		$Type = $this->value;
+
+		$Type_none = $name . '_none';
+		$Type_checkbox = $name . '_checkbox';
+
+		$class_global = 'btn-primary';
+		$class_none = 'btn-danger';
+		$class_checkbox = 'btn-success';
+		$checked_none = ' checked="checked"';
+		$checked_checkbox = '';
+
+		if ($Type == '0')
+		{
+			$class_global = '';
+			$class_none = 'btn-danger';
+			$class_checkbox = '';
+			$checked_global = '';
+			$checked_none = ' checked="checked"';
+			$checked_checkbox = '';
+		}
+		elseif ($Type == '1')
+		{
+			$class_global = '';
+			$class_none = '';
+			$class_checkbox = 'btn-success';
+			$checked_global = '';
+			$checked_none = '';
+			$checked_checkbox = ' checked="checked"';
+		}
+		else
+		{
+			$class_global = 'btn-primary';
+			$class_none = '';
+			$class_checkbox = '';
+			$checked_global = ' checked="checked"';
+			$checked_none = '';
+			$checked_checkbox = '';
+		}
+
+		$html = array();
+
+
+		$html[] = '<fieldset class="radio btn-group">';
+
+		if ($location == 'menu')
+		{
+			$html[] = '<label class="' . $class_global . '">' . JText::_('JGLOBAL_USE_GLOBAL') . '<input type="radio" id="' . $name . '_global" name="' . $this->name . '" value="global"  onClick="icglobal_' . $name . '();"' . $checked_global . ' /></label>';
+		}
+
+		$html[] = '<label class="' . $class_none . '">' . JText::_('JNO') . '<input type="radio" id="' . $name . '_0" name="' . $this->name . '" value="0"  onClick="icnone_' . $name . '();"' . $checked_none . ' /></label>';
+		$html[] = '<label class="' . $class_checkbox . '">' . JText::_('JYES') . '<input type="radio" id="' . $name . '_1" name="' . $this->name . '" value="1"  onClick="iccheckbox_' . $name . '();"' . $checked_checkbox . ' /></label>';
+		$html[] = '</fieldset>';
+
+
+		$html[] = '<script type="text/javascript">';
+		$html[] = 'var typeset = "' . $Type . '";';
+
+		if ($location == 'menu')
+		{
+			$html[] = 'function icglobal_' . $name . '() {';
+			$html[] = '    document.getElementById("' . $Type_checkbox . '").style.display = "none";';
+			$html[] = '    document.getElementById("' . $name . '_global").setAttribute("checked", "checked");';
+			$html[] = '}';
+		}
+
+		$html[] = 'function icnone_' . $name . '() {';
+		$html[] = '    document.getElementById("' . $Type_checkbox . '").style.display = "none";';
+		$html[] = '    document.getElementById("' . $name . '_0").setAttribute("checked", "checked");';
+		$html[] = '}';
+		$html[] = 'function iccheckbox_' . $name . '() {';
+		$html[] = '    document.getElementById("' . $Type_checkbox . '").style.display = "block";';
+		$html[] = '    document.getElementById("' . $name . '_1").setAttribute("checked", "checked");';
+		$html[] = '}';
+		$html[] = '</script>';
+
+		return implode("\n", $html);
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/ictext_content.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/ictext_content.php
new file mode 100644
index 00000000..44e52b7e
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/ictext_content.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.2.0.1 2013-09-22
+ * @since       3.2.0.1
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+jimport( 'joomla.filesystem.path' );
+jimport('joomla.form.formfield');
+
+class JFormFieldModal_ictext_content extends JFormField
+{
+	protected $type='modal_ictext_content';
+
+	protected function getInput()
+	{
+
+		jimport('joomla.application.component.helper');
+		$icagendaParams = JComponentHelper::getParams('com_icagenda');
+
+		$Explode = explode('_', $this->name);
+		$TypeName = $Explode[0].']';
+
+		$replace = array("jform", "[", "]");
+		$name = str_replace($replace, "", $TypeName);
+		$icContent = $icagendaParams->get($name.'_Content', '');
+
+		$Type = $icagendaParams->get($name, '');
+
+		$Type_default = $name.'_default';
+		$Type_content = $name.'_custom';
+
+
+		$editor = JFactory::getEditor();
+
+		$html	= array();
+
+		$html[] = '<div id="'.$Type_content.'"><fieldset class="span9 iCleft">';
+		$html[] = $editor->display($this->name, $icContent, "100%", "300", "300", "20", 1, null, null, null, array('mode' => 'advanced'));
+		$html[] = '</fieldset></div>';
+
+		if ($Type == '2') {
+			$html[] = '<script type="text/javascript">';
+//			$html[] = 'document.getElementById("'.$Type_default.'").style.display = "none";';
+			$html[] = 'document.getElementById("'.$Type_content.'").style.display = "block";';
+			$html[] = '</script>';
+		} else {
+			$html[] = '<script type="text/javascript">';
+			$html[] = 'document.getElementById("'.$Type_content.'").style.display = "none";';
+			$html[] = '</script>';
+		}
+
+		return implode("\n", $html);
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/ictext_placeholder.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/ictext_placeholder.php
new file mode 100644
index 00000000..029658b8
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/ictext_placeholder.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-26
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.2.10
+ *
+ * @deprecated  4.0.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+jimport( 'joomla.filesystem.path' );
+jimport('joomla.form.formfield');
+
+class JFormFieldModal_ictext_Placeholder extends JFormField
+{
+	protected $type = 'modal_ictext_Placeholder';
+
+	protected function getInput()
+	{
+		jimport('joomla.application.component.helper');
+
+		$class = JFactory::getApplication()->input->get('class');
+
+		$icagendaParams = JComponentHelper::getParams('com_icagenda');
+
+		$replace = array("jform", "[", "]", "_Placeholder");
+		$name    = str_replace($replace, "", $this->name);
+		$Type    = $name . '_Placeholder';
+
+		$tos_Type = $icagendaParams->get($Type);
+
+		$placeholder = ( ! isset($tos_Type)) ? JText::_( 'COM_ICAGENDA_' . strtoupper($name) . '_PLACEHOLDER') : '';
+
+		$html ='<input type="text" id="' . $this->id . '" class="' . $class . ' input-xxlarge" name="' . $this->name . '" value="' . $this->value . '" placeholder="' . $placeholder . '"/>';
+
+		return $html;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/ictext_type.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/ictext_type.php
new file mode 100644
index 00000000..8b2c65bc
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/ictext_type.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.2.0.1 2013-09-22
+ * @since       3.2.0.1
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+jimport( 'joomla.filesystem.path' );
+jimport('joomla.form.formfield');
+
+class JFormFieldModal_ictext_type extends JFormField
+{
+	protected $type='modal_ictext_type';
+
+	protected function getInput()
+	{
+		jimport('joomla.application.component.helper');
+
+		$icagendaParams = JComponentHelper::getParams('com_icagenda');
+
+		$replace = array("jform", "[", "]");
+		$name = str_replace($replace, "", $this->name);
+		$Type = $icagendaParams->get($name, '');
+
+		$Type_default = $name.'_default';
+		$Type_content = $name.'_custom';
+
+		$class_default = '';
+		$class_custom = '';
+		$checked_default = '';
+		$checked_custom = '';
+		if ($Type == '') {
+			$class_default = 'btn-success';
+			$checked_default = ' checked="checked"';
+			$checked_custom = '';
+		}
+		elseif ($Type == '2') {
+			$class_custom = 'btn-success';
+			$checked_default = '';
+			$checked_custom = ' checked="checked"';
+		} else {
+			$class_default = 'btn-success';
+			$checked_default = ' checked="checked"';
+			$checked_custom = '';
+		}
+
+		$html	= array();
+		$html[]	= '<fieldset class="radio btn-group">';
+		$html[]	= '<label class="'.$class_default.'">'.JText::_( 'IC_DEFAULT' ).'<input type="radio"  id="'.$name.'_0" name="'.$this->name.'" value=""  onClick="icdefault_'.$name.'();"'.$checked_default.' /></label>';
+		$html[]	= '<label class="'.$class_custom.'">'.JText::_( 'IC_CUSTOM_TEXT' ).'<input type="radio"  id="'.$name.'_2" name="'.$this->name.'" value="2"  onClick="iccustom_'.$name.'();"'.$checked_custom.' /></label>';
+		$html[]	= '</fieldset>';
+
+
+
+		$html[]	= '<script type="text/javascript">';
+		$html[]	= 'function icdefault_'.$name.'()';
+		$html[]	= '{';
+//		$html[]	= 'document.getElementById("'.$Type_default.'").style.display = "block";';
+		$html[]	= 'document.getElementById("'.$Type_content.'").style.display = "none";';
+		$html[]	= '$("#'.$name.'_0").attr("checked", "checked");';
+		$html[]	= '}';
+		$html[]	= 'function iccustom_'.$name.'()';
+		$html[]	= '{';
+//		$html[]	= 'document.getElementById("'.$Type_default.'").style.display = "none";';
+		$html[]	= 'document.getElementById("'.$Type_content.'").style.display = "block";';
+		$html[]	= '$("#'.$name.'_2").attr("checked", "checked");';
+		$html[]	= '}';
+		$html[]	= '</script>';
+
+		return implode("\n", $html);
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/ictextarea_counter.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/ictextarea_counter.php
new file mode 100644
index 00000000..ae2fe2cc
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/ictextarea_counter.php
@@ -0,0 +1,154 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.13 2018-04-04
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.4.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+jimport( 'joomla.filesystem.path' );
+jimport('joomla.form.formfield');
+
+/**
+ * Textarea with a counter. Short Description and Meta Description
+ *
+ * @package		iCagenda
+ * @subpackage	com_icagenda
+ * @since		3.4.0
+ */
+class JFormFieldModal_ictextarea_counter extends JFormField
+{
+	protected $type = 'modal_ictextarea_counter';
+
+	protected function getInput()
+	{
+		$app		= JFactory::getApplication();
+		$replace	= array("jform", "[", "]");
+		$name		= str_replace($replace, "", $this->name);
+		$nb_chars	= strlen(trim(utf8_decode($this->value)));
+		$class		= !empty($this->class) ? ' class="' . $this->class . '"' : '';
+
+		if ($app->isAdmin())
+		{
+			$params	= JComponentHelper::getParams('com_icagenda');
+			$iCparams	= JComponentHelper::getParams('com_icagenda');
+		}
+		else
+		{
+			$params	= $app->getParams();
+			$iCparams	= JComponentHelper::getParams('com_icagenda');
+		}
+
+		$session = JFactory::getSession();
+		$ic_submit_shortdesc = $session->get('ic_submit_shortdesc', '');
+		$ic_submit_metadesc = $session->get('ic_submit_metadesc', '');
+
+		$event_shortdesc = $ic_submit_shortdesc ? $ic_submit_shortdesc : $this->value;
+		$event_metadesc = $ic_submit_metadesc ? $ic_submit_metadesc : $this->value;
+
+		if ($name == 'shortdesc')
+		{
+			$ic_max_component	= $iCparams->get('char_limit_short_description', '100');
+			$ic_max				= $params->get('char_limit_short_description', '100');
+			$ic_max				= ($ic_max_component >= $ic_max) ? $ic_max : $ic_max_component;
+		}
+		elseif ($name == 'metadesc')
+		{
+			$ic_max_component	= $iCparams->get('char_limit_meta_description', '320');
+			$ic_max				= $params->get('char_limit_meta_description', '320');
+			$ic_max				= ($ic_max_component >= $ic_max) ? $ic_max : $ic_max_component;
+		}
+		else
+		{
+			$ic_max = $params->get('ShortDescLimit', '100');
+		}
+
+		// Alert if text stored in the database exceeds the character limit currently set.
+		$display_alert	= ($nb_chars > $ic_max) ? true : false;
+
+		$count_value = $nb_chars ? ($ic_max-$nb_chars) : $ic_max;
+		$ic_size = (strlen($ic_max))-1;
+		$ic_size = $ic_size ? $ic_size : '1';
+
+		$counter_input = '<input id="' . $name . '-counter"';
+//		$counter_input.= ' onblur="iCtextCounter(this.form.' . $this->name . ', this, ' . $ic_max . ');"';
+		$counter_input.= ' class="valid"';
+//		$counter_input.= ' onfocus="this.blur();"';
+//		$counter_input.= ' tabindex="999" maxlength="' . $ic_size . '" size="' . $ic_size . '"';
+		$counter_input.= ' size="' . $ic_size . '"';
+		$counter_input.= ' value="' . $count_value . '"';
+		$counter_input.= ' name="counter_' . $name . '">';
+
+		$html = '<div>';
+
+		if ($display_alert)
+		{
+			$html.= '<div class="alert alert-danger"><h3>Warning</h3><strong>'
+					. JText::sprintf('COM_ICAGENDA_ALERT_S_TEXT_S_EXCEEDS_CHARACTER_LIMIT', $this->title) . '</strong><br />'
+					. JText::_('COM_ICAGENDA_ALERT_EDIT_TEXT_TO_FIT_CHAR_LIMIT') . '<br /><br /><u>'
+					. JText::sprintf('COM_ICAGENDA_ALERT_S_TEXT_S_CURRENTLY_STORED_IN_DATABASE', $this->title) . '</u> :<br/><i>'
+					. $this->value . '</i></div>';
+		}
+		$html.= '<textarea';
+		$html.= ' onKeyPress="iCtextCounter(this, this.form.counter_' . $name.', ' . $ic_max . ');"';
+		$html.= ' onKeyUp="iCtextCounter(' . $name . ', counter_' . $name . ', ' . $ic_max . ');"';
+		$html.= ' onkeydown="iCtextCounter(' . $name . ', counter_' . $name . ', ' . $ic_max . ');"';
+		$html.= ' onmouseout="iCtextCounter(' . $name . ', counter_' . $name . ', ' . $ic_max . ');"';
+//		$html.= ' onpaste="' . $name . 'useractions();"';
+		$html.= $class . ' name="' . $this->name . '" id="' . $name . '">';
+
+		if ($name == 'shortdesc')
+		{
+			$html.= $event_shortdesc;
+
+			// clear the data so we don't process it again
+			$session->clear('ic_submit_shortdesc');
+		}
+		elseif ($name == 'metadesc')
+		{
+			$html.= $event_metadesc;
+
+			// clear the data so we don't process it again
+			$session->clear('ic_submit_metadesc');
+		}
+		else
+		{
+			$html.= $this->value;
+		}
+
+		$html.= '</textarea>';
+
+		$html.= '</div>';
+		$html.= '<div id="'.$name.'-counter-container" class="ic-counter-container">';
+		$html.= '<div class="ic-counter">';
+		$html.= JText::sprintf('COM_ICAGENDA_MAXIMUM_N_CHARACTERS', $ic_max);
+		$html.= '</div> ';
+		$html.= '<div class="ic-counter">';
+		$html.= JText::sprintf('COM_ICAGENDA_N_REMAINING', $counter_input);
+		$html.= '</div>';
+		$html.= '</div>';
+		$html.= '<div>&nbsp;</div>';
+
+//		$html.= '<textarea';
+//		$html.= ' onMouseOut="CheckFieldLength(this.' . $name . ', \'' . $name . '_charcount\', \'' . $name . '_remaining\', 140);"';
+//		$html.= ' onKeyDown="CheckFieldLength(this.' . $name . ', \'' . $name . '_charcount\', \'' . $name . '_remaining\', 140);"';
+//		$html.= ' onkeyup="CheckFieldLength(this.' . $name . ', \'' . $name . '_charcount\', \'' . $name . '_remaining\', 140);"';
+//		$html.= $class . ' name="' . $this->name . '" id ="' . $name . '">';
+//		$html.= '</textarea>';
+//		$html.= '<h2><span id="' . $name . '_charcount">0</span> characters entered   | <span id="' . $name . '_remaining">140</span> characters remaining</h2>';
+
+		return $html;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/ictxt_article.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/ictxt_article.php
new file mode 100644
index 00000000..28c4c433
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/ictxt_article.php
@@ -0,0 +1,201 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-26
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.2.5
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * Supports a modal article picker.
+ */
+class JFormFieldModal_ictxt_article extends JFormField
+{
+	/**
+	 * The form field type.
+	 */
+	protected $type = 'modal_ictxt_article';
+
+	/**
+	 * Method to get the field input markup.
+	 */
+	protected function getInput()
+	{
+		$icagendaParams = JComponentHelper::getParams('com_icagenda');
+
+		$replace = array("jform", "[", "]", "Article");
+		$name    = str_replace($replace, "", $this->name);
+
+		$tos_Type = $icagendaParams->get($name . '_Type', '');
+
+		$allowEdit  = ((string) $this->element['edit'] == 'true') ? true : false;
+		$allowClear = ((string) $this->element['clear'] != 'false') ? true : false;
+
+		// Load language
+		JFactory::getLanguage()->load('com_content', JPATH_ADMINISTRATOR);
+
+		// Load the modal behavior script.
+		JHtml::_('behavior.modal', 'a.modal');
+
+		// Build the script.
+		$script = array();
+
+		// Select button script
+		$script[] = '	function jSelectArticle_' . $this->id . '(id, title, catid, object) {';
+		$script[] = '		document.getElementById("' . $this->id . '_id").value = id;';
+		$script[] = '		document.getElementById("' . $this->id . '_name").value = title;';
+
+		if ($allowEdit)
+		{
+			$script[] = '		jQuery("#' . $this->id . '_edit").removeClass("hidden");';
+		}
+
+		if ($allowClear)
+		{
+			$script[] = '		jQuery("#' . $this->id . '_clear").removeClass("hidden");';
+		}
+
+		$script[] = '		SqueezeBox.close();';
+		$script[] = '	}';
+
+		// Clear button script
+		static $scriptClear;
+
+		if ($allowClear && !$scriptClear)
+		{
+			$scriptClear = true;
+
+			$script[] = '	function jClearArticle(id) {';
+			$script[] = '		document.getElementById(id + "_id").value = "";';
+			$script[] = '		document.getElementById(id + "_name").value = "' . htmlspecialchars(JText::_('COM_CONTENT_SELECT_AN_ARTICLE', true), ENT_COMPAT, 'UTF-8') . '";';
+			$script[] = '		jQuery("#"+id + "_clear").addClass("hidden");';
+			$script[] = '		if (document.getElementById(id + "_edit")) {';
+			$script[] = '			jQuery("#"+id + "_edit").addClass("hidden");';
+			$script[] = '		}';
+			$script[] = '		return false;';
+			$script[] = '	}';
+		}
+
+		// Add the script to the document head.
+		JFactory::getDocument()->addScriptDeclaration(implode("\n", $script));
+
+		// Setup variables for display.
+		$html	= array();
+		$link	= 'index.php?option=com_content&amp;view=articles&amp;layout=modal&amp;tmpl=component&amp;function=jSelectArticle_' . $this->id;
+
+		if (isset($this->element['language']))
+		{
+			$link .= '&amp;forcedLanguage=' . $this->element['language'];
+		}
+
+		$db	= JFactory::getDbo();
+		$db->setQuery(
+			'SELECT title' .
+			' FROM #__content' .
+			' WHERE id = ' . (int) $this->value
+		);
+
+		try
+		{
+			$title = $db->loadResult();
+		}
+		catch (RuntimeException $e)
+		{
+			throw new Exception($e->getMessage(), 500, $e);
+		}
+
+		if (empty($title))
+		{
+			$title = JText::_('COM_CONTENT_SELECT_AN_ARTICLE');
+		}
+		$title = htmlspecialchars($title, ENT_QUOTES, 'UTF-8');
+
+		// The active article id field.
+		if (0 == (int) $this->value)
+		{
+			$value = '';
+		}
+		else
+		{
+			$value = (int) $this->value;
+		}
+
+		// The current article display field.
+		$html[] = '<div id="' . $name . '_article"><fieldset class="span9 iCleft"><div>&nbsp;</div><span class="input-append">';
+		$html[] = '<input type="text" class="input-medium" style="margin:0px" id="' . $this->id . '_name" value="' . $title . '" disabled="disabled" size="35" />';
+
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			$html[] = '<a class="modal btn hasTooltip" title="' . JText::_('COM_CONTENT_CHANGE_ARTICLE') . '"  href="' . $link . '&amp;' . JSession::getFormToken() . '=1" rel="{handler: \'iframe\', size: {x: 800, y: 450}}">' . JText::_('JSELECT') . '</a>';
+		}
+		else
+		{
+			$html[] = '<a class="modal btn hasTooltip" title="' . JHtml::tooltipText('COM_CONTENT_CHANGE_ARTICLE') . '"  href="' . $link . '&amp;' . JSession::getFormToken() . '=1" rel="{handler: \'iframe\', size: {x: 800, y: 450}}"><i class="icon-file"></i> ' . JText::_('JSELECT') . '</a>';
+		}
+
+		// Edit article button
+		if ($allowEdit)
+		{
+			if (version_compare(JVERSION, '3.0', 'lt'))
+			{
+				$html[] = '<a class="btn hasTooltip' . ($value ? '' : ' hidden') . '" href="index.php?option=com_content&view=article&layout=edit&id=' . $value . '" target="_blank" title="' . JText::_('COM_CONTENT_EDIT_ARTICLE') . '" alt="' . JText::_('COM_CONTENT_EDIT_ARTICLE') . '" >' . JText::_('JACTION_EDIT') . '</a>';
+			}
+			else
+			{
+				$html[] = '<a class="btn hasTooltip' . ($value ? '' : ' hidden') . '" href="index.php?option=com_content&layout=modal&tmpl=component&task=article.edit&id=' . $value . '" target="_blank" title="' . JHtml::tooltipText('COM_CONTENT_EDIT_ARTICLE') . '" ><span class="icon-edit"></span> ' . JText::_('JACTION_EDIT') . '</a>';
+			}
+		}
+
+		// Clear article button
+		if ($allowClear)
+		{
+			if (version_compare(JVERSION, '3.0', 'lt'))
+			{
+				$html[] = '<a id="' . $this->id . '_clear" class="btn' . ($value ? '' : ' hidden') . '" onclick="return jClearArticle(\'' . $this->id . '\')">' . JText::_('JCLEAR') . '</a>';
+			}
+			else
+			{
+				$html[] = '<button id="' . $this->id . '_clear" class="btn' . ($value ? '' : ' hidden') . '" onclick="return jClearArticle(\'' . $this->id . '\')"><span class="icon-remove"></span> ' . JText::_('JCLEAR') . '</button>';
+			}
+		}
+
+		$html[] = '</span>';
+
+		// class='required' for client side validation
+		$class = '';
+
+		if ($this->required)
+		{
+			$class = ' class="required modal-value"';
+		}
+
+		$html[] = '<input type="hidden" id="' . $this->id . '_id"' . $class . ' name="' . $this->name . '" value="' . $value . '" /></fieldset></div>';
+
+		if ($tos_Type == '1')
+		{
+			$html[] = '<script type="text/javascript">';
+			$html[] = 'document.getElementById("' . $name . '_article").style.display = "block";';
+			$html[] = '</script>';
+		}
+		else
+		{
+			$html[] = '<script type="text/javascript">';
+			$html[] = 'document.getElementById("' . $name . '_article").style.display = "none";';
+			$html[] = '</script>';
+		}
+
+		return implode("\n", $html);
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/ictxt_content.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/ictxt_content.php
new file mode 100644
index 00000000..94aa8a41
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/ictxt_content.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.2.5 2013-11-10
+ * @since       3.2.5
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+jimport( 'joomla.filesystem.path' );
+jimport('joomla.form.formfield');
+
+class JFormFieldModal_ictxt_content extends JFormField
+{
+	/**
+	 * The form field type.
+	 */
+	protected $type = 'modal_ictxt_content';
+
+	/**
+	 * Method to get the field input markup.
+	 */
+	protected function getInput()
+	{
+		jimport('joomla.application.component.helper');
+		$icagendaParams = JComponentHelper::getParams('com_icagenda');
+
+		$replace = array("jform", "[", "]", "Content");
+		$name = str_replace($replace, "", $this->name);
+
+		$tosContent = $icagendaParams->get($name.'Content', '');
+		$tos_Type = $icagendaParams->get($name.'_Type', '');
+
+		$editor = JFactory::getEditor();
+
+		$html	= array();
+
+		$html[] = '<div id="'.$name.'_custom"><fieldset class="span9 iCleft">';
+		$html[] = $editor->display($this->name, $tosContent, "100%", "300", "300", "20", 1, null, null, null, array('mode' => 'advanced'));
+		$html[] = '</fieldset></div>';
+
+		if ($tos_Type == '2') {
+			$html[] = '<script type="text/javascript">';
+			$html[] = 'document.getElementById("'.$name.'_custom").style.display = "block";';
+			$html[] = '</script>';
+		} else {
+			$html[] = '<script type="text/javascript">';
+			$html[] = 'document.getElementById("'.$name.'_custom").style.display = "none";';
+			$html[] = '</script>';
+		}
+
+		return implode("\n", $html);
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/ictxt_default.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/ictxt_default.php
new file mode 100644
index 00000000..d1afa3a9
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/ictxt_default.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.2.5 2013-11-10
+ * @since       3.2.5
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+jimport( 'joomla.filesystem.path' );
+jimport('joomla.form.formfield');
+
+class JFormFieldModal_ictxt_default extends JFormField
+{
+	/**
+	 * The form field type.
+	 */
+	protected $type = 'modal_ictxt_default';
+
+	/**
+	 * Method to create a blank label.
+	 */
+	protected function getLabel()
+	{
+	   return ' ';
+	}
+
+	/**
+	 * Method to get the field input markup.
+	 */
+	protected function getInput()
+	{
+		jimport('joomla.application.component.helper');
+		$icagendaParams = JComponentHelper::getParams('com_icagenda');
+
+		$replace = array("jform", "[", "]", "Default");
+		$name = str_replace($replace, "", $this->name);
+
+		$tos_Type = $icagendaParams->get($name.'_Type', '');
+
+		$Type_default = $name.'_default';
+		$Type_article = $name.'_article';
+		$Type_content = $name.'_custom';
+
+		$html	= array();
+
+		$html[] = '<div id="'.$name.'_default"><fieldset class="span9 iCleft">';
+		$html[] = '<div class="alert alert-error">';
+		if(version_compare(JVERSION, '3.0', 'ge')) {
+			$html[] = '<i class="icon-warning-2"></i>';
+		}
+		$html[] = ' '.JText::sprintf( 'COM_ICAGENDA_TERMS_IMPORTANT_INFOS', $this->description ).'</div><div>'.JText::_( 'COM_ICAGENDA_SUBMIT_TOS_TYPE_DEFAULT_LBL' ).'<br /><small>'.$this->description.'</small></div><div class="alert alert-info">'.JText::_( $this->description ).'</div>';
+		$html[] = '<input type="hidden" id="'.$this->id.'_id" name="'.$this->name.'" value="'.$this->value.'" />';
+		$html[] = '</fieldset></div>';
+
+		if ($tos_Type == '') {
+			$html[] = '<script type="text/javascript">';
+			$html[] = 'document.getElementById("'.$name.'_default").style.display = "block";';
+			$html[] = '</script>';
+		} else {
+			$html[] = '<script type="text/javascript">';
+			$html[] = 'document.getElementById("'.$name.'_default").style.display = "none";';
+			$html[] = '</script>';
+		}
+
+		return implode("\n", $html);
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/ictxt_type.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/ictxt_type.php
new file mode 100644
index 00000000..550999a1
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/ictxt_type.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.2.5 2013-11-10
+ * @since       3.2.5
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+jimport( 'joomla.filesystem.path' );
+jimport('joomla.form.formfield');
+
+class JFormFieldModal_ictxt_type extends JFormField
+{
+	/**
+	 * The form field type.
+	 */
+	protected $type = 'modal_ictxt_type';
+
+	/**
+	 * Method to get the field input markup.
+	 */
+	protected function getInput()
+	{
+		jimport('joomla.application.component.helper');
+		$icagendaParams = JComponentHelper::getParams('com_icagenda');
+
+		$replace = array("jform", "[", "]", "_Type");
+		$name = str_replace($replace, "", $this->name);
+
+		$Type = $name.'_Type';
+		$tos_Type = $icagendaParams->get($Type, '');
+
+		$class_default = '';
+		$class_article = '';
+		$class_custom = '';
+		$checked_default = '';
+		$checked_article = '';
+		$checked_custom = '';
+		if ($tos_Type == '') {
+			$class_default = 'btn-success';
+			$checked_default = ' checked="checked"';
+			$checked_article = '';
+			$checked_custom = '';
+		}
+		elseif ($tos_Type == '1') {
+			$class_article = 'btn-success';
+			$checked_default = '';
+			$checked_article = ' checked="checked"';
+			$checked_custom = '';
+		}
+		elseif ($tos_Type == '2') {
+			$class_custom = 'btn-success';
+			$checked_default = '';
+			$checked_article = '';
+			$checked_custom = ' checked="checked"';
+		} else {
+			$class_default = 'btn-success';
+			$checked_default = ' checked="checked"';
+			$checked_article = '';
+			$checked_custom = '';
+		}
+
+		$html	= array();
+		$html[]	= '<fieldset class="radio btn-group">';
+		$html[]	= '<label class="'.$class_default.'">'.JText::_( 'IC_DEFAULT' ).'<input type="radio"  id="'.$name.'_Type0" name="'.$this->name.'" value=""  onClick="tosdefault_'.$name.'();"'.$checked_default.' /></label>';
+		$html[]	= '<label class="'.$class_article.'">'.JText::_( 'IC_ARTICLE' ).'<input type="radio"  id="'.$name.'_Type1" name="'.$this->name.'" value="1"  onClick="tosarticle_'.$name.'();"'.$checked_article.' /></label>';
+		$html[]	= '<label class="'.$class_custom.'">'.JText::_( 'IC_CUSTOM_TEXT' ).'<input type="radio"  id="'.$name.'_Type2" name="'.$this->name.'" value="2"  onClick="toscustom_'.$name.'();"'.$checked_custom.' /></label>';
+		$html[]	= '</fieldset>';
+
+
+
+		$html[]	= '<script type="text/javascript">';
+		$html[]	= 'function tosdefault_'.$name.'()';
+		$html[]	= '{';
+		$html[]	= 'document.getElementById("'.$name.'_default").style.display = "block";';
+		$html[]	= 'document.getElementById("'.$name.'_article").style.display = "none";';
+		$html[]	= 'document.getElementById("'.$name.'_custom").style.display = "none";';
+		$html[]	= '$("#'.$name.'_Type0").attr("checked", "checked");';
+		$html[]	= '}';
+		$html[]	= 'function tosarticle_'.$name.'()';
+		$html[]	= '{';
+		$html[]	= 'document.getElementById("'.$name.'_default").style.display = "none";';
+		$html[]	= 'document.getElementById("'.$name.'_article").style.display = "block";';
+		$html[]	= 'document.getElementById("'.$name.'_custom").style.display = "none";';
+		$html[]	= '$("#'.$name.'_Type1").attr("checked", "checked");';
+		$html[]	= '}';
+		$html[]	= 'function toscustom_'.$name.'()';
+		$html[]	= '{';
+		$html[]	= 'document.getElementById("'.$name.'_default").style.display = "none";';
+		$html[]	= 'document.getElementById("'.$name.'_article").style.display = "none";';
+		$html[]	= 'document.getElementById("'.$name.'_custom").style.display = "block";';
+		$html[]	= '$("#'.$name.'_Type2").attr("checked", "checked");';
+		$html[]	= '}';
+		$html[]	= '</script>';
+
+		return implode("\n", $html);
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/icvalue_field.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/icvalue_field.php
new file mode 100644
index 00000000..8e4c9461
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/icvalue_field.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.2.3 2013-10-17
+ * @since       3.2.3
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+jimport( 'joomla.filesystem.path' );
+jimport('joomla.form.formfield');
+
+class JFormFieldModal_icvalue_field extends JFormField
+{
+	protected $type='modal_icvalue_field';
+
+	protected function getInput()
+	{
+
+		$Explode = explode('_', $this->name);
+		$TypeName = $Explode[0].']';
+
+		$replace = array("jform", "[params]", "[", "]");
+		$name = str_replace($replace, "", $TypeName);
+
+		$Type_default = $name.'_default';
+		$Type_content = $name.'_custom';
+
+		$html	= array();
+
+		$html[] = '<div id="'.$Type_content.'"><fieldset class="span9 iCleft">';
+		$html[] = '<input type="text" value="'.$this->value.'" name="'.$this->name.'"/>';
+		$html[] = '</fieldset></div>';
+
+		$html[] = '<script type="text/javascript">';
+		$html[] = 'if (typeset == 1) {';
+		$html[] = 'document.getElementById("'.$Type_content.'").style.display = "block";';
+		$html[] = '}';
+		$html[] = 'if (typeset == 0) {';
+		$html[] = 'document.getElementById("'.$Type_content.'").style.display = "none";';
+		$html[] = '}';
+		$html[] = '</script>';
+
+		return implode("\n", $html);
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/icvalue_opt.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/icvalue_opt.php
new file mode 100644
index 00000000..25c84f9d
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/icvalue_opt.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.2.9 2013-12-22
+ * @since       3.2.3
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+jimport( 'joomla.filesystem.path' );
+jimport('joomla.form.formfield');
+
+class JFormFieldModal_icvalue_opt extends JFormField
+{
+	protected $type='modal_icvalue_opt';
+
+	protected function getInput()
+	{
+
+		$replace = array("jform", "params", "[", "]");
+		$name = str_replace($replace, "", $this->name);
+
+		$Type = $this->value;
+
+		if ($name == 'calendarclosebtn') {
+			$default_text = JText::_( 'JTOOLBAR_DEFAULT' );
+		} else {
+			$default_text = JText::_( 'JGLOBAL_USE_GLOBAL' );
+		}
+
+		$Type_default = $name.'_default';
+		$Type_content = $name.'_custom';
+
+		$class_default = '';
+		$class_custom = '';
+		$checked_default = ' checked="checked"';
+		$checked_custom = '';
+		if ($Type == '0') {
+			$class_default = 'btn-primary';
+			$checked_default = ' checked="checked"';
+			$checked_custom = '';
+		}
+		elseif ($Type == '1') {
+			$class_custom = 'btn-success';
+			$checked_default = '';
+			$checked_custom = ' checked="checked"';
+		} else {
+			$class_default = 'btn-primary';
+			$checked_default = ' checked="checked"';
+			$checked_custom = '';
+		}
+
+		$html	= array();
+
+
+		$html[]	= '<fieldset class="radio btn-group">';
+		$html[]	= '<label class="'.$class_default.'">'.$default_text.'<input type="radio"  id="'.$name.'_0" name="'.$this->name.'" value="0"  onClick="icdefault_'.$name.'();"'.$checked_default.' /></label>';
+		$html[]	= '<label class="'.$class_custom.'">'.JText::_( 'COM_ICAGENDA_LBL_CUSTOM_VALUE' ).'<input type="radio"  id="'.$name.'_1" name="'.$this->name.'" value="1"  onClick="iccustom_'.$name.'();"'.$checked_custom.' /></label>';
+		$html[]	= '</fieldset>';
+
+
+		$html[]	= '<script type="text/javascript">';
+		$html[]	= 'var typeset = '.$Type.';';
+		$html[]	= 'function icdefault_'.$name.'()';
+		$html[]	= '{';
+		$html[]	= 'document.getElementById("'.$Type_content.'").style.display = "none";';
+		$html[]	= '$("#'.$name.'_0").attr("checked", "checked");';
+		$html[]	= '}';
+		$html[]	= 'function iccustom_'.$name.'()';
+		$html[]	= '{';
+		$html[]	= 'document.getElementById("'.$Type_content.'").style.display = "block";';
+		$html[]	= '$("#'.$name.'_1").attr("checked", "checked");';
+		$html[]	= '}';
+		$html[]	= '</script>';
+
+		return implode("\n", $html);
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/index.html b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/index.html
new file mode 100644
index 00000000..42682b47
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/index.html
@@ -0,0 +1 @@
+<html><body></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/media.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/media.php
new file mode 100644
index 00000000..0f147b4a
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/media.php
@@ -0,0 +1,146 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-26
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+jimport( 'joomla.filesystem.path' );
+jimport('joomla.form.formfield');
+
+class JFormFieldModal_media extends JFormField
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $type = 'modal_media';
+
+	/**
+	 * The initialised state of the document object.
+	 *
+	 * @var    boolean
+	 * @since  11.1
+	 */
+	protected static $initialised = false;
+
+	/**
+	 * Method to get the field input markup for a media selector.
+	 * Use attributes to identify specific created_by and asset_id fields
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   11.1
+	 */
+	protected function getInput()
+	{
+		$assetField  = $this->element['asset_field'] ? (string) $this->element['asset_field'] : 'asset_id';
+		$authorField = $this->element['created_by_field'] ? (string) $this->element['created_by_field'] : 'created_by';
+		$asset       = $this->form->getValue($assetField) ? $this->form->getValue($assetField) : (string) $this->element['asset_id'];
+
+		if ($asset == '')
+		{
+			$asset = JFactory::getApplication()->input->get('option');
+		}
+
+		$link = (string) $this->element['link'];
+
+		if ( ! self::$initialised)
+		{
+			// Load the modal behavior script.
+			JHtml::_('behavior.modal');
+
+			// Build the script.
+			$script = array();
+			$script[] = '	function jInsertFieldValue(value, id) {';
+			$script[] = '		var old_id = document.id(id).value;';
+			$script[] = '		if (old_id != id) {';
+			$script[] = '			var elem = document.id(id)';
+			$script[] = '			elem.value = value;';
+			$script[] = '			elem.fireEvent("change");';
+			$script[] = '		}';
+			$script[] = '	}';
+
+			// Add the script to the document head.
+			JFactory::getDocument()->addScriptDeclaration(implode("\n", $script));
+
+			self::$initialised = true;
+		}
+
+		// Initialize variables.
+		$html = array();
+		$attr = '';
+
+		// Initialize some field attributes.
+		$attr .= $this->element['class'] ? ' class="' . (string) $this->element['class'] . '"' : '';
+		$attr .= $this->element['size'] ? ' size="' . (int) $this->element['size'] . '"' : '';
+
+		// Initialize JavaScript field attributes.
+		$attr .= $this->element['onchange'] ? ' onchange="' . (string) $this->element['onchange'] . '"' : '';
+
+		// The text field.
+		$html[] = '<span class="media_field">';
+		$html[] = '	<input type="text" name="' . $this->name . '" id="' . $this->id . '"' . ' value="'
+			. htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8') . '"' . ' readonly="readonly"' . $attr . ' />';
+		$html[] = '</span>';
+
+		$directory = (string) $this->element['directory'];
+
+		if ($this->value && file_exists(JPATH_ROOT . '/' . $this->value))
+		{
+			$folder = explode('/', $this->value);
+			array_shift($folder);
+			array_pop($folder);
+			$folder = implode('/', $folder);
+		}
+		elseif (file_exists(JPATH_ROOT . '/' . JComponentHelper::getParams('com_media')->get('image_path', 'images') . '/' . $directory))
+		{
+			$folder = $directory;
+		}
+		else
+		{
+			$folder = '';
+		}
+
+		// The button.
+		$html[] = '<span class="ic_button">';
+		$html[] = '	<span class="blank">';
+		$html[] = '		<a class="modal" title="' . JText::_('JLIB_FORM_BUTTON_SELECT') . '"' . ' href="'
+			. ($this->element['readonly'] ? ''
+			: ($link ? $link
+				: 'index.php?option=com_media&amp;view=images&amp;tmpl=component&amp;asset=' . $asset . '&amp;author='
+				. $this->form->getValue($authorField)) . '&amp;fieldid=' . $this->id . '&amp;folder=' . $folder) . '"'
+			. ' rel="{handler: \'iframe\', size: {x: 800, y: 500}}">';
+		$html[] = JText::_('JLIB_FORM_BUTTON_SELECT') . '</a>';
+		$html[] = '	</span>';
+		$html[] = '</span>';
+
+		$html[] = '<span class="ic_button">';
+		$html[] = '	<span class="blank">';
+		$html[] = '		<a title="' . JText::_('JLIB_FORM_BUTTON_CLEAR') . '"' . ' href="#" onclick="';
+		$html[] = 'document.id(\'' . $this->id . '\').value=\'\';';
+		$html[] = 'document.id(\'' . $this->id . '\').fireEvent(\'change\');';
+		$html[] = 'return false;';
+		$html[] = '">';
+		$html[] = JText::_('JLIB_FORM_BUTTON_CLEAR') . '</a>';
+		$html[] = '	</span>';
+		$html[] = '</span>';
+
+		return implode("\n", $html);
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/menulink.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/menulink.php
new file mode 100644
index 00000000..5ac0d3bb
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/menulink.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-24
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       2.1.4
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+jimport( 'joomla.filesystem.path' );
+jimport('joomla.form.formfield');
+
+class JFormFieldModal_Menulink extends JFormField
+{
+	protected $type = 'modal_menulink';
+
+	protected function getInput()
+	{
+		$db    = JFactory::getDbo();
+		$query = $db->getQuery(true);
+
+		$query->select('a.title, a.published, a.id, a.path')
+			->from('#__menu AS a')
+			->where( "(link = 'index.php?option=com_icagenda&view=list') AND (published > 0)" );
+
+		$db->setQuery($query);
+
+		$links = $db->loadObjectList();
+
+		$class = isset($this->class) ? ' class="' . $this->class . '"' : '';
+
+		$html = '<select id="' . $this->id . '_id"' . $class . ' name="' . $this->name . '">';
+
+		$html.='<option value="">- ' . JTEXT::_('JGLOBAL_AUTO') . ' -</option>';
+
+		foreach ($links as &$l)
+		{
+			if ($l->published == '1')
+			{
+				$html.='<option value="'.$l->id.'"';
+				$html.= ($this->value == $l->id) ? ' selected="selected"' : '';
+				$html.='>[' . $l->id . '] ' . $l->title . '</option>';
+			}
+		}
+
+		$html.='</select>';
+
+		return $html;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/multicat.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/multicat.php
new file mode 100644
index 00000000..595a55fb
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/multicat.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-24
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.2.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+jimport( 'joomla.filesystem.path' );
+jimport('joomla.form.formfield');
+
+class JFormFieldModal_multicat extends JFormField
+{
+	protected $type = 'modal_multicat';
+
+	protected function getInput()
+	{
+		// Initialize some field attributes.
+		$class = ! empty($this->class) ? ' class="' . $this->class . '"' : '';
+
+		// Query List of Categories
+		$db    = JFactory::getDbo();
+		$query = $db->getQuery(true);
+
+		$query->select('a.title, a.state, a.id')
+			->from('#__icagenda_category AS a');
+
+		$db->setQuery($query);
+
+		$cat = $db->loadObjectList();
+
+		if ( ! is_array($this->value))
+		{
+			$this->value = array($this->value);
+		}
+
+		$html = ' <select multiple id="' . $this->id . '_id" name="' . $this->name . '"' . $class . '>';
+
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		 {
+			if ($this->name != 'jform[catid]' && $this->name != 'catid')
+			{
+				$html.= '<option value="0"';
+
+				if (in_array('0', $this->value))
+				{
+					$html.= ' selected="selected"';
+				}
+
+				$html.= '>-- '.JTEXT::_('COM_ICAGENDA_ALL_CATEGORIES').' --</option>';
+			}
+		}
+
+		foreach ($cat as $c)
+		{
+			if ($c->state == '1')
+			{
+				$html.= '<option value="' . $c->id . '"';
+
+				if (in_array($c->id, $this->value) && ! in_array('0', $this->value))
+				{
+					$html.= ' selected="selected"';
+				}
+
+				$html.= '>' . $c->title . '</option>';
+			}
+		}
+
+		$html.= '</select>';
+
+		return $html;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/param_place.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/param_place.php
new file mode 100644
index 00000000..01fc3a00
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/param_place.php
@@ -0,0 +1,53 @@
+<?php
+/** 
+ *	iCagenda
+ *----------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright	Copyright (C) 2012 JOOMLIC - All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Jooml!C - http://www.joomlic.com
+ * 
+ * @since		1.0
+ * 
+ * @deprecated  3.7
+ *----------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined( '_JEXEC' ) or die( 'Restricted access' );
+
+jimport( 'joomla.filesystem.path' );
+jimport('joomla.form.formfield');
+
+JHTML::_('stylesheet', 'style.css', 'administrator/components/com_icagenda/add/css/');
+
+class JFormFieldModal_param_place extends JFormField
+{
+	protected $type='modal_param_place';
+	
+	protected function getInput()
+	{
+		
+		$db		= JFactory::getDbo();
+		$query	= $db->getQuery(true);
+		$query->select('a.place, a.id, a.coordinate')
+			->from('#__icagenda_events AS a');
+		$db->setQuery($query);
+		$loc = $db->loadObjectList();
+	
+		$html= '
+			<select id="'.$this->id.'_id"'.$class.' place="'.$this->place.'">
+			<option value="NULL">-</option>';
+		foreach ($loc as $l){
+			$html.='<option value="'.$l->id.'"';
+			if ($this->value == $l->id){
+				$html.='selected="selected"';
+			}
+			$html.='>'.$l->place.'</option>';
+			$span.='<span id="coord'.$l->id.'" style="display:none;">'.$l->coordinate.'</span>';
+		}
+		$html.='</select>'.$span;
+			
+		return $html;
+	}
+}
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/period.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/period.php
new file mode 100644
index 00000000..698e19f3
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/period.php
@@ -0,0 +1,50 @@
+<?php
+/** 
+ *	iCagenda
+ *----------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright	Copyright (C) 2012 JOOMLIC - All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Jooml!C - http://www.joomlic.com
+ * 
+ * @since		1.3
+ *----------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined( '_JEXEC' ) or die( 'Restricted access' );
+
+jimport( 'joomla.filesystem.path' );
+jimport('joomla.form.formfield');
+
+
+JText::script('COM_ICAGENDA_TP_CURRENT');
+JText::script('COM_ICAGENDA_TP_CLOSE');
+JText::script('COM_ICAGENDA_TP_TITLE');
+JText::script('COM_ICAGENDA_TP_TIME');
+JText::script('COM_ICAGENDA_TP_HOUR');
+JText::script('COM_ICAGENDA_TP_MINUTE');
+
+
+class JFormFieldModal_period extends JFormField
+{
+	protected $type='modal_period';
+	
+	protected function getInput()
+	{
+		$html ='<script>
+		$(function(){
+			$(\'#jform_period\').datetimepicker({
+				dateFormat: \'yy-mm-dd\',
+				hourGrid: 4,
+				minuteGrid: 10
+			});
+		})
+
+		</script>
+		<input type="text" id="'.$this->id.'" class="'.$this->class.'" name="'.$this->name.'" value="'.$this->value.'"/>';
+		$html ='<input type="text" id="'.$this->id.'" class="'.$this->class.'" name="'.$this->name.'" value="'.$this->value.'"/>';
+			
+		return $html;
+	}
+}
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/ph_regbt.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/ph_regbt.php
new file mode 100644
index 00000000..3fa63f83
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/ph_regbt.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-26
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+jimport( 'joomla.filesystem.path' );
+jimport('joomla.form.formfield');
+
+class JFormFieldModal_ph_regbt extends JFormField
+{
+	protected $type = 'modal_ph_regbt';
+
+	protected function getInput()
+	{
+		jimport('joomla.application.component.helper');
+
+		$class = JFactory::getApplication()->input->get('class');
+
+		$icagendaParams   = JComponentHelper::getParams('com_icagenda');
+		$extRegButtonText = $icagendaParams->get('RegButtonText');
+
+		if ( ! isset($extRegButtonText)) $extRegButtonText = JText::_('COM_ICAGENDA_REGISTRATION_REGISTER');
+
+		$html ='<input type="text" id="' . $this->id . '" class="' . $class . '" name="' . $this->name . '" value="' . $this->value . '" placeholder="' . $extRegButtonText . '"/>';
+
+		return $html;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/startdate.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/startdate.php
new file mode 100644
index 00000000..b8deb1f8
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/startdate.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.5.10 2015-08-13
+ * @since       2.0.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+jimport('joomla.filesystem.path');
+jimport('joomla.form.formfield');
+
+/**
+ * Form Field to load a startdate datetime picker input
+ *
+ * @since	2.0.0
+ */
+class JFormFieldModal_startdate extends JFormField
+{
+	protected $type = 'modal_startdate';
+
+	protected function getInput()
+	{
+		$class = ! empty($this->class) ? ' class="' . $this->class . '"' : '';
+
+		$lang = JFactory::getLanguage();
+
+		if ($lang->getTag() == 'fa-IR')
+		{
+			// Including fallback code for HTML5 non supported browsers.
+			JHtml::_('jquery.framework');
+			JHtml::_('script', 'system/html5fallback.js', false, true);
+
+			$attributes = '';
+
+			$html = JHtml::_('calendar', $this->value, $this->name, 'startdate_jalali', '%Y-%m-%d %H:%M:%S', $attributes);
+		}
+		else
+		{
+			$html ='<input type="text" id="startdate"' . $class . ' name="' . $this->name . '" value="' . $this->value . '"/>';
+		}
+
+		return $html;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/template.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/template.php
new file mode 100644
index 00000000..53383c75
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/template.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.4.1 2015-01-30
+ * @since       1.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+jimport( 'joomla.filesystem.path' );
+jimport('joomla.form.formfield');
+
+class JFormFieldModal_Template extends JFormField
+{
+	protected $type = 'modal_template';
+
+	protected function getInput()
+	{
+		$url	= JPATH_SITE.'/components/com_icagenda/themes/packs';
+		$list	= $this->getList($url);
+		$class 	= !empty($this->class) ? ' class="' . $this->class . '"' : '';
+		$html	= '<select id="' . $this->id . '_id"' . $class . ' name="' . $this->name . '">';
+
+		foreach ($list as $l)
+		{
+			$html.= '<option value="' . $l . '"';
+
+			if ($this->value == $l)
+			{
+				$html.= ' selected="selected"';
+			}
+
+			$html.= '>' . $l . '</option>';
+		}
+
+		$html.= '</select>';
+
+		return $html;
+	}
+
+	function getList($dirname)
+	{
+		$arrayfiles = Array();
+
+		if (file_exists($dirname))
+		{
+			$handle = opendir($dirname);
+
+			while (false !== ($file = readdir($handle)))
+			{
+				if (!is_file($dirname.$file)
+					&& $file != '.'
+					&& $file != '..'
+					&& $file != '.DS_Store'
+					&& $file != '.htaccess'
+					&& $file != '.thumbs'
+					&& $file != 'index.php'
+					&& $file != 'index.html'
+					&& $file != 'php.ini'
+					)
+				{
+					array_push($arrayfiles, $file);
+				}
+			}
+
+			$handle = closedir($handle);
+		}
+
+		sort($arrayfiles);
+
+		return $arrayfiles;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/thumbs.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/thumbs.php
new file mode 100644
index 00000000..86d8cae8
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/thumbs.php
@@ -0,0 +1,138 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.9 2019-04-05
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.5.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+jimport( 'joomla.filesystem.path' );
+jimport('joomla.form.formfield');
+
+class JFormFieldModal_thumbs extends JFormField
+{
+	protected $type='modal_thumbs';
+
+	protected function getInput()
+	{
+		$replace = array("jform", "params", "[", "]");
+		$name_input = str_replace($replace, "", $this->name);
+
+		jimport('joomla.application.component.helper');
+		$iCparams = JComponentHelper::getParams('com_icagenda');
+
+		if ($name_input == 'thumb_large')
+		{
+			$thumbOptions = $iCparams->get('thumb_large');
+			$width = is_numeric($thumbOptions[0]) ? $thumbOptions[0] : '900';
+			$height = is_numeric($thumbOptions[1]) ? $thumbOptions[1] : '600';
+			$quality = is_numeric($thumbOptions[2]) ? $thumbOptions[2] : '100';
+			$crop = isset($thumbOptions[3]) ? $thumbOptions[3] : false;
+			$default_width = '900';
+			$default_height = '600';
+			$default_quality = '100';
+			$default_crop = '0';
+		}
+		elseif ($name_input == 'thumb_medium')
+		{
+			$thumbOptions = $iCparams->get('thumb_medium');
+			$width = is_numeric($thumbOptions[0]) ? $thumbOptions[0] : '300';
+			$height = is_numeric($thumbOptions[1]) ? $thumbOptions[1] : '300';
+			$quality = is_numeric($thumbOptions[2]) ? $thumbOptions[2] : '100';
+			$crop = isset($thumbOptions[3]) ? $thumbOptions[3] : false;
+			$default_width = '300';
+			$default_height = '300';
+			$default_quality = '100';
+			$default_crop = '0';
+		}
+		elseif ($name_input == 'thumb_small')
+		{
+			$thumbOptions = $iCparams->get('thumb_small');
+			$width = is_numeric($thumbOptions[0]) ? $thumbOptions[0] : '100';
+			$height = is_numeric($thumbOptions[1]) ? $thumbOptions[1] : '100';
+			$quality = is_numeric($thumbOptions[2]) ? $thumbOptions[2] : '100';
+			$crop = isset($thumbOptions[3]) ? $thumbOptions[3] : false;
+			$default_width = '100';
+			$default_height = '100';
+			$default_quality = '100';
+			$default_crop = '0';
+		}
+		elseif ($name_input == 'thumb_xsmall')
+		{
+			$thumbOptions = $iCparams->get('thumb_xsmall');
+			$width = is_numeric($thumbOptions[0]) ? $thumbOptions[0] : '48';
+			$height = is_numeric($thumbOptions[1]) ? $thumbOptions[1] : '48';
+			$quality = is_numeric($thumbOptions[2]) ? $thumbOptions[2] : '80';
+			$crop = isset($thumbOptions[3]) ? $thumbOptions[3] : true;
+			$default_width = '48';
+			$default_height = '48';
+			$default_quality = '80';
+			$default_crop = '1';
+		}
+
+		$crop_false = $crop_true = '';
+
+		if ($crop)
+		{
+			$crop_true = ' selected="selected"';
+		}
+		else
+		{
+			$crop_false = ' selected="selected"';
+		}
+
+		$quality_80 = '';
+
+		if ($quality == '80')
+		{
+			$quality_80 =  ' selected="selected"';
+		}
+
+		$quality_values = array('100', '95', '90', '85', '80', '75', '70', '60', '50');
+
+		$html = array();
+
+		$html[] = '<div class="span2">' . JText::_('IC_WIDTH') . '<br />';
+		$html[] = '<input type="text" class="input-mini" name="'.$this->name.'[]" value="'.$width.'" default="'.$default_width.'"/></div>';
+
+		$html[] = '<div class="span2">' . JText::_('IC_HEIGHT') . '<br />';
+		$html[] = '<input type="text" class="input-mini" name="'.$this->name.'[]" value="'.$height.'" default="'.$default_height.'"/></div>';
+
+		$html[] = '<div class="span2">' . JText::_('IC_QUALITY') . '<br />';
+		$html[] = '<select id="ThumbMedium_quality" class="input-small" name="'.$this->name.'[]" value="'.$quality.'">';
+
+		foreach ($quality_values AS $qv)
+		{
+			$html[] = '<option value="'.$qv.'"';
+
+			if ($qv == $quality)
+			{
+				$html[] = ' selected="selected"';
+			}
+
+			$html[] = '>' . JText::_('IC'.$qv.'') . '</option>';
+		}
+
+		$html[] = '</select></div>';
+
+		$html[] = '<div class="span2">' . JText::_('IC_CROPPED') . '<br />';
+		$html[] = '<select id="ThumbMedium_crop" class="input-small" name="' . $this->name . '[]" value="' . $crop . '">';
+		$html[] = '<option value="0" ' . $crop_false . '>'.JText::_('JNO').'</option>';
+		$html[] = '<option value="1" ' . $crop_true . '>'.JText::_('JYES').'</option>';
+		$html[] = '</select></div>';
+
+		return implode("\n", $html);
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/tos_article.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/tos_article.php
new file mode 100644
index 00000000..c57299a8
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/tos_article.php
@@ -0,0 +1,199 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-26
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.2.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * Supports a modal article picker.
+ */
+class JFormFieldModal_tos_article extends JFormField
+{
+	/**
+	 * The form field type.
+	 */
+	protected $type = 'modal_tos_article';
+
+	/**
+	 * Method to get the field input markup.
+	 */
+	protected function getInput()
+	{
+		$icagendaParams = JComponentHelper::getParams('com_icagenda');
+		$tos_Type       = $icagendaParams->get('tos_Type', '1');
+
+		$allowEdit  = ((string) $this->element['edit'] == 'true') ? true : false;
+		$allowClear = ((string) $this->element['clear'] != 'false') ? true : false;
+
+		// Load language
+		JFactory::getLanguage()->load('com_content', JPATH_ADMINISTRATOR);
+
+		// Load the modal behavior script.
+		JHtml::_('behavior.modal', 'a.modal');
+
+		// Build the script.
+		$script = array();
+
+		// Select button script
+		$script[] = '	function jSelectArticle_' . $this->id . '(id, title, catid, object) {';
+		$script[] = '		document.getElementById("' . $this->id . '_id").value = id;';
+		$script[] = '		document.getElementById("' . $this->id . '_name").value = title;';
+
+		if ($allowEdit)
+		{
+			$script[] = '		jQuery("#' . $this->id . '_edit").removeClass("hidden");';
+		}
+
+		if ($allowClear)
+		{
+			$script[] = '		jQuery("#' . $this->id . '_clear").removeClass("hidden");';
+		}
+
+		$script[] = '		SqueezeBox.close();';
+		$script[] = '	}';
+
+		// Clear button script
+		static $scriptClear;
+
+		if ($allowClear && ! $scriptClear)
+		{
+			$scriptClear = true;
+
+			$script[] = '	function jClearArticle(id) {';
+			$script[] = '		document.getElementById(id + "_id").value = "";';
+			$script[] = '		document.getElementById(id + "_name").value = "' . htmlspecialchars(JText::_('COM_CONTENT_SELECT_AN_ARTICLE', true), ENT_COMPAT, 'UTF-8') . '";';
+			$script[] = '		jQuery("#"+id + "_clear").addClass("hidden");';
+			$script[] = '		if (document.getElementById(id + "_edit")) {';
+			$script[] = '			jQuery("#"+id + "_edit").addClass("hidden");';
+			$script[] = '		}';
+			$script[] = '		return false;';
+			$script[] = '	}';
+		}
+
+		// Add the script to the document head.
+		JFactory::getDocument()->addScriptDeclaration(implode("\n", $script));
+
+		// Setup variables for display.
+		$html = array();
+		$link = 'index.php?option=com_content&amp;view=articles&amp;layout=modal&amp;tmpl=component&amp;function=jSelectArticle_' . $this->id;
+
+		if (isset($this->element['language']))
+		{
+			$link .= '&amp;forcedLanguage=' . $this->element['language'];
+		}
+
+		$db	= JFactory::getDbo();
+		$db->setQuery(
+			'SELECT title' .
+			' FROM #__content' .
+			' WHERE id = ' . (int) $this->value
+		);
+
+		try
+		{
+			$title = $db->loadResult();
+		}
+		catch (RuntimeException $e)
+		{
+			throw new Exception($e->getMessage(), 500, $e);
+		}
+
+		if (empty($title))
+		{
+			$title = JText::_('COM_CONTENT_SELECT_AN_ARTICLE');
+		}
+		$title = htmlspecialchars($title, ENT_QUOTES, 'UTF-8');
+
+		// The active article id field.
+		if (0 == (int) $this->value)
+		{
+			$value = '';
+		}
+		else
+		{
+			$value = (int) $this->value;
+		}
+
+		// The current article display field.
+		$html[] = '<div id="ic_article"><fieldset class="span9 iCleft"><div>&nbsp;</div><span class="input-append">';
+		$html[] = '<input type="text" class="input-medium" style="margin:0px" id="' . $this->id . '_name" value="' . $title . '" disabled="disabled" size="35" />';
+
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			$html[] = '<a class="modal btn hasTooltip" title="' . JText::_('COM_CONTENT_CHANGE_ARTICLE') . '"  href="' . $link . '&amp;' . JSession::getFormToken() . '=1" rel="{handler: \'iframe\', size: {x: 800, y: 450}}">' . JText::_('JSELECT') . '</a>';
+		}
+		else
+		{
+			$html[] = '<a class="modal btn hasTooltip" title="' . JHtml::tooltipText('COM_CONTENT_CHANGE_ARTICLE') . '"  href="' . $link . '&amp;' . JSession::getFormToken() . '=1" rel="{handler: \'iframe\', size: {x: 800, y: 450}}"><i class="icon-file"></i> ' . JText::_('JSELECT') . '</a>';
+		}
+
+		// Edit article button
+		if ($allowEdit)
+		{
+			if (version_compare(JVERSION, '3.0', 'lt'))
+			{
+				$html[] = '<a class="btn hasTooltip' . ($value ? '' : ' hidden') . '" href="index.php?option=com_content&view=article&layout=edit&id=' . $value . '" target="_blank" title="' . JText::_('COM_CONTENT_EDIT_ARTICLE') . '" alt="' . JText::_('COM_CONTENT_EDIT_ARTICLE') . '" >' . JText::_('JACTION_EDIT') . '</a>';
+			}
+			else
+			{
+				$html[] = '<a class="btn hasTooltip' . ($value ? '' : ' hidden') . '" href="index.php?option=com_content&layout=modal&tmpl=component&task=article.edit&id=' . $value . '" target="_blank" title="' . JHtml::tooltipText('COM_CONTENT_EDIT_ARTICLE') . '" ><span class="icon-edit"></span> ' . JText::_('JACTION_EDIT') . '</a>';
+			}
+		}
+
+		// Clear article button
+		if ($allowClear)
+		{
+			if (version_compare(JVERSION, '3.0', 'lt'))
+			{
+				$html[] = '<a id="' . $this->id . '_clear" class="btn' . ($value ? '' : ' hidden') . '" onclick="return jClearArticle(\'' . $this->id . '\')">' . JText::_('JCLEAR') . '</a>';
+			}
+			else
+			{
+				$html[] = '<button id="' . $this->id . '_clear" class="btn' . ($value ? '' : ' hidden') . '" onclick="return jClearArticle(\'' . $this->id . '\')"><span class="icon-remove"></span> ' . JText::_('JCLEAR') . '</button>';
+			}
+		}
+
+		$html[] = '</span>';
+
+		// class='required' for client side validation
+		$class = '';
+
+		if ($this->required)
+		{
+			$class = ' class="required modal-value"';
+		}
+
+		$html[] = '<input type="hidden" id="' . $this->id . '_id"' . $class . ' name="' . $this->name . '" value="' . $value . '" /></fieldset></div>';
+
+		if ($tos_Type == '1')
+		{
+			$html[] = '<script type="text/javascript">';
+			$html[] = 'document.getElementById("ic_default").style.display = "none";';
+			$html[] = 'document.getElementById("ic_article").style.display = "block";';
+			$html[] = 'document.getElementById("tos_custom").style.display = "none";';
+			$html[] = '</script>';
+		}
+		else
+		{
+			$html[] = '<script type="text/javascript">';
+			$html[] = 'document.getElementById("ic_article").style.display = "none";';
+			$html[] = '</script>';
+		}
+
+		return implode("\n", $html);
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/tos_content.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/tos_content.php
new file mode 100644
index 00000000..c632c72e
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/tos_content.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.2.0 2013-09-18
+ * @since       3.2.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+jimport( 'joomla.filesystem.path' );
+jimport('joomla.form.formfield');
+
+class JFormFieldModal_tos_content extends JFormField
+{
+	protected $type='modal_tos_content';
+
+//	protected function getLabel()
+//	{
+//	   return ' ';
+//	}
+
+	protected function getInput()
+	{
+
+		jimport('joomla.application.component.helper');
+		$icagendaParams = JComponentHelper::getParams('com_icagenda');
+		$tosContent = $icagendaParams->get('tosContent', '');
+		$tos_Type = $icagendaParams->get('tos_Type', '');
+
+
+		$editor = JFactory::getEditor();
+//		$editor = JEditor::getEditor();
+
+		$html	= array();
+
+		$html[] = '<div id="tos_custom"><fieldset class="span9 iCleft">';
+		$html[] = $editor->display($this->name, $tosContent, "100%", "300", "300", "20", 1, null, null, null, array('mode' => 'advanced'));
+		$html[] = '</fieldset></div>';
+
+		if ($tos_Type == '2') {
+			$html[] = '<script type="text/javascript">';
+			$html[] = 'document.getElementById("ic_default").style.display = "none";';
+			$html[] = 'document.getElementById("ic_article").style.display = "none";';
+			$html[] = 'document.getElementById("tos_custom").style.display = "block";';
+			$html[] = '</script>';
+		} else {
+			$html[] = '<script type="text/javascript">';
+			$html[] = 'document.getElementById("tos_custom").style.display = "none";';
+			$html[] = '</script>';
+		}
+
+		return implode("\n", $html);
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/tos_default.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/tos_default.php
new file mode 100644
index 00000000..9a5bfbc6
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/tos_default.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.2.0 2013-09-18
+ * @since       3.2.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+jimport( 'joomla.filesystem.path' );
+jimport('joomla.form.formfield');
+
+class JFormFieldModal_tos_default extends JFormField
+{
+	protected $type='modal_tos_default';
+
+//	protected function getLabel()
+//	{
+//	   return ' ';
+//	}
+
+	protected function getInput()
+	{
+		jimport('joomla.application.component.helper');
+		$icagendaParams = JComponentHelper::getParams('com_icagenda');
+		$tosContent = $icagendaParams->get('tosContent');
+		$tos_Type = $icagendaParams->get('tos_Type', '');
+
+		$html	= array();
+
+		$html[] = '<div id="ic_default"><fieldset class="span9 iCleft">';
+		$html[] = ''.JText::_( 'COM_ICAGENDA_SUBMIT_TOS_TYPE_DEFAULT_LBL' ).'<br /><div class="alert alert-info">'.JText::_( 'COM_ICAGENDA_TOS' ).'</div>';
+		$html[] = '</fieldset></div>';
+
+		if ($tos_Type == '') {
+			$html[] = '<script type="text/javascript">';
+			$html[] = 'document.getElementById("ic_default").style.display = "block";';
+			$html[] = 'document.getElementById("ic_article").style.display = "none";';
+			$html[] = 'document.getElementById("tos_custom").style.display = "none";';
+			$html[] = '</script>';
+		} else {
+			$html[] = '<script type="text/javascript">';
+			$html[] = 'document.getElementById("ic_default").style.display = "none";';
+			$html[] = '</script>';
+		}
+
+		return implode("\n", $html);
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/tos_type.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/tos_type.php
new file mode 100644
index 00000000..c035030e
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/modal/tos_type.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.2.0 2013-09-18
+ * @since       3.2.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+jimport( 'joomla.filesystem.path' );
+jimport('joomla.form.formfield');
+
+class JFormFieldModal_tos_type extends JFormField
+{
+	protected $type='modal_tos_type';
+
+	protected function getInput()
+	{
+		jimport('joomla.application.component.helper');
+
+		$icagendaParams = JComponentHelper::getParams('com_icagenda');
+		$tos_Type = $icagendaParams->get('tos_Type', '');
+		$class_default = '';
+		$class_article = '';
+		$class_custom = '';
+		$checked_default = '';
+		$checked_article = '';
+		$checked_custom = '';
+		if ($tos_Type == '') {
+			$class_default = 'btn-success';
+			$checked_default = ' checked="checked"';
+			$checked_article = '';
+			$checked_custom = '';
+		}
+		elseif ($tos_Type == '1') {
+			$class_article = 'btn-success';
+			$checked_default = '';
+			$checked_article = ' checked="checked"';
+			$checked_custom = '';
+		}
+		elseif ($tos_Type == '2') {
+			$class_custom = 'btn-success';
+			$checked_default = '';
+			$checked_article = '';
+			$checked_custom = ' checked="checked"';
+		} else {
+			$class_default = 'btn-success';
+			$checked_default = ' checked="checked"';
+			$checked_article = '';
+			$checked_custom = '';
+		}
+
+		$html	= array();
+		$html[]	= '<fieldset class="radio btn-group">';
+		$html[]	= '<label class="'.$class_default.'">'.JText::_( 'IC_DEFAULT' ).'<input type="radio"  id="tos_Type0" name="'.$this->name.'" value=""  onClick="tosdefault();"'.$checked_default.' /></label>';
+		$html[]	= '<label class="'.$class_article.'">'.JText::_( 'IC_ARTICLE' ).'<input type="radio"  id="tos_Type1" name="'.$this->name.'" value="1"  onClick="tosarticle();"'.$checked_article.' /></label>';
+		$html[]	= '<label class="'.$class_custom.'">'.JText::_( 'IC_CUSTOM_TEXT' ).'<input type="radio"  id="tos_Type2" name="'.$this->name.'" value="2"  onClick="toscustom();"'.$checked_custom.' /></label>';
+		$html[]	= '</fieldset>';
+
+
+
+		$html[]	= '<script type="text/javascript">';
+//		$html[]	= 'var tos_Type0 = document.getElementById("tos_Type0").checked;';
+//		$html[]	= 'var tos_Type1 = document.getElementById("tos_Type1").checked;';
+//		$html[]	= 'var tos_Type2 = document.getElementById("tos_Type2").checked;';
+//		$html[]	= 'if(tos_Type0==true)';
+//		$html[]	= '{';
+//		$html[]	= 'document.getElementByName("tos_Type").value = "";';
+//		$html[]	= '$("#tos_Type1").attr("checked", "checked");';
+//		$html[]	= '}';
+//		$html[]	= 'if(tos_Type1==true)';
+//		$html[]	= '{';
+//		$html[]	= 'document.getElementByName("tos_Type").value = 1;';
+//		$html[]	= '}';
+//		$html[]	= 'if(tos_Type2==true)';
+//		$html[]	= '{';
+//		$html[]	= 'document.getElementByName("tos_Type").value = 2;';
+//		$html[]	= '}';
+//		$html[]	= '';
+//		$html[]	= '';
+		$html[]	= 'function tosdefault()';
+		$html[]	= '{';
+		$html[]	= 'document.getElementById("ic_default").style.display = "block";';
+		$html[]	= 'document.getElementById("ic_article").style.display = "none";';
+		$html[]	= 'document.getElementById("tos_custom").style.display = "none";';
+		$html[]	= '$("#tos_Type0").attr("checked", "checked");';
+		$html[]	= '}';
+		$html[]	= 'function tosarticle()';
+		$html[]	= '{';
+		$html[]	= 'document.getElementById("ic_default").style.display = "none";';
+		$html[]	= 'document.getElementById("ic_article").style.display = "block";';
+		$html[]	= 'document.getElementById("tos_custom").style.display = "none";';
+		$html[]	= '$("#tos_Type1").attr("checked", "checked");';
+		$html[]	= '}';
+		$html[]	= 'function toscustom()';
+		$html[]	= '{';
+		$html[]	= 'document.getElementById("ic_default").style.display = "none";';
+		$html[]	= 'document.getElementById("ic_article").style.display = "none";';
+		$html[]	= 'document.getElementById("tos_custom").style.display = "block";';
+		$html[]	= '$("#tos_Type2").attr("checked", "checked");';
+		$html[]	= '}';
+		$html[]	= '</script>';
+
+		return implode("\n", $html);
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/spacer/description.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/spacer/description.php
new file mode 100644
index 00000000..6a22bfa7
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/spacer/description.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.6.0 2016-07-07
+ * @since       3.6.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+/**
+ * Spacer Description form field
+ */
+class JFormFieldSpacer_Description extends JFormField
+{
+	public $type = 'spacer_description';
+
+	public function getLabel()
+	{
+		if (empty($this->element['label']))
+		{
+			return '';
+		}
+
+		$desc   = $this->element['label']
+				? (string) $this->element['label']
+				: ($this->element['title'] ? (string) $this->element['title'] : '');
+
+		$class  = $this->class ? (string) trim($this->class) : '';
+		$class  = ! empty($class) ? ' class="' . $class . '"' : ' style="clear: both;"';
+
+		$html   = array();
+
+		$html[] = '<div' . $class . '>';
+		$html[] = ! empty($desc) ? $desc : '';
+		$html[] = '</div>';
+
+		return '</div><div>' . implode('', $html);
+	}
+
+	public function getInput()
+	{
+		return '';
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/fields/spacer/label.php b/deployed/icagenda/administrator/components/com_icagenda/models/fields/spacer/label.php
new file mode 100644
index 00000000..3a5625fc
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/fields/spacer/label.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.6.0 2016-07-07
+ * @since       3.6.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+/**
+ * Spacer Label form field
+ */
+class JFormFieldSpacer_Label extends JFormField
+{
+	public $type = 'spacer_label';
+
+	public function getLabel()
+	{
+		if (empty($this->element['label']))
+		{
+			return '';
+		}
+
+		$title  = $this->element['label']
+				? (string) $this->element['label']
+				: ($this->element['title'] ? (string) $this->element['title'] : '');
+
+		$spacer_class = $this->class ? (string) $this->class : '';
+		$class_ex     = explode(' ', $spacer_class);
+
+		$heading = 'h4';
+
+		foreach ($class_ex AS $c)
+		{
+			if (in_array(strtolower($c), array('h1', 'h2', 'h3', 'h4', 'h5', 'h6')))
+			{
+				$heading = strtolower($c);
+			}
+		}
+
+		$class = trim(str_replace($heading, '', $spacer_class));
+		$class = ! empty($class) ? ' class="' . $class . '"' : '';
+
+		$html   = array();
+
+		$html[] = '<div' . $class . '>';
+		$html[] = ! empty($title) ? '<' . $heading . '>' . JText::_($title) . '</' . $heading . '>' : '';
+		$html[] = '</div>';
+
+		return '</div><div>' . implode('', $html);
+	}
+
+	public function getInput()
+	{
+		return '';
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/forms/category.xml b/deployed/icagenda/administrator/components/com_icagenda/models/forms/category.xml
new file mode 100644
index 00000000..989b4cc4
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/forms/category.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<!--fields addfieldpath="/administrator/components/com_icagenda/models/fields"-->
+	<fieldset addfieldpath="/administrator/components/com_icagenda/models/fields">
+		<field
+			name="id"
+			type="text"
+			class="readonly"
+			label="JGLOBAL_FIELD_ID_LABEL"
+			description ="JGLOBAL_FIELD_ID_DESC"
+			size="10"
+			default="0"
+			readonly="true"
+		/>
+
+		<field
+ 			name="title"
+ 			type="text"
+ 			label="COM_ICAGENDA_FORM_LBL_CATEGORY_TITLE"
+			description="COM_ICAGENDA_FORM_DESC_CATEGORY_TITLE"
+			size="30"
+			required="true"
+		/>
+
+		<field
+			name="alias"
+			type="text"
+			label="JFIELD_ALIAS_LABEL"
+			description="JFIELD_ALIAS_DESC"
+		/>
+
+		<field
+			name="color"
+			type="color"
+			size="40"
+			class="inputbox"
+			label="COM_ICAGENDA_FORM_LBL_CATEGORY_COLOR"
+			description="COM_ICAGENDA_FORM_DESC_CATEGORY_COLOR"
+			default="#bdbdbd"
+		/>
+
+		<field
+			name="desc"
+			type="editor"
+			buttons="readmore,pagebreak"
+			class="inputbox"
+			filter="JComponentHelper::filterText"
+			label="COM_ICAGENDA_FORM_LBL_EVENT_DESC"
+			description="COM_ICAGENDA_FORM_DESC_EVENT_DESC"
+		/>
+
+		<field
+			name="state"
+			type="list"
+			label="JSTATUS"
+			description="JFIELD_PUBLISHED_DESC"
+			class="span12 small"
+			filter="intval"
+			size="1"
+			default="1">
+				<option value="1">JPUBLISHED</option>
+				<option value="0">JUNPUBLISHED</option>
+		</field>
+
+		<field name="checked_out" type="hidden" filter="unset" />
+		<field name="checked_out_time" type="hidden" filter="unset" />
+
+	</fieldset>
+</form>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/forms/customfield.xml b/deployed/icagenda/administrator/components/com_icagenda/models/forms/customfield.xml
new file mode 100644
index 00000000..61f2c392
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/forms/customfield.xml
@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset addfieldpath="/administrator/components/com_icagenda/models/fields">
+		<field
+			name="parent_form"
+			type="list"
+			filter="intval"
+			required="true"
+			label="COM_ICAGENDA_CUSTOMFIELD_PARENT_FORM_LBL"
+			description="COM_ICAGENDA_CUSTOMFIELD_PARENT_FORM_DESC"
+			default=""
+			>
+				<option value="">IC_SELECT_AN_OPTION</option>
+				<option value="1">COM_ICAGENDA_CUSTOMFIELD_PARENT_REGISTRATION_FORM</option>
+				<option value="2">COM_ICAGENDA_CUSTOMFIELD_PARENT_EVENT_EDIT</option>
+		</field>
+
+		<field
+			name="type"
+			type="list"
+			label="COM_ICAGENDA_CUSTOMFIELD_TYPE_LBL"
+			description="COM_ICAGENDA_CUSTOMFIELD_TYPE_DESC"
+			default=""
+			required="true"
+			>
+			<option value="">IC_SELECT_AN_OPTION</option>
+			<option value="text">COM_ICAGENDA_CUSTOMFIELD_TYPE_TEXT</option>
+			<option value="list">COM_ICAGENDA_CUSTOMFIELD_TYPE_LIST</option>
+			<option value="radio">COM_ICAGENDA_CUSTOMFIELD_TYPE_RADIO</option>
+			<option value="calendar">COM_ICAGENDA_CUSTOMFIELD_TYPE_CALENDAR</option>
+			<option value="url">COM_ICAGENDA_CUSTOMFIELD_TYPE_URL</option>
+			<option value="email">COM_ICAGENDA_CUSTOMFIELD_TYPE_EMAIL</option>
+			<option value="spacer_label">COM_ICAGENDA_CUSTOMFIELD_TYPE_SPACER_LABEL</option>
+			<option value="spacer_description">COM_ICAGENDA_CUSTOMFIELD_TYPE_SPACER_DESCRIPTION</option>
+			<option value="core_name">CORE::NAME</option>
+			<option value="core_email">CORE::EMAIL</option>
+			<option value="core_phone">CORE::PHONE</option>
+			<option value="core_date">CORE::DATE</option>
+			<option value="core_people">CORE::TICKETS</option>
+		</field>
+
+		<field
+			name="spacer_settings"
+			type="spacer"
+			label="COM_ICAGENDA_CUSTOMFIELD_SETTINGS_LABEL"
+			class="ic-spacer-h3"
+			showon="parent_form:1,2"
+		/>
+
+		<field
+			name="title"
+			type="text"
+			label="COM_ICAGENDA_CUSTOMFIELD_TITLE_LBL"
+			description="COM_ICAGENDA_CUSTOMFIELD_TITLE_DESC"
+			size="30"
+			required="true"
+			showon="parent_form:1,2"
+			/>
+
+		<field
+			name="slug"
+			type="text"
+			label="COM_ICAGENDA_CUSTOMFIELD_SLUG_LBL"
+			description="COM_ICAGENDA_CUSTOMFIELD_SLUG_DESC"
+			showon="type:text,list,radio,calendar,url,email,spacer_label,spacer_description"
+			/>
+
+		<field
+			name="groups"
+			type="icagenda.customfieldgroups"
+			label="COM_ICAGENDA_CUSTOMFIELD_GROUPS_LABEL"
+			description="COM_ICAGENDA_CUSTOMFIELD_GROUPS_DESC"
+			class="inputbox input-normal"
+			multiple="true"
+			showon="parent_form:1"
+			/>
+
+		<field
+			name="spacer_options"
+			type="spacer"
+			label="COM_ICAGENDA_CUSTOMFIELD_OPTIONS_LABEL"
+			class="ic-spacer-h3"
+			showon="type:text,list,radio,calendar,url,email,spacer_label,core_name,core_email,core_phone"
+		/>
+
+		<field
+			name="placeholder"
+			type="text"
+			label="COM_ICAGENDA_CUSTOMFIELD_PLACEHOLDER_LBL"
+			description="COM_ICAGENDA_CUSTOMFIELD_PLACEHOLDER_DESC"
+			showon="type:text,url,email,core_name,core_email,core_phone"
+		/>
+
+		<field
+			name="spacer_class"
+			type="text"
+			label="COM_ICAGENDA_CUSTOMFIELD_SPACER_CLASS_LBL"
+			description="COM_ICAGENDA_CUSTOMFIELD_SPACER_CLASS_DESC"
+			showon="type:spacer_label,spacer_description"
+		/>
+
+		<field
+			name="options"
+			type="textarea"
+			label="COM_ICAGENDA_CUSTOMFIELD_OPTIONS_LBL"
+			description="COM_ICAGENDA_CUSTOMFIELD_OPTIONS_DESC"
+			showon="type:list,radio"
+		/>
+
+		<field
+			name="required"
+			type="radio"
+			label="COM_ICAGENDA_CUSTOMFIELD_REQUIRED_LBL"
+			description="COM_ICAGENDA_CUSTOMFIELD_REQUIRED_DESC"
+			default="0"
+			class="btn-group"
+			labelclass="control-label"
+			showon="type:text,list,radio,calendar,url,email"
+			>
+			<option value="0">JNO</option>
+			<option value="1">JYES</option>
+		</field>
+
+		<!-- @TODO : enable it for core override fields in 3.7.0 (when minimum Joomla version 3.2.4) -->
+		<!--field
+			name="required"
+			type="radio"
+			label="COM_ICAGENDA_CUSTOMFIELD_REQUIRED_LBL"
+			description="COM_ICAGENDA_CUSTOMFIELD_REQUIRED_DESC"
+			default="0"
+			class="btn-group"
+			labelclass="control-label"
+			showon="type:core_phone"
+			>
+			<option value="">JGLOBAL</option>
+			<option value="0">JNO</option>
+			<option value="1">JYES</option>
+		</field-->
+
+		<field
+			name="id"
+			type="text"
+			class="readonly"
+			label="JGLOBAL_FIELD_ID_LABEL"
+			description ="JGLOBAL_FIELD_ID_DESC"
+			size="10"
+			default="0"
+			readonly="true"
+			/>
+		<field
+			name="state"
+			type="list"
+			label="JSTATUS"
+			description="JFIELD_PUBLISHED_DESC"
+			class="span12 small"
+			filter="intval"
+			size="1"
+			default="1"
+			>
+				<option value="1">JPUBLISHED</option>
+				<option value="0">JUNPUBLISHED</option>
+		</field>
+		<field
+			name="alias"
+			type="text"
+			label="JFIELD_ALIAS_LABEL"
+			description="JFIELD_ALIAS_DESC"
+			/>
+		<field
+			name="description"
+			type="editor"
+			buttons="readmore,pagebreak"
+			class="inputbox"
+			filter="JComponentHelper::filterText"
+			label="COM_ICAGENDA_CUSTOMFIELD_DESCRIPTION_LBL"
+			description="COM_ICAGENDA_CUSTOMFIELD_DESCRIPTION_DESC"
+			/>
+		<!--field
+			name="default"
+			type="text"
+			label="COM_ICAGENDA_CUSTOMFIELD_DEFAULT_LBL"
+			description="COM_ICAGENDA_CUSTOMFIELD_DEFAULT_DESC"
+			/-->
+		<field
+			name="language"
+			type="contentlanguage"
+			label="JFIELD_LANGUAGE_LABEL"
+			description="COM_ICAGENDA_CUSTOMFIELD_LANGUAGE_DESC"
+			class="span12 small"
+			>
+				<option value="*">JALL</option>
+		</field>
+		<field
+			name="created"
+			type="calendar"
+			label="JGLOBAL_FIELD_CREATED_LABEL"
+			format="%Y-%m-%d %H:%M:%S"
+			filter="user_utc"
+			labelclass="control-label"
+			/>
+		<field
+			name="created_by"
+			type="user"
+			label="JGLOBAL_FIELD_CREATED_BY_LABEL"
+			description="JGLOBAL_FIELD_CREATED_BY_DESC"
+			labelclass="control-label"
+			/>
+		<!-- created_by_alias to be removed ? Not really needed there... -->
+		<field
+			name="created_by_alias"
+			type="text"
+			label="JGLOBAL_FIELD_CREATED_BY_ALIAS_LABEL"
+			description="JGLOBAL_FIELD_CREATED_BY_ALIAS_DESC"
+			class="inputbox"
+			size="20"
+			labelclass="control-label"
+			/>
+		<field
+			name="modified"
+			type="calendar"
+			class="readonly"
+			label="JGLOBAL_FIELD_MODIFIED_LABEL"
+			size="22"
+			readonly="true"
+			format="%Y-%m-%d %H:%M:%S"
+			filter="user_utc"
+			labelclass="control-label"
+			/>
+		<field
+			name="modified_by"
+			type="user"
+			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
+			description="JGLOBAL_FIELD_MODIFIED_BY_DESC"
+			class="readonly"
+			readonly="true"
+			filter="unset"
+			labelclass="control-label"
+			/>
+		<field name="checked_out" type="hidden" filter="unset" />
+		<field name="checked_out_time" type="hidden" filter="unset" />
+	</fieldset>
+</form>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/forms/download.xml b/deployed/icagenda/administrator/components/com_icagenda/models/forms/download.xml
new file mode 100644
index 00000000..f21fac65
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/forms/download.xml
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+
+	<fieldset name="details" addfieldpath="/administrator/components/com_icagenda/assets/elements">
+
+		<field type="spacer" name="spacerOptions" label="JOPTIONS" class="ic-spacer-h3" />
+
+		<field
+			name="event_title"
+			type="radio"
+			label="COM_ICAGENDA_EXPORT_EVENT_TITLE_LABEL"
+			default="1"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="date"
+			type="radio"
+			label="COM_ICAGENDA_REGISTRATION_DATE"
+			default="1"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="tickets"
+			type="radio"
+			label="COM_ICAGENDA_REGISTRATION_TICKETS"
+			default="1"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="name"
+			type="radio"
+			label="IC_NAME"
+			default="1"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="email"
+			type="radio"
+			label="COM_ICAGENDA_REGISTRATION_EMAIL"
+			default="1"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="phone"
+			type="radio"
+			label="COM_ICAGENDA_REGISTRATION_PHONE"
+			default="1"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="customfields"
+			type="radio"
+			label="COM_ICAGENDA_CUSTOMFIELDS"
+			default="1"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="notes"
+			type="radio"
+			label="COM_ICAGENDA_REGISTRATION_NOTES_DISPLAY_LABEL"
+			default="0"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="status"
+			type="radio"
+			label="JSTATUS"
+			default="0"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="created"
+			type="radio"
+			label="JGLOBAL_FIELD_CREATED_LABEL"
+			default="1"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="reg_id"
+			type="radio"
+			label="JGLOBAL_FIELD_ID_LABEL"
+			default="0"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field type="spacer" name="spacerExport" label="COM_ICAGENDA_REGISTRATIONS_EXPORT" class="ic-spacer-h3" />
+
+		<field
+			name="basename"
+			type="text"
+			label="COM_ICAGENDA_EXPORT_BASENAME_LABEL"
+			description="COM_ICAGENDA_EXPORT_BASENAME_DESC"
+			size="40"
+			class="inputbox"
+		/>
+
+		<field
+			name="character_encoding"
+			type="list"
+			label="COM_ICAGENDA_EXPORT_ENCODING_LABEL"
+			description="COM_ICAGENDA_EXPORT_ENCODING_DESC"
+			default="UTF-8"
+			>
+			<option value="BIG5">BIG5</option>
+			<option value="ISO-2022-JP">ISO-2022-JP</option>
+			<option value="ISO-8859-1">ISO-8859-1</option>
+			<option value="ISO-8859-2">ISO-8859-2</option>
+			<option value="ISO-8859-3">ISO-8859-3</option>
+			<option value="ISO-8859-4">ISO-8859-4</option>
+			<option value="ISO-8859-5">ISO-8859-5</option>
+			<option value="ISO-8859-6">ISO-8859-6</option>
+			<option value="ISO-8859-7">ISO-8859-7</option>
+			<option value="ISO-8859-8">ISO-8859-8</option>
+			<option value="ISO-8859-9">ISO-8859-9</option>
+			<option value="ISO-8859-10">ISO-8859-10</option>
+			<option value="ISO-8859-13">ISO-8859-13</option>
+			<option value="ISO-8859-14">ISO-8859-14</option>
+			<option value="ISO-8859-15">ISO-8859-15</option>
+			<!-- (iconv?) option value="ISO-8859-16">ISO-8859-16</option-->
+			<!-- (iconv?) option value="US-ASCII">US-ASCII</option-->
+			<option value="UTF-7">UTF-7</option>
+			<option value="UTF-8">UTF-8</option>
+			<option value="UTF-16">UTF-16</option>
+			<option value="Windows-1251">Windows-1251</option>
+			<option value="Windows-1252">Windows-1252</option>
+			<option value="Windows-1256">Windows-1256</option>
+		</field>
+
+		<field
+			name="separator"
+			type="radio"
+			label="COM_ICAGENDA_EXPORT_SEPARATOR_LABEL"
+			description="COM_ICAGENDA_EXPORT_SEPARATOR_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">IC_COMMA</option>
+			<option value="2">IC_SEMICOLON</option>
+		</field>
+
+		<field
+			name="compressed"
+			type="radio"
+			label="COM_ICAGENDA_EXPORT_COMPRESSED_LABEL"
+			description="COM_ICAGENDA_EXPORT_COMPRESSED_DESC"
+			default="0"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+	</fieldset>
+</form>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/forms/event.xml b/deployed/icagenda/administrator/components/com_icagenda/models/forms/event.xml
new file mode 100644
index 00000000..990104f6
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/forms/event.xml
@@ -0,0 +1,664 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset addfieldpath="/administrator/components/com_icagenda/models/fields" >
+		<field
+			name="id"
+			type="text"
+			label="JGLOBAL_FIELD_ID_LABEL"
+			description ="JGLOBAL_FIELD_ID_DESC"
+			class="readonly"
+			size="10"
+			readonly="true"
+			default="0"
+			/>
+		<field
+			name="title"
+			type="text"
+			label="COM_ICAGENDA_FORM_LBL_EVENT_TITLE"
+			description="COM_ICAGENDA_FORM_DESC_EVENT_TITLE"
+			class="input-xlarge"
+			size="30"
+			required="true"
+			/>
+		<field
+			name="alias"
+			type="text"
+			label="JFIELD_ALIAS_LABEL"
+			description="JFIELD_ALIAS_DESC"
+			/>
+		<field
+			name="state"
+			type="list"
+			label="JSTATUS"
+			description="JFIELD_PUBLISHED_DESC"
+			class="span12 small"
+			filter="intval"
+			size="1"
+			default="1"
+			>
+			<option value="1">JPUBLISHED</option>
+			<option value="0">JUNPUBLISHED</option>
+			<option value="2">JARCHIVED</option>
+			<option value="-2">JTRASHED</option>
+		</field>
+		<field
+			name="approval"
+			type="list"
+			label="COM_ICAGENDA_EVENTS_APPROVAL"
+			description="COM_ICAGENDA_EVENTS_APPROVAL_DESC"
+			class="span12 small"
+			filter="intval"
+			size="1"
+			default="0"
+			>
+			<option value="0">COM_ICAGENDA_APPROVED</option>
+			<option value="1">COM_ICAGENDA_UNAPPROVED</option>
+		</field>
+		<field
+			name="site_itemid"
+			type="test"
+			label="COM_ICAGENDA_FORM_FRONTEND_SUBMIT_ITEMID_LBL"
+			description="COM_ICAGENDA_FORM_FRONTEND_SUBMIT_ITEMID_DESC"
+			size="3"
+			class="inputbox"
+			readonly="true"
+			default="0"
+			/>
+		<field
+			name="username"
+			type="text"
+			label="COM_ICAGENDA_FORM_LBL_EVENT_USERNAME"
+			description="COM_ICAGENDA_FORM_DESC_EVENT_USERNAME"
+			size="40"
+			class="inputbox"
+			filter="safehtml"
+			readonly="true"
+			/>
+		<field
+			name="access"
+			type="accesslevel"
+			label="JFIELD_ACCESS_LABEL"
+			description="COM_ICAGENDA_ACCESS_DESC"
+			class="span12 small"
+			size="1"
+			default="1"
+		/>
+		<field
+			name="language"
+			type="contentlanguage"
+			label="JFIELD_LANGUAGE_LABEL"
+			description="COM_ICAGENDA_FORM_DESC_LANGUAGE"
+			class="span12 small"
+			>
+			<option value="*">JALL</option>
+		</field>
+		<field
+			name="hits"
+			type="text"
+			label="JGLOBAL_HITS"
+			description="COM_ICAGENDA_FIELD_HITS_DESC"
+			class="span12 small readonly"
+			size="6"
+			readonly="true"
+			filter="unset"
+		/>
+		<field
+			name="created"
+			type="calendar"
+			label="JGLOBAL_FIELD_CREATED_LABEL"
+			format="%Y-%m-%d %H:%M:%S"
+			filter="user_utc"
+			/>
+		<field
+			name="created_by"
+			type="user"
+			label="JGLOBAL_FIELD_CREATED_BY_LABEL"
+			description="JGLOBAL_FIELD_CREATED_BY_DESC"
+			/>
+		<field
+			name="created_by_alias"
+			type="text"
+			label="JGLOBAL_FIELD_CREATED_BY_ALIAS_LABEL"
+			description="JGLOBAL_FIELD_CREATED_BY_ALIAS_DESC"
+			class="inputbox"
+			size="20"
+			/>
+		<field
+			name="modified"
+			type="calendar"
+			label="JGLOBAL_FIELD_MODIFIED_LABEL"
+			class="readonly"
+			size="22"
+			readonly="true"
+			format="%Y-%m-%d %H:%M:%S"
+			filter="user_utc"
+			/>
+		<field
+			name="modified_by"
+			type="user"
+			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
+			description="JGLOBAL_FIELD_MODIFIED_BY_DESC"
+			class="readonly"
+			readonly="true"
+			filter="unset"
+			/>
+		<field name="checked_out" type="hidden" filter="unset" />
+		<field name="checked_out_time" type="hidden" filter="unset" />
+		<field
+			name="catid"
+			type="modal_cat"
+			label="COM_ICAGENDA_FORM_LBL_EVENT_CATID"
+			description="COM_ICAGENDA_FORM_DESC_EVENT_CATID"
+			class="inputbox"
+			required="true"
+			/>
+		<field
+			name="image"
+			type="media"
+			label="COM_ICAGENDA_FORM_LBL_EVENT_IMAGE"
+			description="COM_ICAGENDA_FORM_DESC_EVENT_IMAGE"
+			hide_none="1"
+			/>
+		<field
+			name="file"
+			type="modal_icfile"
+			class="inputbox"
+			id="upload_file"
+			label="COM_ICAGENDA_FORM_LBL_EVENT_FILE"
+			description="COM_ICAGENDA_FORM_DESC_EVENT_FILE"
+			/>
+		<field
+			name="displaytime"
+			type="radio"
+			class="btn-group"
+			label="COM_ICAGENDA_DISPLAY_TIME_LABEL"
+			description="COM_ICAGENDA_DISPLAY_TIME_DESC"
+			>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+		<field
+			name="dates"
+			type="modal_date"
+			class="inputbox"
+			label="COM_ICAGENDA_FORM_LBL_EVENT_DATES"
+			description="COM_ICAGENDA_FORM_DESC_EVENT_DATES"
+			default="0000-00-00 00:00"
+			/>
+		<!--field
+			name="eventDates"
+			type="modal_ic_singledates"
+			label="COM_ICAGENDA_FORM_LBL_EVENT_DATES"
+			description="COM_ICAGENDA_FORM_DESC_EVENT_DATES"
+			class="inputbox"
+			/-->
+		<field
+			name="startdate"
+			type="modal_startdate"
+			size="40"
+			class="inputbox"
+			label="COM_ICAGENDA_FORM_LBL_EVENTPERIOD_START"
+			description="COM_ICAGENDA_FORM_DESC_EVENTPERIOD_START"
+			/>
+		<field
+			name="enddate"
+			type="modal_enddate"
+			size="40"
+			class="inputbox"
+			label="COM_ICAGENDA_FORM_LBL_EVENTPERIOD_END"
+			description="COM_ICAGENDA_FORM_DESC_EVENTPERIOD_END"
+			/>
+		<field
+			name="weekdays"
+			type="list"
+			label="COM_ICAGENDA_FORM_LBL_WEEK_DAYS"
+			description="COM_ICAGENDA_FORM_WEEK_DAYS_INFO_DESC"
+			multiple="true"
+			default=""
+			>
+			<option value="0">SUNDAY</option>
+			<option value="1">MONDAY</option>
+			<option value="2">TUESDAY</option>
+			<option value="3">WEDNESDAY</option>
+			<option value="4">THURSDAY</option>
+			<option value="5">FRIDAY</option>
+			<option value="6">SATURDAY</option>
+		</field>
+		<!--field
+			name="weekdays_filter"
+			type="modal_icfilter_weekdays"
+			label="COM_ICAGENDA_FORM_LBL_WEEK_DAYS"
+			description="COM_ICAGENDA_FORM_DESC_WEEK_DAYS"
+			multiple="true"
+			default=""
+			/-->
+		<field
+			name="next"
+			type="hidden"
+			class="inputbox"
+			default="0000-00-00 00:00:00"
+			/>
+		<field
+			name="email"
+			type="email"
+			label="COM_ICAGENDA_FORM_LBL_EVENT_EMAIL"
+			description="COM_ICAGENDA_FORM_DESC_EVENT_EMAIL"
+			size="30"
+			class="inputbox"
+			filter="safehtml"
+			/>
+		<field
+			name="phone"
+			type="text"
+			label="COM_ICAGENDA_FORM_LBL_EVENT_PHONE"
+			description="COM_ICAGENDA_FORM_DESC_EVENT_PHONE"
+			size="30"
+			class="inputbox"
+			filter="safehtml"
+			/>
+		<field
+			name="website"
+			type="text"
+			label="COM_ICAGENDA_FORM_LBL_EVENT_WEBSITE"
+			description="COM_ICAGENDA_FORM_DESC_EVENT_WEBSITE"
+			size="30"
+			class="inputbox"
+			filter="safehtml"
+			/>
+		<field
+			name="features"
+			type="sql"
+			label="COM_ICAGENDA_FORM_LBL_EVENT_FEATURES"
+			description="COM_ICAGENDA_FORM_DESC_EVENT_FEATURES"
+			query="SELECT id AS value, title AS features FROM #__icagenda_feature WHERE state=1 AND icon IS NOT NULL AND icon!='' ORDER BY features"
+			multiple="true"
+			class="inputbox"
+			/>
+		<!--field
+			name="features"
+			type="modal_features"
+			label="COM_ICAGENDA_FORM_LBL_EVENT_FEATURES"
+			description="COM_ICAGENDA_FORM_DESC_EVENT_FEATURES"
+			multiple="true"
+			class="inputbox"
+			/-->
+		<field
+			name="custom_fields"
+			type="hidden"
+			class="inputbox"
+			default=""
+			/>
+		<field
+			name="place"
+			type="text"
+			label="COM_ICAGENDA_FORM_LBL_EVENT_VENUE"
+			description="COM_ICAGENDA_FORM_DESC_EVENT_VENUE"
+			size="30"
+			class="inputbox"
+			filter="safehtml"
+			/>
+		<field
+			name="coordinate"
+			type="modal_coordinate"
+			label="COM_ICAGENDA_FORM_LBL_EVENT_MAP"
+			description="COM_ICAGENDA_FORM_DESC_EVENT_MAP"
+			class="inputbox"
+			/>
+		<field
+			name="address"
+			type="text"
+			label="COM_ICAGENDA_GOOGLE_MAPS_ADDRESS_LBL"
+			description="COM_ICAGENDA_FORM_DESC_EVENT_LOCATION"
+			class="inputbox"
+			filter="safehtml"
+			/>
+		<field
+			name="city"
+			type="icmap_city"
+			label="COM_ICAGENDA_FORM_LBL_EVENT_CITY"
+			description="COM_ICAGENDA_FORM_DESC_EVENT_CITY"
+			class="inputbox"
+			filter="safehtml"
+			/>
+		<field
+			name="country"
+			type="icmap_country"
+			label="COM_ICAGENDA_FORM_LBL_EVENT_COUNTRY"
+			description="COM_ICAGENDA_FORM_DESC_EVENT_COUNTRY"
+			class="inputbox"
+			filter="safehtml"
+			labelclass="control-label"
+			/>
+		<field
+			name="lat"
+			type="icmap_lat"
+			label="LATITUDE"
+			description="COM_ICAGENDA_FORM_DESC_EVENT_MAP"
+			class="inputbox"
+			/>
+		<field
+			name="lng"
+			type="icmap_lng"
+			label="LONGITUDE"
+			description="COM_ICAGENDA_FORM_DESC_EVENT_MAP"
+			class="inputbox"
+			/>
+		<field
+			name="shortdesc"
+			type="modal_ictextarea_counter"
+			label="COM_ICAGENDA_FORM_EVENT_SHORT_DESCRIPTION_LBL"
+			description="COM_ICAGENDA_FORM_EVENT_SHORT_DESCRIPTION_DESC"
+			class="span-12"
+			row="3"
+			cols="80"
+			/>
+		<field
+			name="desc"
+			type="editor"
+			label="COM_ICAGENDA_FORM_LBL_EVENT_DESC"
+			description="COM_ICAGENDA_FORM_DESC_EVENT_DESC"
+			buttons="true"
+			hide="readmore,pagebreak,helix_shortcode"
+			class="inputbox"
+			filter="JComponentHelper::filterText"
+			/>
+		<field
+			name="metadesc"
+			type="modal_ictextarea_counter"
+			label="COM_ICAGENDA_FORM_EVENT_METADESC_LBL"
+			description="COM_ICAGENDA_FORM_EVENT_METADESC_DESC"
+			class="span-12"
+			row="3"
+			cols="80"
+			/>
+	</fieldset>
+	<fields name="params">
+
+		<!-- Registrations Tab - Individual Params -->
+		<fieldset name="registrations"
+			addfieldpath="/administrator/components/com_icagenda/assets/elements"
+			>
+			<field type="TitleHeader" label="COM_ICAGENDA_REGISTRATION_LABEL" />
+			<field
+				name="statutReg"
+				type="radio"
+				label="COM_ICAGENDA_REGISTRATION_LABEL"
+				description="COM_ICAGENDA_REGISTRATION_DESC"
+				labelclass="control-label"
+				class="btn-group"
+				default=""
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JOFF</option>
+				<option value="1">JON</option>
+			</field>
+			<field
+				name="accessReg"
+				type="accesslevel"
+				label="JFIELD_ACCESS_LABEL"
+				description="JFIELD_ACCESS_DESC"
+				class="inputbox"
+				size="1"
+				default=""
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+			</field>
+			<field
+				name="typeReg"
+				type="list"
+				label="COM_ICAGENDA_TYPE_REG_LABEL"
+				description="COM_ICAGENDA_TYPE_REG_DESC"
+				default="1"
+				>
+				<option value="1">COM_ICAGENDA_ADMIN_REGISTRATION_BY_INDIVIDUAL_DATE</option>
+				<option value="2">COM_ICAGENDA_ADMIN_REGISTRATION_FOR_ALL_DATES</option>
+			</field>
+			<field
+				name="reg_deadline"
+				type="radio"
+				label="COM_ICAGENDA_REGISTRATION_DEADLINE_LABEL"
+				description="COM_ICAGENDA_REGISTRATION_DEADLINE_DESC"
+				class="btn-group"
+				labelclass="control-label"
+				default=""
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="1">COM_ICAGENDA_REGISTRATION_DEADLINE_START</option>
+				<option value="2">COM_ICAGENDA_REGISTRATION_DEADLINE_END</option>
+			</field>
+			<field type="TitleHeader" label="COM_ICAGENDA_REGISTRATION_FORM_OPTIONS_LABEL" />
+			<field
+				name="custom_form"
+				type="icagenda.customform"
+				label="COM_ICAGENDA_REGISTRATION_FORM_GROUPS_LABEL"
+				description="COM_ICAGENDA_REGISTRATION_FORM_GROUPS_DESC"
+				multiple="true"
+				default=""
+			/>
+			<!--field type="Title" label="COM_ICAGENDA_MAX_REGISTRATIONS_DESC"
+				class="styleblanck"/-->
+			<!--field
+				name="maxRegGlobal"
+				type="radio"
+				label="JGLOBAL_USE_GLOBAL"
+				description="JGLOBAL_USE_GLOBAL"
+				default="1"
+				>
+				<option value="1">JYES</option>
+				<option value="0">JNO</option>
+			</field-->
+			<field
+				name="maxReg"
+				type="text"
+				label="COM_ICAGENDA_MAX_REGISTRATIONS_LABEL"
+				description="COM_ICAGENDA_MAX_REGISTRATIONS_DESC"
+				size="3"
+				default=""
+				/>
+			<field
+				name="maxRlistGlobal"
+				type="radio"
+				label="COM_ICAGENDA_MAX_PER_REGISTRATION_LABEL"
+				description="COM_ICAGENDA_MAX_PER_REGISTRATION_DESC"
+				labelclass="control-label"
+				class="btn-group"
+				default=""
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="2">COM_ICAGENDA_LBL_CUSTOM_VALUE</option>
+			</field>
+			<field
+				name="maxRlist"
+				type="text"
+				label="COM_ICAGENDA_LBL_CUSTOM_VALUE"
+				description="COM_ICAGENDA_DESC_CUSTOM_VALUE"
+				size="2"
+				default=""
+				showon="maxRlistGlobal:2"
+				/>
+			<field type="TitleHeader" label="COM_ICAGENDA_REGISTRATION_BUTTON" />
+			<!--field
+				name="maxRlistGlobal"
+				type="radio"
+				label="COM_ICAGENDA_MAX_PER_REGISTRATION_LABEL"
+				description="COM_ICAGENDA_MAX_PER_REGISTRATION_DESC"
+				labelclass="control-label"
+				class="btn-group"
+				default=""
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="2">COM_ICAGENDA_LBL_CUSTOM_VALUE</option>
+			</field-->
+			<field
+				name="RegButtonText"
+				type="modal_ph_regbt"
+				label="COM_ICAGENDA_REGISTRATION_BUTTON_TEXT"
+				description="COM_ICAGENDA_REGISTRATION_BUTTON_TEXT_DESC"
+				size="40"
+				class="inputbox"
+				default=""
+				/>
+			<field
+				name="RegButtonLink"
+				type="modal_iclink_type"
+				label="COM_ICAGENDA_REGISTRATION_LINK_LBL"
+				description="COM_ICAGENDA_REGISTRATION_LINK_DESC"
+				labelclass="control-label"
+				default=""
+				/>
+			<field
+				name="RegButtonLink_Article"
+				type="modal_iclink_article"
+				label=" "
+				class="inputbox"
+				/>
+			<field
+				name="RegButtonLink_Url"
+				type="modal_iclink_url"
+				label=" "
+				class="inputbox"
+				/>
+			<field
+				name="RegButtonTarget"
+				type="list"
+				label="COM_ICAGENDA_BROWSER_TARGET"
+				description="COM_ICAGENDA_REGISTRATION_LINK_BROWSER_TARGET_DESC"
+				default="0"
+				filter="options"
+				class="inputbox"
+				>
+				<option value="0">JBROWSERTARGET_PARENT</option>
+				<option value="1">JBROWSERTARGET_NEW</option>
+			</field>
+			<field type="Title" label=" "
+				class="styleblanck"/>
+		</fieldset>
+
+		<!-- Publishing Tab -->
+		<fieldset name="publishing">
+
+			<field
+				name="event_cancelled"
+				type="list"
+				label="COM_ICAGENDA_EVENT_CANCELLED_LABEL"
+				description="COM_ICAGENDA_EVENT_CANCELLED_DESC"
+				default="0"
+				>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field
+				name="event_cancelled_customlabel"
+				type="radio"
+				label="COM_ICAGENDA_EVENT_CANCELLED_CUSTOMLABEL_LABEL"
+				description="COM_ICAGENDA_EVENT_CANCELLED_CUSTOMLABEL_DESC"
+				class="btn-group"
+				default=""
+				showon="event_cancelled:1"
+				>
+				<option value="">JDEFAULT</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field
+				name="event_cancelled_customlabel_text"
+				type="text"
+				label="COM_ICAGENDA_EVENT_CANCELLED_CUSTOMLABEL_TEXT_LABEL"
+				description="COM_ICAGENDA_EVENT_CANCELLED_CUSTOMLABEL_TEXT_DESC"
+				size="40"
+				class="inputbox"
+				default=""
+				hint="COM_ICAGENDA_EVENT_CANCELLED_TEXT"
+				showon="event_cancelled:1[AND]event_cancelled_customlabel:1"
+			/>
+
+			<field
+				name="event_cancelled_customlabel_css"
+				type="text"
+				label="COM_ICAGENDA_EVENT_CANCELLED_CUSTOMLABEL_CSS_LABEL"
+				description="COM_ICAGENDA_EVENT_CANCELLED_CUSTOMLABEL_CSS_DESC"
+				size="40"
+				class="inputbox"
+				default=""
+				hint="label label-important"
+				showon="event_cancelled:1[AND]event_cancelled_customlabel:1"
+			/>
+
+			<field 
+				name="event_cancelled_desc"
+				type="editor"
+				label="COM_ICAGENDA_EVENT_CANCELLED_INFOTEXT_LABEL"
+				description="COM_ICAGENDA_EVENT_CANCELLED_INFOTEXT_DESC"
+				buttons="readmore,pagebreak"
+				filter="safehtml"
+				showon="event_cancelled:1"
+			/>
+
+			<field
+				name="event_cancelled_date"
+				type="calendar"
+				label="COM_ICAGENDA_EVENT_CANCELLED_DATE_LABEL"
+				class="readonly"
+				size="22"
+				readonly="true"
+				format="%Y-%m-%d %H:%M:%S"
+				filter="user_utc"
+				showon="event_cancelled:1"
+			/>
+
+			<field 
+				name="event_cancelled_spacer" 
+				type="spacer" 
+				hr="true"
+			/>
+		</fieldset>
+
+		<!-- Registrations Tab - Actions -->
+		<fieldset name="registration_actions">
+		</fieldset>
+
+		<fieldset name="registration_payment">
+		</fieldset>
+
+		<!-- Option Tab - Options -->
+		<fieldset name="options">
+			<field type="Title" label="COM_ICAGENDA_ADDTHIS"
+				class="styleblanck"/>
+			<field
+				name="atevent"
+				type="radio"
+				label="COM_ICAGENDA_ADDTHIS_DISPLAY_SHARING"
+				description="COM_ICAGENDA_ADDTHIS_EVENT_DESC"
+				class="btn-group"
+				default=""
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+			<!--field
+				name="mapTypeId"
+				type="list"
+				label="mapTypeId"
+				description="mapTypeId"
+				filter="safehtml"
+				default="ROADMAP"
+				>
+				<option value="ROADMAP">ROADMAP</option>
+				<option value="TERRAIN">TERRAIN</option>
+				<option value="SATELLITE">SATELLITE</option>
+				<option value="HYBRID">HYBRID</option>
+			</field-->
+		</fieldset>
+
+		<!-- Management Actions -->
+		<fieldset name="management_actions">
+			<field
+				name="first_published_and_approved"
+				type="hidden"
+				default="0"
+			/>
+		</fieldset>
+	</fields>
+</form>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/forms/feature.xml b/deployed/icagenda/administrator/components/com_icagenda/models/forms/feature.xml
new file mode 100644
index 00000000..965f1def
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/forms/feature.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+
+	<fieldset addfieldpath="/administrator/components/com_icagenda/models/fields">
+
+		<field
+			name="id"
+			type="text"
+			label="JGLOBAL_FIELD_ID_LABEL"
+			description ="JGLOBAL_FIELD_ID_DESC"
+			default="0"
+			size="10"
+			class="readonly"
+			readonly="true"
+		/>
+
+		<field
+			name="title"
+			type="text"
+			label="COM_ICAGENDA_FORM_FEATURE_TITLE_LABEL"
+			description="COM_ICAGENDA_FORM_FEATURE_TITLE_DESC"
+			size="30"
+			required="true"
+		/>
+
+		<field
+			name="alias"
+			type="text"
+			label="JFIELD_ALIAS_LABEL"
+			description="JFIELD_ALIAS_DESC"
+		/>
+
+		<field
+			name="icon"
+			type="imagelist"
+			label="COM_ICAGENDA_FORM_FEATURE_ICON_LABEL"
+			description="COM_ICAGENDA_FORM_FEATURE_ICON_DESC"
+			directory="images/icagenda/feature_icons/16_bit"
+			exclude="\.(?:html|htm)$"
+			hide_none="false"
+			hide_default="true"
+			required="false"
+		/>
+
+		<field
+			name="new_icon"
+			type="media"
+			label="COM_ICAGENDA_FORM_FEATURE_NEW_ICON_LABEL"
+			description="COM_ICAGENDA_FORM_FEATURE_NEW_ICON_LABEL"
+		/>
+
+		<field
+			name="icon_alt"
+			type="text"
+			label="COM_ICAGENDA_FORM_FEATURE_ICON_ALT_LABEL"
+			description="COM_ICAGENDA_FORM_FEATURE_ICON_ALT_DESC"
+			size="30"
+			required="false"
+		/>
+
+		<field
+			name="show_filter"
+			type="radio"
+			label="COM_ICAGENDA_FORM_FEATURE_SHOW_FILTER_LABEL"
+			description="COM_ICAGENDA_FORM_FEATURE_SHOW_FILTER_DESC"
+			default="1"
+			class="btn-group"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="desc"
+			type="editor"
+			label="COM_ICAGENDA_FORM_FEATURE_DESCRIPTION_LABEL"
+			description="COM_ICAGENDA_FORM_FEATURE_DESCRIPTION_DESC"
+			class="inputbox"
+			buttons="readmore,pagebreak"
+			filter="JComponentHelper::filterText"
+		/>
+
+		<field
+			name="state"
+			type="list"
+			label="JSTATUS"
+			description="JFIELD_PUBLISHED_DESC"
+			default="1"
+			size="1"
+			class="span12 small"
+			filter="intval"
+			>
+			<option value="1">JPUBLISHED</option>
+			<option value="0">JUNPUBLISHED</option>
+		</field>
+
+		<field name="checked_out" type="hidden" filter="unset" />
+		<field name="checked_out_time" type="hidden" filter="unset" />
+	</fieldset>
+</form>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/forms/index.html b/deployed/icagenda/administrator/components/com_icagenda/models/forms/index.html
new file mode 100644
index 00000000..42682b47
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/forms/index.html
@@ -0,0 +1 @@
+<html><body></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/forms/mail.xml b/deployed/icagenda/administrator/components/com_icagenda/models/forms/mail.xml
new file mode 100644
index 00000000..207fb650
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/forms/mail.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset>
+		<field
+			name="eventid"
+			type="modal_evt"
+			label="ICEVENT"
+			description =" "
+			class="inputbox"
+			size="10"
+			default="0"
+			/>
+		<field
+			name="date"
+			type="modal_evt_date"
+			size="30"
+			class="inputbox"
+			label="COM_ICAGENDA_REGISTRATION_DATE"
+			description=" "
+			filter="safehtml"
+			/>
+		<field
+			name="subject"
+			type="text"
+			size="40"
+			class="inputbox input-xxlarge"
+			label="COM_ICAGENDA_FORM_LBL_NEWSLETTER_OBJ"
+			description="COM_ICAGENDA_FORM_DESC_NEWSLETTER_OBJ"
+			/>
+		<field
+			name="message"
+			type="editor"
+			class="inputbox"
+			buttons="readmore,pagebreak"
+			label="COM_ICAGENDA_FORM_LBL_NEWSLETTER_BODY"
+			description="COM_ICAGENDA_FORM_DESC_NEWSLETTER_BODY"
+			cols="70"
+			rows="20"
+			filter="safehtml"
+			/>
+	</fieldset>
+</form>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/forms/registration.xml b/deployed/icagenda/administrator/components/com_icagenda/models/forms/registration.xml
new file mode 100644
index 00000000..2f7aee88
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/forms/registration.xml
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+
+	<fieldset addfieldpath="/administrator/components/com_icagenda/models/fields">
+
+		<field
+			name="userid"
+			type="user"
+			label="COM_ICAGENDA_REGISTRATION_USERID"
+			default="0"
+			size="10"
+			onchange="setUserID()"
+		/>
+
+		<field
+ 			name="name"
+ 			type="text"
+ 			label="COM_ICAGENDA_REGISTRATION_NAME"
+			size="30"
+			required="true"
+		/>
+
+		<field
+			name="email"
+			type="email"
+			label="COM_ICAGENDA_REGISTRATION_EMAIL"
+			class="inputbox"
+			size="30"
+			filter="safehtml"
+		/>
+
+		<field
+			name="phone"
+			type="text"
+			label="COM_ICAGENDA_REGISTRATION_PHONE"
+			class="inputbox"
+			size="30"
+			filter="safehtml"
+		/>
+
+		<field
+			name="id"
+			type="text"
+			label="JGLOBAL_FIELD_ID_LABEL"
+			description="JGLOBAL_FIELD_ID_DESC"
+			default="0"
+			class="readonly"
+			size="10"
+			readonly="true"
+		/>
+
+		<field
+			name="state"
+			type="list"
+			label="JSTATUS"
+			description="JFIELD_PUBLISHED_DESC"
+			default="1"
+			class="span12 small"
+			size="1"
+			filter="intval"
+			>
+			<option value="1">JPUBLISHED</option>
+			<option value="0">JUNPUBLISHED</option>
+			<option value="2">JARCHIVED</option>
+			<option value="-2">JTRASHED</option>
+		</field>
+
+		<field
+			name="eventid"
+			type="modal_evt"
+			label="ICEVENT"
+			default="0"
+			size="10"
+			readonly="true"
+		/>
+
+		<field
+			name="date"
+			type="modal_evt_date"
+			label="COM_ICAGENDA_REGISTRATION_DATE"
+			size="30"
+			class="inputbox"
+			filter="safehtml"
+		/>
+
+		<field
+			name="period"
+			type="hidden"
+			default="0"
+		/>
+
+		<field
+			name="people"
+			type="text"
+			label="COM_ICAGENDA_REGISTRATION_NUMBER_PLACES"
+			default="1"
+			class="inputbox input-mini"
+			size="30"
+			filter="safehtml"
+		/>
+
+		<field
+			name="data_people"
+			type="hidden"
+			default=""
+		/>
+
+		<field
+			name="notes"
+			type="editor"
+			label="COM_ICAGENDA_REGISTRATION_NOTES_DISPLAY_LABEL"
+			class="inputbox"
+			buttons="readmore,pagebreak"
+			filter="JComponentHelper::filterText"
+		/>
+
+		<field
+			name="custom_fields"
+			type="hidden"
+			default=""
+		/>
+
+		<field
+			name="created"
+			type="calendar"
+			label="JGLOBAL_FIELD_CREATED_LABEL"
+			format="%Y-%m-%d %H:%M:%S"
+			filter="user_utc"
+		/>
+
+		<field
+			name="created_by"
+			type="user"
+			label="JGLOBAL_FIELD_CREATED_BY_LABEL"
+			description="JGLOBAL_FIELD_CREATED_BY_DESC"
+		/>
+
+		<field
+			name="modified"
+			type="calendar"
+			label="JGLOBAL_FIELD_MODIFIED_LABEL"
+			class="readonly"
+			size="22"
+			readonly="true"
+			format="%Y-%m-%d %H:%M:%S"
+			filter="user_utc"
+		/>
+
+		<field
+			name="modified_by"
+			type="user"
+			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
+			description="JGLOBAL_FIELD_MODIFIED_BY_DESC"
+			class="readonly"
+			readonly="true"
+			filter="unset"
+		/>
+
+		<field
+			name="checked_out"
+			type="hidden"
+			filter="unset"
+		/>
+
+		<field
+			name="checked_out_time"
+			type="hidden"
+			filter="unset"
+		/>
+	</fieldset>
+</form>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/icagenda.php b/deployed/icagenda/administrator/components/com_icagenda/models/icagenda.php
new file mode 100644
index 00000000..02eaef28
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/icagenda.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.6.0 2015-12-16
+ * @since       1.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+jimport('joomla.application.component.modellist');
+
+/**
+ * Methods supporting a list of iCagenda records.
+ */
+// J2.5 : class iCagendaModelicagenda extends JModelList
+class iCagendaModelicagenda extends JModelLegacy
+{
+	/**
+	 * Build an SQL query to load CATEGORY STATS.
+	 *
+	 * @return  JDatabaseQuery
+	 */
+	public function getCategoryStats()
+	{
+		// Get database object
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+		$query->select('e.catid AS catid, sum(e.hits) AS hits')
+			->from('#__icagenda_events AS e');
+
+		// Join over the category
+		$query->select('c.id AS cat_id, c.title AS cat_title, c.title AS stats_label, c.color AS cat_color');
+		$query->join('LEFT', '#__icagenda_category AS c ON c.id = e.catid');
+
+		$query->group('c.id');
+		$query->order('hits DESC');
+
+		$db->setQuery($query, 0, 10);
+		$list = $db->loadObjectList();
+
+		return $list;
+	}
+
+	/**
+	 * Build an SQL query to return total of event hits.
+	 *
+	 * @return  JDatabaseQuery
+	 */
+	public function getEventHitsTotal()
+	{
+		// Get database object
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+		$query->select('sum(e.hits) AS hits')
+			->from('#__icagenda_events AS e');
+		$db->setQuery($query);
+		$list = $db->loadResult();
+
+		return $list;
+	}
+
+	/**
+	 * Build an SQL query to load EVENT STATS.
+	 *
+	 * @return  JDatabaseQuery
+	 */
+	public function getEventStats()
+	{
+		// Get database object
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+		$query->select('e.title AS stats_label, e.hits AS hits')
+			->from('#__icagenda_events AS e');
+
+		// Join over the category
+		$query->select('c.id AS cat_id, c.title AS cat_title, c.color AS cat_color');
+		$query->join('LEFT', '#__icagenda_category AS c ON c.id = e.catid');
+
+		$query->order('hits DESC');
+
+		$db->setQuery($query, 0, 10);
+		$list = $db->loadObjectList();
+
+		return $list;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/index.html b/deployed/icagenda/administrator/components/com_icagenda/models/index.html
new file mode 100644
index 00000000..42682b47
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/index.html
@@ -0,0 +1 @@
+<html><body></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/info.php b/deployed/icagenda/administrator/components/com_icagenda/models/info.php
new file mode 100644
index 00000000..96c3f67c
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/info.php
@@ -0,0 +1,26 @@
+<?php
+/** 
+ *	iCagenda
+ *----------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright	Copyright (C) 2012 JOOMLIC - All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Jooml!C - http://www.joomlic.com
+ * 
+ * @since		1.2.6
+ *----------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined( '_JEXEC' ) or die( 'Restricted access' );
+
+jimport('joomla.application.component.modellist');
+
+/**
+ * Methods supporting a list of iCagenda records.
+ */
+class iCagendaModelinfo extends JModelList
+{
+	
+
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/mail.php b/deployed/icagenda/administrator/components/com_icagenda/models/mail.php
new file mode 100644
index 00000000..cf9866e9
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/mail.php
@@ -0,0 +1,300 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-30
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       2.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+jimport('joomla.application.component.modeladmin');
+jimport('joomla.mail.mail');
+
+
+/**
+ * Newsletter Mail model.
+ */
+class iCagendaModelMail extends JModelAdmin
+{
+	/**
+	 * @var     string  The prefix to use with controller messages.
+	 * @since   2.0
+	 */
+	protected $text_prefix = 'COM_ICAGENDA';
+
+	/**
+	 * Method to get the row form.
+	 *
+	 * @param   array    $data      An optional array of data for the form to interogate.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  JForm  A JForm object on success, false on failure
+	 *
+	 * @since   2.0
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		// Get the form.
+		$form = $this->loadForm('com_icagenda.mail', 'mail', array('control' => 'jform', 'load_data' => $loadData));
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return  mixed  The data for the form.
+	 *
+	 * @since   2.0
+	 */
+	protected function loadFormData()
+	{
+		// Check the session for previously entered form data.
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			$data = JFactory::getApplication()->getUserState('com_icagenda.display.mail.data', array());
+
+			if (empty($data))
+			{
+				$data = JFactory::getApplication()->getUserState('com_icagenda.mail.data', array());
+			}
+		}
+		else
+		{
+			$data = JFactory::getApplication()->getUserState('com_icagenda.display.mail.data', array());
+
+			if (empty($data))
+			{
+				$data = JFactory::getApplication()->getUserState('com_icagenda.mail.data', array());
+			}
+
+			$this->preprocessData('com_icagenda.mail', $data);
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Method to preprocess the form
+	 *
+	 * @param   JForm   $form   A form object.
+	 * @param   mixed   $data   The data expected for the form.
+	 * @param   string  $group  The name of the plugin group to import (defaults to "content").
+	 *
+	 * @return  void
+	 *
+	 * @since   2.0
+	 * @throws  Exception if there is an error loading the form.
+	 */
+	protected function preprocessForm(JForm $form, $data, $group = 'user')
+	{
+		parent::preprocessForm($form, $data, $group);
+	}
+
+	/**
+	 * Send the email
+	 *
+	 * @return  boolean
+	 *
+	 * @since   2.0
+	 */
+	public function send()
+	{
+		$app    = JFactory::getApplication();
+		$user   = JFactory::getUser();
+
+		$send   = '';
+		$data   = $app->input->post->get('jform', array(), 'array');
+		$access = new JAccess;
+
+		// Set Form Data to Session
+		$session = JFactory::getSession();
+		$session->set('ic_newsletter', $data);
+
+		$mailfrom = $app->get('mailfrom');
+		$fromname = $app->get('fromname');
+		$sitename = $app->get('sitename');
+
+		$eventid = array_key_exists('eventid', $data) ? $data['eventid'] : '';
+		$date    = array_key_exists('date', $data) ? $data['date'] : '';
+
+		$db    = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		$query->select('r.email, r.eventid, r.state, r.date, r.people')
+			->from('#__icagenda_registration AS r');
+		$query->where('r.state = 1');
+		$query->where('r.email <> ""');
+		$query->where('r.eventid = ' . (int) $eventid);
+
+		if ($date != 'all')
+		{
+			if (iCDate::isDate($date))
+			{
+				$query->where('r.date = ' . $db->q($date));
+			}
+			elseif ($date == 1)
+			{
+				$query->where('r.period = 1');
+			}
+			elseif ($date)
+			{
+				// Fix for old date saving data
+				$query->where('r.date = ' . $db->q($date));
+			}
+			else
+			{
+				$query->where('r.period = 0');
+			}
+		}
+
+		$db->setQuery($query);
+
+		$result = $db->loadObjectList();
+
+		$list   = '';
+		$people = 0;
+
+		foreach ($result as $v)
+		{
+			$list.= $v->email . ', ';
+			$people = ($people + $v->people);
+		}
+
+		$subject = array_key_exists('subject', $data) ? $data['subject'] : '';
+		$message = array_key_exists('message', $data) ? $data['message'] : '';
+
+		$list_emails = explode(', ', $list);
+
+		// Remove dupplicated email addresses
+		$recipient = array_unique($list_emails);
+		$recipient = array_filter($recipient);
+
+		$content = stripcslashes($message);
+		$body    = str_replace('src="images/', 'src="' . JURI::root() . '/images/', $content);
+
+		// Set Mail
+		$mail = JFactory::getMailer();
+		$mail->addRecipient($app->getCfg('mailfrom'));
+		$mail->addBCC($recipient);
+
+		// FIX Joomla 3.5.1 issue on some servers, by addition of "Optional" ReplyTo, not previously set.
+		// JOOMLA 3.x/2.5 SWITCH
+		if (version_compare(JVERSION, '3.0', 'ge'))
+		{
+			$mail->addReplyTo($mailfrom, $fromname);
+		}
+		else
+		{
+			$mail->addReplyTo(array($mailfrom, $fromname));
+		}
+
+		$mail->setSender(array($mailfrom, $fromname));
+		$mail->setSubject($subject);
+
+		$mail->isHTML(true);
+
+		// JDocs: When sending HTML emails you should normally set the Encoding to base64
+		//        in order to avoid unwanted characters in the output.
+		//        See https://docs.joomla.org/Sending_email_from_extensions
+		$mail->Encoding = 'base64'; // JDocs Sending HTML Email
+
+		$mail->setBody($body);
+
+		// Send Mail
+		if ($subject && $body && $eventid && ($date || $date == '0'))
+		{
+			$send = $mail->Send();
+		}
+
+		if ($send !== true)
+		{
+			$app->enqueueMessage(JText::_('COM_ICAGENDA_NEWSLETTER_ERROR_ALERT'), 'error');
+
+			if ( ! $subject)
+			{
+				$app->enqueueMessage('- ' . JText::_('COM_ICAGENDA_NEWSLETTER_NO_OBJ_ALERT'), 'error');
+			}
+
+			if ( ! $body)
+			{
+				$app->enqueueMessage('- ' . JText::_('COM_ICAGENDA_NEWSLETTER_NO_BODY_ALERT'), 'error');
+			}
+
+			if ( ! $eventid && ( ! $date && $date != '0'))
+			{
+				$app->enqueueMessage('- ' . JText::_('COM_ICAGENDA_NEWSLETTER_NO_EVENT_SELECTED'), 'error');
+			}
+			elseif ( $eventid && ( ! $date && $date != '0'))
+			{
+				$app->enqueueMessage('- ' . JText::_('COM_ICAGENDA_NEWSLETTER_NO_DATE_SELECTED'), 'error');
+			}
+
+			return false;
+		}
+		else
+		{
+			$app->enqueueMessage('<h2>' . JText::_('COM_ICAGENDA_NEWSLETTER_SUCCESS') . '</h2>', 'message');
+
+			$app->enqueueMessage($this->listSend($recipient, 0, $people), 'message');
+
+			$dupplicated_emails = count($list_emails) - count($recipient);
+
+			if ($dupplicated_emails)
+			{
+				$app->enqueueMessage('<i>' . JText::sprintf('COM_ICAGENDA_NEWSLETTER_NB_EMAIL_NOT_SEND', $dupplicated_emails) . '</i>', 'message');
+			}
+
+			return $send;
+		}
+	}
+
+	/**
+	 * Html list of emails send
+	 *
+	 * @return  HTML
+	 *
+	 * @since   2.0
+	 */
+	public function listSend($recipient, $level = 0, $people = null)
+	{
+		$number    = 0;
+		$list_send = '';
+
+		foreach($recipient AS $key => $value)
+		{
+			if (is_array($value) | is_object($value))
+			{
+				parent::listArray($value, $level+=1);
+			}
+			else
+			{
+				$number = ($number + 1);
+
+				$list_send.= str_repeat("&nbsp;", $level*3);
+				$list_send.= $number . " : " . $value . "<br>";
+			}
+		}
+
+		$list_send.= '<h4>' . JText::_('COM_ICAGENDA_NEWSLETTER_NB_EMAIL_SEND') . ' = ' . $number . '';
+		$list_send.= '<small> (' . JText::_('COM_ICAGENDA_REGISTRATION_TICKETS') . ': ' . $people . ')</small></h4>';
+
+		return $list_send;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/registration.php b/deployed/icagenda/administrator/components/com_icagenda/models/registration.php
new file mode 100644
index 00000000..ea4e4912
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/registration.php
@@ -0,0 +1,301 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.0 2018-05-16
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.3.3
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+jimport('joomla.application.component.modeladmin');
+
+
+/**
+ * iCagenda model.
+ */
+class iCagendaModelregistration extends JModelAdmin
+{
+	/**
+	 * @var		string	The prefix to use with controller messages.
+	 * @since	3.3.3
+	 */
+	protected $text_prefix = 'COM_ICAGENDA';
+
+	/**
+	 * Method to test whether a record can be deleted.
+	 *
+	 * @param   object  $record  A record object.
+	 *
+	 * @return  boolean  True if allowed to delete the record. Defaults to the permission set in the component.
+	 *
+	 * @since   3.5.6
+	 */
+	protected function canDelete($record)
+	{
+		if ( ! empty($record->id))
+		{
+			if ($record->state != -2)
+			{
+				return false;
+			}
+
+			$user = JFactory::getUser();
+
+			// Delete linked data from other tables
+			if ($user->authorise('core.delete'))
+			{
+				// Delete Custom Fields data
+				icagendaCustomfields::deleteData($record->id, 1);
+				icagendaCustomfields::cleanData(1);
+
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Returns a reference to the a Table object, always creating it.
+	 *
+	 * @param	type	The table type to instantiate
+	 * @param	string	A prefix for the table class name. Optional.
+	 * @param	array	Configuration array for model. Optional.
+	 * @return	JTable	A database object
+	 * @since	3.3.3
+	 */
+	public function getTable($type = 'Registration', $prefix = 'iCagendaTable', $config = array())
+	{
+		return JTable::getInstance($type, $prefix, $config);
+	}
+
+	/**
+	 * Method to get the record form.
+	 *
+	 * @param	array	$data		An optional array of data for the form to interogate.
+	 * @param	boolean	$loadData	True if the form is to load its own data (default case), false if not.
+	 * @return	JForm	A JForm object on success, false on failure
+	 * @since	3.3.3
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		// Get the form.
+		$form = $this->loadForm('com_icagenda.registration', 'registration',
+								array('control' => 'jform', 'load_data' => $loadData));
+		if (empty($form))
+		{
+			return false;
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return	mixed	The data for the form.
+	 * @since	3.3.3
+	 */
+	protected function loadFormData()
+	{
+		// Check the session for previously entered form data.
+		$data_array = JFactory::getApplication()->getUserState('com_icagenda.edit.registration.data', array());
+
+		if (empty($data_array))
+		{
+			$data = $this->getItem();
+		}
+		else
+		{
+			$data = new JObject;
+			$data->setProperties($data_array);
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Method to save the form data.
+	 *
+	 * @param   array  $data  The form data.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since	3.5.6
+	 */
+	public function save($data)
+	{
+		$app	= JFactory::getApplication();
+		$input	= $app->input;
+		$date	= JFactory::getDate();
+		$user	= JFactory::getUser();
+
+		// Set registration creator
+		if (empty($data['created_by']))
+		{
+			$data['created_by'] = (int) $data['userid'];
+		}
+
+		// Set Params
+		if (isset($data['params']) && is_array($data['params']))
+		{
+			// Convert the params field to a string.
+			$parameter = new JRegistry;
+			$parameter->loadArray($data['params']);
+			$data['params'] = (string)$parameter;
+		}
+
+		if ($input->get('task') == 'delete')
+		{
+			icagendaCustomfields::deleteData($data['custom_fields'], $data['id'], 1);
+			// To Be Tested $app->enqueueMessage('Test');
+		}
+
+		// Control number of tickets available
+		$iCParams   = JComponentHelper::getParams('com_icagenda');
+		$evtParams  = icagendaEvent::getParams($data['eventid']);
+		$typeReg    = $evtParams->get('typeReg', 1);
+		$maxReg     = $evtParams->get('maxReg', '1000000');
+		$tickets    = ($evtParams->get('maxRlistGlobal', '') == 2)
+					? $evtParams->get('maxRlist', $iCParams->get('maxRlist', '5'))
+					: $iCParams->get('maxRlist', '5');
+
+		$ticketsAvailable   = icagendaRegistration::getTicketsBookable($data['eventid'], $data['date'], $typeReg, $maxReg, $tickets);
+		$extraTickets       = ($data['people'] - $data['data_people']);
+		$ticketsBookable    = ($data['data_people'] + $ticketsAvailable);
+
+		if ($data['people'] > $ticketsBookable)
+		{
+			$msg = '<strong>' . JText::_('COM_ICAGENDA_REGISTRATION_ERROR_NOT_ENOUGH_TICKETS_AVAILABLE') . '</strong><br />';
+
+			if ($data['data_people'])
+			{
+				$msg.= JText::sprintf('COM_ICAGENDA_REGISTRATION_ERROR_NOT_ENOUGH_TICKETS_ALREADY_BOOKED', $data['data_people']);
+				$msg.= JText::sprintf('COM_ICAGENDA_REGISTRATION_ERROR_NOT_ENOUGH_TICKETS_EXTRA_PEOPLE', $extraTickets, $ticketsAvailable)
+					. '<br />';
+			}
+
+			$msg.= '<strong>' . JText::sprintf('COM_ICAGENDA_REGISTRATION_ERROR_MAXIMUM_TICKETS_BOOKABLE', $ticketsBookable)
+				. '</strong>'
+				. '<br />';
+			$msg.= JText::_('COM_ICAGENDA_REGISTRATION_ERROR_NOT_ENOUGH_TICKETS_CHANGE_NUMBER_OF_PEOPLE');
+
+
+//			$msg.= '<br /><br />$maxReg: ' . $maxReg;
+//			$msg.= '<br />$tickets: ' . $tickets;
+//			$msg.= '<br />$ticketsAvailable: ' . $ticketsAvailable;
+
+			$this->setError($msg);
+
+			return false;
+		}
+
+		if ($typeReg == 1 && $data['date'] == '')
+		{
+			$msg = '<strong>' . JText::_('COM_ICAGENDA_REGISTRATION_NO_DATE_SELECTED') . '</strong>';
+
+			$this->setError($msg);
+
+			return false;
+		}
+
+		if ($data['date'] == 'from_to')
+		{
+			$data['date'] = '';
+		}
+
+		// Get Registration ID from the result back to the Table after saving.
+		$table = $this->getTable();
+
+		if ($table->save($data) === true)
+		{
+			$data['id'] = $table->id;
+		}
+		else
+		{
+			$data['id'] = null;
+		}
+
+		if (parent::save($data))
+		{
+			// Save Custom Fields to database
+			if (isset($data['custom_fields']) && is_array($data['custom_fields']))
+			{
+				icagendaCustomfields::saveToData($data['custom_fields'], $data['id'], 1);
+			}
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Method to get a single record.
+	 *
+	 * @param	integer	The id of the primary key.
+	 *
+	 * @return	mixed	Object on success, false on failure.
+	 * @since	3.3.3
+	 */
+	public function getItem($pk = null)
+	{
+		if ($item = parent::getItem($pk))
+		{
+			// Do any procesing on fields here if needed
+		}
+
+		return $item;
+	}
+
+	/**
+	 * Prepare and sanitise the table prior to saving.
+	 *
+	 * @since	3.3.3
+	 */
+
+	protected function prepareTable($table)
+	{
+		$date = JFactory::getDate();
+		$user = JFactory::getUser();
+
+		$table->name = htmlspecialchars_decode($table->name, ENT_QUOTES);
+
+		if (empty($table->id))
+		{
+			// Set the values
+			$table->created		= $date->toSql();
+			$table->created_by	= $user->get('id');
+
+			// Set ordering to the last item if not set
+			if (empty($table->ordering))
+			{
+				$db = JFactory::getDbo();
+				$query = $db->getQuery(true)
+					->select('MAX(ordering)')
+					->from($db->quoteName('#__icagenda_registration'));
+				$db->setQuery($query);
+				$max = $db->loadResult();
+
+				$table->ordering = $max + 1;
+			}
+		}
+		else
+		{
+			// Set the values
+			$table->modified	= $date->toSql();
+			$table->modified_by	= $user->get('id');
+		}
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/registrations.php b/deployed/icagenda/administrator/components/com_icagenda/models/registrations.php
new file mode 100644
index 00000000..f247d04e
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/registrations.php
@@ -0,0 +1,993 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.12 2020-03-13
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2020 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       2.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+use Joomla\Archive\Archive;
+
+/**
+ * Registrations Model.
+ */
+class iCagendaModelregistrations extends JModelList
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @since   2.0
+	 * @see     JControllerLegacy
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'id', 'a.id',
+				'ordering', 'a.ordering',
+				'userid', 'userid',
+				'name', 'name',
+				'username', 'username',
+				'email', 'email',
+				'phone', 'phone',
+				'event', 'event',
+				'date', 'a.date',
+				'startdate', 'e.startdate',
+				'people', 'a.people',
+				'notes', 'a.notes',
+				'evt_created_by', 'a.evt_created_by'
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 */
+	protected function populateState($ordering = null, $direction = null)
+	{
+		// Initialise variables.
+		$app = JFactory::getApplication('administrator');
+
+		// Load the filter search.
+		$search = $app->getUserStateFromRequest($this->context . '.filter.search', 'filter_search');
+		$this->setState('filter.search', $search);
+
+		// Filter (dropdown) state.
+		$published = $app->getUserStateFromRequest($this->context . '.filter.state', 'filter_published', '1', 'string');
+		$this->setState('filter.state', $published);
+
+		// Filter (dropdown) categories
+		$categories = $this->getUserStateFromRequest($this->context . '.filter.categories', 'filter_categories', '', 'string');
+		$this->setState('filter.categories', $categories);
+
+		// Filter (dropdown) events
+		$events = $this->getUserStateFromRequest($this->context . '.filter.events', 'filter_events', '', 'string');
+		$this->setState('filter.events', $events);
+
+		// Filter (dropdown) dates
+		$dates = $this->getUserStateFromRequest($this->context . '.filter.dates', 'filter_dates', '', 'string');
+		$this->setState('filter.dates', $dates);
+
+		// Load the parameters.
+		$params = JComponentHelper::getParams('com_icagenda');
+		$this->setState('params', $params);
+
+		// List state information.
+		parent::populateState('a.id', 'desc');
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id.
+	 *
+	 * @return  string  A store id.
+	 *
+	 * @since   2.0
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id.= ':' . $this->getState('filter.search');
+		$id.= ':' . $this->getState('filter.state');
+		$id.= ':' . $this->getState('filter.categories');
+		$id.= ':' . $this->getState('filter.events');
+		$id.= ':' . $this->getState('filter.dates');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Build an SQL query to load the list data.
+	 *
+	 * @return  JDatabaseQuery
+	 *
+	 * @since   2.0
+	 */
+	protected function getListQuery()
+	{
+		// Create a new query object.
+		$db    = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		// Select the required fields from the table.
+		$query->select(
+			$this->getState(
+				'list.select',
+				'a.*'
+			)
+		);
+		$query->from('#__icagenda_registration AS a');
+
+		// Join over the events.
+		$query->select('e.title AS event, e.created_by AS evt_created_by, e.state AS evt_state,
+						e.startdate AS startdate, e.enddate AS enddate, e.displaytime AS displaytime,
+						e.params AS eventParams');
+		$query->join('LEFT', '#__icagenda_events AS e ON e.id=a.eventid');
+
+		// Join over the categories.
+		$query->select('c.id AS cat_id, c.title AS cat_title');
+		$query->join('LEFT', '#__icagenda_category AS c ON c.id=e.catid');
+
+		// Join over the users for the checked out user.
+		$query->select('u.username AS username, u.name AS fullname');
+		$query->join('LEFT', '#__users AS u ON u.id=a.userid');
+
+		// Join over the users for the author.
+		$query->select('ua.name AS author_name, ua.username AS author_username')
+			->join('LEFT', '#__users AS ua ON ua.id = a.created_by');
+
+		// Join over the users actions (consents).
+		$query->select('GROUP_CONCAT(uc.user_action) AS user_action')
+			->join('LEFT', '#__icagenda_user_actions as uc ON uc.parent_id = a.id')
+			->group('a.id, uc.parent_id');
+
+		// Filter by published state
+		$published = $this->getState('filter.state');
+
+		if (is_numeric($published))
+		{
+			$query->where('a.state = ' . (int) $published);
+		}
+		elseif ($published === '')
+		{
+			$query->where('(a.state IN (0, 1))');
+		}
+
+		// Filter by edit access
+		if ( ! JFactory::getUser()->authorise('core.edit', 'com_icagenda')
+			&& JFactory::getUser()->authorise('core.edit.own', 'com_icagenda'))
+		{
+			$userID = JFactory::getUser()->get('id');
+			$query->where('a.userid = ' . (int) $userID);
+		}
+
+		// Filter by search in content
+		$search = $this->getState('filter.search');
+
+		if ( ! empty($search))
+		{
+			// Search for registration id with Prefix "ID:"
+			if (stripos($search, 'id:') === 0)
+			{
+				$query->where('a.id = ' . (int) substr($search, 3));
+			}
+			// Search for user id with Prefix "USERID:"
+			elseif (stripos($search, 'userid:') === 0)
+			{
+				$query->where('a.userid = ' . (int) substr($search, 7));
+			}
+			// Search for user email with Prefix "EMAIL:"
+			elseif (stripos($search, 'email:') === 0)
+			{
+				$query->where('a.email = ' . $db->quote(trim(substr($search, 6))));
+			}
+			// Search for event id with Prefix "EVENTID:"
+			elseif (stripos($search, 'eventid:') === 0)
+			{
+				$query->where('a.eventid = ' . $db->quote(trim(substr($search, 8))));
+			}
+			else
+			{
+				$search = $db->Quote('%' . $db->escape($search, true) . '%');
+
+				$query->where('(u.username LIKE ' . $search .
+							' OR  a.name LIKE ' . $search .
+							' OR  a.userid LIKE ' . $search .
+							' OR  a.email LIKE ' . $search .
+							' OR  a.phone LIKE ' . $search .
+							' OR  a.date LIKE ' . $search .
+							' OR  a.period LIKE ' . $search .
+							' OR  a.people LIKE ' . $search .
+							' OR  a.notes LIKE ' . $search .
+							' OR  e.title LIKE ' . $search . ' )');
+			}
+		}
+
+		// Filter categories
+		$category = $db->escape($this->getState('filter.categories'));
+
+		if ( ! empty($category))
+		{
+			$query->where('(c.id=' . $db->q($category) . ')');
+		}
+
+		// Filter events
+		$event = $db->escape($this->getState('filter.events'));
+
+		if ( ! empty($event))
+		{
+			$query->where($db->qn('a.eventid') . ' = ' . $db->q($event));
+		}
+
+		// Filter dates
+		$date = $db->escape($this->getState('filter.dates'));
+
+		if (empty($event) && ! empty($date) && iCDate::isDate($date) && ! in_array($date, array('1', 'all')))
+		{
+			if (empty($event))
+			{
+				$query->where('(DATE(a.date) = ' . $db->q($date) . ' OR (DATE(e.startdate) = ' . $db->q($date) . ' AND ' . $db->qn('a.date') . ' = ""))');
+			}
+			elseif ( ! empty($event))
+			{
+				$query->where('(' . $db->qn('a.date') . ' = ' . $db->q($date) . ' OR (' . $db->qn('e.startdate') . ' = ' . $db->q($date) . ' AND ' . $db->qn('a.date') . ' = ""))');
+			}
+		}
+		elseif ($date == 1)
+		{
+			$query->where($db->qn('a.date') . ' = ""');
+			$query->where($db->qn('a.period') . ' = "0"');
+		}
+		elseif ($date == 'all')
+		{
+			$query->where($db->qn('a.date') . ' = ""');
+			$query->where($db->qn('a.period') . ' = "1"');
+		}
+		elseif ( ! empty($date))
+		{
+			$query->where($db->qn('a.date') . ' = ' . $db->q($date));
+		}
+
+		// Add the list ordering clause.
+		$orderCol  = $this->state->get('list.ordering');
+		$orderDirn = $this->state->get('list.direction');
+
+		if ($orderCol && $orderDirn)
+		{
+			if ($orderCol == 'a.date')
+			{
+				$query->order($db->escape($db->qn('a.period') . ' ' . $orderDirn));
+			}
+
+			$query->order($db->escape($orderCol . ' ' . $orderDirn));
+		}
+
+		return $query;
+	}
+
+	/**
+	 * Gets a list of categories.
+	 */
+	function getCategories()
+	{
+		// Create a new query object.
+		$db    = JFactory::getDbo();
+		$query = $db->getQuery(true);
+
+		// Select the required fields from the table.
+		$query->select('c.id AS cat_id, c.title AS cat_title');
+		$query->from('#__icagenda_category AS c');
+
+		// Join over the events.
+		$query->select('e.id AS id');
+		$query->join('LEFT', '#__icagenda_events AS e ON e.catid=c.id');
+
+		// Join over the registrations.
+		$query->select('r.eventid AS event_id');
+		$query->join('LEFT', '#__icagenda_registration AS r ON r.eventid=e.id');
+		$query->where('(e.id = r.eventid)');
+		$query->order('c.ordering ASC');
+
+		$db->setQuery($query);
+		$categories = $db->loadObjectList();
+
+		$list = array();
+
+		foreach ($categories as $c)
+		{
+			$list[$c->cat_id] = $c->cat_title . ' [' . $c->cat_id . ']';
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Gets a list of all events.
+	 */
+	function getEvents()
+	{
+		// Create a new query object.
+		$db    = JFactory::getDbo();
+		$query = $db->getQuery(true);
+
+		// Select the required fields from the table.
+		$query->select('e.id AS event, e.title AS title');
+		$query->from('#__icagenda_events AS e');
+
+		// Join over the categories.
+		$query->select('c.id AS cat_id, c.title AS cat_title');
+		$query->join('LEFT', '#__icagenda_category AS c ON c.id=e.catid');
+
+		// Join over the registrations.
+		$query->select('r.eventid AS eventid');
+		$query->join('LEFT', '#__icagenda_registration AS r ON r.eventid=e.id');
+		$query->where('(e.id = r.eventid)');
+		$query->order('e.title ASC');
+
+		// Filter by published state
+//		$query->where('(e.state IN (0, 1))');
+
+		$db->setQuery($query);
+		$events = $db->loadObjectList();
+
+		$list = array();
+
+		$catId = $db->escape($this->getState('filter.categories'));
+
+		foreach ($events as $e)
+		{
+			if ( ! empty($catId) && $catId == $e->cat_id)
+			{
+				$list[$e->event] = $e->title . ' [' . $e->event . ']';
+			}
+			elseif (empty($catId))
+			{
+				$list[$e->event] = $e->title . ' [' . $e->event . ']';
+			}
+//			$list[$e->event] = $e->title . ' [' . $e->event . ']';
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Gets a list of dates.
+	 */
+	function getDates()
+	{
+		$params        = $this->getState('params');
+		$dateFormat    = $params->get('date_format_global', 'Y - m - d');
+		$dateSeparator = $params->get('date_separator', ' ');
+		$timeFormat    = ($params->get('timeformat', '1') == 1) ? 'H:i' : 'h:i A';
+
+		// Create a new query object.
+		$db    = JFactory::getDbo();
+		$query = $db->getQuery(true);
+
+		// Select the required fields from the table.
+		$query->select('r.date AS date, r.period AS period, r.eventid AS eventid');
+		$query->from('#__icagenda_registration AS r');
+
+		// Join over the events (period).
+		$query->select('e.startdate AS startdate, e.enddate AS enddate, e.displaytime AS displaytime');
+		$query->join('LEFT', '#__icagenda_events AS e ON e.id=r.eventid');
+
+		$db->setQuery($query);
+		$dates = $db->loadObjectList();
+
+		$list = array();
+
+		$eventId = $db->escape($this->getState('filter.events'));
+
+		$p = $e = 0;
+
+		// Add to select dropdown the filters 'For all dates of the event' and/or 'For all the period',
+		// depending of registrations in data, and selected event
+		foreach ($dates as $d)
+		{
+			$period = (empty($d->date) && ($d->period == 1 || $d->period == ''))
+					? '[ ' . ucfirst(JText::_('COM_ICAGENDA_ADMIN_REGISTRATION_FOR_ALL_DATES')) . ' ]'
+					: '';
+
+			if (empty($d->date)
+				&& $d->period == 1
+				&& $e == 0
+				)
+			{
+				if ( ! empty($eventId) && $eventId == $d->eventid)
+				{
+					$e = $e+1;
+					$list['all'] = $period;
+				}
+				elseif (empty($eventId))
+				{
+					$e = $e+1;
+					$list['all'] = $period;
+				}
+			}
+		}
+
+		// Add to select dropdown the list of dates,
+		// depending of registrations in data, and selected event
+		foreach ($dates as $d)
+		{
+			$date = '';
+
+			if (empty($d->date) && $d->period == 0)
+			{
+				if ( ! empty($eventId) && $eventId == $d->eventid)
+				{
+					if (iCDate::isDate($d->startdate))
+					{
+						$date = iCGlobalize::dateFormat($d->startdate, $dateFormat, $dateSeparator);
+
+						if ($d->displaytime)
+						{
+							$date.= ' - ' . date($timeFormat, strtotime($d->startdate));
+						}
+					}
+					if (iCDate::isDate($d->enddate))
+					{
+						$date.= "\n" . '> ' . iCGlobalize::dateFormat($d->enddate, $dateFormat, $dateSeparator);
+
+						if ($d->displaytime)
+						{
+							$date.= ' - ' . date($timeFormat, strtotime($d->enddate));
+						}
+					}
+				}
+				elseif (empty($eventId))
+				{
+					if (iCDate::isDate($d->startdate))
+					{
+						$date = iCGlobalize::dateFormat($d->startdate, $dateFormat, $dateSeparator);
+					}
+				}
+				else
+				{
+					$date = '[ ' . ucfirst(JText::_('COM_ICAGENDA_ADMIN_REGISTRATION_FOR_ALL_PERIOD')) . ' ]';
+				}
+			}
+			else
+			{
+				$deprecatedDate = iCDate::isDate($d->date)
+								? $d->date
+								: JText::_('JUNDEFINED') . "\n" . '&#8627; ' . JText::_('COM_ICAGENDA_LEGEND_EDIT_REGISTRATION');
+
+				if  ( ! empty($eventId))
+				{
+					$date   = iCDate::isDate($d->date)
+							? iCGlobalize::dateFormat($d->date, $dateFormat, $dateSeparator) . ' - ' . date('H:i', strtotime($d->date))
+							: '&#9888; ' . $deprecatedDate;
+				}
+				else
+				{
+					$date   = iCDate::isDate($d->date)
+							? iCGlobalize::dateFormat($d->date, $dateFormat, $dateSeparator)
+							: '&#9888; ' . $deprecatedDate;
+				}
+			}
+
+			$display_date	= ($date != '0000-00-00 00:00:00' && $d->date) ? true : false;
+			$display_period	= ($date != '0000-00-00 00:00:00' && $d->startdate) ? true : false;
+
+			if ($display_date
+				&& ! empty($eventId)
+				&& $eventId == $d->eventid
+				)
+			{
+				$list[$d->date] = $date;
+			}
+			elseif ($display_date
+				&& empty($eventId)
+				)
+			{
+				if (iCDate::isDate($d->date))
+				{
+					$list[date('Y-m-d', strtotime($d->date))] = $date;
+				}
+				else
+				{
+					$list[$d->date] = $date;
+				}
+			}
+			elseif ($display_period
+				&& empty($eventId)
+				)
+			{
+				$list[date('Y-m-d', strtotime($d->startdate))] = $date;
+			}
+
+			if (empty($d->date)
+				&& $d->period == 0
+				&& $p == 0
+				)
+			{
+				if ( ! empty($eventId) && $eventId == $d->eventid)
+				{
+					$p = $p+1;
+					$list[1] = $date;
+				}
+				elseif (empty($eventId))
+				{
+					$p = $p+1;
+					$list[1] = $date;
+				}
+			}
+		}
+
+		// Joomla 3 (update chosen)
+		if (version_compare(JVERSION, '3.0', 'ge'))
+		{
+			$js = '
+			(function($){
+				$(window).load(function(){
+					$("#filter_dates.chzn-done option").each(
+						function(){
+							var arr = $(this).html().split(/\n/);
+							var html = arr[1] ? arr[0]+"<br />&#160;<small style=\"margin-left: 13px\">"+arr[1]+"</small>" : arr[0];
+							$(this).html(html);
+						}
+					);
+					$("#filter_dates").trigger("liszt:updated");
+				});
+			})(jQuery);
+			';
+
+			JFactory::getDocument()->addScriptDeclaration($js);
+		}
+
+//		if (empty($eventId))
+//		{
+//			$list = array_unique($list);
+//		}
+
+		krsort($list);
+
+		return $list;
+	}
+	/**
+	 * Get file name
+	 *
+	 * @return  string  The file name
+	 *
+	 * @since   2.0
+	 */
+	public function getBaseName()
+	{
+		if (!isset($this->basename))
+		{
+			$app = JFactory::getApplication();
+			$basename = $this->getState('basename');
+			$basename = str_replace('__SITE__', $app->getCfg('sitename'), $basename);
+
+			$eventId = $this->getState('filter.events');
+
+			if (is_numeric($eventId))
+			{
+				$basename = str_replace('__EVENTID__', $eventId, $basename);
+				$basename = str_replace('__EVENT__', $this->getEventTitle($eventId), $basename);
+			}
+			else
+			{
+				$basename = str_replace('__EVENTID__', '', $basename);
+				$basename = str_replace('__EVENT__', '', $basename);
+			}
+
+			$date = $this->getState('filter.dates');
+
+			if (!empty($date))
+			{
+				if (iCDate::isDate($date))
+				{
+					$basename = str_replace('__DATE__', JHtml::date($date, JText::_('DATE_FORMAT_LC3'), null)
+											. ' - ' . date('H:i', strtotime($date)),
+											$basename);
+				}
+				else
+				{
+					$basename = str_replace('__DATE__', $date, $basename);
+				}
+			}
+			else
+			{
+				$basename = str_replace('__DATE__', '', $basename);
+			}
+
+			$this->basename = $basename;
+		}
+
+		return $this->basename;
+	}
+
+	/**
+	 * Get the event title.
+	 *
+	 * @return  string  The event title
+	 *
+	 * @since   3.5.0
+	 */
+	protected function getEventTitle()
+	{
+		$eventId = $this->getState('filter.events');
+
+		if ($eventId)
+		{
+			$db = $this->getDbo();
+			$query = $db->getQuery(true)
+				->select('title')
+				->from($db->quoteName('#__icagenda_events'))
+				->where($db->quoteName('id') . '=' . $db->quote($eventId));
+			$db->setQuery($query);
+
+			try
+			{
+				$title = $db->loadResult();
+			}
+			catch (RuntimeException $e)
+			{
+				$this->setError($e->getMessage());
+
+				return false;
+			}
+		}
+		else
+		{
+			$title = JText::_('COM_ICAGENDA_NO_EVENT_TITLE');
+		}
+
+		return $title;
+	}
+
+	/**
+	 * Get the status name.
+	 *
+	 * @return  string  The status name
+	 *
+	 * @since   3.5.0
+	 */
+	protected function getStatusName($status)
+	{
+		$status_array = JHtml::_('jgrid.publishedOptions');
+
+		foreach ($status_array AS $key => $name)
+		{
+			if ($status == $name->value)
+			{
+				$status_name = $name->text;
+			}
+		}
+
+		return JText::_($status_name);
+	}
+
+	/**
+	 * Get the file type.
+	 *
+	 * @return  string  The file type
+	 *
+	 * @since   3.5.0
+	 */
+	public function getFileType()
+	{
+		return $this->getState('compressed') ? 'zip' : 'csv';
+	}
+
+	/**
+	 * Get the mime type.
+	 *
+	 * @return  string  The mime type.
+	 *
+	 * @since   3.5.0
+	 */
+	public function getMimeType()
+	{
+		return $this->getState('compressed') ? 'application/zip' : 'text/csv';
+	}
+
+	/**
+	 * Get the separator for values.
+	 *
+	 * @return  string  The separator.
+	 *
+	 * @since   3.5.9
+	 */
+	public function getSeparator()
+	{
+		return ($this->getState('separator') == 1) ? "," : ";";
+	}
+
+	/**
+	 * Get the content
+	 *
+	 * @return  string  The content.
+	 *
+	 * @since   3.5.0
+	 */
+	public function getContent()
+	{
+		if (!isset($this->content))
+		{
+			$separator = $this->getSeparator();
+
+			foreach ($this->getItems() as $item)
+			{
+				// Adds filled custom fields
+				$customfields = icagendaCustomfields::getList($item->id, 1);
+
+ 				$header_cfs = array();
+
+				if ($customfields)
+				{
+					foreach ($customfields AS $customfield)
+					{
+						$header_cfs[]= $customfield->cf_title;
+					}
+				}
+			}
+
+			// Start csv content
+			$this->content  = '';
+
+			$this->content .= '"';
+
+			if ($this->getState('event_title'))
+			{
+				$this->content .= str_replace('"', '""', JText::_('COM_ICAGENDA_REGISTRATION_EVENTID')) . '"';
+			}
+			else
+			{
+				$this->content .= '#' . '"';
+			}
+
+			if ($this->getState('date'))
+			{
+				$this->content .= $separator . '"' . str_replace('"', '""', JText::_('COM_ICAGENDA_REGISTRATION_DATE')) . '"';
+			}
+
+			if ($this->getState('tickets'))
+			{
+				$this->content .= $separator . '"' . str_replace('"', '""', JText::_('COM_ICAGENDA_REGISTRATION_TICKETS')) . '"';
+			}
+
+			if ($this->getState('name'))
+			{
+				$this->content .= $separator . '"' . str_replace('"', '""', JText::_('IC_NAME')) . '"';
+			}
+
+			if ($this->getState('email'))
+			{
+				$this->content .= $separator . '"' . str_replace('"', '""', JText::_('COM_ICAGENDA_REGISTRATION_EMAIL')) . '"';
+			}
+
+			if ($this->getState('phone'))
+			{
+				$this->content .= $separator . '"' . str_replace('"', '""', JText::_('COM_ICAGENDA_REGISTRATION_PHONE')) . '"';
+			}
+
+			if ($this->getState('customfields'))
+			{
+				foreach ($header_cfs AS $header)
+				{
+					$this->content .= $separator . '"' . str_replace('"', '""', JText::_($header)) . '"';
+				}
+			}
+
+			if ($this->getState('notes'))
+			{
+				$this->content .= $separator . '"' . str_replace('"', '""', JText::_('COM_ICAGENDA_REGISTRATION_NOTES_DISPLAY_LABEL')) . '"';
+			}
+
+			if ($this->getState('status'))
+			{
+				$this->content .= $separator . '"' . str_replace('"', '""', JText::_('JSTATUS')) . '"';
+			}
+
+			if ($this->getState('created'))
+			{
+				$this->content .= $separator . '"' . str_replace('"', '""', JText::_('JGLOBAL_FIELD_CREATED_LABEL')) . '"';
+			}
+
+			if ($this->getState('reg_id'))
+			{
+				$this->content .= $separator . '"' . str_replace('"', '""', JText::_('JGLOBAL_FIELD_ID_LABEL')) . '"';
+			}
+
+			$this->content .= "\n";
+
+			// Data Rows
+			$n = 0;
+
+			foreach ($this->getItems() as $item)
+			{
+				// Adds filled custom fields
+				$customfields = icagendaCustomfields::getList($item->id, 1);
+
+ 				$values_cfs = array();
+
+				if ($customfields)
+				{
+					foreach ($customfields AS $customfield)
+					{
+						$cf_value = isset($customfield->cf_value) ? $customfield->cf_value : JText::_('IC_NOT_SPECIFIED');
+
+						$values_cfs[]= $cf_value;
+					}
+				}
+
+				$this->content .= '"';
+
+				if ($this->getState('event_title'))
+				{
+					$this->content .= str_replace('"', '""', $item->event) . '"';
+				}
+				else
+				{
+					$n = $n + 1;
+					$this->content .= $n . '"';
+				}
+
+				if ($this->getState('date'))
+				{
+					$isPeriod = ($item->period != 1 && ! $item->date) ? true : false;
+					$regDate  = $isPeriod ? $item->startdate . ' > ' . $item->enddate : $item->date;
+
+					$this->content .= $separator . '"' .
+						str_replace('"', '""', ($item->period == 1 ? JText::_('COM_ICAGENDA_REGISTRATION_ALL_DATES') : $regDate)) . '"';
+				}
+
+				if ($this->getState('tickets'))
+				{
+					$this->content .= $separator . '"' . str_replace('"', '""', $item->people) . '"';
+				}
+
+				if ($this->getState('name'))
+				{
+					$this->content .= $separator . '"' . str_replace('"', '""', $item->name) . '"';
+				}
+
+				if ($this->getState('email'))
+				{
+					$this->content .= $separator . '"' . str_replace('"', '""', $item->email) . '"';
+				}
+
+				if ($this->getState('phone'))
+				{
+					$this->content .= $separator . '"' . str_replace('"', '""', $item->phone) . '"';
+				}
+
+				if ($this->getState('customfields'))
+				{
+					foreach ($values_cfs AS $value)
+					{
+						$this->content .= $separator . '"' . str_replace('"', '""', JText::_($value)) . '"';
+					}
+				}
+
+				if ($this->getState('notes'))
+				{
+					$this->content .= $separator . '"' . str_replace('"', '""', strip_tags($item->notes)) . '"';
+				}
+
+				if ($this->getState('status'))
+				{
+					$this->content .= $separator . '"' . str_replace('"', '""', $this->getStatusName($item->state)) . '"';
+				}
+
+				if ($this->getState('created'))
+				{
+					$this->content .= $separator . '"' . str_replace('"', '""', $item->created) . '"';
+				}
+
+				if ($this->getState('reg_id'))
+				{
+					$this->content .= $separator . '"' . str_replace('"', '""', $item->id) . '"';
+				}
+
+				$this->content .= "\n";
+			}
+
+			// Exporting Format: character encoding
+			if (function_exists('mb_convert_encoding'))
+			{
+				$this->content = mb_convert_encoding($this->content, $this->getState('character_encoding', 'UTF-8'));
+			}
+
+			if ($this->getState('compressed'))
+			{
+				$app = JFactory::getApplication('administrator');
+
+				// Remove carriage returns (line breaks)
+				$this->content = str_replace(CHR(13).CHR(10), " ", $this->content);
+
+				$files = array(
+					'registrations' => array(
+						'name' => $this->getBasename() . '.csv',
+						'data' => $this->content,
+						'time' => time()
+					)
+				);
+				$ziproot = $app->get('tmp_path') . '/' . uniqid('icagenda_registrations_') . '.zip';
+
+				// Run the packager
+				jimport('joomla.filesystem.folder');
+				jimport('joomla.filesystem.file');
+				$delete = JFolder::files($app->get('tmp_path') . '/', uniqid('icagenda_registrations_'), false, true);
+
+				if ( ! empty($delete))
+				{
+					if (!JFile::delete($delete))
+					{
+						// JFile::delete throws an error
+						$this->setError(JText::_('COM_ICAGENDA_EXPORT_ERR_ZIP_DELETE_FAILURE'));
+
+						return false;
+					}
+				}
+
+				if (version_compare(JVERSION, '3.8', 'ge'))
+				{
+					$archive = new Archive;
+
+					if ( ! $packager = $archive->getAdapter('zip'))
+					{
+						$this->setError(JText::_('COM_ICAGENDA_EXPORT_ERR_ZIP_ADAPTER_FAILURE'));
+
+						return false;
+					}
+					elseif ( ! $packager->create($ziproot, $files))
+					{
+						$this->setError(JText::_('COM_ICAGENDA_EXPORT_ERR_ZIP_CREATE_FAILURE'));
+
+						return false;
+					}
+				}
+				else
+				{
+					// JArchive deprecated J4.0
+					if ( ! $packager = JArchive::getAdapter('zip'))
+					{
+						$this->setError(JText::_('COM_ICAGENDA_EXPORT_ERR_ZIP_ADAPTER_FAILURE'));
+
+						return false;
+					}
+					elseif ( ! $packager->create($ziproot, $files))
+					{
+						$this->setError(JText::_('COM_ICAGENDA_EXPORT_ERR_ZIP_CREATE_FAILURE'));
+
+						return false;
+					}
+
+				}
+
+				$this->content = file_get_contents($ziproot);
+			}
+		}
+
+		return $this->content;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/models/themes.php b/deployed/icagenda/administrator/components/com_icagenda/models/themes.php
new file mode 100644
index 00000000..84844080
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/models/themes.php
@@ -0,0 +1,669 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-25
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       2.0.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+jimport('joomla.application.component.modellist');
+jimport( 'joomla.html.parameter' );
+
+if (version_compare(JVERSION, '3.0', 'ge'))
+{
+	jimport( 'joomla.installer.installer' );
+	jimport( 'joomla.installer.helper' );
+	jimport( 'joomla.filesystem.folder' );
+}
+
+/**
+ * Model Admin - Theme Manager - iCagenda
+ */
+class iCagendaModelthemes extends JModelList
+{
+	protected 	$_paths      = array();
+	protected 	$_manifest   = null;
+	protected	$option      = 'com_icagenda';
+	protected 	$text_prefix = 'com_icagenda';
+
+	function __construct()
+	{
+		parent::__construct();
+	}
+
+	public function getForm($data = array(), $loadData = true)
+	{
+		$app  = JFactory::getApplication();
+		$form = $this->loadForm('com_icagenda.template', 'themes', array('control' => 'jform', 'load_data' => $loadData));
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		return $form;
+	}
+
+	function install($theme)
+	{
+		$app     = JFactory::getApplication();
+		$db      = JFactory::getDbo();
+		$package = $this->_getPackageFromUpload();
+
+		if ( ! $package)
+		{
+			$app->enqueueMessage(JText::_('COM_ICAGENDA_ERROR_FIND_INSTALL_PACKAGE'), 'warning');
+			$this->deleteTempFiles();
+
+			return false;
+		}
+
+		if ($package['dir'] && JFolder::exists($package['dir']))
+		{
+			$this->setPath('source', $package['dir']);
+		}
+		else
+		{
+			$app->enqueueMessage(JText::_('COM_ICAGENDA_ERROR_INSTALL_PATH_NOT_EXISTS'), 'warning');
+			$this->deleteTempFiles();
+
+			return false;
+		}
+
+		// We need to find the installation manifest file
+		if ( ! $this->_findManifest())
+		{
+			$app->enqueueMessage(JText::_('COM_ICAGENDA_ERROR_FIND_INFO_INSTALL_PACKAGE'), 'warning');
+			$this->deleteTempFiles();
+
+			return false;
+		}
+
+		// Files - copy files in manifest
+		foreach ($this->_manifest->children() as $child)
+		{
+			if (is_a($child, 'JXMLElement') && $child->name() == 'files')
+			{
+				if ($this->parseFiles($child) === false)
+				{
+					$app->enqueueMessage(JText::_('COM_ICAGENDA_ERROR_FIND_INFO_INSTALL_PACKAGE'), 'warning');
+					$this->deleteTempFiles();
+
+					return false;
+				}
+			}
+		}
+
+		// File - copy the xml file
+		$copyFile     = array();
+		$path['src']  = $this->getPath( 'manifest' ); // XML file will be copied too
+		$path['dest'] = JPATH_SITE . '/components/com_icagenda/themes/' . basename($this->getPath('manifest'));
+		$copyFile[]   = $path;
+
+		$this->copyFiles($copyFile, array());
+		$this->deleteTempFiles();
+
+		// -------------------
+		// Themes
+		// -------------------
+		// Params -  Get new themes params
+		$paramsThemes = $this->getParamsThemes();
+
+
+		// -------------------
+		// Component
+		// -------------------
+		if (isset($theme['component']) && $theme['component'] == 1 )
+		{
+			$component = 'com_icagenda';
+			$paramsC   = JComponentHelper::getParams($component) ;
+
+			foreach ($paramsThemes as $keyT => $valueT)
+			{
+				if (version_compare(JVERSION, '3.0', 'lt'))
+				{
+					$paramsC->setValue($valueT['name'], $valueT['value']);
+				}
+				else
+				{
+					$paramsC->set($valueT['name'], $valueT['value']);
+				}
+			}
+
+			$data['params'] = $paramsC->toArray();
+			$table          = JTable::getInstance('extension');
+
+			$idCom          = $table->find( array('element' => $component ));
+
+			$table->load($idCom);
+
+			if ( ! $table->bind($data))
+			{
+				$app->enqueueMessage(JText::_('Not a valid component'), 'warning');
+
+				return false;
+			}
+
+			// pre-save checks
+			if ( ! $table->check())
+			{
+				$app->enqueueMessage(JText::_('Check Problem'), 'warning');
+
+				return false;
+			}
+
+			// save the changes
+			if ( ! $table->store())
+			{
+				$app->enqueueMessage(JText::_('Store Problem'), 'warning');
+
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	function _getPackageFromUpload()
+	{
+		$app = JFactory::getApplication();
+
+		// Get the uploaded file information
+		// Do not change the filter type 'raw'. We need this to let files containing PHP code to upload. See JInputFiles::get.
+		$userfile = $app->input->files->get('Filedata', null, 'raw');
+
+		// Make sure that file uploads are enabled in php
+		if ( ! (bool) ini_get('file_uploads'))
+		{
+			$app->enqueueMessage(JText::_('COM_ICAGENDA_ERROR_INSTALL_FILE_UPLOAD'), 'warning');
+
+			return false;
+		}
+
+		// Make sure that zlib is loaded so that the package can be unzipped
+		if ( ! extension_loaded('zlib'))
+		{
+			$app->enqueueMessage(JText::_('COM_ICAGENDA_ERROR_INSTALL_ZLIB'), 'warning');
+
+			return false;
+		}
+
+		// If there is no uploaded file, we have a problem...
+		if ( ! is_array($userfile))
+		{
+			$app->enqueueMessage(JText::_('COM_ICAGENDA_ERROR_NO_FILE_SELECTED'), 'warning');
+
+			return false;
+		}
+
+		// Check if there was a problem uploading the file.
+		if ($userfile['error'] || $userfile['size'] < 1)
+		{
+			$app->enqueueMessage(JText::_('COM_ICAGENDA_ERROR_UPLOAD_FILE'), 'warning');
+
+			return false;
+		}
+
+		// Build the appropriate paths
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			$config   = JFactory::getConfig();
+			$tmp_dest = $config->getValue('config.tmp_path') . '/' . $userfile['name'];
+		}
+		else
+		{
+			$config   = JFactory::getConfig();
+			$tmp_dest = $config->get('tmp_path') . '/' . $userfile['name'];
+		}
+
+		$tmp_src = $userfile['tmp_name'];
+
+		// Move uploaded file
+		jimport('joomla.filesystem.file');
+		$uploaded = JFile::upload($tmp_src, $tmp_dest, false, true);
+
+		// Unpack the downloaded package file
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			$package = JInstallerHelper::unpack($tmp_dest);
+		}
+		else
+		{
+			$package = self::unpack($tmp_dest);
+		}
+
+		$this->_manifest =& $manifest;
+
+		$this->setPath('packagefile', $package['packagefile']);
+		$this->setPath('extractdir', $package['extractdir']);
+
+		return $package;
+	}
+
+	function getPath($name, $Default = null)
+	{
+		return ( ! empty($this->_paths[$name])) ? $this->_paths[$name] : $Default;
+	}
+
+	function setPath($name, $value)
+	{
+		$this->_paths[$name] = $value;
+	}
+
+	function _findManifest()
+	{
+		$app = JFactory::getApplication();
+
+		// Get an array of all the xml files from teh installation directory
+		$xmlfiles = JFolder::files($this->getPath('source'), '.xml$', 1, true);
+
+		// If at least one xml file exists
+		if (count($xmlfiles) > 0)
+		{
+			foreach ($xmlfiles as $file)
+			{
+				// Is it a valid joomla installation manifest file?
+				$manifest = $this->_isManifest($file);
+
+				if ( ! is_null($manifest))
+				{
+					$attr = $manifest->attributes();
+
+					if ((string)$attr['method'] != 'icthemes')
+					{
+						$app->enqueueMessage(JText::_('COM_ICAGENDA_ERROR_NO_THEME_FILE'), 'warning');
+
+						return false;
+					}
+
+					// Set the manifest object and path
+					$this->_manifest =& $manifest;
+					$this->setPath('manifest', $file);
+
+					// Set the installation source path to that of the manifest file
+					$this->setPath('source', dirname($file));
+
+					return true;
+				}
+			}
+
+			// None of the xml files found were valid install files
+			$app->enqueueMessage(JText::_('COM_ICAGENDA_ERROR_XML_INSTALL_ICAGENDA'), 'warning');
+
+			return false;
+		}
+		else
+		{
+			// No xml files were found in the install folder
+			$app->enqueueMessage(JText::_('COM_ICAGENDA_ERROR_XML_INSTALL'), 'warning');
+
+			return false;
+		}
+	}
+
+	function _isManifest($file)
+	{
+		$xml = JFactory::getXML($file, true);
+
+		if ( ! $xml)
+		{
+			unset ($xml);
+
+			return null;
+		}
+
+		if ( ! is_object($xml) || ($xml->name() != 'install' && $xml->name() != 'installtheme'))
+		{
+			unset ($xml);
+
+			return null;
+		}
+
+		return $xml;
+	}
+
+
+	function parseFiles($element, $cid = 0)
+	{
+		$copyfiles   = array();
+		$copyfolders = array();
+
+		if ( ! is_a($element, 'JXMLElement') || ! count($element->children()))
+		{
+			return 0; // Either the tag does not exist or has no children therefore we return zero files processed.
+		}
+
+		$files = $element->children();// Get the array of file nodes to process
+
+		if (count($files) == 0)
+		{
+			return 0; // No files to process
+		}
+
+		$source       = $this->getPath('source');
+		$destination  = JPATH_SITE . '/components/com_icagenda/themes';
+		$destination2 = JPATH_SITE . '/components/com_icagenda/themes/packs';
+
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			foreach ($files as $file)
+			{
+				if ($file->name() == 'folder')
+				{
+					$path['src']   = $source . '/' . $file->data();
+					$path['dest']  = $destination2 . '/' . $file->data();
+					$copyfolders[] = $path;
+				}
+				else
+				{
+					$path['src']   = $source . '/' . $file->data();
+					$path['dest']  = $destination . '/' . $file->data();
+					$copyfiles[]   = $path;
+				}
+			}
+		}
+		else
+		{
+			if ( ! empty($files->folder))
+			{
+				foreach ($files->folder as $fk => $fv)
+				{
+					$path['src']   = $source . '/' . $fv;
+					$path['dest']  = $destination2 . '/' . $fv;
+					$copyfolders[] = $path;
+				}
+			}
+
+			if ( ! empty($files->filename))
+			{
+				foreach ($files->filename as $fik => $fiv)
+				{
+					$path['src']   = $source . '/' . $fiv;
+					$path['dest']  = $destination . '/' . $fiv;
+					$copyfiles[]   = $path;
+				}
+			}
+		}
+
+		return $this->copyFiles($copyfiles, $copyfolders);
+	}
+
+	function copyFiles($files, $folders)
+	{
+		$app = JFactory::getApplication();
+
+		$i = 0;
+		$fileIncluded = $folderIncluded = 0;
+
+		if (is_array($folders) && count($folders) > 0)
+		{
+			foreach ($folders as $folder)
+			{
+				// Get the source and destination paths
+				$foldersource = JPath::clean($folder['src']);
+				$folderdest   = JPath::clean($folder['dest']);
+
+				if ( ! JFolder::exists($foldersource))
+				{
+					$app->enqueueMessage(JText::sprintf('COM_ICAGENDA_FOLDER_NOT_EXISTS', $foldersource), 'warning');
+
+					return false;
+				}
+				else
+				{
+					if ( ! (JFolder::copy($foldersource, $folderdest, '', true)))
+					{
+						$app->enqueueMessage(JText::sprintf('COM_ICAGENDA_ERROR_COPY_FOLDER_TO', $foldersource, $folderdest), 'warning');
+
+						return false;
+					}
+					else
+					{
+						$i++;
+					}
+				}
+			}
+
+			$folderIncluded = 1;
+		}
+
+		if (is_array($files) && count($files) > 0)
+		{
+			foreach ($files as $file)
+			{
+				// Get the source and destination paths
+				$filesource = JPath::clean($file['src']);
+				$filedest   = JPath::clean($file['dest']);
+
+				if ( ! file_exists($filesource))
+				{
+					$app->enqueueMessage(JText::sprintf('COM_ICAGENDA_FILE_NOT_EXISTS', $filesource), 'warning');
+
+					return false;
+				}
+				else
+				{
+					if ( ! (JFile::copy($filesource, $filedest)))
+					{
+						$app->enqueueMessage(JText::sprintf('COM_ICAGENDA_ERROR_COPY_FILE_TO', $filesource, $filedest), 'warning');
+
+						return false;
+					}
+					else
+					{
+						$i++;
+					}
+				}
+			}
+
+			$fileIncluded = 1;
+		}
+
+		if ($fileIncluded == 0 && $folderIncluded ==0)
+		{
+			$app->enqueueMessage(JText::_('COM_ICAGENDA_ERROR_INSTALL_FILE'), 'warning');
+
+			return false;
+		}
+
+		return $i; // Possible TO DO, now it returns count folders and files togeter, //return count($files);
+	}
+
+	protected function getParamsThemes()
+	{
+		$element = $this->_manifest->children()->params;
+
+		if ( ! is_a($element, 'JXMLElement') || ! count($element->children()))
+		{
+			return null; // Either the tag does not exist or has no children therefore we return zero files processed.
+		}
+
+		$params = $element->children();
+
+		if (count($params) == 0)
+		{
+			return null; // No params to process
+		}
+
+		// Process each parameter in the $params array.
+		$paramsArray = array();
+		$i = 0;
+
+		foreach ($params as $param)
+		{
+			if ( ! $name = $param['name'])
+			{
+				continue;
+			}
+			if ( ! $value = $param['default'])
+			{
+				continue;
+			}
+
+			$paramsArray[$i]['name']  = (string)$name;
+			$paramsArray[$i]['value'] = (string)$value;
+			$i++;
+		}
+
+		return $paramsArray;
+	}
+
+	function deleteTempFiles()
+	{
+		$path = $this->getPath('source');
+
+		if (is_dir($path))
+		{
+			$val = JFolder::delete($path);
+		}
+		elseif (is_file($path))
+		{
+			$val = JFile::delete($path);
+		}
+
+		$packageFile = $this->getPath('packagefile');
+
+		if (is_file($packageFile))
+		{
+			$val = JFile::delete($packageFile);
+		}
+
+		$extractDir = $this->getPath('extractdir');
+
+		if (is_dir($extractDir))
+		{
+			$val = JFolder::delete($extractDir);
+		}
+	}
+
+
+	/*
+	 * Added @since 3.0.
+	 */
+	public static function unpack($p_filename)
+	{
+		// Path to the archive
+		$archivename = $p_filename;
+
+		// Temporary folder to extract the archive into
+		$tmpdir = uniqid('install_');
+
+		// Clean the paths to use for archive extraction
+		$extractdir  = JPath::clean(dirname($p_filename) . '/' . $tmpdir);
+		$archivename = JPath::clean($archivename);
+
+		// Do the unpacking of the archive
+		try
+		{
+			JArchive::extract($archivename, $extractdir);
+		}
+		catch (Exception $e)
+		{
+			return false;
+		}
+
+		/*
+		 * Let's set the extraction directory and package file in the result array so we can
+		 * cleanup everything properly later on.
+		 */
+		$retval['extractdir']  = $extractdir;
+		$retval['packagefile'] = $archivename;
+
+		/*
+		 * Try to find the correct install directory.  In case the package is inside a
+		 * subdirectory detect this and set the install directory to the correct path.
+		 *
+		 * List all the items in the installation directory.  If there is only one, and
+		 * it is a folder, then we will set that folder to be the installation folder.
+		 */
+		$dirList = array_merge(JFolder::files($extractdir, ''), JFolder::folders($extractdir, ''));
+
+		if (count($dirList) == 1)
+		{
+			if (JFolder::exists($extractdir . '/' . $dirList[0]))
+			{
+				$extractdir = JPath::clean($extractdir . '/' . $dirList[0]);
+			}
+		}
+
+		/*
+		 * We have found the install directory so lets set it and then move on
+		 * to detecting the extension type.
+		 */
+		$retval['dir'] = $extractdir;
+
+		/*
+		 * Get the extension type and return the directory/type array on success or
+		 * false on fail.
+		 */
+		$retval['type'] = self::detectType($extractdir);
+
+		if ($retval['type'])
+		{
+			return $retval;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/*
+	 * Added @since 3.0.
+	 */
+	public static function detectType($p_dir)
+	{
+		// Search the install dir for an XML file
+		$files = JFolder::files($p_dir, '\.xml$', 1, true);
+
+		if ( ! count($files))
+		{
+			JLog::add(JText::_('JLIB_INSTALLER_ERROR_NOTFINDXMLSETUPFILE'), JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		foreach ($files as $file)
+		{
+			$xml = simplexml_load_file($file);
+
+			if ( ! $xml)
+			{
+				continue;
+			}
+
+			if ($xml->getName() != 'install' && $xml->getName() != 'installtheme')
+			{
+				unset($xml);
+
+				continue;
+			}
+
+			$type = (string) $xml->attributes()->type;
+
+			// Free up memory
+			unset($xml);
+
+			return $type;
+		}
+
+		JLog::add(JText::_('JLIB_INSTALLER_ERROR_NOTFINDJOOMLAXMLSETUPFILE'), JLog::WARNING, 'jerror');
+
+		// Free up memory.
+		unset($xml);
+
+		return false;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/script.icagenda.php b/deployed/icagenda/administrator/components/com_icagenda/script.icagenda.php
new file mode 100644
index 00000000..83062e1f
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/script.icagenda.php
@@ -0,0 +1,1414 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.5 2018-10-30
+ *
+ * @package     iCagenda
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       2.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+jimport('joomla.filesystem.folder');
+jimport('joomla.filesystem.file');
+
+// System Installation/Update, component iCagenda https://icagenda.joomlic.com
+class com_icagendaInstallerScript
+{
+	/*
+	 * $parent is the class calling this method.
+	 * $type is the type of change (install, update or discover_install, not uninstall).
+	 * preflight runs before anything else and while the extracted files are in the uploaded temp folder.
+	 * If preflight returns false, Joomla will abort the update and undo everything already done.
+	 */
+	private $ictype = 'core';
+
+	/** @var array The list of extra modules and plugins to install */
+	private $installation_queue = array(
+		// modules => { (folder) => { (module) => { (position), (published) } }* }*
+		'modules' => array(
+			'admin' => array(
+			),
+			'site' => array(
+				'mod_iccalendar'	=> array('', 0),
+			)
+		),
+		// plugins => { (folder) => { (element) => { (name), (published) } }* }*
+		'plugins' => array(
+			'actionlog' => array(
+				'icagenda'       => array('Action Log - iCagenda', 1),
+			),
+			'installer' => array(
+				'icagenda'       => array('Installer - iCagenda', 1),
+			),
+			'privacy' => array(
+				'icagenda'       => array('Privacy - iCagenda', 1),
+			),
+			'quickicon' => array(
+				'icagendaupdate' => array('Quick Icon - iCagenda :: Update Notification', 1),
+			),
+			'system' => array(
+				'ic_autologin'   => array('System - iCagenda :: Autologin', 1),
+				'ic_library'     => array('System - iC Library', 1),
+			),
+			'search' => array(
+				'icagenda'       => array('Search - iCagenda', 1),
+			)
+		)
+	);
+
+	/** @var array Obsolete files and folders to remove from the iCagenda oldest releases*/
+	private $icagendaRemoveFiles = array(
+		'files'	=> array(
+			'components/com_icagenda/views/list/tmpl/search.php',
+			'components/com_icagenda/views/list/tmpl/search.xml',
+			'modules/mod_iccalendar/js/bottomcenter_function.js',
+			'modules/mod_iccalendar/js/center_function.js',
+			'modules/mod_iccalendar/js/left_function.js',
+			'modules/mod_iccalendar/js/right_function.js',
+			'modules/mod_iccalendar/js/topcenter_function.js',
+			'components/com_icagenda/helpers/icmodcalendar.php',
+			'administrator/components/com_icagenda/models/fields/eventtitle.php',
+			'components/com_icagenda/themes/packs/ic_rounded/ic_rounded_alldates.php',
+			'media/com_icagenda/icicons/lte-ie7.js',
+			'media/com_icagenda/icicons/fonts/iCicons.dev.svg',
+			'media/com_icagenda/icicons/selection.json',
+			'modules/mod_iccalendar/js/function.js',
+			'modules/mod_iccalendar/js/function_312.js',
+			'modules/mod_iccalendar/js/function_316.js',
+			'modules/mod_iccalendar/js/ictip.js',
+			'components/com_icagenda/themes/packs/default/default_list.php',
+			'components/com_icagenda/themes/packs/ic_rounded/ic_rounded_list.php',
+			'media/com_icagenda/images/iconicagenda48 - copie.png',
+			'administrator/components/com_icagenda/views/event/tmpl/ajaxfile.php',
+			'administrator/components/com_icagenda/views/registration/tmpl/default.php',
+			'administrator/components/com_icagenda/models/fields/modal/time.php',
+			'administrator/components/com_icagenda/UPDATELOGS.php',
+			'administrator/components/com_icagenda/sql/install.mysql.utf8.sql',
+			'administrator/components/com_icagenda/sql/uninstall.mysql.utf8.sql',
+			'administrator/components/com_icagenda/models/fields/custom_field.php',
+			'administrator/components/com_icagenda/tables/mail.php',
+			'administrator/components/com_icagenda/models/fields/modal/mailinglist.php',
+			'components/com_icagenda/add/elements/icsetvar.php',
+			'components/com_icagenda/helpers/iCalcreator.class.php',
+			'components/com_icagenda/helpers/ichelper.php',
+			'components/com_icagenda/helpers/icmodel.php',
+			'components/com_icagenda/helpers/media_css.class.php',
+			'components/com_icagenda/views/list/tmpl/actions.php',
+			'components/com_icagenda/views/list/tmpl/default_vcal.php',
+			'components/com_icagenda/views/list/tmpl/event.php',
+			'components/com_icagenda/views/list/tmpl/registration.php',
+			'media/com_icagenda/images/video_poster_icagenda.jpg',
+			'media/com_icagenda/images/youtube_iCagenda.png',
+			'media/com_icagenda/js/jsevt.js',
+		),
+		'folders' => array(
+			'modules/mod_iccalendar/tmpl',
+			'components/com_icagenda/css',
+			'modules/mod_ic_event_list/language',
+			'modules/mod_iccalendar/language',
+			'administrator/components/com_icagenda/add/js',
+			'components/com_icagenda/add/js',
+			'media/com_icagenda/scripts',
+			'components/com_icagenda/js',
+			'administrator/components/com_icagenda/add/css',
+			'components/com_icagenda/add/css',
+			'administrator/components/com_icagenda/add/image',
+			'components/com_icagenda/add/image',
+			'administrator/components/com_icagenda/globalization',
+			'administrator/components/com_icagenda/add',
+			'components/com_icagenda/views/events',
+			'libraries/ic_library/form/rules',
+		)
+	);
+
+
+	private function _removeObsoleteFilesAndFolders($icagendaRemoveFiles)
+	{
+		// Remove files
+		jimport('joomla.filesystem.file');
+
+		if ( ! empty($icagendaRemoveFiles['files']))
+		{
+			foreach ($icagendaRemoveFiles['files'] as $file)
+			{
+				$f = JPATH_ROOT . '/' . $file;
+
+				if ( ! JFile::exists($f)) continue;
+
+				JFile::delete($f);
+			}
+		}
+
+		// Remove folders
+		jimport('joomla.filesystem.file');
+
+		if ( ! empty($icagendaRemoveFiles['folders']))
+		{
+			foreach ($icagendaRemoveFiles['folders'] as $folder)
+			{
+				$f = JPATH_ROOT . '/' . $folder;
+
+				if ( ! JFolder::exists($f)) continue;
+
+				JFolder::delete($f);
+			}
+		}
+	}
+
+
+	function preflight ($type, $parent)
+	{
+		$app = JFactory::getApplication();
+
+		$jversion = new JVersion();
+
+		// Installing component manifest file version
+		$this->release = $parent->get("manifest")->version;
+
+		// Manifest file minimum Joomla version
+		$this->minimum_joomla_release = $parent->get("manifest")->attributes()->version;
+
+		// Load translations
+		$language = JFactory::getLanguage();
+		$language->load('com_icagenda.sys', JPATH_ADMINISTRATOR, 'en-GB', true);
+		$language->load('com_icagenda.sys', JPATH_ADMINISTRATOR, null, true);
+
+//		if (version_compare(phpversion(), '5.3.0', '<'))
+//		{
+//			$app->enqueueMessage('<span class="icon-warning"></span><b> '.JText::sprintf('COM_ICAGENDA_YOUR_PHP_VERSION_IS', phpversion()).'</b><br />'.JText::_('COM_ICAGENDA_PHP_VERSION_JOOMLA_RECOMMENDED').' ( '.JText::_('IC_READMORE').': <a href="http://www.joomla.org/technical-requirements.html" target="_blanck">http://www.joomla.org/technical-requirements.html</a> )<br />'.JText::_('COM_ICAGENDA_PHP_VERSION_ICAGENDA_RECOMMENDATION').'', 'warning');
+//		}
+
+		echo '<hr />';
+
+		echo '<p>';
+		echo '<img src="../media/com_icagenda/images/iconicagenda48.png" />';
+
+		if ($this->ictype != 'core') echo '<span style="font-weight: bold; font-size: 20px; color: #555;"> ' . strtoupper($this->ictype) . '</span>';
+
+		echo '<br />';
+		echo '<span style="font-size: 16px; color: #555; margin-left: 70px;">' . JText::_('COM_ICAGENDA_XML_DESCRIPTION') . '</span>';
+		echo '</p>';
+
+		echo '<hr />';
+
+		echo '<p>';
+		echo '<div style="float: left; margin-right: 30px;">';
+		echo '<img src="../media/com_icagenda/images/logo_icagenda.png" />';
+		echo '</div>';
+
+		echo '<span style="text-transform:uppercase; letter-spacing: 3px; font-size: 14px">'
+			. JText::_('COM_ICAGENDA_WELCOME')
+			. '</span>'
+			. '<br />';
+
+		if ($type == 'install')
+		{
+			echo '<span style="text-transform:uppercase; font-size: 14px; font-weight: bold;">'
+				. JText::sprintf('COM_ICAGENDA_WELCOME_1', '<strong>iCagenda</strong>') . ' ' . $this->release
+				. ' ' . JText::_('COM_ICAGENDA_WELCOME_2') . '</span>'
+				. '<br /><br />';
+		}
+
+		// Abort if the current Joomla release is older
+		if (version_compare($jversion->getShortVersion(), $this->minimum_joomla_release, 'lt'))
+		{
+			$app->enqueueMessage(' ' . JText::_('COM_ICAGENDA_INSTALL_ERROR_JOOMLA_VERSION') . ' ' . $this->minimum_joomla_release, 'warning');
+
+			return false;
+		}
+
+		// Abort if Joomla 3 release is prior to 3.2.3
+		if (version_compare(JVERSION, '3.0.0', 'ge')
+			&& version_compare(JVERSION, '3.2.3', 'lt'))
+		{
+			$app->enqueueMessage(JText::_('COM_ICAGENDA_INSTALL_ERROR_JOOMLA_VERSION') . ' ' . '3.2.3', 'error');
+
+			return false;
+		}
+
+		// Extension Update
+		if ($type == 'update')
+		{
+			echo '<span style="font-size: 14px; font-weight: bold;">'
+				. JText::_('COM_ICAGENDA') . ' : '
+				. JText::_('COM_ICAGENDA_UPDATE') . ' ' . $this->release . ' !'
+				. '</span>'
+				. '<br /><br />';
+		}
+
+		echo '<div class="small">';
+		echo JText::_('COM_ICAGENDA_FEATURES_BACKEND') . '<br />';
+		echo JText::_('COM_ICAGENDA_FEATURES_FRONTEND');
+		echo '</div>';
+
+		echo '</p>';
+
+		echo '<div style="clear: both"></div>';
+
+		echo '<hr />';
+
+		$translationPacks =  array(
+			'af'    => 'Afrikaans (South Africa)',
+			'ar'    => 'Arabic (Unitag)',
+			'eu_es' => 'Basque (Spain)',
+			'bg'    => 'Bulgarian (Bulgaria)',
+			'ca'    => 'Catalan (Spain)',
+			'zh'    => 'Chinese (China)',
+			'tw'    => 'Chinese (Taiwan)',
+			'hr'    => 'Croatian (Croatia)',
+			'cz'    => 'Czech (Czech Republic)',
+			'dk'    => 'Danish (Denmark)',
+			'nl'    => 'Dutch (Netherlands)',
+			'en'    => 'English (United Kingdom)',
+			'us'    => 'English (United States)',
+			'eo'    => 'Esperanto',
+			'et'    => 'Estonian (Estonia)',
+			'fi'    => 'Finnish (Finland)',
+			'fr'    => 'French (France)',
+			'gl'    => 'Galician (Spain)',
+			'de'    => 'German (Germany)',
+			'el'    => 'Greek (Greece)',
+			'hu'    => 'Hungarian (Hungary)',
+			'it'    => 'Italian (Italy)',
+			'ja'    => 'Japanese (Japan)',
+			'lv'    => 'Latvian (Latvia)',
+			'lt'    => 'Lithuanian (Lithuania)',
+			'none'  => 'Luxembourgish (Luxembourg)',
+			'mk'    => 'Macedonian (Macedonia)',
+			'no'    => 'Norwegian Bokmål (Norway)',
+			'fa_ir' => 'Persian (Iran)',
+			'pl'    => 'Polish (Poland)',
+			'pt_br' => 'Portuguese (Brazil)',
+			'pt'    => 'Portuguese (Portugal)',
+			'ro'    => 'Romanian (Romania)',
+			'ru'    => 'Russian (Russia)',
+			'sr'    => 'Serbian (latin)',
+			'sk'    => 'Slovak (Slovakia)',
+			'sl'    => 'Slovenian (Slovenia)',
+			'es'    => 'Spanish (Spain)',
+			'sv'    => 'Swedish (Sweden)',
+			'th'    => 'Thai (Thailand)',
+			'tr'    => 'Turkish (Turkey)',
+			'uk'    => 'Ukrainian (Ukraine)',
+		);
+
+		echo '<div style="font-size: 18px; font-weight: bold; color: #555; margin-bottom: 10px;">'
+			. JText::sprintf('COM_ICAGENDA_FEATURES_TRANSLATION_PACKS', count($translationPacks))
+			. '</div>';
+
+		echo '<p>';
+
+		foreach ($translationPacks as $code => $lang)
+		{
+			$flagIcon = ($code == 'none') ? 'icon-16-language.png' : $code . '.gif';
+
+			echo '<span rel="tooltip" data-placement="top" class="editlinktip hasTip" style="margin: 2px;" title="' . $lang . '">'
+				. '<img src="../media/mod_languages/images/' . $flagIcon . '" border="0" alt="Tooltip"/>'
+				. '</span>';
+		}
+
+		echo '<br /><br />';
+		echo '<a href="http://icagenda.joomlic.com/resources/translations" target="_blank" class="btn">'
+			. JText::_('COM_ICAGENDA_TRANSLATION_PACKS_DONWLOAD')
+			. '</a>';
+
+		echo '</p>';
+
+		echo '<hr />';
+
+		echo '<div style="font-size: 18px; font-weight: bold; color: #555; margin-bottom: 10px;">'
+			. JText::_('COM_ICAGENDA_INSTALL_LABEL')
+			. '</div>';
+	}
+
+	/*
+	 * $parent is the class calling this method.
+	 * install runs after the database scripts are executed.
+	 * If the extension is new, the install method is run.
+	 * If install returns false, Joomla will abort the install and undo everything already done.
+	 */
+	function install( $parent )
+	{
+		// Load language
+		JFactory::getLanguage()->load('com_installer', JPATH_ADMINISTRATOR);
+
+		$module_type    = JText::_( 'COM_INSTALLER_TYPE_TYPE_MODULE' );
+		$plugin_type    = JText::_( 'COM_INSTALLER_TYPE_TYPE_PLUGIN' );
+		$library_type   = JText::_( 'COM_INSTALLER_TYPE_TYPE_LIBRARY' );
+
+		// Addons install (library, modules, plugins)
+		$db             = JFactory::getDbo();
+		$manifest       = $parent->get("manifest");
+		$parent         = $parent->getParent();
+		$source         = $parent->getPath("source");
+		$installer      = new JInstaller();
+
+//		$installLibraries = array();
+//		$installModules = array();
+//		$installPlugins = array();
+
+		echo '<div><i>' . JText::_('JTOOLBAR_INSTALL') . '</i></div>';
+
+		// Proceed Libraries Install
+		if (is_object($manifest->libraries) && isset($manifest->libraries->library))
+		{
+			foreach ($manifest->libraries->library as $library)
+			{
+				$attributes         = $library->attributes();
+
+				// Install Library
+				$lib                = $source . '/' . $attributes['folder'] . '/' . $attributes['library'];
+				$installer->install($lib);
+
+//				$installLibraries[] = $attributes['library'];
+				$installed_lib      = '<strong>' . $attributes['name'] . '</strong>';
+
+				$libraryLabel   = version_compare(JVERSION, '3.0.0', 'ge')
+								? '<span class="label label-warning">' . $library_type . '</span>'
+								: '<span style="color:orange">[' . $library_type . ']</span>';
+
+				echo '<div>' . $libraryLabel . ' ' . JText::sprintf( 'COM_INSTALLER_INSTALL_SUCCESS', $installed_lib )
+					. ' &#8680; <span style="color: green; font-weight: bold;">' . JText::_( 'JPUBLISHED' ) . '</span></div>';
+			}
+		}
+
+		// Proceed Modules Install
+		if (is_object($manifest->modules) && isset($manifest->modules->module))
+		{
+			foreach ($manifest->modules->module AS $module)
+			{
+				$attributes         = $module->attributes();
+
+				// Install Module
+				$mod                = $source . '/' . $attributes['folder'] . '/' . $attributes['module'];
+				$installer->install($mod);
+
+//				$installModules[]   =  $attributes['module'];
+				$installed_mod      = '<strong>' . $attributes['name'] . '</strong>';
+
+				$moduleLabel        = version_compare(JVERSION, '3.0.0', 'ge')
+									? '<span class="label label-danger label-important">' . $module_type . '</span>'
+									: '<span style="color:red">[' . $module_type . ']</span>';
+
+				echo '<div>' . $moduleLabel . ' ' . JText::sprintf('COM_INSTALLER_INSTALL_SUCCESS', $installed_mod)
+					. ' &#8680; <span style="color: red; font-weight: bold;">' . JText::_( 'JUNPUBLISHED' ) . '</span></div>';
+			}
+		}
+
+		// Proceed Plugins Install
+		$this->_installAddons($parent, $source);
+
+		echo '<br /><br />';
+
+//		echo '<span style="text-transform:uppercase; font-size: 8px"><b>' . JText::_('COM_ICAGENDA_INSTALL') . $this->release . '</b> | </span>';
+		// You can have the backend jump directly to the newly installed component configuration page
+		// $parent->getParent()->setRedirectURL('index.php?option=com_democompupdate');
+
+
+		// Get Joomla Images PATH setting
+		$params         = JComponentHelper::getParams('com_media');
+		$image_path     = $params->get('image_path');
+
+		// Create Folder iCagenda in ROOT/IMAGES_PATH/icagenda
+		$folder[0][0]  = 'icagenda/' ;
+		$folder[0][1]  = JPATH_ROOT.'/'.$image_path.'/'.$folder[0][0];
+		$folder[1][0]  = 'icagenda/files/';
+		$folder[1][1]  = JPATH_ROOT.'/'.$image_path.'/'.$folder[1][0];
+		$folder[2][0]  = 'icagenda/thumbs/';
+		$folder[2][1]  = JPATH_ROOT.'/'.$image_path.'/'.$folder[2][0];
+		$folder[3][0]  = 'icagenda/thumbs/system/';
+		$folder[3][1]  = JPATH_ROOT.'/'.$image_path.'/'.$folder[3][0];
+		$folder[4][0]  = 'icagenda/thumbs/themes/';
+		$folder[4][1]  = JPATH_ROOT.'/'.$image_path.'/'.$folder[4][0];
+		$folder[5][0]  = 'icagenda/thumbs/copy/';
+		$folder[5][1]  = JPATH_ROOT.'/'.$image_path.'/'.$folder[5][0];
+		$folder[6][0]  = 'icagenda/feature_icons/';
+		$folder[6][1]  = JPATH_ROOT.'/'.$image_path.'/'.$folder[6][0];
+		$folder[7][0]  = 'icagenda/feature_icons/16_bit';
+		$folder[7][1]  = JPATH_ROOT.'/'.$image_path.'/'.$folder[7][0];
+		$folder[8][0]  = 'icagenda/feature_icons/24_bit';
+		$folder[8][1]  = JPATH_ROOT.'/'.$image_path.'/'.$folder[8][0];
+		$folder[9][0]  = 'icagenda/feature_icons/32_bit';
+		$folder[9][1]  = JPATH_ROOT.'/'.$image_path.'/'.$folder[9][0];
+		$folder[10][0] = 'icagenda/feature_icons/48_bit';
+		$folder[10][1] = JPATH_ROOT.'/'.$image_path.'/'.$folder[10][0];
+		$folder[11][0] = 'icagenda/feature_icons/64_bit';
+		$folder[11][1] = JPATH_ROOT.'/'.$image_path.'/'.$folder[11][0];
+
+
+		$message = '<div><i>'.JText::_('COM_ICAGENDA_FOLDER_CREATION').'</i></div>';
+		$error   = array();
+
+		foreach ($folder as $key => $value)
+		{
+			if ( ! JFolder::exists( $value[1]))
+			{
+				if (JFolder::create( $value[1], 0755 ))
+				{
+
+					$data = "<html>\n<body bgcolor=\"#FFFFFF\">\n</body>\n</html>";
+					JFile::write($value[1]."/index.html", $data);
+					$message .= '<div><b><span style="color:#009933">'.JText::_('COM_ICAGENDA_FOLDER').'</span> ' . $image_path.'/'.$value[0]
+								.' <span style="color:#009933">'.JText::_('COM_ICAGENDA_CREATED').'</span></b></div>';
+					$error[] = 0;
+				}
+				else
+				{
+					$message .= '<div><b><span style="color:#CC0033">'.JText::_('COM_ICAGENDA_FOLDER').'</span> ' . $image_path.'/'.$value[0]
+								.' <span style="color:#CC0033">'.JText::_('COM_ICAGENDA_CREATION_FAILED').'</span></b> '.JText::_('COM_ICAGENDA_PLEASE_CREATE_MANUALLY').'</div>';
+					$error[] = 1;
+				}
+			}
+			else //Folder exist
+			{
+				$message .= '<div><b><span style="color:#009933">'.JText::_('COM_ICAGENDA_FOLDER').'</span> ' . $image_path.'/'.$value[0]
+							.' <span style="color:#009933">'.JText::_('COM_ICAGENDA_EXISTS').'</span></b></div>';
+				$error[] = 0;
+			}
+		}
+
+		$message.= '<br /><br />';
+
+		echo $message;
+	}
+
+	/*
+	 * $parent is the class calling this method.
+	 * update runs after the database scripts are executed.
+	 * If the extension exists, then the update method is run.
+	 * If this returns false, Joomla will abort the update and undo everything already done.
+	 */
+	function update( $parent )
+	{
+		// Load language
+		JFactory::getLanguage()->load('com_installer', JPATH_ADMINISTRATOR);
+		$module_type = JText::_( 'COM_INSTALLER_TYPE_TYPE_MODULE' );
+		$plugin_type = JText::_( 'COM_INSTALLER_TYPE_TYPE_PLUGIN' );
+		$library_type = JText::_( 'COM_INSTALLER_TYPE_TYPE_LIBRARY' );
+
+		// Addons update (library, modules, plugins)
+		$db = JFactory::getDbo();
+		$manifest = $parent->get("manifest");
+		$parent = $parent->getParent();
+		$source = $parent->getPath("source");
+
+		$installer = new JInstaller();
+
+		$installLibraries = array();
+		$installModules = array();
+		$installPlugins = array();
+
+		echo '<div><i>'.JText::_('COM_INSTALLER_TOOLBAR_UPDATE').'</i></div>';
+
+		// Pre-test iC Library
+		$query = $db->getQuery(true);
+		$query->select('p.enabled')
+			->from('`#__extensions` AS p')
+			->where($db->qn('type').' = '.$db->q('library'))
+			->where($db->qn('element').' = '.$db->q('lib_ic_library'));
+		$db->setQuery($query);
+
+		$ic_library_ok = $db->loadResult();
+
+		// Proceed Libraries Update
+		if (is_object($manifest->libraries) && isset($manifest->libraries->library))
+		{
+			foreach ($manifest->libraries->library as $library)
+			{
+				$attributes         = $library->attributes();
+
+				// Install Library
+				$lib                = $source . '/' . $attributes['folder'] . '/' . $attributes['library'];
+				$installer->install($lib);
+
+				$element            = $attributes['element'];
+				$installLibraries[] = $attributes['library'];
+				$installed_lib      = '<strong>' . $attributes['name'] . '</strong>';
+
+				$libraryLabel   = version_compare(JVERSION, '3.0.0', 'ge')
+								? '<span class="label label-warning">' . $library_type . '</span>'
+								: '<span style="color:orange">[' . $library_type . ']</span>';
+
+				if (($ic_library_ok == '1') && ($element == 'lib_ic_library'))
+				{
+					echo '<div>' . $libraryLabel . ' ' . JText::sprintf( 'COM_INSTALLER_MSG_UPDATE_SUCCESS', $installed_lib ) . '</div>';
+				}
+				else
+				{
+					echo '<div>' . $libraryLabel . ' ' . JText::sprintf( 'COM_INSTALLER_INSTALL_SUCCESS', $installed_lib )
+						. ' &#8680; <span style="color: green; font-weight: bold;">' . JText::_( 'JPUBLISHED' ) . '</span></div>';
+				}
+			}
+		}
+
+		// Proceed Modules Update
+		if (is_object($manifest->modules) && isset($manifest->modules->module))
+		{
+			foreach ($manifest->modules->module AS $module)
+			{
+				$attributes         = $module->attributes();
+
+				// Install Module
+				$mod                = $source . '/' . $attributes['folder'] . '/' . $attributes['module'];
+				$installer->install($mod);
+
+				$installModules[]   =  $attributes['module'];
+				$installed_mod      = '<strong>' . $attributes['name'] . '</strong>';
+
+				$moduleLabel        = version_compare(JVERSION, '3.0.0', 'ge')
+									? '<span class="label label-danger label-important">' . $module_type . '</span>'
+									: '<span style="color:red">[' . $module_type . ']</span>';
+
+				echo '<div>' . $moduleLabel . ' ' . JText::sprintf('COM_INSTALLER_MSG_UPDATE_SUCCESS', $installed_mod) . '</div>';
+			}
+		}
+
+		// Proceed Plugins Update
+		$this->_installAddons($parent, $source);
+
+		echo '<br /><br />';
+
+//		echo '<span style="text-transform:uppercase; font-size: 8px">' . JText::_('COM_ICAGENDA_UPDATE') . $this->release . ' | </span>';
+		// You can have the backend jump directly to the newly updated component configuration page
+		// $parent->getParent()->setRedirectURL('index.php?option=com_democompupdate');
+
+
+		// Get Joomla Images PATH setting
+		$params     = JComponentHelper::getParams('com_media');
+		$image_path = $params->get('image_path');
+
+		// Create Folder iCagenda in ROOT/IMAGES_PATH/icagenda
+		$folderimg[0][0]  = 'icagenda/' ;
+		$folderimg[0][1]  = JPATH_ROOT.'/'.$image_path.'/'.$folderimg[0][0];
+		$folderimg[1][0]  = 'icagenda/files/';
+		$folderimg[1][1]  = JPATH_ROOT.'/'.$image_path.'/'.$folderimg[1][0];
+		$folderimg[2][0]  = 'icagenda/thumbs/';
+		$folderimg[2][1]  = JPATH_ROOT.'/'.$image_path.'/'.$folderimg[2][0];
+		$folderimg[3][0]  = 'icagenda/thumbs/system/';
+		$folderimg[3][1]  = JPATH_ROOT.'/'.$image_path.'/'.$folderimg[3][0];
+		$folderimg[4][0]  = 'icagenda/thumbs/themes/';
+		$folderimg[4][1]  = JPATH_ROOT.'/'.$image_path.'/'.$folderimg[4][0];
+		$folderimg[5][0]  = 'icagenda/thumbs/copy/';
+		$folderimg[5][1]  = JPATH_ROOT.'/'.$image_path.'/'.$folderimg[5][0];
+		$folderimg[6][0]  = 'icagenda/feature_icons/';
+		$folderimg[6][1]  = JPATH_ROOT.'/'.$image_path.'/'.$folderimg[6][0];
+		$folderimg[7][0]  = 'icagenda/feature_icons/16_bit';
+		$folderimg[7][1]  = JPATH_ROOT.'/'.$image_path.'/'.$folderimg[7][0];
+		$folderimg[8][0]  = 'icagenda/feature_icons/24_bit';
+		$folderimg[8][1]  = JPATH_ROOT.'/'.$image_path.'/'.$folderimg[8][0];
+		$folderimg[9][0]  = 'icagenda/feature_icons/32_bit';
+		$folderimg[9][1]  = JPATH_ROOT.'/'.$image_path.'/'.$folderimg[9][0];
+		$folderimg[10][0] = 'icagenda/feature_icons/48_bit';
+		$folderimg[10][1] = JPATH_ROOT.'/'.$image_path.'/'.$folderimg[10][0];
+		$folderimg[11][0] = 'icagenda/feature_icons/64_bit';
+		$folderimg[11][1] = JPATH_ROOT.'/'.$image_path.'/'.$folderimg[11][0];
+
+
+		$message = '<div><i>'.JText::_('COM_ICAGENDA_FOLDER_CREATION').'</i></div>';
+		$error	 = array();
+		foreach ($folderimg as $key => $value)
+		{
+			if (!JFolder::exists( $value[1]))
+			{
+				if (JFolder::create( $value[1], 0755 ))
+				{
+
+					$data = "<html>\n<body bgcolor=\"#FFFFFF\">\n</body>\n</html>";
+					JFile::write($value[1]."/index.html", $data);
+					$message .= '<div><b><span style="color:#009933">'.JText::_('COM_ICAGENDA_FOLDER').'</span> ' . $image_path.'/'.$value[0]
+								.' <span style="color:#009933">'.JText::_('COM_ICAGENDA_CREATED').'</span></b></div>';
+					$error[] = 0;
+				}
+				else
+				{
+					$message .= '<div><b><span style="color:#CC0033">'.JText::_('COM_ICAGENDA_FOLDER').'</span> ' . $image_path.'/'.$value[0]
+								.' <span style="color:#CC0033">'.JText::_('COM_ICAGENDA_CREATION_FAILED').'</span></b> '.JText::_('COM_ICAGENDA_PLEASE_CREATE_MANUALLY').'</div>';
+					$error[] = 1;
+				}
+			}
+			else//Folder exist
+			{
+				$message .= '<div><b><span style="color:#009933">'.JText::_('COM_ICAGENDA_FOLDER').'</span> ' . $image_path.'/'.$value[0]
+							.' <span style="color:#009933">'.JText::_('COM_ICAGENDA_EXISTS').'</span></b></div>';
+				$error[] = 0;
+			}
+		}
+
+		$message.= '<br /><br />';
+
+		echo $message;
+	}
+
+
+	/**
+	 * Installs subextensions (modules, plugins) bundled with the main extension
+	 * NOTE: Currently installing only plugins (3.4.0). Modules install to be added later.
+	 *
+	 * @param JInstaller $parent
+	 *
+	 * @return JObject The subextension installation status
+	 */
+	private function _installAddons($parent, $source)
+	{
+		// Load language
+		JFactory::getLanguage()->load('com_installer', JPATH_ADMINISTRATOR);
+
+		$module_type	= JText::_( 'COM_INSTALLER_TYPE_TYPE_MODULE' );
+		$plugin_type	= JText::_( 'COM_INSTALLER_TYPE_TYPE_PLUGIN' );
+		$library_type	= JText::_( 'COM_INSTALLER_TYPE_TYPE_LIBRARY' );
+
+		$db = JFactory::getDbo();
+
+		$status = new JObject();
+
+		/*
+		 * PLUGINS UPDATE/INSTALL
+		 */
+		$status->plugins = array();
+
+		// Plugins installation process
+		if (count($this->installation_queue['plugins']))
+		{
+			foreach ($this->installation_queue['plugins'] AS $folder => $plugins)
+			{
+				if (count($plugins))
+				{
+					foreach ($plugins AS $plugin => $pluginPreferences)
+					{
+						$path = "$source/plugins/$folder/$plugin";
+
+						if ( ! is_dir($path))
+						{
+							$path = "$source/plugins/$folder/plg_$plugin";
+						}
+
+						if ( ! is_dir($path))
+						{
+							$path = "$source/plugins/$plugin";
+						}
+
+						if ( ! is_dir($path))
+						{
+							$path = "$source/plugins/plg_$plugin";
+						}
+
+						if ( ! is_dir($path))
+						{
+							continue;
+						}
+
+						// Was the plugin already installed?
+						$query = $db->getQuery(true)
+							->select('COUNT(*)')
+							->from($db->qn('#__extensions'))
+							->where($db->qn('element') . ' = ' . $db->q($plugin))
+							->where($db->qn('folder') . ' = ' . $db->q($folder));
+						$db->setQuery($query);
+
+						try
+						{
+							$count = $db->loadResult();
+						}
+						catch (Exception $exc)
+						{
+							$count = 0;
+						}
+
+						$installer = new JInstaller;
+						$result = $installer->install($path);
+
+						$status->plugins[] = array('name' => 'plg_' . $plugin, 'group' => $folder, 'result' => $result);
+
+						list($pluginName, $pluginPublished) = $pluginPreferences;
+
+						// We publish the plugin if not already installed, and default is published
+						if ($pluginPublished && ! $count)
+						{
+							$query = $db->getQuery(true)
+								->update($db->qn('#__extensions'))
+								->set($db->qn('enabled') . ' = ' . $db->q('1'))
+								->where($db->qn('element') . ' = ' . $db->q($plugin))
+								->where($db->qn('folder') . ' = ' . $db->q($folder));
+							$db->setQuery($query);
+
+							try
+							{
+								$db->execute();
+							}
+							catch (Exception $exc)
+							{
+								// Nothing
+							}
+						}
+
+						// Display plugin status
+						$pluginStatus = '';
+
+						$pluginName = '<strong>' . $pluginName . '</strong>';
+
+						$pluginLabel   = version_compare(JVERSION, '3.0.0', 'ge')
+										? '<span class="label label-info">' . $plugin_type . '</span>'
+										: '<span style="color:blue">[' . $plugin_type . ']</span>';
+
+						$pluginStatus.= '<div>' . $pluginLabel . ' ';
+
+						// Plugin update
+						if ($count)
+						{
+							$pluginStatus.= JText::sprintf('COM_INSTALLER_MSG_UPDATE_SUCCESS', $pluginName);
+						}
+
+						// Plugin first install
+						else
+						{
+							$pluginStatus.= JText::sprintf('COM_INSTALLER_INSTALL_SUCCESS', $pluginName);
+							$pluginStatus.= ' &#8680; <span style="color: green; font-weight: bold;">' . JText::_('JPUBLISHED') . '</span>';
+						}
+
+						$pluginStatus.= '</div>';
+
+						echo $pluginStatus;
+					}
+				}
+			}
+		}
+
+		return $status;
+	}
+
+
+	/*
+	 * $parent is the class calling this method.
+	 * $type is the type of change (install, update or discover_install, not uninstall).
+	 * postflight is run after the extension is registered in the database.
+	 */
+	function postflight($type, $parent)
+	{
+		// Updating Params to ensure a correct value
+		jimport('joomla.application.component.helper'); // Import component helper library
+
+		$this->release  = $parent->get("manifest")->version;
+		$icagendaParams = JComponentHelper::getParams('com_icagenda');
+		$oldRelease     = $icagendaParams->get('release'); // Since 3.6.0
+		$oldSys         = $icagendaParams->get('icsys');
+
+		// Fix old versions created date missing (runs if version previously installed is before 3.3.7)
+		// update database to set a valid created date for events created with versions of iCagenda < 3.1.5,
+		// and set in this order : modified date if valid or next/last date if valid or, at the end, will use current date.
+		// (this fix is to prevent wrong 'Created on 30 November -0001' in search results)
+		if (version_compare($oldRelease, '3.3.7', 'le'))
+		{
+			$db    = JFactory::getDbo();
+			$date  = JFactory::getDate();
+
+			$null_created = '0000-00-00 00:00:00';
+
+			$query = $db->getQuery(true);
+
+			$query->select('e.id, e.created, e.modified, e.next')
+				->from('`#__icagenda_events` AS e')
+				->where($db->qn('e.created').' = '.$db->q($null_created));
+			$db->setQuery($query);
+
+			$list_created_null = $db->loadObjectList();
+
+			foreach ($list_created_null AS $cn)
+			{
+				if ($cn->modified != $null_created)
+				{
+					$new_created = $cn->modified;
+				}
+				elseif ($cn->next != $null_created)
+				{
+					$new_created = $cn->next;
+				}
+				else
+				{
+					$new_created = $date->toSql();
+				}
+				$query = $db->getQuery(true)
+					->update($db->qn('#__icagenda_events'))
+					->set($db->qn('created').' = '.$db->q($new_created))
+					->where($db->qn('id').' = '.intval($cn->id));
+				$db->setQuery($query);
+				$db->execute();
+			}
+		}
+
+		// Fix for 'period' value in db when registration mode was set on "for all dates" (versions 3.6.0 to 3.6.2)
+		// Due to possible older issue, good to run this check/update for all version before 3.6
+		if (version_compare($oldRelease, '3.6.6', 'lt'))
+		{
+			$db = JFactory::getDbo();
+			$db->setQuery('SELECT id, params FROM #__icagenda_events');
+			$listEvtParams = $db->loadObjectList();
+
+			foreach ($listEvtParams as $event)
+			{
+				$evtID     = $event->id;
+				$evtParams = json_decode($event->params, true);
+
+				if ($evtParams['typeReg'] == 2)
+				{
+					$query = $db->getQuery(true)
+						->update($db->qn('#__icagenda_registration'))
+						->set($db->qn('period') . ' = 1')
+						->where($db->qn('eventid') . ' = ' . intval($evtID))
+						->where($db->qn('date') . ' = ""');
+					$db->setQuery($query);
+					$db->execute();
+				}
+			}
+		}
+
+		// Remove obsolete files and folders
+		$icagendaRemoveFiles = $this->icagendaRemoveFiles;
+
+		$this->_removeObsoleteFilesAndFolders($icagendaRemoveFiles);
+
+		// Always create or modify these parameters
+		$ictype_label = ($this->ictype == 'core') ? '' : ' <strong>' . strtoupper($this->ictype) . '</strong>';
+
+		$params['version'] = $ictype_label . ' [' . $this->release . ']';
+		$params['release'] = $this->release;
+		$params['author']  = 'JoomliC';
+		$params['icsys']   = $this->ictype;
+
+		if ($this->ictype == 'core') $params['copy'] = '1';
+
+		if ($oldSys !== $params['icsys'])
+		{
+			// Get com_icagenda extension_id
+			$db    = JFactory::getDbo();
+			$query = $db->getQuery(true);
+
+			$query->select('extension_id')
+				->from('#__extensions')
+				->where('element = "com_icagenda"');
+			$db->setQuery($query);
+
+			$eid = $db->loadResult();
+
+			if ($eid)
+			{
+				$this->removeObsoleteUpdateSites($eid);
+			}
+
+		}
+
+		if (($type == 'install' || $oldSys !== $params['icsys']) && $this->ictype != 'core')
+		{
+			$params['copy'] = NULL;
+		}
+
+		// Define the following parameters only if it is an original install // To be checked!
+		if ($type == 'install')
+		{
+			$params['atlist'] = '1';
+			$params['atevent'] = '1';
+			$params['atfloat'] = '2';
+			$params['aticon'] = '2';
+			$params['arrowtext'] = '1';
+			$params['statutReg'] = '1';
+			$params['maxRlist'] = '5';
+			$params['navposition'] = '0';
+			$params['targetLink'] = '1';
+			$params['participantList'] = '0';
+			$params['participantSlide'] = '1';
+			$params['participantDisplay'] = '1';
+			$params['fullListColumns'] = 'tiers';
+			$params['regEmailUser'] = '1';
+			$params['timeformat'] = '1';
+			$params['ShortDescLimit'] = '100';
+			$params['limitRegEmail'] = '1';
+			$params['limitRegDate'] = '1';
+			$params['phoneRequired'] = '2';
+			$params['headerList'] = '1';
+		}
+
+		$extparticipantList   = $icagendaParams->get('participantList');
+		$extparticipantSlide  = $icagendaParams->get('participantSlide');
+		$extstatutReg         = $icagendaParams->get('statutReg');
+		$extlimitRegEmail     = $icagendaParams->get('limitRegEmail');
+		$extlimitRegDate      = $icagendaParams->get('limitRegDate');
+		$extphoneRequired     = $icagendaParams->get('phoneRequired');
+		$extregEmailUser      = $icagendaParams->get('regEmailUser');
+		$largewidththreshold  = $icagendaParams->get('largewidththreshold', '1201');
+		$mediumwidththreshold = $icagendaParams->get('mediumwidththreshold', '769');
+		$smallwidththreshold  = $icagendaParams->get('smallwidththreshold', '481');
+
+		$params['largewidththreshold']  = $largewidththreshold;
+		$params['mediumwidththreshold'] = $mediumwidththreshold;
+		$params['smallwidththreshold']  = $smallwidththreshold;
+
+		if ($extparticipantList == '2')
+		{
+			$params['participantList'] = '0';
+		}
+
+		if ($extparticipantSlide == '2')
+		{
+			$params['participantSlide'] = '0';
+		}
+
+		if ($extstatutReg == '2')
+		{
+			$params['statutReg'] = '0';
+		}
+
+		if ($extlimitRegEmail == '2')
+		{
+			$params['limitRegEmail'] = '0';
+		}
+
+		if ($extlimitRegDate == '2')
+		{
+			$params['limitRegDate'] = '0';
+		}
+
+		if ($extphoneRequired == '2')
+		{
+			$params['phoneRequired'] = '0';
+		}
+
+		if ($extregEmailUser == '2')
+		{
+			$params['regEmailUser'] = '0';
+		}
+
+		// Update 3.1.1
+		$emailRequired = $icagendaParams->get('emailRequired');
+
+		if ($emailRequired == '')
+		{
+			$params['emailRequired'] = '1';
+		}
+
+		// Update 3.4.1
+		$datesDisplay_global = $icagendaParams->get('datesDisplay_global');
+		$reg_captcha         = $icagendaParams->get('reg_captcha', '');
+		$submit_captcha      = $icagendaParams->get('submit_captcha', '');
+		$captcha             = $icagendaParams->get('captcha', '');
+
+		if ($datesDisplay_global)
+		{
+			$params['datesDisplay'] = $datesDisplay_global;
+		}
+
+		if (in_array($reg_captcha, array('', '0'))
+			&& in_array($submit_captcha, array('', '0'))
+			)
+		{
+			$params['captcha'] = $captcha;
+		}
+		elseif ( ! in_array($reg_captcha, array('', '0', '1')))
+		{
+			$params['captcha'] = $reg_captcha;
+		}
+		elseif ( ! in_array($submit_captcha, array('', '0', '1')))
+		{
+			$params['captcha'] = $submit_captcha;
+		}
+		else
+		{
+			$params['captcha'] = $captcha;
+		}
+
+		$params['reg_captcha']    = (in_array($reg_captcha, array('', '0'))) ? '0' : '1';
+		$params['submit_captcha'] = (in_array($submit_captcha, array('', '0'))) ? '0' : '1';
+
+		// Update 3.6.9
+		$filters_mode = $icagendaParams->get('filters_mode');
+
+		if (version_compare($oldRelease, '3.6.9', 'lt')
+			&& ! $filters_mode)
+		{
+			$params['filters_mode'] = '2';
+		}
+		
+		// Patch for 3.6.9
+		if (version_compare($oldRelease, '3.6.8', 'gt')
+			&& version_compare($oldRelease, '3.6.10', 'lt'))
+		{
+			$db    = JFactory::getDbo();
+			$query = $db->getQuery(true);
+
+			$query->update($db->qn('#__icagenda_events'))
+				->set($db->qn('startdate') . ' = "0000-00-00 00:00:00"')
+				->where($db->qn('startdate') . ' = "1970-01-01 01:00:00"')
+				->update($db->qn('#__icagenda_events'))
+				->set($db->qn('enddate') . ' = "0000-00-00 00:00:00"')
+				->where($db->qn('enddate') . ' = "1970-01-01 01:00:00"')
+				->update($db->qn('#__icagenda_events'))
+				->set($db->qn('next') . ' = "0000-00-00 00:00:00"')
+				->where($db->qn('next') . ' = "1970-01-01 01:00:00"');
+			$db->setQuery($query);
+			$db->execute();
+		}
+
+		// Update 3.7.0
+		$terms_Type = $icagendaParams->get('terms_Type');
+
+		if ($terms_Type == '')
+		{
+			$terms_Type = 3;
+		}
+
+		$params['terms_type'] = $terms_Type;
+
+		if (version_compare($oldRelease, '3.7.0', 'lt'))
+		{
+			$accessParticipantList = $icagendaParams->get('accessParticipantList');
+
+			$params['participant_name_visibility']  = ($accessParticipantList < 3 ) ? $accessParticipantList : '';
+			$params['participant_gravatar_consent'] = '0';
+		}
+
+		// Update 3.7.2
+		if (version_compare($oldRelease, '3.7.2', 'lt'))
+		{
+			$params['maps_service'] = '3';
+		}
+
+		// UPDATE PARAMS
+		$this->setParams($params);
+
+		// Set default Access Permissions for iCagenda component
+		$rules['core.manage']                   = array('6' => 1);
+		$rules['icagenda.access.categories']    = array('7' => 1);
+		$rules['icagenda.access.events']        = array('6' => 1);
+		$rules['icagenda.access.registrations'] = array('7' => 1);
+		$rules['icagenda.access.newsletter']    = array('7' => 1);
+		$rules['icagenda.access.themes']        = array('7' => 1);
+		$rules['icagenda.access.customfields']  = array('7' => 1);
+		$rules['icagenda.access.features']      = array('7' => 1);
+
+		// UPDATE RULES
+		$this->setRules( $rules );
+
+		$this->clean();
+
+		$usageStats = $icagendaParams->get('usage_stats', '1');
+
+		$sendSystemInfo = $this->getSystemInfo($type, $parent);
+
+		if ($sendSystemInfo && $usageStats)
+		{
+			echo $sendSystemInfo;
+		}
+
+		echo '<span style="font-size: 11px; font-style: italic; font-weight: bold;">Jooml!C &#8226; iCagenda &#8226; <a href="http://www.joomlic.com" target="_blank">www.joomlic.com</a></span>';
+
+		echo '<hr />';
+	}
+
+	// Delete unused update site
+	/*
+	 * Delete unused update site
+	 *
+	 * $eid  int  extension_id
+	 */
+	private function removeObsoleteUpdateSites($eid)
+	{
+		if ($eid)
+		{
+			$db = JFactory::getDbo();
+			$query = $db->getQuery(true)
+				->delete('#__update_sites_extensions')
+				->where('extension_id = ' . $eid);
+			$db->setQuery($query);
+			$db->execute();
+
+			// Delete any unused update sites
+			$query->clear()
+				->select('update_site_id')
+				->from('#__update_sites_extensions');
+			$db->setQuery($query);
+			$results = $db->loadColumn();
+
+			if (is_array($results))
+			{
+				// So we need to delete the update sites and their associated updates
+				$updatesite_delete = $db->getQuery(true);
+				$updatesite_delete->delete('#__update_sites');
+				$updatesite_query = $db->getQuery(true);
+				$updatesite_query->select('update_site_id')
+					->from('#__update_sites');
+
+				// If we get results back then we can exclude them
+				if (count($results))
+				{
+					$updatesite_query->where('update_site_id NOT IN (' . implode(',', $results) . ')');
+					$updatesite_delete->where('update_site_id NOT IN (' . implode(',', $results) . ')');
+				}
+
+				// So let's find what update sites we're about to nuke and remove their associated extensions
+				$db->setQuery($updatesite_query);
+				$update_sites_pending_delete = $db->loadColumn();
+
+				if (is_array($update_sites_pending_delete) && count($update_sites_pending_delete))
+				{
+					// Nuke any pending updates with this site before we delete it
+					// TODO: investigate alternative of using a query after the delete below with a query and not in like above
+					$query->clear()
+						->delete('#__updates')
+						->where('update_site_id IN (' . implode(',', $update_sites_pending_delete) . ')');
+					$db->setQuery($query);
+					$db->execute();
+				}
+
+				// Note: this might wipe out the entire table if there are no extensions linked
+				$db->setQuery($updatesite_delete);
+				$db->execute();
+			}
+
+			// Last but not least we wipe out any pending updates for the extension
+			$query->clear()
+				->delete('#__updates')
+				->where('extension_id = ' . $eid);
+			$db->setQuery($query);
+			$db->execute();
+		}
+	}
+
+	/*
+	 * $parent is the class calling this method
+	 * uninstall runs before any other action is taken (file removal or database processing).
+	 */
+	function uninstall( $parent )
+	{
+		echo '<p>' . JText::_('COM_ICAGENDA_UNINSTALL') . '</p>';
+	}
+
+
+	/*
+	 * get a variable from the manifest file (actually, from the manifest cache).
+	 */
+	function getParam( $name )
+	{
+		$db = JFactory::getDbo();
+		$db->setQuery('SELECT manifest_cache FROM #__extensions WHERE element = "com_icagenda"');
+		$manifest = json_decode( $db->loadResult(), true );
+		return $manifest[ $name ];
+	}
+
+
+	/*
+	 * sets parameter values in the component's row of the extension table
+	 */
+	function setParams( $param_array )
+	{
+		if ( count($param_array) > 0 )
+		{
+			// read the existing component value(s)
+			$db = JFactory::getDbo();
+			$db->setQuery('SELECT params FROM #__extensions WHERE element = "com_icagenda"');
+			$params = json_decode( $db->loadResult(), true );
+			// add the new variable(s) to the existing one(s)
+			foreach ( $param_array as $name => $value )
+			{
+				$params[ (string) $name ] = (string) $value;
+			}
+			// store the combined new and existing values back as a JSON string
+			$paramsString = json_encode( $params );
+			$db->setQuery('UPDATE #__extensions SET params = ' .
+				$db->quote( $paramsString ) .
+				' WHERE element = "com_icagenda"' );
+				$db->query();
+		}
+	}
+
+
+	/*
+	 * sets access permissions values (rules) in the component's row of the assets table
+	 */
+	function setRules( $rule_array )
+	{
+		if ( count($rule_array) > 0 )
+		{
+			// read the existing rules values
+			$db = JFactory::getDbo();
+			$db->setQuery('SELECT rules FROM #__assets WHERE name = "com_icagenda"');
+			$rules = json_decode( $db->loadResult(), true );
+			// add the new variable(s) to the existing one(s)
+			foreach ( $rule_array as $name => $value )
+			{
+				if (!array_key_exists($name, $rules))
+				{
+					$rules[ (string) $name ] = (array) $value;
+				}
+			}
+			// store the combined new and existing values back as a JSON string
+			$rulesString = json_encode( $rules );
+			$db->setQuery('UPDATE #__assets SET rules = ' .
+				$db->quote( stripslashes($rulesString) ) .
+				' WHERE name = "com_icagenda"' );
+				$db->query();
+		}
+	}
+
+	/**
+	 * Purge the cache.
+	 *
+	 * @return  void
+	 */
+	public function purgeCache()
+	{
+		$app = JFactory::getApplication();
+
+		$ret = $this->clean();
+
+		$msg = JText::_('COM_ICAGENDA_CACHE_EXPIRED_ITEMS_HAVE_BEEN_PURGED');
+		$msgType = 'message';
+
+		if ($ret === false)
+		{
+			$msg = JText::_('COM_ICAGENDA_CACHE_EXPIRED_ITEMS_PURGING_ERROR');
+			$msgType = 'error';
+		}
+
+		$app->redirect('index.php?option=com_icagenda&view=icagenda', $msg, $msgType);
+	}
+
+	/**
+	 * Clean out a cache group as named by param.
+	 * If no param is passed clean all cache groups.
+	 *
+	 * @param   string  $group  Cache group name.
+	 *
+	 * @return  void
+	 */
+	public function clean($group = '')
+	{
+		$cache = JFactory::getCache('');
+		$cache->clean($group);
+	}
+
+	/**
+	 * Send site system information
+	 * Adapted from Nicholas K. Dionysopoulos's code (Akeeba - www.akeebabackup.com).
+	 */
+	public function getSystemInfo($type, $parent)
+	{
+		$this->release = $parent->get( "manifest" )->version;
+
+		// Do not system info on localhost
+		if ((strpos(JUri::root(), 'localhost') !== false)
+			|| (strpos(JUri::root(), '127.0.0.1') !== false))
+		{
+			return false;
+		}
+
+		// Set site ID
+		$siteId = md5(JUri::base());
+
+		// If info file is missing, stop it!
+		if ( ! file_exists(JPATH_ROOT . '/administrator/components/com_icagenda/assets/jcms/info.php'))
+		{
+			return false;
+		}
+
+		if ( ! class_exists('iCagendaSystemInfo', false))
+		{
+			require_once JPATH_ROOT . '/administrator/components/com_icagenda/assets/jcms/info.php';
+		}
+
+		if ( ! class_exists('iCagendaSystemInfo', false))
+		{
+			return false;
+		}
+
+		$params = JComponentHelper::getParams('com_icagenda');
+
+		// Stop if system info is turned off
+		if ( ! $params->get('system_info', 1))
+		{
+			return false;
+		}
+
+		$db = JFactory::getDbo();
+		$stats = new iCagendaSystemInfo();
+
+		$stats->setSiteId($siteId);
+
+		// Get iCagenda release
+		$ic_parts = explode('.', $this->release);
+		$ic_major = $ic_parts[0];
+		$ic_minor = isset($ic_parts[1]) ? $ic_parts[1] : '';
+		$ic_revision = isset($ic_parts[2]) ? $ic_parts[2] : '';
+
+		// Get PHP version
+		list($php_major, $php_minor, $php_revision) = explode('.', phpversion());
+		$php_qualifier = strpos($php_revision, '~') !== false ? substr($php_revision, strpos($php_revision, '~')) : '';
+
+		// Get Joomla version
+		list($cms_major, $cms_minor, $cms_revision) = explode('.', JVERSION);
+
+		// Get Database version
+		list($db_major, $db_minor, $db_revision) = explode('.', $db->getVersion());
+		$db_qualifier = strpos($db_revision, '~') !== false ? substr($db_revision, strpos($db_revision, '~')) : '';
+
+		// Get Database type
+		$db_driver = get_class($db);
+
+		if (stripos($db_driver, 'mysql') !== false)
+		{
+			$db_type = '1';
+		}
+		elseif (stripos($db_driver, 'sqlsrv') !== false || stripos($db_driver, 'sqlazure'))
+		{
+			$db_type = '2';
+		}
+		elseif (stripos($db_driver, 'postgresql') !== false)
+		{
+			$db_type = '3';
+		}
+		else
+		{
+			$db_type = '0';
+		}
+
+		$installtype	= ($type == 'install') ? '1' : '2';
+		$ictype			= $this->ictype;
+
+		$stats->setValue('ins', $installtype); // software_install
+
+		// Version : major(x).minor(y).revision/patch(z)
+
+		$stats->setValue('swn', 'iCagenda'); // software_name
+		$stats->setValue('swt', $ictype); // software_type
+		$stats->setValue('swx', $ic_major); // software_major
+		$stats->setValue('swy', $ic_minor); // software_minor
+		$stats->setValue('swz', $ic_revision); // software_revision
+
+		$stats->setValue('cmst', 1); // cms_type
+		$stats->setValue('cmsx', $cms_major); // cms_major
+		$stats->setValue('cmsy', $cms_minor); // cms_minor
+		$stats->setValue('cmsz', $cms_revision); // cms_revision
+
+		$stats->setValue('phpx', $php_major); // php_major
+		$stats->setValue('phpy', $php_minor); // php_minor
+		$stats->setValue('phpz', $php_revision); // php_revision
+		$stats->setValue('phpq', $php_qualifier); // php_qualifiers
+
+		$stats->setValue('dbt', $db_type); // db_type
+		$stats->setValue('dbx', $db_major); // db_major
+		$stats->setValue('dby', $db_minor); // db_minor
+		$stats->setValue('dbz', $db_revision); // db_revision
+		$stats->setValue('dbq', $db_qualifier); // db_qualifiers
+
+		$return = $stats->sendInfo(true);
+
+		return $return;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/index.html b/deployed/icagenda/administrator/components/com_icagenda/sql/index.html
new file mode 100644
index 00000000..94906bce
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/install/mysql/icagenda.install.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/install/mysql/icagenda.install.sql
new file mode 100644
index 00000000..83554fb6
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/install/mysql/icagenda.install.sql
@@ -0,0 +1,281 @@
+--
+-- iCagenda: Install Database `icagenda`
+--
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `#__icagenda`
+--
+
+CREATE TABLE IF NOT EXISTS `#__icagenda` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `version` varchar(255) DEFAULT NULL,
+  `releasedate` varchar(255) DEFAULT NULL,
+  `params` text NOT NULL,
+  PRIMARY KEY (`id`)
+) DEFAULT CHARSET=utf8;
+
+--
+-- Dumping data for table `#__icagenda`
+--
+
+INSERT IGNORE INTO `#__icagenda` (`id`, `version`, `releasedate`, `params`) VALUES
+(3,'3.7.15','2020-08-29','');
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `#__icagenda_category`
+--
+
+CREATE TABLE IF NOT EXISTS `#__icagenda_category` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `ordering` int(11) NOT NULL,
+  `state` tinyint(1) NOT NULL DEFAULT '1',
+  `checked_out` int(11) NOT NULL,
+  `checked_out_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `title` varchar(255) NOT NULL,
+  `alias` varchar(255) NOT NULL,
+  `color` varchar(255) NOT NULL,
+  `desc` text(65535) NOT NULL,
+  `image` varchar(255) NOT NULL,
+  `groups` varchar(255) NOT NULL DEFAULT '',
+  `language` varchar(10) NOT NULL DEFAULT '*',
+  PRIMARY KEY (`id`),
+  KEY `idx_state` (`state`),
+  KEY `idx_language` (`language`)
+) ENGINE=MyISAM DEFAULT COLLATE=utf8_general_ci;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `#__icagenda_events`
+--
+
+CREATE TABLE IF NOT EXISTS `#__icagenda_events` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `ordering` int(11) NOT NULL,
+  `state` tinyint(1) NOT NULL DEFAULT '1',
+  `approval` int(11) NOT NULL DEFAULT '0',
+  `site_itemid` int(10) NOT NULL DEFAULT '0',
+  `checked_out` int(11) NOT NULL,
+  `checked_out_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `title` varchar(255) NOT NULL,
+  `alias` varchar(255) NOT NULL,
+  `access` int(10) unsigned NOT NULL DEFAULT '0',
+  `language` varchar(10) NOT NULL DEFAULT '*',
+  `hits` int(10) unsigned NOT NULL DEFAULT '0',
+  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `created_by` int(10) unsigned NOT NULL DEFAULT '0',
+  `created_by_alias` varchar(255) NOT NULL,
+  `created_by_email` varchar(100) NOT NULL,
+  `modified` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `modified_by` int(10) unsigned NOT NULL DEFAULT '0',
+  `username` varchar(255) NOT NULL,
+  `catid` int(11) NOT NULL,
+  `image` varchar(255) NOT NULL,
+  `file` varchar(255) NOT NULL,
+  `displaytime` int(10) NOT NULL DEFAULT '1',
+  `weekdays` varchar(255) NOT NULL,
+  `daystime` varchar(255) NOT NULL,
+  `startdate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `enddate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `period` text(65535) NOT NULL,
+  `dates` text(65535) NOT NULL,
+  `next` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `time` varchar(255) NOT NULL,
+  `place` varchar(255) NOT NULL,
+  `website` varchar(255) NOT NULL,
+  `email` varchar(255) NOT NULL,
+  `phone` varchar(255) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `city` varchar(255) NOT NULL,
+  `country` varchar(255) NOT NULL,
+  `address` varchar(255) NOT NULL,
+  `coordinate` varchar(255) NOT NULL,
+  `lat` float( 20, 16 ) NOT NULL,
+  `lng` FLOAT( 20, 16 ) NOT NULL,
+  `shortdesc` text NOT NULL,
+  `desc` text(65535) NOT NULL ,
+  `metadesc` text NOT NULL,
+  `params` text NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `idx_state` (`state`),
+  KEY `idx_approval` (`approval`),
+  KEY `idx_language` (`language`),
+  KEY `idx_catid` (`catid`)
+) ENGINE=MyISAM DEFAULT COLLATE=utf8_general_ci;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `#__icagenda_registration`
+--
+
+CREATE TABLE IF NOT EXISTS `#__icagenda_registration` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `ordering` int(11) NOT NULL,
+  `state` tinyint(1) NOT NULL DEFAULT '1',
+  `checked_out` int(11) NOT NULL,
+  `checked_out_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `userid` int(11) NOT NULL,
+  `itemid` int(11) NOT NULL,
+  `eventid` int(11) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `email` varchar(255) NOT NULL,
+  `phone` varchar(255) NOT NULL,
+  `date` text(65535) NOT NULL,
+  `period` tinyint(1) NOT NULL DEFAULT '0',
+  `people` int(2) NOT NULL,
+  `notes` text(65535) NOT NULL ,
+  `status` tinyint(1) NOT NULL DEFAULT '1',
+  `params` text NOT NULL ,
+  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `created_by` int(10) unsigned NOT NULL DEFAULT '0',
+  `modified` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `modified_by` int(10) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `idx_state` (`state`),
+  KEY `idx_userid` (`userid`),
+  KEY `idx_eventid` (`eventid`),
+  KEY `idx_status` (`status`),
+  KEY `idx_created_by` (`created_by`)
+) ENGINE=MyISAM DEFAULT COLLATE=utf8_general_ci;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `#__icagenda_customfields`
+--
+
+CREATE TABLE IF NOT EXISTS `#__icagenda_customfields` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `ordering` int(11) NOT NULL,
+  `state` tinyint(1) NOT NULL DEFAULT '1',
+  `checked_out` int(11) NOT NULL,
+  `checked_out_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `title` varchar(255) NOT NULL,
+  `alias` varchar(255) NOT NULL,
+  `slug` varchar(255) NOT NULL,
+  `description` mediumtext NOT NULL,
+  `parent_form` int(11) NOT NULL DEFAULT '0',
+  `groups` varchar(255) NOT NULL DEFAULT '',
+  `type` varchar(255) NOT NULL,
+  `options` mediumtext,
+  `default` varchar(255) NOT NULL,
+  `required` tinyint(3) NOT NULL DEFAULT '0',
+  `language` varchar(10) NOT NULL DEFAULT '*',
+  `params` mediumtext,
+  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `created_by` int(10) unsigned NOT NULL DEFAULT '0',
+  `created_by_alias` varchar(255) NOT NULL DEFAULT '',
+  `modified` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `modified_by` int(10) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `idx_state` (`state`),
+  KEY `idx_parent_form` (`parent_form`),
+  KEY `idx_language` (`language`)
+) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `#__icagenda_customfields_data`
+--
+
+CREATE TABLE IF NOT EXISTS `#__icagenda_customfields_data` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `state` tinyint(1) NOT NULL DEFAULT '1',
+  `slug` varchar(255) NOT NULL,
+  `parent_form` int(11) NOT NULL DEFAULT '0',
+  `parent_id` int(11) NOT NULL DEFAULT '0',
+  `value` varchar(255) NOT NULL,
+  `language` varchar(10) NOT NULL DEFAULT '*',
+  PRIMARY KEY (`id`),
+  KEY `idx_state` (`state`),
+  KEY `idx_parent_form` (`parent_form`),
+  KEY `idx_parent_id` (`parent_id`),
+  KEY `idx_language` (`language`)
+) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `#__icagenda_feature`
+--
+
+CREATE TABLE IF NOT EXISTS  `#__icagenda_feature` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `ordering` int(11) NOT NULL,
+  `state` tinyint(1) NOT NULL DEFAULT '1',
+  `checked_out` int(11) NOT NULL,
+  `checked_out_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `title` varchar(255) NOT NULL,
+  `alias` varchar(255) NOT NULL,
+  `desc` mediumtext NOT NULL,
+  `icon` varchar(255) NOT NULL,
+  `icon_alt` varchar(255) NOT NULL,
+  `show_filter` tinyint(1) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`id`),
+  KEY `idx_state` (`state`)
+) ENGINE=MyISAM DEFAULT COLLATE=utf8_general_ci;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `#__icagenda_feature_xref`
+--
+
+CREATE TABLE IF NOT EXISTS  `#__icagenda_feature_xref` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `event_id` int(11) NOT NULL,
+  `feature_id` int(11) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `idx_event_id` (`event_id`),
+  KEY `idx_feature_id` (`feature_id`)
+) ENGINE=MyISAM DEFAULT COLLATE=utf8_general_ci;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `#__icagenda_filters`
+--
+
+CREATE TABLE IF NOT EXISTS `#__icagenda_filters` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `ordering` int(11) NOT NULL DEFAULT 0,
+  `state` tinyint(3) NOT NULL DEFAULT 0,
+  `type` varchar(255) NOT NULL DEFAULT '',
+  `filter` varchar(255) NOT NULL DEFAULT '',
+  `value` varchar(255) NOT NULL DEFAULT '',
+  `option` varchar(255) NOT NULL DEFAULT '',
+  `selected` tinyint(1) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`),
+  KEY `idx_state` (`state`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `#__icagenda_user_actions`
+--
+
+CREATE TABLE IF NOT EXISTS `#__icagenda_user_actions` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `user_id` int(10) unsigned NOT NULL DEFAULT 0,
+  `user_action` varchar(255) NOT NULL,
+  `parent_form` int(11) NOT NULL DEFAULT '0',
+  `parent_id` int(11) NOT NULL DEFAULT '0',
+  `action_subject` varchar(100) NOT NULL DEFAULT '',
+  `action_body` text NOT NULL,
+  `user_ip` varchar(100) NOT NULL DEFAULT '',
+  `user_agent` text NOT NULL,
+  `state` tinyint(3) NOT NULL DEFAULT 0,
+  `created_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  PRIMARY KEY (`id`),
+  KEY `idx_user_id` (`user_id`),
+  KEY `idx_parent_form` (`parent_form`),
+  KEY `idx_parent_id` (`parent_id`),
+  KEY `idx_state` (`state`)
+) DEFAULT CHARSET=utf8;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/uninstall/mysql/icagenda.uninstall.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/uninstall/mysql/icagenda.uninstall.sql
new file mode 100644
index 00000000..43019bdc
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/uninstall/mysql/icagenda.uninstall.sql
@@ -0,0 +1,17 @@
+--
+-- iCagenda: Uninstall Database `icagenda`
+--
+
+-- --------------------------------------------------------
+
+DROP TABLE IF EXISTS `#__icagenda`;
+DROP TABLE IF EXISTS `#__icagenda_category`;
+DROP TABLE IF EXISTS `#__icagenda_events`;
+DROP TABLE IF EXISTS `#__icagenda_registration`;
+DROP TABLE IF EXISTS `#__icagenda_customfields`;
+DROP TABLE IF EXISTS `#__icagenda_customfields_data`;
+DROP TABLE IF EXISTS `#__icagenda_feature`;
+DROP TABLE IF EXISTS `#__icagenda_feature_xref`;
+DROP TABLE IF EXISTS `#__icagenda_filters`;
+DROP TABLE IF EXISTS `#__icagenda_user_actions`;
+DROP TABLE IF EXISTS `#__icagenda_location`;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.0.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.0.sql
new file mode 100644
index 00000000..e69de29b
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.1.1.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.1.1.sql
new file mode 100644
index 00000000..d19683d7
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.1.1.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='1.1.1' WHERE id=1;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.1.2.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.1.2.sql
new file mode 100644
index 00000000..4d7867e6
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.1.2.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='1.1.2' WHERE id=1;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.1.3.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.1.3.sql
new file mode 100644
index 00000000..5ade9fd7
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.1.3.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='1.1.3' WHERE id=1;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.1.4.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.1.4.sql
new file mode 100644
index 00000000..27b42ccb
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.1.4.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='1.1.4' WHERE id=1;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.1.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.1.sql
new file mode 100644
index 00000000..bb773288
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.1.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='1.1' WHERE id=1;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.2.1.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.2.1.sql
new file mode 100644
index 00000000..99576ad4
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.2.1.sql
@@ -0,0 +1,3 @@
+UPDATE `#__icagenda` SET version='1.2.1' WHERE id=1;
+DROP TABLE IF EXISTS `#__icagenda_registration`;
+DROP TABLE IF EXISTS `#__icagenda_location`;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.2.2.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.2.2.sql
new file mode 100644
index 00000000..124f8c96
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.2.2.sql
@@ -0,0 +1,3 @@
+UPDATE `#__icagenda` SET version='1.2.2' WHERE id=1;
+DROP TABLE IF EXISTS `#__icagenda_registration`;
+DROP TABLE IF EXISTS `#__icagenda_location`;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.2.3.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.2.3.sql
new file mode 100644
index 00000000..7fd5c5af
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.2.3.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='1.2.3' WHERE id=1;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.2.4.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.2.4.sql
new file mode 100644
index 00000000..850512c7
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.2.4.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='1.2.4' WHERE id=1;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.2.5.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.2.5.sql
new file mode 100644
index 00000000..de652910
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.2.5.sql
@@ -0,0 +1,3 @@
+UPDATE `#__icagenda` SET version='1.2.5' WHERE id=1;
+
+
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.2.6.1.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.2.6.1.sql
new file mode 100644
index 00000000..d696a22b
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.2.6.1.sql
@@ -0,0 +1,3 @@
+UPDATE `#__icagenda` SET version='1.2.6 beta1', releasedate='2012-10-09' WHERE id=1;
+
+
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.2.6.2.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.2.6.2.sql
new file mode 100644
index 00000000..77c90f93
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.2.6.2.sql
@@ -0,0 +1,3 @@
+UPDATE `#__icagenda` SET version='1.2.6 beta2', releasedate='2012-10-11' WHERE id=1;
+
+
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.2.6.3.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.2.6.3.sql
new file mode 100644
index 00000000..1486ebdf
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.2.6.3.sql
@@ -0,0 +1,3 @@
+UPDATE `#__icagenda` SET version='1.2.6 beta3', releasedate='2012-10-13' WHERE id=1;
+
+
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.2.6.4.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.2.6.4.sql
new file mode 100644
index 00000000..7ca99cb6
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.2.6.4.sql
@@ -0,0 +1,3 @@
+UPDATE `#__icagenda` SET version='1.2.6', releasedate='2012-10-15' WHERE id=1;
+
+
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.2.6.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.2.6.sql
new file mode 100644
index 00000000..965b302d
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.2.6.sql
@@ -0,0 +1,20 @@
+ALTER TABLE `#__icagenda` ADD COLUMN `releasedate` TEXT(65535)  NOT NULL AFTER `version`;
+UPDATE `#__icagenda` SET version='1.2.6', releasedate='2012-10-06' WHERE id=1;
+
+DROP TABLE IF EXISTS `#__icagenda_registration`;
+
+CREATE TABLE `#__icagenda_registration` (
+`id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
+`ordering` INT(11)  NOT NULL ,
+`checked_out` INT(11)  NOT NULL ,
+`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
+`userid` INT(11)  NOT NULL ,
+`eventid` INT(11)  NOT NULL ,
+`name` VARCHAR(255)  NOT NULL ,
+`email` VARCHAR(255)  NOT NULL ,
+`phone` VARCHAR(255)  NOT NULL ,
+`date` DATE NOT NULL ,
+`people` INT(2)  NOT NULL ,
+PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT COLLATE=utf8_general_ci;
+
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.2.7.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.2.7.sql
new file mode 100644
index 00000000..4af60e3d
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.2.7.sql
@@ -0,0 +1,3 @@
+UPDATE `#__icagenda` SET version='1.2.7', releasedate='2012-10-18' WHERE id=1;
+
+
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.2.8.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.2.8.sql
new file mode 100644
index 00000000..a23115dc
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.2.8.sql
@@ -0,0 +1,3 @@
+UPDATE `#__icagenda` SET version='1.2.8', releasedate='2012-10-22' WHERE id=1;
+
+
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.2.9.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.2.9.sql
new file mode 100644
index 00000000..946eb1e2
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.2.9.sql
@@ -0,0 +1,3 @@
+UPDATE `#__icagenda` SET version='1.2.9', releasedate='2012-10-28' WHERE id=1;
+
+
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.2.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.2.sql
new file mode 100644
index 00000000..15638f16
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.2.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='1.2' WHERE id=1;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.3.0.1.1.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.3.0.1.1.sql
new file mode 100644
index 00000000..9fe34237
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.3.0.1.1.sql
@@ -0,0 +1,4 @@
+UPDATE `#__icagenda` SET version='1.3 beta1', releasedate='2012-10-28' WHERE id=1;
+
+ALTER TABLE `#__icagenda_events` ADD COLUMN `registration` TINYINT(1)  NOT NULL DEFAULT '1';
+
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.3.0.1.2.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.3.0.1.2.sql
new file mode 100644
index 00000000..cd428ae4
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.3.0.1.2.sql
@@ -0,0 +1,3 @@
+UPDATE `#__icagenda` SET version='1.3 beta1', releasedate='2012-12-03' WHERE id=1;
+
+ALTER TABLE `#__icagenda_registration` MODIFY COLUMN `date` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00';
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.3.0.1.3.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.3.0.1.3.sql
new file mode 100644
index 00000000..2af2628b
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.3.0.1.3.sql
@@ -0,0 +1,3 @@
+UPDATE `#__icagenda` SET version='1.3 beta1', releasedate='2012-12-10' WHERE id=1;
+
+ALTER TABLE `#__icagenda_events` MODIFY COLUMN `params` TEXT NOT NULL DEFAULT '';
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.3.0.1.4.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.3.0.1.4.sql
new file mode 100644
index 00000000..2a088ed4
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.3.0.1.4.sql
@@ -0,0 +1,3 @@
+UPDATE `#__icagenda` SET version='1.3 beta1', releasedate='2012-12-11' WHERE id=1;
+
+ALTER TABLE `#__icagenda_events` DROP COLUMN `registration`;
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.3.0.1.5.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.3.0.1.5.sql
new file mode 100644
index 00000000..99445aa6
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.3.0.1.5.sql
@@ -0,0 +1,3 @@
+UPDATE `#__icagenda` SET version='1.3 beta1', releasedate='2012-12-11' WHERE id=1;
+
+ALTER TABLE `#__icagenda_registration` ADD COLUMN `period` TINYINT(1) NOT NULL DEFAULT '0' AFTER `date`;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.3.0.1.6.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.3.0.1.6.sql
new file mode 100644
index 00000000..1806ab71
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.3.0.1.6.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='1.3 beta2', releasedate='2012-12-15' WHERE id=1;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.3.0.1.7.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.3.0.1.7.sql
new file mode 100644
index 00000000..bc5d1b3e
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.3.0.1.7.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='1.3 beta3', releasedate='2012-12-16' WHERE id=1;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.3.0.1.8.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.3.0.1.8.sql
new file mode 100644
index 00000000..3d4b764c
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.3.0.1.8.sql
@@ -0,0 +1,3 @@
+UPDATE `#__icagenda` SET version='1.3 beta4', releasedate='2012-12-24' WHERE id=1;
+
+ALTER TABLE `#__icagenda_events` ADD COLUMN `country` VARCHAR(255) NOT NULL AFTER `city`;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.3.0.1.9.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.3.0.1.9.sql
new file mode 100644
index 00000000..d5096b8a
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.3.0.1.9.sql
@@ -0,0 +1,3 @@
+UPDATE `#__icagenda` SET version='1.3 beta4', releasedate='2012-12-28' WHERE id=1;
+
+ALTER TABLE `#__icagenda_registration` MODIFY COLUMN `date` TEXT(65535)  NOT NULL;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.3.0.1.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.3.0.1.sql
new file mode 100644
index 00000000..b14ae36f
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.3.0.1.sql
@@ -0,0 +1,26 @@
+UPDATE `#__icagenda` SET version='1.3 beta1', releasedate='2012-10-28' WHERE id=1;
+
+ALTER TABLE `#__icagenda_events` ADD `period` TEXT(65535) NOT NULL AFTER `file`;
+ALTER TABLE `#__icagenda_events` ADD `enddate` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' AFTER `file`;
+ALTER TABLE `#__icagenda_events` ADD `startdate` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' AFTER `file`;
+ALTER TABLE `#__icagenda_events` MODIFY `next` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00';
+ALTER TABLE `#__icagenda_events` ADD `website` VARCHAR(255) NOT NULL AFTER `place`;
+
+DROP TABLE IF EXISTS `#__icagenda_registration`;
+
+CREATE TABLE `#__icagenda_registration` (
+`id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
+`ordering` INT(11)  NOT NULL ,
+`state` TINYINT(11)  NOT NULL DEFAULT '1',
+`checked_out` INT(11)  NOT NULL ,
+`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
+`userid` INT(11)  NOT NULL ,
+`eventid` INT(11)  NOT NULL ,
+`name` VARCHAR(255)  NOT NULL ,
+`email` VARCHAR(255)  NOT NULL ,
+`phone` VARCHAR(255)  NOT NULL ,
+`date` DATE NOT NULL ,
+`people` INT(2)  NOT NULL ,
+PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT COLLATE=utf8_general_ci;
+
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.3.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.3.sql
new file mode 100644
index 00000000..a5546fbd
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/1.3.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='1.3', releasedate='2012-10-19' WHERE id=1;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.0.1.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.0.1.sql
new file mode 100644
index 00000000..7e91c45e
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.0.1.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='2.0.1 RC', releasedate='2013-01-01' WHERE id=1;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.0.2.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.0.2.sql
new file mode 100644
index 00000000..c90bd172
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.0.2.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='2.0.2 RC', releasedate='2013-01-04' WHERE id=1;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.0.3.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.0.3.sql
new file mode 100644
index 00000000..2adc0920
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.0.3.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='2.0.3', releasedate='2013-01-10' WHERE id=1;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.0.4.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.0.4.sql
new file mode 100644
index 00000000..4b1a1049
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.0.4.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='2.0.4', releasedate='2013-01-23' WHERE id=1;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.0.5.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.0.5.sql
new file mode 100644
index 00000000..caee65d7
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.0.5.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='2.0.5', releasedate='2013-02-01' WHERE id=1;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.0.6.1.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.0.6.1.sql
new file mode 100644
index 00000000..83062933
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.0.6.1.sql
@@ -0,0 +1,11 @@
+UPDATE `#__icagenda` SET version='2.1 beta', releasedate='2013-02-21' WHERE id=1;
+
+ALTER TABLE `#__icagenda_events` ADD COLUMN `asset_id` INT(10) NOT NULL DEFAULT '0' AFTER `id`;
+
+
+ALTER TABLE `#__icagenda_events` ADD COLUMN `modified_by` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `alias`;
+ALTER TABLE `#__icagenda_events` ADD COLUMN `modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' AFTER `alias`;
+ALTER TABLE `#__icagenda_events` ADD COLUMN `created_by_alias` VARCHAR(255) NOT NULL AFTER `alias`;
+ALTER TABLE `#__icagenda_events` ADD COLUMN `created_by` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `alias`;
+ALTER TABLE `#__icagenda_events` ADD COLUMN `created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' AFTER `alias`;
+ALTER TABLE `#__icagenda_events` ADD COLUMN `access` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `alias`;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.0.6.2.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.0.6.2.sql
new file mode 100644
index 00000000..bfe37122
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.0.6.2.sql
@@ -0,0 +1,3 @@
+UPDATE `#__icagenda` SET version='2.1 beta', releasedate='2013-02-22' WHERE id=1;
+
+ALTER TABLE `#__icagenda_events` ADD COLUMN `displaytime` INT(10) NOT NULL DEFAULT '1' AFTER `file`;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.0.6.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.0.6.sql
new file mode 100644
index 00000000..6e8b18cb
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.0.6.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='2.0.6', releasedate='2013-02-07' WHERE id=1;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.0.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.0.sql
new file mode 100644
index 00000000..d964bef3
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.0.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='2.0.0 RC', releasedate='2012-12-31' WHERE id=1;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.1.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.1.sql
new file mode 100644
index 00000000..86a1ad02
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.1.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='2.1.1', releasedate='2013-03-14' WHERE id=1;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.10.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.10.sql
new file mode 100644
index 00000000..9ffad140
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.10.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='2.1.10', releasedate='2013-05-07' WHERE id=1;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.11.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.11.sql
new file mode 100644
index 00000000..843545cf
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.11.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='2.1.11', releasedate='2013-05-13' WHERE id=1;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.12.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.12.sql
new file mode 100644
index 00000000..2b365cc2
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.12.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='2.1.12', releasedate='2013-05-21' WHERE id=1;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.13.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.13.sql
new file mode 100644
index 00000000..974e56ee
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.13.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='2.1.13', releasedate='2013-05-23' WHERE id=1;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.14.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.14.sql
new file mode 100644
index 00000000..0aa5973e
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.14.sql
@@ -0,0 +1,4 @@
+UPDATE `#__icagenda` SET version='2.1.14', releasedate='2013-05-29' WHERE id=1;
+UPDATE `#__icagenda_events` SET language='*' WHERE language='';
+
+ALTER TABLE `#__icagenda_registration` ADD COLUMN `itemid` INT(11) NOT NULL AFTER `userid`;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.2.2.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.2.2.sql
new file mode 100644
index 00000000..6fe26dfe
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.2.2.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='2.1.2.2', releasedate='2013-03-27' WHERE id=1;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.2.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.2.sql
new file mode 100644
index 00000000..7cfb3c8e
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.2.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='2.1.2', releasedate='2013-03-21' WHERE id=1;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.3.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.3.sql
new file mode 100644
index 00000000..fa2d0a93
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.3.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='2.1.3', releasedate='2013-04-01' WHERE id=1;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.4.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.4.sql
new file mode 100644
index 00000000..ada6d156
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.4.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='2.1.4', releasedate='2013-04-05' WHERE id=1;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.5.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.5.sql
new file mode 100644
index 00000000..0227f1c2
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.5.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='2.1.5', releasedate='2013-04-10' WHERE id=1;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.6.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.6.sql
new file mode 100644
index 00000000..3ff4523e
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.6.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='2.1.6', releasedate='2013-04-12' WHERE id=1;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.7.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.7.sql
new file mode 100644
index 00000000..eb6af5e3
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.7.sql
@@ -0,0 +1,6 @@
+UPDATE `#__icagenda` SET version='2.1.7', releasedate='2013-04-29' WHERE id=1;
+
+ALTER TABLE `#__icagenda_events` ADD COLUMN `language` CHAR(7) NOT NULL AFTER `access`;
+
+ALTER TABLE `#__icagenda_events` ADD COLUMN `lng` FLOAT( 20, 16 ) NOT NULL AFTER `coordinate`;
+ALTER TABLE `#__icagenda_events` ADD COLUMN `lat` FLOAT( 20, 16 ) NOT NULL AFTER `coordinate`;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.8.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.8.sql
new file mode 100644
index 00000000..7e4f6205
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.8.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='2.1.8', releasedate='2013-04-30' WHERE id=1;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.9.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.9.sql
new file mode 100644
index 00000000..7346200e
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.9.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='2.1.9', releasedate='2013-05-03' WHERE id=1;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.sql
new file mode 100644
index 00000000..5dd30ad8
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/2.1.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='2.1', releasedate='2013-03-11' WHERE id=1;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.0.1.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.0.1.sql
new file mode 100644
index 00000000..53c7a77c
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.0.1.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.0.1', releasedate='2013-07-04' WHERE id=2;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.0.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.0.sql
new file mode 100644
index 00000000..490ab214
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.0.sql
@@ -0,0 +1 @@
+INSERT INTO `#__icagenda` (id,version,releasedate) VALUES (2,'3.0','2013-06-04');
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.1.0.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.1.0.sql
new file mode 100644
index 00000000..53b5fb3b
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.1.0.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.1.0', releasedate='2013-07-26' WHERE id=2;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.1.1.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.1.1.sql
new file mode 100644
index 00000000..0a34ac96
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.1.1.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.1.1', releasedate='2013-07-29' WHERE id=2;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.1.10.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.1.10.sql
new file mode 100644
index 00000000..b160019d
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.1.10.sql
@@ -0,0 +1,3 @@
+UPDATE `#__icagenda` SET version='3.1.10', releasedate='2013-09-12' WHERE id=2;
+
+ALTER TABLE `#__icagenda_events` ADD COLUMN `approval` INT(11)  NOT NULL DEFAULT '0' AFTER `state`;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.1.11.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.1.11.sql
new file mode 100644
index 00000000..1e74a983
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.1.11.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.1.11', releasedate='2013-09-13' WHERE id=2;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.1.12.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.1.12.sql
new file mode 100644
index 00000000..bf1181ad
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.1.12.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.1.12', releasedate='2013-09-17' WHERE id=2;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.1.13.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.1.13.sql
new file mode 100644
index 00000000..2ef67823
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.1.13.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.1.13', releasedate='2013-09-20' WHERE id=2;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.1.2.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.1.2.sql
new file mode 100644
index 00000000..4c25cd30
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.1.2.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.1.2', releasedate='2013-08-05' WHERE id=2;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.1.3.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.1.3.sql
new file mode 100644
index 00000000..c071a7f6
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.1.3.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.1.3', releasedate='2013-08-09' WHERE id=2;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.1.4.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.1.4.sql
new file mode 100644
index 00000000..468df799
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.1.4.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.1.4', releasedate='2013-08-13' WHERE id=2;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.1.5.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.1.5.sql
new file mode 100644
index 00000000..d67303ed
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.1.5.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.1.5', releasedate='2013-08-19' WHERE id=2;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.1.6.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.1.6.sql
new file mode 100644
index 00000000..f8f30f8f
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.1.6.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.1.6', releasedate='2013-08-20' WHERE id=2;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.1.7.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.1.7.sql
new file mode 100644
index 00000000..09feee9e
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.1.7.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.1.7', releasedate='2013-08-29' WHERE id=2;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.1.8.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.1.8.sql
new file mode 100644
index 00000000..0733c143
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.1.8.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.1.8', releasedate='2013-08-30' WHERE id=2;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.1.9.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.1.9.sql
new file mode 100644
index 00000000..4d3ca2f4
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.1.9.sql
@@ -0,0 +1,5 @@
+UPDATE `#__icagenda` SET version='3.1.9', releasedate='2013-09-06' WHERE id=2;
+
+ALTER TABLE `#__icagenda_registration` ADD COLUMN `notes` TEXT(65535) NOT NULL DEFAULT '' AFTER `people`;
+ALTER TABLE `#__icagenda_events` ADD COLUMN `created_by_email` VARCHAR(100) NOT NULL DEFAULT '' AFTER `created_by_alias`;
+ALTER TABLE `#__icagenda_events` ADD COLUMN `weekdays` VARCHAR(255) NOT NULL DEFAULT '' AFTER `displaytime`;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.0.1.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.0.1.sql
new file mode 100644
index 00000000..48b1ab10
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.0.1.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.2.0 RC2', releasedate='2013-09-22' WHERE id=2;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.0.2.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.0.2.sql
new file mode 100644
index 00000000..48b1ab10
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.0.2.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.2.0 RC2', releasedate='2013-09-22' WHERE id=2;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.0.3.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.0.3.sql
new file mode 100644
index 00000000..c935e8a6
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.0.3.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.2.0 RC3', releasedate='2013-09-26' WHERE id=2;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.0.4.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.0.4.sql
new file mode 100644
index 00000000..dc3148dc
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.0.4.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.2.0 RC4', releasedate='2013-10-04' WHERE id=2;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.0.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.0.sql
new file mode 100644
index 00000000..9098f144
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.0.sql
@@ -0,0 +1,3 @@
+UPDATE `#__icagenda` SET version='3.2.0', releasedate='2013-09-20' WHERE id=2;
+
+ALTER TABLE `#__icagenda_events` ADD COLUMN `daystime` VARCHAR(255) NOT NULL DEFAULT '' AFTER `weekdays`;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.1.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.1.sql
new file mode 100644
index 00000000..27e11627
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.1.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.2.1', releasedate='2013-10-07' WHERE id=2;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.10.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.10.sql
new file mode 100644
index 00000000..acd77c03
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.10.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.2.10', releasedate='2014-01-03' WHERE id=2;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.11.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.11.sql
new file mode 100644
index 00000000..3391c368
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.11.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.2.11', releasedate='2014-01-04' WHERE id=2;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.12.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.12.sql
new file mode 100644
index 00000000..d343682d
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.12.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.2.12', releasedate='2014-01-08' WHERE id=2;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.13.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.13.sql
new file mode 100644
index 00000000..2a3e1d0e
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.13.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.2.13', releasedate='2014-02-01' WHERE id=2;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.14.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.14.sql
new file mode 100644
index 00000000..e3718f67
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.14.sql
@@ -0,0 +1,33 @@
+ALTER TABLE `#__icagenda` ADD COLUMN `params` TEXT NOT NULL DEFAULT '' AFTER `releasedate`;
+INSERT INTO `#__icagenda` (id,version,releasedate,params) VALUES (3,'3.2.14','2014-03-01','');
+
+ALTER TABLE `#__icagenda_events` ADD COLUMN `metadesc` TEXT NOT NULL DEFAULT '' AFTER `desc`;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `#__icagenda_customfields`
+--
+
+CREATE TABLE IF NOT EXISTS `#__icagenda_customfields` (
+  `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `ordering` INT(11) NOT NULL,
+  `state` TINYINT(1) NOT NULL DEFAULT '1',
+  `checked_out` INT(11) NOT NULL,
+  `checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `title` VARCHAR(255) NOT NULL,
+  `alias` VARCHAR(255) NOT NULL,
+  `parent_form` INT(11) NOT NULL DEFAULT '0',
+  `type` VARCHAR(255) NOT NULL,
+  `options` mediumtext,
+  `default` VARCHAR(255) NOT NULL,
+  `required` tinyint(3) NOT NULL DEFAULT '0',
+  `language` varchar(10) NOT NULL DEFAULT '*',
+  `params` mediumtext,
+  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `created_by` int(10) unsigned NOT NULL DEFAULT '0',
+  `created_by_alias` varchar(255) NOT NULL DEFAULT '',
+  `modified` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `modified_by` int(10) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.2.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.2.sql
new file mode 100644
index 00000000..5a56ff99
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.2.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.2.2', releasedate='2013-10-10' WHERE id=2;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.3.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.3.sql
new file mode 100644
index 00000000..06c198d6
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.3.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.2.3', releasedate='2013-10-20' WHERE id=2;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.4.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.4.sql
new file mode 100644
index 00000000..38011c6d
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.4.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.2.4', releasedate='2013-10-29' WHERE id=2;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.5.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.5.sql
new file mode 100644
index 00000000..8471a537
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.5.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.2.5', releasedate='2013-11-11' WHERE id=2;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.6.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.6.sql
new file mode 100644
index 00000000..ee254722
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.6.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.2.6', releasedate='2013-11-21' WHERE id=2;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.7.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.7.sql
new file mode 100644
index 00000000..673d3dec
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.7.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.2.7', releasedate='2013-11-23' WHERE id=2;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.8.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.8.sql
new file mode 100644
index 00000000..b8736659
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.8.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.2.8', releasedate='2013-12-15' WHERE id=2;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.9.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.9.sql
new file mode 100644
index 00000000..9f42732f
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.9.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.2.9', releasedate='2013-12-28' WHERE id=2;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.sql
new file mode 100644
index 00000000..36f69d74
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.2.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.2', releasedate='2013-09-20' WHERE id=2;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.3.1.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.3.1.sql
new file mode 100644
index 00000000..91c61a6c
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.3.1.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.3.1', releasedate='2014-03-14' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.3.2.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.3.2.sql
new file mode 100644
index 00000000..0a530b21
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.3.2.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.3.2', releasedate='2014-03-17' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.3.3.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.3.3.sql
new file mode 100644
index 00000000..b6eb43b1
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.3.3.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.3.3', releasedate='2014-04-20' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.3.4.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.3.4.sql
new file mode 100644
index 00000000..cb04aeaf
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.3.4.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.3.4', releasedate='2014-04-25' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.3.5-1.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.3.5-1.sql
new file mode 100644
index 00000000..f1fde395
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.3.5-1.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.3.5-1', releasedate='2014-04-29' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.3.5.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.3.5.sql
new file mode 100644
index 00000000..3f16b878
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.3.5.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.3.5', releasedate='2014-04-27' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.3.6.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.3.6.sql
new file mode 100644
index 00000000..80d45890
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.3.6.sql
@@ -0,0 +1,3 @@
+UPDATE `#__icagenda` SET version='3.3.6', releasedate='2014-05-16' WHERE id=3;
+
+ALTER TABLE `#__icagenda_customfields` ADD COLUMN `slug` VARCHAR(255) NOT NULL DEFAULT '' AFTER `alias`;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.3.7.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.3.7.sql
new file mode 100644
index 00000000..5a7a73a3
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.3.7.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.3.7', releasedate='2014-05-29' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.3.8.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.3.8.sql
new file mode 100644
index 00000000..ed4b67c5
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.3.8.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.3.8', releasedate='2014-07-04' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.3.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.3.sql
new file mode 100644
index 00000000..213f1dd7
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.3.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.3.0', releasedate='2014-03-06' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.4.0-alpha1.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.4.0-alpha1.sql
new file mode 100644
index 00000000..525bb93d
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.4.0-alpha1.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.4.0-alpha1', releasedate='2014-07-11' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.4.0-alpha2.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.4.0-alpha2.sql
new file mode 100644
index 00000000..99be0702
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.4.0-alpha2.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.4.0-alpha2', releasedate='2014-07-16' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.4.0-beta1.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.4.0-beta1.sql
new file mode 100644
index 00000000..306d9df4
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.4.0-beta1.sql
@@ -0,0 +1,3 @@
+UPDATE `#__icagenda` SET version='3.4.0-beta1', releasedate='2014-07-23' WHERE id=3;
+
+ALTER TABLE `#__icagenda_events` ADD COLUMN `shortdesc` TEXT NOT NULL DEFAULT '' AFTER `lng`;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.4.0-beta2.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.4.0-beta2.sql
new file mode 100644
index 00000000..0dc9f6e6
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.4.0-beta2.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.4.0-beta2', releasedate='2014-11-09' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.4.0-rc.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.4.0-rc.sql
new file mode 100644
index 00000000..529b81a0
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.4.0-rc.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.4.0-rc', releasedate='2014-12-14' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.4.0.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.4.0.sql
new file mode 100644
index 00000000..e4c84331
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.4.0.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.4.0', releasedate='2014-12-22' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.4.1-alpha1.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.4.1-alpha1.sql
new file mode 100644
index 00000000..09faacbb
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.4.1-alpha1.sql
@@ -0,0 +1,3 @@
+UPDATE `#__icagenda` SET version='3.4.1-alpha1', releasedate='2015-01-24' WHERE id=3;
+
+ALTER TABLE `#__icagenda_events` ADD COLUMN `site_itemid` INT(10) NOT NULL DEFAULT '0' AFTER `approval`;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.4.1.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.4.1.sql
new file mode 100644
index 00000000..0341735a
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.4.1.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.4.1', releasedate='2015-01-30' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.4.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.4.sql
new file mode 100644
index 00000000..c45e4761
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.4.sql
@@ -0,0 +1,54 @@
+UPDATE `#__icagenda` SET version='3.4', releasedate='2014-07-03' WHERE id=3;
+
+ALTER TABLE `#__icagenda_customfields` ADD COLUMN `description` VARCHAR(255) NOT NULL DEFAULT '' AFTER `slug`;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `#__icagenda_customfields_data`
+--
+
+CREATE TABLE IF NOT EXISTS `#__icagenda_customfields_data` (
+  `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `state` TINYINT(1) NOT NULL DEFAULT '1',
+  `slug` VARCHAR(255) NOT NULL,
+  `parent_form` INT(11) NOT NULL DEFAULT '0',
+  `parent_id` INT(11) NOT NULL DEFAULT '0',
+  `value` VARCHAR(255) NOT NULL,
+  `language` varchar(10) NOT NULL DEFAULT '*',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `#__icagenda_feature`
+--
+
+CREATE TABLE IF NOT EXISTS  `#__icagenda_feature` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `ordering` int(11) NOT NULL,
+  `state` tinyint(1) NOT NULL DEFAULT '1',
+  `checked_out` int(11) NOT NULL,
+  `checked_out_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `title` varchar(255) NOT NULL,
+  `alias` varchar(255) NOT NULL,
+  `desc` mediumtext NOT NULL,
+  `icon` varchar(255) NOT NULL,
+  `icon_alt` varchar(255) NOT NULL,
+  `show_filter` tinyint(1) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT COLLATE=utf8_general_ci;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `#__icagenda_feature_xref`
+--
+
+CREATE TABLE IF NOT EXISTS  `#__icagenda_feature_xref` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `event_id` int(11) NOT NULL,
+  `feature_id` int(11) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT COLLATE=utf8_general_ci;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.0.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.0.sql
new file mode 100644
index 00000000..af0a6881
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.0.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.5.0', releasedate='2015-02-25' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.1.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.1.sql
new file mode 100644
index 00000000..67e8b31f
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.1.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.5.1', releasedate='2015-03-01' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.10.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.10.sql
new file mode 100644
index 00000000..01357697
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.10.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.5.10', releasedate='2015-09-01' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.11.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.11.sql
new file mode 100644
index 00000000..68837931
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.11.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.5.11', releasedate='2015-09-05' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.12.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.12.sql
new file mode 100644
index 00000000..51651363
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.12.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.5.12', releasedate='2015-10-12' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.13.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.13.sql
new file mode 100644
index 00000000..62d139d9
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.13.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.5.13', releasedate='2015-12-05' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.14.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.14.sql
new file mode 100644
index 00000000..2f4574f0
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.14.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.5.14', releasedate='2016-01-23' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.15.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.15.sql
new file mode 100644
index 00000000..936608fa
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.15.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.5.15', releasedate='2016-02-19' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.16.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.16.sql
new file mode 100644
index 00000000..4754526f
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.16.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.5.16', releasedate='2016-03-19' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.17.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.17.sql
new file mode 100644
index 00000000..123be1ac
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.17.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.5.17', releasedate='2016-04-12' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.18.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.18.sql
new file mode 100644
index 00000000..4ab59c70
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.18.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.5.18', releasedate='2016-06-19' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.19.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.19.sql
new file mode 100644
index 00000000..98d34fdc
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.19.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.5.19', releasedate='2016-06-30' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.2.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.2.sql
new file mode 100644
index 00000000..e1aac6ba
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.2.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.5.2', releasedate='2015-03-13' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.20.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.20.sql
new file mode 100644
index 00000000..8f1dbfd4
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.20.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.5.20', releasedate='2016-07-28' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.21.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.21.sql
new file mode 100644
index 00000000..02d951b6
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.21.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.5.21', releasedate='2016-08-04' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.3.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.3.sql
new file mode 100644
index 00000000..e77e5300
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.3.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.5.3', releasedate='2015-03-25' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.4.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.4.sql
new file mode 100644
index 00000000..c7eed6ef
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.4.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.5.4', releasedate='2015-04-24' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.5.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.5.sql
new file mode 100644
index 00000000..be5e0977
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.5.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.5.5', releasedate='2015-04-27' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.6.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.6.sql
new file mode 100644
index 00000000..88ffe166
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.6.sql
@@ -0,0 +1,3 @@
+UPDATE `#__icagenda` SET version='3.5.6', releasedate='2015-06-29' WHERE id=3;
+
+ALTER TABLE `#__icagenda_registration` ADD COLUMN `params` text NOT NULL AFTER `notes`;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.7.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.7.sql
new file mode 100644
index 00000000..ec18ecb6
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.7.sql
@@ -0,0 +1,7 @@
+UPDATE `#__icagenda` SET version='3.5.7', releasedate='2015-07-16' WHERE id=3;
+
+ALTER TABLE `#__icagenda_registration` ADD COLUMN `asset_id` int(10) NOT NULL DEFAULT '0' AFTER `id`;
+ALTER TABLE `#__icagenda_registration` ADD COLUMN `modified_by` int(10) unsigned NOT NULL DEFAULT '0' AFTER `params`;
+ALTER TABLE `#__icagenda_registration` ADD COLUMN `modified` datetime NOT NULL DEFAULT '0000-00-00 00:00:00' AFTER `params`;
+ALTER TABLE `#__icagenda_registration` ADD COLUMN `created_by` int(10) unsigned NOT NULL DEFAULT '0' AFTER `params`;
+ALTER TABLE `#__icagenda_registration` ADD COLUMN `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00' AFTER `params`;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.8.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.8.sql
new file mode 100644
index 00000000..66ad0eb5
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.8.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.5.8', releasedate='2015-07-17' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.9.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.9.sql
new file mode 100644
index 00000000..09915392
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.5.9.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.5.9', releasedate='2015-08-01' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.0-alpha1.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.0-alpha1.sql
new file mode 100644
index 00000000..cb22a409
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.0-alpha1.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.6.0-alpha1', releasedate='2015-12-28' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.0-alpha2.1.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.0-alpha2.1.sql
new file mode 100644
index 00000000..9ff31411
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.0-alpha2.1.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.6.0-alpha2.1', releasedate='2016-06-02' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.0-alpha2.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.0-alpha2.sql
new file mode 100644
index 00000000..1cd853cb
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.0-alpha2.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.6.0-alpha2', releasedate='2016-05-31' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.0-beta1.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.0-beta1.sql
new file mode 100644
index 00000000..5b41d23f
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.0-beta1.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.6.0-beta1', releasedate='2016-07-13' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.0-rc1.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.0-rc1.sql
new file mode 100644
index 00000000..a8eb01be
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.0-rc1.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.6.0-rc1', releasedate='2016-07-30' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.0.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.0.sql
new file mode 100644
index 00000000..5e857f4a
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.0.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.6.0', releasedate='2016-08-19' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.1.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.1.sql
new file mode 100644
index 00000000..1d617b98
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.1.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.6.1', releasedate='2016-08-29' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.10.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.10.sql
new file mode 100644
index 00000000..4e561793
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.10.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.6.10', releasedate='2017-07-06' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.11.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.11.sql
new file mode 100644
index 00000000..f6a17c91
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.11.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.6.11', releasedate='2017-07-20' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.12.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.12.sql
new file mode 100644
index 00000000..045f2ed1
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.12.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.6.12', releasedate='2017-07-27' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.13.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.13.sql
new file mode 100644
index 00000000..8a46c6ff
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.13.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.6.13', releasedate='2018-04-17' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.14.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.14.sql
new file mode 100644
index 00000000..84d4db6e
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.14.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.6.14', releasedate='2018-05-04' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.2.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.2.sql
new file mode 100644
index 00000000..358e7c10
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.2.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.6.2', releasedate='2016-09-01' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.3.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.3.sql
new file mode 100644
index 00000000..ecc4631b
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.3.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.6.3', releasedate='2016-09-26' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.4.1.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.4.1.sql
new file mode 100644
index 00000000..898a7af2
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.4.1.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.6.4.1', releasedate='2016-10-18' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.4.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.4.sql
new file mode 100644
index 00000000..76d8d5cd
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.4.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.6.4', releasedate='2016-10-15' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.5.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.5.sql
new file mode 100644
index 00000000..3dfd676e
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.5.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.6.5', releasedate='2016-11-23' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.6.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.6.sql
new file mode 100644
index 00000000..1efdf851
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.6.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.6.6', releasedate='2016-12-20' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.7.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.7.sql
new file mode 100644
index 00000000..970a2925
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.7.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.6.7', releasedate='2017-04-27' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.8.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.8.sql
new file mode 100644
index 00000000..77439034
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.8.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.6.8', releasedate='2017-05-03' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.9.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.9.sql
new file mode 100644
index 00000000..1d27308c
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.9.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.6.9', releasedate='2017-07-05' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.sql
new file mode 100644
index 00000000..1752f86b
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.6.sql
@@ -0,0 +1,22 @@
+UPDATE `#__icagenda` SET version='3.6', releasedate='2015-12-28' WHERE id=3;
+
+ALTER TABLE `#__icagenda_events` ADD COLUMN `hits` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `language`;
+ALTER TABLE `#__icagenda_customfields` ADD COLUMN `groups` VARCHAR(255) NOT NULL DEFAULT '' AFTER `parent_form`;
+ALTER TABLE `#__icagenda_registration` ADD COLUMN `status` tinyint(1) NOT NULL DEFAULT '0' AFTER `notes`;
+ALTER TABLE `#__icagenda_category` ADD COLUMN `language` varchar(10) NOT NULL DEFAULT '*' AFTER `desc`;
+ALTER TABLE `#__icagenda_category` ADD COLUMN `groups` varchar(255) NOT NULL DEFAULT '' AFTER `desc`;
+ALTER TABLE `#__icagenda_category` ADD COLUMN `image` varchar(255) NOT NULL AFTER `desc`;
+ALTER TABLE `#__icagenda_events` MODIFY `language` varchar(10) NOT NULL DEFAULT '*';
+UPDATE `#__icagenda_events` SET language='*' WHERE language='';
+
+CREATE TABLE IF NOT EXISTS `#__icagenda_filters` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `ordering` int(11) NOT NULL DEFAULT 0,
+  `state` tinyint(3) NOT NULL DEFAULT 0,
+  `type` varchar(255) NOT NULL DEFAULT '',
+  `filter` varchar(255) NOT NULL DEFAULT '',
+  `value` varchar(255) NOT NULL DEFAULT '',
+  `option` varchar(255) NOT NULL DEFAULT '',
+  `selected` tinyint(1) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.0.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.0.sql
new file mode 100644
index 00000000..5ce39518
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.0.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.7.0', releasedate='2018-05-25' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.1.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.1.sql
new file mode 100644
index 00000000..be0c5111
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.1.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.7.1', releasedate='2018-05-28' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.10.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.10.sql
new file mode 100644
index 00000000..79102a1a
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.10.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.7.10', releasedate='2019-08-31' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.11.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.11.sql
new file mode 100644
index 00000000..32dd562c
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.11.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.7.11', releasedate='2019-12-19' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.12.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.12.sql
new file mode 100644
index 00000000..889a92d3
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.12.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.7.12', releasedate='2020-03-28' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.13.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.13.sql
new file mode 100644
index 00000000..c8fcab5e
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.13.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.7.13', releasedate='2020-04-02' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.14.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.14.sql
new file mode 100644
index 00000000..e52b8335
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.14.sql
@@ -0,0 +1,4 @@
+UPDATE `#__icagenda` SET version='3.7.14', releasedate='2020-04-27' WHERE id=3;
+
+ALTER TABLE `#__icagenda_events` DROP COLUMN `asset_id`;
+ALTER TABLE `#__icagenda_registration` DROP COLUMN `asset_id`;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.15.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.15.sql
new file mode 100644
index 00000000..f542a8d1
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.15.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.7.15', releasedate='2020-08-29' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.2.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.2.sql
new file mode 100644
index 00000000..f792cfff
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.2.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.7.2', releasedate='2018-06-11' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.3.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.3.sql
new file mode 100644
index 00000000..ce01c4aa
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.3.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.7.3', releasedate='2018-08-23' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.4.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.4.sql
new file mode 100644
index 00000000..ade9ed77
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.4.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.7.4', releasedate='2018-09-26' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.5.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.5.sql
new file mode 100644
index 00000000..9cea8933
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.5.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.7.5', releasedate='2018-10-30' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.6.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.6.sql
new file mode 100644
index 00000000..71b15427
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.6.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.7.6', releasedate='2018-11-28' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.7.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.7.sql
new file mode 100644
index 00000000..aa4efd25
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.7.sql
@@ -0,0 +1,72 @@
+UPDATE `#__icagenda` SET version='3.7.7', releasedate='2019-01-09' WHERE id=3;
+
+--
+-- Indexes for table `#__icagenda_category`
+--
+ALTER TABLE `#__icagenda_category`
+  ADD KEY `idx_state` (`state`),
+  ADD KEY `idx_language` (`language`);
+
+--
+-- Indexes for table `#__icagenda_customfields`
+--
+ALTER TABLE `#__icagenda_customfields`
+  ADD KEY `idx_state` (`state`),
+  ADD KEY `idx_parent_form` (`parent_form`),
+  ADD KEY `idx_language` (`language`);
+
+--
+-- Indexes for table `#__icagenda_customfields_data`
+--
+ALTER TABLE `#__icagenda_customfields_data`
+  ADD KEY `idx_state` (`state`),
+  ADD KEY `idx_parent_form` (`parent_form`),
+  ADD KEY `idx_parent_id` (`parent_id`),
+  ADD KEY `idx_language` (`language`);
+
+--
+-- Indexes for table `#__icagenda_events`
+--
+ALTER TABLE `#__icagenda_events`
+  ADD KEY `idx_state` (`state`),
+  ADD KEY `idx_approval` (`approval`),
+  ADD KEY `idx_language` (`language`),
+  ADD KEY `idx_catid` (`catid`);
+
+--
+-- Indexes for table `#__icagenda_feature`
+--
+ALTER TABLE `#__icagenda_feature`
+  ADD KEY `idx_state` (`state`);
+
+--
+-- Indexes for table `#__icagenda_feature_xref`
+--
+ALTER TABLE `#__icagenda_feature_xref`
+  ADD KEY `idx_event_id` (`event_id`),
+  ADD KEY `idx_feature_id` (`feature_id`);
+
+--
+-- Indexes for table `#__icagenda_filters`
+--
+ALTER TABLE `#__icagenda_filters`
+  ADD KEY `idx_state` (`state`);
+
+--
+-- Indexes for table `#__icagenda_registration`
+--
+ALTER TABLE `#__icagenda_registration`
+  ADD KEY `idx_state` (`state`),
+  ADD KEY `idx_userid` (`userid`),
+  ADD KEY `idx_eventid` (`eventid`),
+  ADD KEY `idx_status` (`status`),
+  ADD KEY `idx_created_by` (`created_by`);
+
+--
+-- Indexes for table `#__icagenda_user_actions`
+--
+ALTER TABLE `#__icagenda_user_actions`
+  ADD KEY `idx_user_id` (`user_id`),
+  ADD KEY `idx_parent_form` (`parent_form`),
+  ADD KEY `idx_parent_id` (`parent_id`),
+  ADD KEY `idx_state` (`state`);
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.8.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.8.sql
new file mode 100644
index 00000000..ed7615b7
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.8.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.7.8', releasedate='2019-01-10' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.9.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.9.sql
new file mode 100644
index 00000000..cdf4cd7d
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.9.sql
@@ -0,0 +1 @@
+UPDATE `#__icagenda` SET version='3.7.9', releasedate='2019-06-13' WHERE id=3;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.sql b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.sql
new file mode 100644
index 00000000..ac28e230
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/3.7.sql
@@ -0,0 +1,16 @@
+UPDATE `#__icagenda` SET version='3.7', releasedate='2018-05-25' WHERE id=3;
+
+CREATE TABLE IF NOT EXISTS `#__icagenda_user_actions` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `user_id` int(10) unsigned NOT NULL DEFAULT 0,
+  `user_action` varchar(255) NOT NULL,
+  `parent_form` int(11) NOT NULL DEFAULT '0',
+  `parent_id` int(11) NOT NULL DEFAULT '0',
+  `action_subject` varchar(100) NOT NULL DEFAULT '',
+  `action_body` text NOT NULL,
+  `user_ip` varchar(100) NOT NULL DEFAULT '',
+  `user_agent` text NOT NULL,
+  `state` tinyint(3) NOT NULL DEFAULT 0,
+  `created_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  PRIMARY KEY (`id`)
+) DEFAULT CHARSET=utf8;
diff --git a/deployed/icagenda/administrator/components/com_icagenda/sql/updates/index.html b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/index.html
new file mode 100644
index 00000000..94906bce
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/sql/updates/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/tables/category.php b/deployed/icagenda/administrator/components/com_icagenda/tables/category.php
new file mode 100644
index 00000000..698abbf4
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/tables/category.php
@@ -0,0 +1,165 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.8 2019-01-10
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * category Table class
+ */
+class iCagendaTablecategory extends JTable
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   JDatabaseDriver  $db  Database connector object
+	 *
+	 * @since   1.0
+	 */
+	public function __construct(&$db)
+	{
+		parent::__construct('#__icagenda_category', 'id', $db);
+
+		if (version_compare(JVERSION, '3.7', 'ge'))
+		{
+			// Set the alias for 'published' since the column is called 'state'
+			$this->setColumnAlias('published', 'state');
+		}
+	}
+
+	/**
+	 * Overloaded bind function to pre-process the params.
+	 *
+	 * @param   array        Named array
+	 * @return  null|string  null is operation was satisfactory, otherwise returns an error
+	 * @see     JTable:bind
+	 * @since   1.5
+	 */
+	public function bind($array, $ignore = '')
+	{
+		if (isset($array['params']) && is_array($array['params']))
+		{
+			$registry = new JRegistry();
+			$registry->loadArray($array['params']);
+			$array['params'] = (string)$registry;
+		}
+
+		if (isset($array['metadata']) && is_array($array['metadata']))
+		{
+			$registry = new JRegistry();
+			$registry->loadArray($array['metadata']);
+			$array['metadata'] = (string)$registry;
+		}
+
+		return parent::bind($array, $ignore);
+	}
+
+	/**
+	 * Overloaded check function
+	 */
+	public function check()
+	{
+		// If there is an ordering column and this is a new row then get the next ordering value
+		if (property_exists($this, 'ordering') && $this->id == 0)
+		{
+			$this->ordering = self::getNextOrder();
+		}
+
+		return parent::check();
+	}
+
+
+	/**
+	 * Method to set the publishing state for a row or list of rows in the database
+	 * table.  The method respects checked out rows by other users and will attempt
+	 * to checkin rows that it can after adjustments are made.
+	 *
+	 * @param    mixed    An optional array of primary key values to update.  If not
+	 *                    set the instance property value is used.
+	 * @param    integer The publishing state. eg. [0 = unpublished, 1 = published]
+	 * @param    integer The user id of the user performing the operation.
+	 * @return    boolean    True on success.
+	 * @since    1.0.4
+	 */
+	public function publish($pks = null, $state = 1, $userId = 0)
+	{
+		// Initialise variables.
+		$k = $this->_tbl_key;
+
+		// Sanitize input.
+		JArrayHelper::toInteger($pks);
+		$userId = (int) $userId;
+		$state  = (int) $state;
+
+		// If there are no primary keys set check to see if the instance key is set.
+		if (empty($pks))
+		{
+			if ($this->$k) {
+				$pks = array($this->$k);
+			}
+			// Nothing to set publishing state on, return false.
+			else {
+				$this->setError(JText::_('JLIB_DATABASE_ERROR_NO_ROWS_SELECTED'));
+				return false;
+			}
+		}
+
+		// Build the WHERE clause for the primary keys.
+		$where = $k.'='.implode(' OR '.$k.'=', $pks);
+
+		// Determine if there is checkin support for the table.
+		if (!property_exists($this, 'checked_out') || !property_exists($this, 'checked_out_time')) {
+			$checkin = '';
+		}
+		else {
+			$checkin = ' AND (checked_out = 0 OR checked_out = '.(int) $userId.')';
+		}
+
+		// Update the publishing state for rows with the given primary keys.
+		$this->_db->setQuery(
+			'UPDATE '.$this->_tbl.'' .
+			' SET state = '.(int) $state .
+			' WHERE ('.$where.')' .
+			$checkin
+		);
+		$this->_db->query();
+
+		// Check for a database error.
+		if ($this->_db->getErrorNum()) {
+			$this->setError($this->_db->getErrorMsg());
+			return false;
+		}
+
+		// If checkin is supported and all rows were adjusted, check them in.
+		if ($checkin && (count($pks) == $this->_db->getAffectedRows()))
+		{
+			// Checkin the rows.
+			foreach($pks as $pk)
+			{
+				$this->checkin($pk);
+			}
+		}
+
+		// If the JTable instance value is in the list of primary keys that were set, set the instance.
+		if (in_array($this->$k, $pks)) {
+			$this->state = $state;
+		}
+
+		$this->setError('');
+		return true;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/tables/customfield.php b/deployed/icagenda/administrator/components/com_icagenda/tables/customfield.php
new file mode 100644
index 00000000..4f6c63b7
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/tables/customfield.php
@@ -0,0 +1,287 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.8 2019-01-10
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.4.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * Custom Field Table class
+ */
+class iCagendaTablecustomfield extends JTable
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   JDatabaseDriver  $db  Database connector object
+	 *
+	 * @since   3.4.0
+	 */
+	public function __construct(&$db)
+	{
+		parent::__construct('#__icagenda_customfields', 'id', $db);
+
+		if (version_compare(JVERSION, '3.7', 'ge'))
+		{
+			// Set the alias for 'published' since the column is called 'state'
+			$this->setColumnAlias('published', 'state');
+		}
+	}
+
+	/**
+	 * Overloaded bind function.
+	 *
+	 * @param   array        Named array
+	 * @return  null|string  null is operation was satisfactory, otherwise returns an error
+	 * @see     JTable:bind
+	 * @since   3.4.0
+	 */
+	public function bind($array, $ignore = '')
+	{
+		// Set Creator infos
+		$user = JFactory::getUser();
+		$userId	= $user->get('id');
+
+		if ($array['created_by'] == '0')
+		{
+			$array['created_by'] = (int)$userId;
+		}
+
+		// Set Params
+		if (isset($array['params']) && is_array($array['params']))
+		{
+			$registry = new JRegistry();
+			$registry->loadArray($array['params']);
+			$array['params'] = (string) $registry;
+		}
+
+		// Force system slugs for core fields and protect from usage in other field types
+		$coreFields = array('core_name', 'core_email', 'core_phone', 'core_date', 'core_people');
+
+		if (in_array($array['type'], $coreFields))
+		{
+			$array['slug'] = $array['type'];
+		}
+		elseif (in_array($array['slug'], $coreFields)
+			&& ! in_array($array['type'], $coreFields))
+		{
+			$array['slug'] = $array['slug'] . '_copy';
+		}
+
+		// Set Placeholder to Options, and unset placeholder (if input type with hint)
+		$hintFields = array('text', 'url', 'tel', 'email', 'core_name', 'core_email', 'core_phone');
+
+		if (isset($array['placeholder'])
+			&& in_array($array['type'], $hintFields))
+		{
+			$array['options'] = $array['placeholder'];
+			unset($array['placeholder']);
+		}
+
+		// Set Class to Options, and unset spacer_class (if input type is spacer)
+		$spacerFields = array('spacer_label', 'spacer_description');
+
+		if (isset($array['spacer_class'])
+			&& in_array($array['type'], $spacerFields))
+		{
+			$array['options'] = $array['spacer_class'];
+			unset($array['spacer_class']);
+		}
+
+		// Set Groups
+		if ( ! isset($array['groups']))
+		{
+			$array['groups'] = '';
+		}
+		elseif (is_array($array['groups']))
+		{
+			$array['groups'] = implode(',', $array['groups']);
+		}
+
+		return parent::bind($array, $ignore);
+	}
+
+	/**
+	* Overloaded check function
+	* @since   3.4.0
+	*/
+	public function check()
+	{
+		// Import Joomla 2.5
+		jimport( 'joomla.filter.output' );
+
+		// If there is an ordering column and this is a new row then get the next ordering value
+		if (property_exists($this, 'ordering')
+			&& $this->id == 0)
+		{
+			$this->ordering = self::getNextOrder();
+		}
+
+		// URL alias
+		if (empty($this->alias))
+		{
+			$this->alias = $this->title;
+		}
+
+		$this->alias = JFilterOutput::stringURLSafe($this->alias);
+
+		// Alias is not generated if non-latin characters, so we fix it by using created date, or title if unicode is activated, as alias
+		if ($this->alias == null || empty($this->alias))
+		{
+			if (JFactory::getConfig()->get('unicodeslugs') == 1)
+			{
+				$this->alias = JFilterOutput::stringURLUnicodeSlug($this->title);
+			}
+			else
+			{
+				$this->alias = JFilterOutput::stringURLSafe($this->created);
+			}
+		}
+
+		// Slug auto-create
+		$slug_empty = empty($this->slug) ? true : false;
+
+		if ($slug_empty)
+		{
+			$this->slug = $this->title;
+		}
+
+		$this->slug = iCFilterOutput::stringToSlug($this->slug);
+
+		// Slug is not generated if non-latin characters, so we fix it by using created date as a slug
+		if ($this->slug == null)
+		{
+			$this->slug = iCFilterOutput::stringToSlug($this->created);
+		}
+
+		// Check if Slug already exists
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('slug')
+			->from($db->qn('#__icagenda_customfields'))
+			->where($db->qn('slug') . ' = ' . $db->q($this->slug));
+
+		if (!empty($this->id))
+		{
+			$query->where('id <> ' . (int) $this->id);
+		}
+
+		$db->setQuery($query);
+		$slug_exists = $db->loadResult();
+
+		if ($slug_exists)
+		{
+			$error_slug = $slug_empty
+						? JText::sprintf('COM_ICAGENDA_CUSTOMFIELD_DATABASE_ERROR_AUTO_SLUG',
+										'<strong>' . $this->title . '</strong>', '<strong>' . $this->slug . '</strong>')
+						: '<strong>' . JText::_('COM_ICAGENDA_CUSTOMFIELD_DATABASE_ERROR_UNIQUE_SLUG') . '</strong>';
+
+			$this->setError($error_slug . '<br /><br /><span class="iCicon-info-circle"></span> <i>'
+							. JTEXT::_('COM_ICAGENDA_CUSTOMFIELD_SLUG_DESC').'</i>');
+
+			return false;
+		}
+
+		return parent::check();
+	}
+
+
+	/**
+	 * Method to set the publishing state for a row or list of rows in the database
+	 * table.  The method respects checked out rows by other users and will attempt
+	 * to checkin rows that it can after adjustments are made.
+	 *
+	 * @param   mixed       An optional array of primary key values to update.  If not
+	 *                      set the instance property value is used.
+	 * @param   integer     The publishing state. eg. [0 = unpublished, 1 = published]
+	 * @param   integer     The user id of the user performing the operation.
+	 * @return  boolean     True on success.
+	 * @since   3.4.0
+	 */
+	public function publish($pks = null, $state = 1, $userId = 0)
+	{
+		// Initialise variables.
+		$k = $this->_tbl_key;
+
+		// Sanitize input.
+		JArrayHelper::toInteger($pks);
+		$userId = (int) $userId;
+		$state  = (int) $state;
+
+		// If there are no primary keys set check to see if the instance key is set.
+		if (empty($pks))
+		{
+			if ($this->$k)
+			{
+				$pks = array($this->$k);
+			}
+			// Nothing to set publishing state on, return false.
+			else
+			{
+				$this->setError(JText::_('JLIB_DATABASE_ERROR_NO_ROWS_SELECTED'));
+				return false;
+			}
+		}
+
+		// Build the WHERE clause for the primary keys.
+		$where = $k.'='.implode(' OR '.$k.'=', $pks);
+
+		// Determine if there is checkin support for the table.
+		if (!property_exists($this, 'checked_out') || !property_exists($this, 'checked_out_time'))
+		{
+			$checkin = '';
+		}
+		else
+		{
+			$checkin = ' AND (checked_out = 0 OR checked_out = '.(int) $userId.')';
+		}
+
+		// Update the publishing state for rows with the given primary keys.
+		$this->_db->setQuery(
+			'UPDATE '.$this->_tbl.'' .
+			' SET state = '.(int) $state .
+			' WHERE ('.$where.')' .
+			$checkin
+		);
+		$this->_db->query();
+
+		// Check for a database error.
+		if ($this->_db->getErrorNum())
+		{
+			$this->setError($this->_db->getErrorMsg());
+			return false;
+		}
+
+		// If checkin is supported and all rows were adjusted, check them in.
+		if ($checkin && (count($pks) == $this->_db->getAffectedRows()))
+		{
+			// Checkin the rows.
+			foreach($pks as $pk)
+			{
+				$this->checkin($pk);
+			}
+		}
+
+		// If the JTable instance value is in the list of primary keys that were set, set the instance.
+		if (in_array($this->$k, $pks))
+		{
+			$this->state = $state;
+		}
+
+		$this->setError('');
+		return true;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/tables/event.php b/deployed/icagenda/administrator/components/com_icagenda/tables/event.php
new file mode 100644
index 00000000..8d7728aa
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/tables/event.php
@@ -0,0 +1,528 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.8 2019-01-10
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * event Table class
+ */
+class iCagendaTableEvent extends JTable
+{
+	/**
+	 * @var array $custom_fields  Property for the array of custom fields.
+	 * This needs to be specified because there is no column for features in the events table
+	 */
+	protected $custom_fields = array();
+
+	/**
+	 * Constructor
+	 *
+	 * @param   JDatabaseDriver  $db  Database connector object
+	 *
+	 * @since   1.0
+	 */
+	public function __construct(&$db)
+	{
+		parent::__construct('#__icagenda_events', 'id', $db);
+
+		if (version_compare(JVERSION, '3.7', 'ge'))
+		{
+			// Set the alias for 'published' since the column is called 'state'
+			$this->setColumnAlias('published', 'state');
+		}
+	}
+
+	/**
+	 * Overloaded bind function to pre-process the params.
+	 *
+	 * @param	array		Named array
+	 * @return	null|string	null is operation was satisfactory, otherwise returns an error
+	 * @see		JTable:bind
+	 * @since	1.3
+	 */
+	public function bind($array, $ignore = '')
+	{
+		$lang = JFactory::getLanguage();
+
+		// Serialize Single Dates
+		$dev_option = '0';
+
+		// Set Vars
+		$eventTimeZone = null;
+		$nodate        = '0000-00-00 00:00:00';
+		$date_today    = JHtml::date('now', 'Y-m-d'); // Joomla Time Zone
+
+		if (iCString::isSerialized($array['dates']))
+		{
+			$dates = unserialize($array['dates']);
+
+			foreach ($dates as $key => $date)
+			{
+				if ($date == '-0001-11-30 00:00')
+				{
+					unset($dates[$key]);
+				}
+			}
+		}
+		elseif ($dev_option == '1') // DEV.
+		{
+			$dates = $this->setDatesOptions($array['dates']);
+		}
+		else
+		{
+			$dates = $this->getDates($array['dates']);
+
+			if ($lang->getTag() == 'fa-IR'
+				&& $dates != array('0000-00-00 00:00')
+				&& $dates != array('')
+				)
+			{
+				$dates_to_sql = array();
+
+				foreach ($dates AS $date)
+				{
+					if (iCDate::isDate($date))
+					{
+						$year  = date('Y', strtotime($date));
+						$month = date('m', strtotime($date));
+						$day   = date('d', strtotime($date));
+						$time  = date('H:i', strtotime($date));
+
+						$converted_date = iCGlobalizeConvert::jalaliToGregorian($year, $month, $day, true) . ' ' . $time;
+						$dates_to_sql[] = date('Y-m-d H:i', strtotime($converted_date));
+					}
+				}
+
+				$dates = $dates_to_sql;
+			}
+		}
+
+		$dates = ($dates == array('')) ? array('0000-00-00 00:00') : $dates;
+
+		rsort($dates);
+
+		if ($dev_option == '1') // DEV.
+		{
+			$array['dates'] = $array['dates'];
+		}
+		else
+		{
+			$array['dates'] = serialize($dates);
+		}
+
+
+		/**
+		 * Set Week Days
+		 */
+		if (!isset($array['weekdays']))
+		{
+			$array['weekdays'] = '';
+		}
+		elseif (is_array($array['weekdays']))
+		{
+			$array['weekdays'] = implode(',', $array['weekdays']);
+		}
+
+		// Return the dates of the period.
+		$startdate = iCDate::isDate($array['startdate']) ? date('Y-m-d H:i:s', strtotime($array['startdate'])) : $nodate;
+		$enddate   = iCDate::isDate($array['enddate']) ? date('Y-m-d H:i:s', strtotime($array['enddate'])) : $nodate;
+		$period    = array();
+
+		if (($startdate == $nodate) && ($enddate != $nodate))
+		{
+			$enddate = $nodate;
+		}
+
+		if (strtotime($startdate) > strtotime($enddate))
+		{
+			$errorperiod = '1';
+		}
+		else
+		{
+			$errorperiod = '';
+
+			$period_all_dates_array = iCDatePeriod::listDates($startdate, $enddate, $eventTimeZone);
+			$WeeksDays              = iCDatePeriod::weekdaysToArray($array['weekdays']);
+
+			$period_array = array();
+
+			foreach ($period_all_dates_array AS $date_in_weekdays)
+			{
+				$datetime_period_date = JHtml::date($date_in_weekdays, 'Y-m-d H:i', $eventTimeZone);
+
+				if (in_array(date('w', strtotime($datetime_period_date)), $WeeksDays))
+				{
+					array_push($period_array, $datetime_period_date);
+				}
+			}
+		}
+
+		// Serialize Period Dates
+		if (($startdate != $nodate) && ($enddate != $nodate))
+		{
+			if ($errorperiod != '1')
+			{
+				$array['period'] = serialize($period_array);
+
+				$period = (iCString::isSerialized($array['period'])) ? unserialize($array['period']) : array();
+
+				if ($lang->getTag() == 'fa-IR')
+				{
+					$period_to_sql = array();
+
+					foreach ($period AS $date)
+					{
+						if (iCDate::isDate($date))
+						{
+							$year  = date('Y', strtotime($date));
+							$month = date('m', strtotime($date));
+							$day   = date('d', strtotime($date));
+							$time  = date('H:i', strtotime($date));
+
+							$converted_date  = iCGlobalizeConvert::jalaliToGregorian($year, $month, $day, true) . ' ' . $time;
+							$period_to_sql[] = date('Y-m-d H:i', strtotime($converted_date));
+						}
+					}
+
+					$period = $period_to_sql;
+				}
+
+				rsort($period);
+
+				$array['period'] = serialize($period);
+			}
+			else
+			{
+				$array['period'] = '';
+			}
+		}
+		else
+		{
+			$array['period'] = '';
+		}
+
+		// Set Next Date
+		$NextDates  = $this->getNextDates($dates);
+		$NextPeriod = ! empty($period)
+					? $this->getNextPeriod($period, $array['weekdays'])
+					: $this->getNextDates($dates);
+
+		$date_NextDates  = JHtml::date($NextDates, 'Y-m-d', $eventTimeZone);
+		$date_NextPeriod = JHtml::date($NextPeriod, 'Y-m-d', $eventTimeZone);
+		$time_NextDates  = JHtml::date($NextDates, 'H:i', $eventTimeZone);
+		$time_NextPeriod = JHtml::date($NextPeriod, 'H:i', $eventTimeZone);
+
+
+		// Control the next date
+		if ((strtotime($date_NextDates) >= strtotime($date_today)) && (strtotime($date_NextPeriod) >= strtotime($date_today)))
+		{
+			if (strtotime($date_NextDates) < strtotime($date_NextPeriod))
+			{
+				$array['next'] = $this->getNextDates($dates);
+			}
+			if (strtotime($date_NextDates) > strtotime($date_NextPeriod))
+			{
+				$array['next'] = ! empty($period) ? $this->getNextPeriod($period, $array['weekdays']) : $this->getNextDates($dates);;
+			}
+			if (strtotime($date_NextDates) == strtotime($date_NextPeriod))
+			{
+				if (strtotime($time_NextDates) >= strtotime($time_NextPeriod))
+				{
+					$array['next'] = ! empty($period) ? $this->getNextPeriod($period, $array['weekdays']) : $this->getNextDates($dates);
+				}
+				else
+				{
+					$array['next'] = $this->getNextDates($dates);
+				}
+			}
+		}
+		elseif ((strtotime($date_NextDates) < strtotime($date_today)) && (strtotime($date_NextPeriod) >= strtotime($date_today)))
+		{
+			$array['next'] = ! empty($period) ? $this->getNextPeriod($period, $array['weekdays']) : $this->getNextDates($dates);
+		}
+		elseif ((strtotime($date_NextDates) >= strtotime($date_today)) && (strtotime($date_NextPeriod) < strtotime($date_today)))
+		{
+			$array['next'] = $this->getNextDates($dates);
+		}
+		elseif ((strtotime($date_NextDates) < strtotime($date_today)) && (strtotime($date_NextPeriod) < strtotime($date_today)))
+		{
+			if (strtotime($date_NextDates) < strtotime($date_NextPeriod))
+			{
+				$array['next'] = ! empty($period) ? $this->getNextPeriod($period, $array['weekdays']) : $this->getNextDates($dates);
+			}
+			else
+			{
+				$array['next'] = $this->getNextDates($dates);
+			}
+		}
+
+		// Control of dates if valid (EDIT SINCE VERSION 3.0 - update 3.1.4)
+		if (((strtotime($NextDates) >= '943916400')
+			&& (strtotime($NextDates) <= '944002800'))
+			&& ($errorperiod == '1'))
+		{
+			$array['next'] = '-3600';
+		}
+		if (((strtotime($NextDates)=='943916400') || (strtotime($NextDates)=='943920000'))
+			&& ((strtotime($NextPeriod)=='943916400') || (strtotime($NextPeriod)=='943920000')))
+		{
+			$array['next'] = '-3600';
+		}
+
+		if ($array['next'] == '-3600')
+		{
+			$state = 0;
+
+			$this->_db->setQuery(
+			'UPDATE #__icagenda_events' .
+			' SET state = '.(int) $state .
+			' WHERE id = '. (int) $array['id']
+			);
+
+			if (version_compare(JVERSION, '3.0', 'lt'))
+			{
+				$this->_db->query();
+			}
+			else
+			{
+				$this->_db->execute();
+			}
+		}
+
+		$return = parent::bind($array, $ignore);
+
+		return $return;
+	}
+
+	/**
+	 * DEV.
+	 */
+	function setDatesOptions($dates) // DEV.
+	{
+		$dates = str_replace('day=', '', $dates);
+		$dates = str_replace('start=', '', $dates);
+		$dates = str_replace('end=', '', $dates);
+//		$dates = str_replace('+', ' ', $dates);
+		$dates = str_replace('%3A', ':', $dates);
+		$dates = str_replace('&', ',', $dates);
+
+		$ex_dates = explode(',stop=stop', $dates);
+
+		$singles_dates = array();
+
+		foreach ($ex_dates AS $sd)
+		{
+			if ($sd != '')
+			{
+				array_push($singles_dates, $sd);
+			}
+		}
+
+		return $singles_dates;
+	}
+
+	/**
+	 * Get Dates for Single Dates Script Input
+	 */
+	function getDates($dates)
+	{
+		$dates    = str_replace('d=', '', $dates);
+		$dates    = str_replace('+', ' ', $dates);
+		$dates    = str_replace('%3A', ':', $dates);
+		$ex_dates = explode('&', $dates);
+
+		$setDates = array();
+
+		foreach ($ex_dates as $date)
+		{
+			$setDates[] = iCDate::isDate($date)
+						? date('Y-m-d H:i', strtotime($date))
+						: '0000-00-00 00:00';
+		}
+
+		return $setDates;
+	}
+
+	/**
+	 * Get Next Date from Single Dates
+	 */
+	function getNextDates($dates)
+	{
+		// Set Vars
+		$eventTimeZone = null;
+		$date_today    = JHtml::date('now', 'Y-m-d'); // Joomla Time Zone
+
+		// Get Next
+		$next = JFactory::getApplication()->input->get('next');
+
+		if (count($dates))
+		{
+			while (strtotime($next) <= strtotime($date_today))
+			{
+				$nextDate = $dates[0];
+
+				foreach ($dates as $d)
+				{
+					if (strtotime($d) >= strtotime($date_today))
+					{
+						$nextDate = $d;
+					}
+				}
+
+//				return JHtml::date($nextDate, 'Y-m-d H:i', $eventTimeZone);
+				return date('Y-m-d H:i', strtotime($nextDate));
+			}
+		}
+	}
+
+	/**
+	 * Get Next Date from Period
+	 */
+	function getNextPeriod($period, $i_weekdays)
+	{
+		// Set Vars
+		$eventTimeZone = null;
+		$date_today    = JHtml::date('now', 'Y-m-d'); // Joomla Time Zone
+
+		$WeeksDays = iCDatePeriod::weekdaysToArray($i_weekdays);
+
+		// Set Next Date for Period, if dates exist in Period
+		if (count($period))
+		{
+			$nextPeriod = $period[0];
+
+			foreach ($period as $e)
+			{
+				if (in_array(date('w', strtotime($e)), $WeeksDays))
+				{
+					if (strtotime($e) >= strtotime($date_today)) // if datetime in period >= date today
+					{
+						$nextPeriod = $e;
+					}
+				}
+			}
+
+//			return JHtml::date($nextPeriod, 'Y-m-d H:i', $eventTimeZone);
+			return date('Y-m-d H:i', strtotime($nextPeriod));
+		}
+	}
+
+	/**
+	* Overloaded check function
+	*/
+	public function check()
+	{
+		// If there is an ordering column and this is a new row then get the next ordering value
+		if (property_exists($this, 'ordering') && $this->id == 0)
+		{
+			$this->ordering = self::getNextOrder();
+		}
+
+		return parent::check();
+	}
+
+
+	/**
+	* Method to set the publishing state for a row or list of rows in the database
+	* table.  The method respects checked out rows by other users and will attempt
+	* to checkin rows that it can after adjustments are made.
+	*
+	* @param   mixed    An optional array of primary key values to update.  If not
+	*                   set the instance property value is used.
+	* @param   integer  The publishing state. eg. [0 = unpublished, 1 = published]
+	* @param   integer  The user id of the user performing the operation.
+	* @return  boolean  True on success.
+	* @since   1.0.4
+	*/
+	public function publish($pks = null, $state = 1, $userId = 0)
+	{
+		// Initialise variables.
+		$k = $this->_tbl_key;
+
+		// Sanitize input.
+		JArrayHelper::toInteger($pks);
+		$userId = (int) $userId;
+		$state  = (int) $state;
+
+		// If there are no primary keys set check to see if the instance key is set.
+		if (empty($pks))
+		{
+			if ($this->$k)
+			{
+				$pks = array($this->$k);
+			}
+			// Nothing to set publishing state on, return false.
+			else
+			{
+				$this->setError(JText::_('JLIB_DATABASE_ERROR_NO_ROWS_SELECTED'));
+
+				return false;
+			}
+		}
+
+		// Build the WHERE clause for the primary keys.
+		$where = $k . '=' . implode(' OR ' . $k . '=', $pks);
+
+		// Determine if there is checkin support for the table.
+		if ( ! property_exists($this, 'checked_out') || ! property_exists($this, 'checked_out_time'))
+		{
+			$checkin = '';
+		}
+		else
+		{
+			$checkin = ' AND (checked_out = 0 OR checked_out = ' . (int) $userId . ')';
+		}
+
+		// Update the publishing state for rows with the given primary keys.
+		$this->_db->setQuery(
+			'UPDATE '.$this->_tbl.'' .
+			' SET state = ' . (int) $state .
+			' WHERE (' . $where . ')' .
+			$checkin
+		);
+		$this->_db->query();
+
+		// Check for a database error.
+		if ($this->_db->getErrorNum())
+		{
+			$this->setError($this->_db->getErrorMsg());
+
+			return false;
+		}
+
+		// If checkin is supported and all rows were adjusted, check them in.
+		if ($checkin && (count($pks) == $this->_db->getAffectedRows()))
+		{
+			// Checkin the rows.
+			foreach($pks as $pk)
+			{
+				$this->checkin($pk);
+			}
+		}
+
+		// If the JTable instance value is in the list of primary keys that were set, set the instance.
+		if (in_array($this->$k, $pks))
+		{
+			$this->state = $state;
+		}
+
+		$this->setError('');
+
+		return true;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/tables/feature.php b/deployed/icagenda/administrator/components/com_icagenda/tables/feature.php
new file mode 100644
index 00000000..0971dbef
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/tables/feature.php
@@ -0,0 +1,221 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.8 2019-01-10
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.4.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * feature Table class
+ */
+class iCagendaTablefeature extends JTable
+{
+	protected $new_icon = null;
+
+	/**
+	 * Constructor
+	 *
+	 * @param   JDatabaseDriver  $db  Database connector object
+	 *
+	 * @since   3.4.0
+	 */
+	public function __construct(&$db)
+	{
+		parent::__construct('#__icagenda_feature', 'id', $db);
+
+		if (version_compare(JVERSION, '3.7', 'ge'))
+		{
+			// Set the alias for 'published' since the column is called 'state'
+			$this->setColumnAlias('published', 'state');
+		}
+	}
+
+	/**
+	 * Overloaded bind function to pre-process the params.
+	 *
+	 * @param	array		Named array
+	 * @return	null|string	null is operation was satisfactory, otherwise returns an error
+	 * @see		JTable:bind
+	 * @since	3.4.0
+	 */
+	public function bind($array, $ignore = '')
+	{
+		if (isset($array['new_icon']))
+		{
+			// Get media path
+			$params_media	= JComponentHelper::getParams('com_media');
+			$image_path		= $params_media->get('image_path', 'images');
+
+			// Paths to feature icons folder
+			$thumbsPath		= $image_path . '/icagenda/feature_icons';
+
+			// Get Image File Infos
+			$link_image		= $array['new_icon'];
+			$decomposition	= explode( '/' , $link_image );
+
+			// in each parent
+			$i = 0;
+
+			while ( isset($decomposition[$i]) )
+				$i++;
+			$i--;
+
+			$imgname		= $decomposition[$i];
+			$fichier		= explode( '.', $decomposition[$i] );
+			$imgtitle		= $fichier[0];
+			$imgextension	= strtolower($fichier[1]);
+
+			// Check file type if authorized to be generated as feature icon
+			$authorized_types = array('jpg', 'jpeg', 'png', 'gif');
+
+			if (!in_array($imgextension, $authorized_types) && $imgextension)
+			{
+				$this->setError('<strong>' . JText::_('COM_ICAGENDA_NOT_AUTHORIZED_IMAGE_TYPE') . '</strong><br />'
+								. JText::_('COM_ICAGENDA_FORM_FEATURE_MIMETYPE_ERROR'));
+
+				return false;
+			}
+			elseif ($imgextension)
+			{
+				// Clean icon name
+				jimport( 'joomla.filter.output' );
+				$icon_name = JFilterOutput::stringURLSafe($imgtitle) . '.' . $imgextension;
+
+				// Generate 16_bit if not exist
+				iCThumbGet::thumbnail($array['new_icon'], $thumbsPath, '16_bit', '16', '16', '100', false, '', '', '', $icon_name);
+
+				// Generate 24_bit if not exist
+				iCThumbGet::thumbnail($array['new_icon'], $thumbsPath, '24_bit', '24', '24', '100', false, '', '', '', $icon_name);
+
+				// Generate 32_bit if not exist
+				iCThumbGet::thumbnail($array['new_icon'], $thumbsPath, '32_bit', '32', '32', '100', false, '', '', '', $icon_name);
+
+				// Generate 48_bit if not exist
+				iCThumbGet::thumbnail($array['new_icon'], $thumbsPath, '48_bit', '48', '48', '100', false, '', '', '', $icon_name);
+
+				// Generate 64_bit if not exist
+				iCThumbGet::thumbnail($array['new_icon'], $thumbsPath, '64_bit', '64', '64', '100', false, '', '', '', $icon_name);
+
+				$array['icon'] = $icon_name;
+			}
+		}
+
+		return parent::bind($array, $ignore);
+	}
+
+	/**
+	 * Overloaded check function
+	 * @since	3.4.0
+	*/
+	public function check()
+	{
+		// If there is an ordering column and this is a new row then get the next ordering value
+		if (property_exists($this, 'ordering') && $this->id == 0)
+		{
+			$this->ordering = self::getNextOrder();
+		}
+
+		return parent::check();
+	}
+
+	/**
+	 * Method to set the publishing state for a row or list of rows in the database
+	 * table.  The method respects checked out rows by other users and will attempt
+	 * to checkin rows that it can after adjustments are made.
+	 *
+	 * @param	mixed    An optional array of primary key values to update.  If not
+	 *                    set the instance property value is used.
+	 * @param	integer The publishing state. eg. [0 = unpublished, 1 = published]
+	 * @param	integer The user id of the user performing the operation.
+	 * @return	boolean    True on success.
+	 * @since	3.4.0
+	 */
+	public function publish($pks = null, $state = 1, $userId = 0)
+	{
+		// Initialise variables.
+		$k = $this->_tbl_key;
+
+		// Sanitize input.
+		JArrayHelper::toInteger($pks);
+		$userId = (int) $userId;
+		$state  = (int) $state;
+
+		// If there are no primary keys set check to see if the instance key is set.
+		if (empty($pks))
+		{
+			if ($this->$k)
+			{
+				$pks = array($this->$k);
+			}
+			// Nothing to set publishing state on, return false.
+			else
+			{
+				$this->setError(JText::_('JLIB_DATABASE_ERROR_NO_ROWS_SELECTED'));
+				return false;
+			}
+		}
+
+		// Build the WHERE clause for the primary keys.
+		$where = $k.'='.implode(' OR '.$k.'=', $pks);
+
+		// Determine if there is checkin support for the table.
+		if (!property_exists($this, 'checked_out') || !property_exists($this, 'checked_out_time'))
+		{
+			$checkin = '';
+		}
+		else
+		{
+			$checkin = ' AND (checked_out = 0 OR checked_out = '.(int) $userId.')';
+		}
+
+		// Update the publishing state for rows with the given primary keys.
+		$this->_db->setQuery(
+			'UPDATE '.$this->_tbl.'' .
+			' SET state = '.(int) $state .
+			' WHERE ('.$where.')' .
+			$checkin
+		);
+		$this->_db->query();
+
+		// Check for a database error.
+		if ($this->_db->getErrorNum())
+		{
+			$this->setError($this->_db->getErrorMsg());
+
+			return false;
+		}
+
+		// If checkin is supported and all rows were adjusted, check them in.
+		if ($checkin && (count($pks) == $this->_db->getAffectedRows()))
+		{
+			// Checkin the rows.
+			foreach($pks as $pk)
+			{
+				$this->checkin($pk);
+			}
+		}
+
+		// If the JTable instance value is in the list of primary keys that were set, set the instance.
+		if (in_array($this->$k, $pks))
+		{
+			$this->state = $state;
+		}
+
+		$this->setError('');
+
+		return true;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/tables/icagenda.php b/deployed/icagenda/administrator/components/com_icagenda/tables/icagenda.php
new file mode 100644
index 00000000..4ca3e5e4
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/tables/icagenda.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.4.0 2014-06-29
+ * @since       1.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+// import Joomla table library
+jimport('joomla.database.table');
+
+/**
+ * iCagenda Table class
+ */
+class iCagendaTableiCagenda extends JTable
+{
+	/**
+	 * Constructor
+	 *
+	 * @param object Database connector object
+	 */
+	function __construct(&$db)
+	{
+		parent::__construct('#__icagenda_events', 'id', $db);
+	}
+	/**
+	 * Overloaded bind function
+	 *
+	 * @param       array           named array
+	 * @return      null|string     null is operation was satisfactory, otherwise returns an error
+	 * @see JTable:bind
+	 * @since 1.5
+	 */
+	public function bind($array, $ignore = '')
+	{
+		if (isset($array['params']) && is_array($array['params']))
+		{
+			// Convert the params field to a string.
+			$parameter = new JRegistry;
+			$parameter->loadArray($array['params']);
+			$array['params'] = (string)$parameter;
+		}
+		return parent::bind($array, $ignore);
+	}
+
+	/**
+	 * Overloaded load function
+	 *
+	 * @param       int $pk primary key
+	 * @param       boolean $reset reset data
+	 * @return      boolean
+	 * @see JTable:load
+	 */
+	public function load($pk = null, $reset = true)
+	{
+		if (parent::load($pk, $reset))
+		{
+			// Convert the params field to a registry.
+			$params = new JRegistry;
+                       // loadJSON is @deprecated    12.1  Use loadString passing JSON as the format instead.
+                       // $params->loadString($this->item->params, 'JSON');
+                       // "item" should not be present.
+                       $params->loadJSON($this->params);
+
+			$this->params = $params;
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/tables/index.html b/deployed/icagenda/administrator/components/com_icagenda/tables/index.html
new file mode 100644
index 00000000..42682b47
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/tables/index.html
@@ -0,0 +1 @@
+<html><body></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/tables/registration.php b/deployed/icagenda/administrator/components/com_icagenda/tables/registration.php
new file mode 100644
index 00000000..aa54cc4f
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/tables/registration.php
@@ -0,0 +1,165 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.8 2019-01-10
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.3.3
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * category Table class
+ */
+class iCagendaTableregistration extends JTable
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   JDatabaseDriver  $db  Database connector object
+	 *
+	 * @since   3.3.3
+	 */
+	public function __construct(&$db)
+	{
+		parent::__construct('#__icagenda_registration', 'id', $db);
+
+		if (version_compare(JVERSION, '3.7', 'ge'))
+		{
+			// Set the alias for 'published' since the column is called 'state'
+			$this->setColumnAlias('published', 'state');
+		}
+	}
+
+	/**
+	 * Overloaded bind function.
+	 *
+	 * @param   array        Named array
+	 * @return  null|string  null is operation was satisfactory, otherwise returns an error
+	 * @see     JTable:bind
+	 * @since   3.3.3
+	 */
+	public function bind($array, $ignore = '')
+	{
+		if ($array['date'] == 'period')
+		{
+			$array['date'] = '';
+		}
+
+		return parent::bind($array, $ignore);
+	}
+
+	/**
+	 * Overloaded check function
+	 */
+	public function check()
+	{
+		// If there is an ordering column and this is a new row then get the next ordering value
+		if (property_exists($this, 'ordering') && $this->id == 0)
+		{
+			$this->ordering = self::getNextOrder();
+		}
+
+		return parent::check();
+	}
+
+
+	/**
+	 * Method to set the publishing state for a row or list of rows in the database
+	 * table.  The method respects checked out rows by other users and will attempt
+	 * to checkin rows that it can after adjustments are made.
+	 *
+	 * @param   mixed    An optional array of primary key values to update.  If not
+	 *                   set the instance property value is used.
+	 * @param   integer  The publishing state. eg. [0 = unpublished, 1 = published]
+	 * @param   integer  The user id of the user performing the operation.
+	 * @return  boolean  True on success.
+	 * @since   3.3.3
+	 */
+	public function publish($pks = null, $state = 1, $userId = 0)
+	{
+		// Initialise variables.
+		$k = $this->_tbl_key;
+
+		// Sanitize input.
+		JArrayHelper::toInteger($pks);
+		$userId = (int) $userId;
+		$state  = (int) $state;
+
+		// If there are no primary keys set check to see if the instance key is set.
+		if (empty($pks))
+		{
+			if ($this->$k)
+			{
+				$pks = array($this->$k);
+			}
+			// Nothing to set publishing state on, return false.
+			else
+			{
+				$this->setError(JText::_('JLIB_DATABASE_ERROR_NO_ROWS_SELECTED'));
+
+				return false;
+			}
+		}
+
+		// Build the WHERE clause for the primary keys.
+		$where = $k.'='.implode(' OR '.$k.'=', $pks);
+
+		// Determine if there is checkin support for the table.
+		if (!property_exists($this, 'checked_out') || !property_exists($this, 'checked_out_time'))
+		{
+			$checkin = '';
+		}
+		else
+		{
+			$checkin = ' AND (checked_out = 0 OR checked_out = '.(int) $userId.')';
+		}
+
+		// Update the publishing state for rows with the given primary keys.
+		$this->_db->setQuery(
+			'UPDATE '.$this->_tbl.'' .
+			' SET state = '.(int) $state .
+			' WHERE ('.$where.')' .
+			$checkin
+		);
+		$this->_db->query();
+
+		// Check for a database error.
+		if ($this->_db->getErrorNum())
+		{
+			$this->setError($this->_db->getErrorMsg());
+
+			return false;
+		}
+
+		// If checkin is supported and all rows were adjusted, check them in.
+		if ($checkin && (count($pks) == $this->_db->getAffectedRows()))
+		{
+			// Checkin the rows.
+			foreach($pks as $pk)
+			{
+				$this->checkin($pk);
+			}
+		}
+
+		// If the JTable instance value is in the list of primary keys that were set, set the instance.
+		if (in_array($this->$k, $pks))
+		{
+			$this->state = $state;
+		}
+
+		$this->setError('');
+
+		return true;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/addthis/addthis.php b/deployed/icagenda/administrator/components/com_icagenda/utilities/addthis/addthis.php
new file mode 100644
index 00000000..b81269f4
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/addthis/addthis.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     iCagenda
+ * @subpackage  utilities
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version 	3.6.4 2016-10-13
+ * @since       3.6.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+/**
+ * ADDTHIS - Social Networks
+ */
+class icagendaAddthis
+{
+	/*
+	 * Function to display sharing on social networks
+	 *
+	 * VIEW: Event Details
+	 *
+	 * @since 3.6.0
+	 */
+	static public function sharing($item)
+	{
+		$addthisEvent = $item->params->get('atevent', 1);
+
+		if ($addthisEvent == 1)
+		{
+			return self::share();
+		}
+
+		return false;
+	}
+
+	// function AddThis social networks sharing
+	static public function share()
+	{
+		$url			= parse_url(Juri::base());
+		$addthis_scheme	= ($url['scheme'] == 'https') ? 'https://' : 'http://';
+
+		$params			= JFactory::getApplication()->getParams();
+
+		$addthis		= $params->get('addthis', '');
+		$float			= $params->get('atfloat', '');
+		$icon			= $params->get('aticon', '');
+
+		if ($float == 1)
+		{
+			$floataddthis	= 'floating';
+			$float_position	= 'position: fixed;';
+			$float_side		= 'left';
+		}
+		elseif ($float == 2)
+		{
+			$floataddthis	= 'floating';
+			$float_position	= 'position: fixed;';
+			$float_side		= 'right';
+		}
+		else
+		{
+			$floataddthis	= 'default';
+			$float_position	= '';
+			$float_side		= 'right';
+		}
+
+		if ($icon == 2)
+		{
+			$iconaddthis	= '32x32';
+		}
+		else
+		{
+			$iconaddthis	= '16x16';
+		}
+
+		$at_div = '<div class="share ic-share" style="' . $float_position . '">';
+		$at_div.= '<!-- AddThis Button BEGIN -->';
+		$at_div.= '<div class="addthis_toolbox';
+		$at_div.= ' addthis_' . $floataddthis . '_style';
+		$at_div.= ' addthis_' . $iconaddthis . '_style"';
+		$at_div.= ' style="' . $float_side . ': 2%; top: 40%;">';
+		$at_div.= '<a class="addthis_button_preferred_1"></a>';
+		$at_div.= '<a class="addthis_button_preferred_2"></a>';
+		$at_div.= '<a class="addthis_button_preferred_3"></a>';
+		$at_div.= '<a class="addthis_button_preferred_4"></a>';
+		$at_div.= '<a class="addthis_button_compact"></a>';
+		$at_div.= '<a class="addthis_counter addthis_bubble_style"></a>';
+		$at_div.= '</div>';
+
+		if ($addthis)
+		{
+			$at_div.= '<script type="text/javascript">var addthis_config = {"data_track_addressbar":true};</script>';
+			$at_div.= '<script type="text/javascript" src="' . $addthis_scheme . 's7.addthis.com/js/300/addthis_widget.js#pubid=' . $addthis . '"  async="async"></script>';
+		}
+		else
+		{
+			$at_div.= '<script type="text/javascript">var addthis_config = {"data_track_addressbar":false};</script>';
+			$at_div.= '<script type="text/javascript" src="' . $addthis_scheme . 's7.addthis.com/js/300/addthis_widget.js#pubid=ra-5024db5322322e8b" async="async"></script>';
+		}
+
+		$at_div.= '<!-- AddThis Button END -->';
+		$at_div.= '</div>';
+
+		return $at_div;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/addthis/index.html b/deployed/icagenda/administrator/components/com_icagenda/utilities/addthis/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/addthis/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/addtocal/addtocal.php b/deployed/icagenda/administrator/components/com_icagenda/utilities/addtocal/addtocal.php
new file mode 100644
index 00000000..bd8fde5d
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/addtocal/addtocal.php
@@ -0,0 +1,296 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.3 2018-08-09
+ *
+ * @package     iCagenda.Admin
+ * @subpackage  Utilities
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.6.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * class icagendaAddtocal
+ */
+class icagendaAddtocal
+{
+	/**
+	 * Function to return Url to add to Google Calendar
+	 *
+	 * @since   3.6.0
+	 */
+	static public function googleCalendar($i)
+	{
+		$app    = JFactory::getApplication();
+		$jinput = $app->input;
+
+		$text         = $i->title . ' (' . $i->cat_title . ')';
+		$details      = $i->desc;
+		$venue        = $i->place;
+		$s_dates      = $i->dates;
+		$single_dates = iCString::isSerialized($i->dates) ? unserialize($i->dates) : array(); // returns array
+		$website      = icagendaEvent::eventURL($i);
+		$location     = $venue ? $venue . ' - ' . $i->address : $i->address;
+
+		$get_date = '';
+		$href     = '#';
+
+		if ($jinput->get('date'))
+		{
+			// if 'All Dates' set
+			$get_date = $jinput->get('date');
+		}
+		else
+		{
+			// if 'Only Next/Last Date' set
+			$get_date = date('Y-m-d-H-i', strtotime($i->next));
+		}
+
+		$ex        = explode('-', $get_date);
+		$this_date = $ex['0'] . '-' . $ex['1'] . '-' . $ex['2'] . ' ' . $ex['3'] . ':' . $ex['4'];
+
+		$startdate = date('Y-m-d-H-i', strtotime($i->startdate));
+		$enddate   = date('Y-m-d-H-i', strtotime($i->enddate));
+
+		if (icagendaEvent::eventHasPeriod($i->period, $i->startdate, $i->enddate)
+			&& ($get_date >= $startdate)
+			&& ($get_date <= $enddate)
+			&& (!in_array($this_date, $single_dates))
+			)
+		{
+			$weekdays = ($i->weekdays || $i->weekdays == '0') ? true : false;
+
+			if ($weekdays)
+			{
+				$startdate = date('Y-m-d-H-i', strtotime($this_date));
+				$enddate   = date('Y-m-d', strtotime($this_date)) . '-' . date('H-i', strtotime($i->enddate));
+			}
+
+			$ex_S = explode('-', $startdate);
+			$ex_E = explode('-', $enddate);
+
+			$dateday = $ex_S['0'] . $ex_S['1'] . $ex_S['2'] . 'T' . $ex_S['3'] . $ex_S['4'];
+			$dateday.= '00/' . $ex_E['0'] . $ex_E['1'] . $ex_E['2'] . 'T' . $ex_E['3'] . $ex_E['4'] . '00';
+		}
+		else
+		{
+			$dateday = $ex['0'] . $ex['1'] . $ex['2'] . 'T' . $ex['3'] . $ex['4'];
+			$dateday.= '00/' . $ex['0'] . $ex['1'] . $ex['2'] . 'T' . $ex['3'] . $ex['4'] . '00';
+		}
+
+		// Get the site name
+		$sitename = $app->getCfg('sitename');
+
+		$href = 'https://www.google.com/calendar/event?action=TEMPLATE';
+
+		$mbString = extension_loaded('mbstring');
+		$text     = $mbString ? mb_substr($text, 0, 100, 'UTF-8') : substr($text, 0, 100);
+		$len      = strrpos($text, ' ');  // interruption on a space
+		$text     = substr($text, 0, $len);
+
+		$href.= '&text=' . urlencode($text) . '...';
+		$href.= '&dates=' . $dateday;
+		$href.= '&location=' . urlencode($location);
+		$href.= '&trp=true';
+
+		$limit_reduc     = '37'; // 37 chars (&trp=true&details=&sf=true&output=xml)
+		$limit_notlogged = '785';
+		$lenpart         = strlen($href);
+		$lenlast         = 2068 - $lenpart - $limit_reduc - $limit_notlogged; // max link length minus (title+location)
+		$details         = urlencode(strip_tags($details));
+		$details         = substr($details, 0 , $lenlast);
+		$len             = strrpos($details, '+');
+		$details         = substr($details, 0 , $len);
+
+		$href.= '&details=' . substr($details, 0, $lenlast) . '...';
+
+		return $href;
+	}
+
+	/**
+	 * Function to return Url to add to Windows Live (Hotmail) Calendar
+	 *
+	 * @since   3.6.0
+	 */
+	static public function windowsliveCalendar($i)
+	{
+		$jinput = JFactory::getApplication()->input;
+
+		$text         = $i->title.' ('.$i->cat_title.')';
+		$details      = $i->desc;
+		$venue        = $i->place;
+		$s_dates      = $i->dates;
+//		$single_dates = unserialize($s_dates);
+		$single_dates = iCString::isSerialized($i->dates) ? unserialize($i->dates) : array(); // returns array
+		$website      = icagendaEvent::eventURL($i);
+		$location     = $venue ? $venue . ' - ' . $i->address : $i->address;
+
+		$get_date = '';
+		$href     = '#';
+		$endday   = '';
+
+		if ($jinput->get('date'))
+		{
+			// if 'All Dates' set
+			$get_date = $jinput->get('date');
+		}
+		else
+		{
+			// if 'Only Next/Last Date' set
+			$get_date = date('Y-m-d-H-i', strtotime($i->next));
+		}
+
+		$ex        = explode('-', $get_date);
+		$this_date = $ex['0'] . '-' . $ex['1'] . '-' . $ex['2'] . ' ' . $ex['3'] . ':' . $ex['4'];
+
+		$startdate = date('Y-m-d-H-i', strtotime($i->startdate));
+		$enddate   = date('Y-m-d-H-i', strtotime($i->enddate));
+
+		if ( icagendaEvent::eventHasPeriod($i->period, $i->startdate, $i->enddate)
+			&& $get_date >= $startdate
+			&& $get_date <= $enddate
+			&& !in_array($this_date, $single_dates)
+			)
+		{
+			$weekdays = ($i->weekdays || $i->weekdays == '0') ? true : false;
+
+			if ($weekdays)
+			{
+				$startdate = date('Y-m-d-H-i', strtotime($this_date));
+				$enddate   = date('Y-m-d', strtotime($this_date)) . '-' . date('H-i', strtotime($i->enddate));
+			}
+
+			$ex_S = explode('-', $startdate);
+			$ex_E = explode('-', $enddate);
+
+			$dateday = $ex_S['0'] . $ex_S['1'] . $ex_S['2'] . 'T' . $ex_S['3'] . $ex_S['4'] . '00';
+			$endday  = $ex_E['0'] . $ex_E['1'] . $ex_E['2'] . 'T' . $ex_E['3'] . $ex_E['4'] . '00';
+
+		}
+		else
+		{
+			$dateday = $ex['0'] . $ex['1'] . $ex['2'] . 'T' . $ex['3'] . $ex['4'] . '00';
+		}
+
+		$href = "https://calendar.live.com/calendar/calendar.aspx?rru=addevent";
+		$href.= "&dtstart=" . $dateday;
+		$href.= isset($endday) ? "&dtend=" . $endday : '';
+		$href.= "&summary=" . urlencode($text);
+		$href.= "&location=" . urlencode($location);
+
+		// Shortens the description, if more than 1000 characters
+		$lengthMax        = '1000';
+		$details          = urlencode(strip_tags($details));
+		$details          = substr($details, 0, $lengthMax);
+		$shortenedDetails = strrpos($details, '+');
+		$details          = substr($details, 0, $shortenedDetails);
+
+		$href.= "&description=" . substr($details, 0, $lengthMax) . '...';
+
+		return $href;
+	}
+
+	/**
+	 * Function to return Url to add to Yahoo Calendar
+	 *
+	 * @since   3.6.0
+	 */
+	static public function yahooCalendar($i)
+	{
+		$jinput = JFactory::getApplication()->input;
+
+		$text         = $i->title . ' (' . $i->cat_title . ')';
+		$details      = $i->desc;
+		$venue        = $i->place;
+		$s_dates      = $i->dates;
+//		$single_dates = unserialize($s_dates);
+		$single_dates = iCString::isSerialized($i->dates) ? unserialize($i->dates) : array(); // returns array
+		$website      = icagendaEvent::eventURL($i);
+		$location     = $venue ? $venue . ' - ' . $i->address : $i->address;
+
+		$get_date = '';
+		$href     = '#';
+		$endday   = '';
+
+		if ($jinput->get('date'))
+		{
+			// if 'All Dates' set
+			$get_date = $jinput->get('date');
+		}
+		else
+		{
+			// if 'Only Next/Last Date' set
+			$get_date = date('Y-m-d-H-i', strtotime($i->next));
+		}
+
+		$ex        = explode('-', $get_date);
+		$this_date = $ex['0'] . '-' . $ex['1'] . '-' . $ex['2'] . ' ' . $ex['3'] . ':' . $ex['4'];
+
+		$startdate = date('Y-m-d-H-i', strtotime($i->startdate));
+		$enddate   = date('Y-m-d-H-i', strtotime($i->enddate));
+
+		if ( icagendaEvent::eventHasPeriod($i->period, $i->startdate, $i->enddate)
+			&& $get_date >= $startdate
+			&& $get_date <= $enddate
+			&& ! in_array($this_date, $single_dates)
+			)
+		{
+			$weekdays = ($i->weekdays || $i->weekdays == '0') ? true : false;
+
+			if ($weekdays)
+			{
+				$startdate = date('Y-m-d-H-i', strtotime($this_date));
+				$enddate   = date('Y-m-d', strtotime($this_date)) . '-' . date('H-i', strtotime($i->enddate));
+			}
+
+			$ex_S = explode('-', $startdate);
+			$ex_E = explode('-', $enddate);
+
+			$dateday = $ex_S['0'] . $ex_S['1'] . $ex_S['2'] . 'T' . $ex_S['3'] . $ex_S['4'] . '00';
+
+//			$diff = strtotime($i->enddate) - strtotime($i->startdate);
+//			$M = (floor($diff /60)) % 60;
+//			$M = sprintf("%02d", $M);
+//			$H = (floor($diff / 3600));
+
+//			$duration = ($H <= 24) ? $H . $M : '';
+			$endday = $ex_E['0'] . $ex_E['1'] . $ex_E['2'] . 'T' . $ex_E['3'] . $ex_E['4'] . '00';
+		}
+		else
+		{
+			$dateday = $ex['0'] . $ex['1'] . $ex['2'] . 'T' . $ex['3'] . $ex['4'] . '00';
+//			$duration = '';
+		}
+
+		// Shortens the description, if more than 1000 characters
+		$lengthMax        = '1000';
+		$details          = urlencode(strip_tags($details));
+		$details          = substr($details, 0, $lengthMax);
+		$shortenedDetails = strrpos($details, '+');
+		$details          = substr($details, 0, $shortenedDetails);
+
+		$href = "https://calendar.yahoo.com/?v=60";
+		$href.= "&VIEW=d";
+		$href.= "&in_loc=" . urlencode($location);
+//		$href.= "&type=20";
+		$href.= "&TITLE=" . urlencode($text);
+		$href.= "&ST=" . $dateday;
+		$href.= "&ET=" . $endday;
+//		$href.= "&DUR=";
+//		$href.= $duration ? "&DUR=" . $duration : '';
+		$href.= "&DESC=" . substr($details, 0, $lengthMax) . '...';
+		$href.= "&URL=" . urlencode($website);
+
+		return $href;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/addtocal/index.html b/deployed/icagenda/administrator/components/com_icagenda/utilities/addtocal/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/addtocal/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/ajax/ajax.php b/deployed/icagenda/administrator/components/com_icagenda/utilities/ajax/ajax.php
new file mode 100644
index 00000000..3a97707c
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/ajax/ajax.php
@@ -0,0 +1,356 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-26
+ *
+ * @package     iCagenda.Admin
+ * @subpackage  Utilities
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.5.9
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * class icagendaAjax
+ */
+class icagendaAjax
+{
+	/**
+	 * Function to return options for date select, depending of event
+	 *
+	 * @since   3.5.9
+	 */
+	public static function getOptionsEventDates($view = null, $id = null)
+	{
+		$jinput  = JFactory::getApplication()->input;
+		$regid   = $jinput->get('regid', '0');
+		$eventid = $jinput->get('eventid', '0');
+
+		$data = JFactory::getApplication()->getUserState('com_icagenda.' . $view . '.data', array());
+		$date = isset($data['date']) ? $data['date'] : '';
+
+		$date_format_global = JComponentHelper::getParams('com_icagenda')->get('date_format_global', 'Y - m - d');
+		$separator          = JComponentHelper::getParams('com_icagenda')->get('date_separator', ' ');
+
+		if ($eventid != 0 && $view == 'mail')
+		{
+			$db    = JFactory::getDbo();
+			$query = $db->getQuery(true);
+			$query->select('r.id as reg_id, r.date AS reg_date, r.period AS reg_period, r.eventid AS reg_eventid, sum(r.people) AS reg_count')
+				->from('#__icagenda_registration AS r');
+			$query->select('e.startdate AS startdate, e.enddate AS enddate, e.weekdays AS weekdays')
+				->join('LEFT', $db->quoteName('#__icagenda_events') . ' AS e ON e.id = r.eventid');
+			$query->where('r.state = 1');
+			$query->where('r.email <> ""');
+			$query->group('r.date');
+			$query->where('r.eventid = ' . (int) $eventid);
+			$db->setQuery($query);
+
+			$result = $db->loadObjectList();
+		}
+		elseif ($view == 'registration')
+		{
+			$db = JFactory::getDbo();
+
+			$query = $db->getQuery(true);
+			$query->select('next AS next, dates AS dates,
+							startdate AS startdate, enddate AS enddate, weekdays AS weekdays,
+							id AS id, state AS state, access AS access, params AS params');
+			$query->from('#__icagenda_events AS e');
+			$query->where(' e.id = ' . $eventid);
+
+			$db->setQuery($query);
+
+			$i = $db->loadObject();
+
+			if ($regid != 0)
+			{
+				$reg_query	= $db->getQuery(true);
+				$reg_query->select('r.id as reg_id, r.date AS reg_date, r.period AS reg_period, r.eventid AS reg_eventid')
+					->from('#__icagenda_registration AS r');
+				$reg_query->where('r.id = ' . (int) $regid);
+				$db->setQuery($reg_query);
+
+				$obj = $db->loadObject();
+
+				$reg_date   = $obj->reg_date;
+				$reg_period = $obj->reg_period;
+			}
+			else
+			{
+				$reg_date   = '';
+				$reg_period = '';
+			}
+		}
+
+		$options = '';
+
+		if ($view == 'mail')
+		{
+			$options.= '<option value="">' . JText::_('COM_ICAGENDA_SELECT_DATE') . '</option>';
+			$options.= '<option value="1"';
+			$options.= ($date == '1') ? ' selected="selected"' : '';
+			$options.= '>' . strtoupper(JText::_('COM_ICAGENDA_REGISTRATION_ALL_DATES')) . '</option>';
+		}
+		elseif ($i && $view == 'registration')
+		{
+			$options.= self::getOptionsAllDates($i, 'registration', $reg_date, $reg_period);
+		}
+
+		if (isset($result) && $view == 'mail')
+		{
+			foreach($result as $r)
+			{
+				// Full period (no single date selected, supposes registration for full period)
+				if ( ! $r->reg_date && $r->reg_period == 0)
+				{
+					// Check the period if is separated into individual dates
+					$is_full_period = ($r->weekdays || $r->weekdays == '0') ? false : true;
+
+					if ($is_full_period
+						&& iCDate::isDate($r->startdate)
+						&& iCDate::isDate($r->enddate))
+					{
+						$option_value = '0';
+						$option_date  = self::formatDate($r->startdate) . ' &#x279c; ' . self::formatDate($r->startdate);
+					}
+					else
+					{
+						$option_value = '0';
+						$option_date  = JText::_( 'COM_ICAGENDA_ADMIN_REGISTRATION_FOR_ALL_PERIOD' );
+					}
+				}
+
+				// All dates of the event (single dates + period)
+				elseif ( ! $r->reg_date && $r->reg_period == 1)
+				{
+					$option_value = '1';
+					$option_date  = JText::_( 'COM_ICAGENDA_ADMIN_REGISTRATION_FOR_ALL_DATES' );
+				}
+
+				// One date selected (from single dates or split period into single dates)
+				else
+				{
+					if (iCDate::isDate($r->reg_date))
+					{
+						$regDate = iCGlobalize::dateFormat($r->reg_date, $date_format_global, $separator);
+						$time    = date('H:i', strtotime($r->reg_date));
+						$regTime = ($time && $time != '00:00') ? ' - ' . $time : '';
+					}
+
+					$option_value	= $r->reg_date;
+
+					// Date format (global option).
+					// NOTE: Date saved in database with versions before 3.3.8 can not be formatted
+					//       Will return a string (date in old format) with double quote.
+					$option_date	= iCDate::isDate($r->reg_date) ? $regDate . $regTime : '"' . $r->reg_date . '"';
+				}
+
+				$options.= '<option value="' . $option_value . '"';
+				$options.= ($date == $option_value) ? ' selected="selected"' : '';
+				$options.= '>' . $option_date . ' (&#10003;' . $r->reg_count . ')</option>';
+			}
+		}
+
+		echo $options;
+
+		Jexit();
+	}
+
+	public static function getOptionsAllDates($i, $view = null, $reg_date = null, $reg_period = null)
+	{
+		$options = '';
+
+		if ($i)
+		{
+			// Set Event Params
+			$evtParams  = new JRegistry($i->params);
+			$typeReg    = $evtParams->get('typeReg');
+
+			// Registration type for event is set to "All dates of the event"
+			if ($typeReg == '2')
+			{
+				if ( $reg_period != 1 )
+				{
+					$options.= '<option value="' . $reg_date . '" selected="selected">' . JText::_('COM_ICAGENDA_SELECT_DATE') . '</option>';
+					$options.= '<option value="period"';
+					$options.= '>' . JText::_('COM_ICAGENDA_ADMIN_REGISTRATION_FOR_ALL_DATES') . '</option>';
+				}
+				else
+				{
+					$options.= '<option value=""';
+					$options.= ' selected="selected"';
+					$options.= '>' . JText::_('COM_ICAGENDA_ADMIN_REGISTRATION_FOR_ALL_DATES') . '</option>';
+				}
+			}
+			else
+			{
+				if ( ( ! $reg_date && $reg_period == 1)
+					|| ($reg_date && ! iCDate::isDate($reg_date))
+					|| ( ! $reg_date && $reg_period == 0)
+					|| ( iCDate::isDate($reg_date) && $reg_period == 1) )
+				{
+					$options.= '<option value="' . $reg_date . '"';
+					$options.= ' selected="selected"';
+					$options.= '>' . JText::_('COM_ICAGENDA_SELECT_DATE') . '</option>';
+				}
+
+				// Declare AllDates array
+				$AllDates = array();
+
+				// Get WeekDays setting
+				$WeeksDays = iCDatePeriod::weekdaysToArray($i->weekdays);
+
+				// If Single Dates, added each one to All Dates for this event
+				$singledates = iCString::isSerialized($i->dates) ? unserialize($i->dates) : array();
+
+				foreach($singledates as $sd)
+				{
+					if (iCDate::isDate($sd))
+					{
+						array_push($AllDates, $sd);
+					}
+				}
+
+				// If Period Dates, added each one to All Dates for this event (filter week Days, and if date not null)
+				$perioddates = iCDatePeriod::listDates($i->startdate, $i->enddate);
+
+				if (isset($perioddates)
+					&& is_array($perioddates))
+				{
+					// Check the period if is separated into individual dates
+					$is_full_period = ($i->weekdays || $i->weekdays == '0') ? false : true;
+
+					if ($is_full_period
+						&& iCDate::isDate($i->startdate)
+						&& iCDate::isDate($i->enddate))
+					{
+						$value_datetime = 'from_to';
+
+						$options.= '<option value="' . $value_datetime . '"';
+
+						if ($reg_date == '' && $reg_period != 1)
+						{
+							$date_exist = true;
+							$options.= ' selected="selected"';
+						}
+
+						$options.= '>' . self::formatDate($i->startdate) . ' &#x279c; ' . self::formatDate($i->startdate) . '</option>';
+					}
+					else
+					{
+						foreach ($perioddates as $Dat)
+						{
+							if (in_array(date('w', strtotime($Dat)), $WeeksDays))
+							{
+								// May not work in php < 5.2.3 (should return false if date null since 5.2.4)
+								$isValid = iCDate::isDate($Dat);
+
+								if ($isValid)
+								{
+									$SingleDate = date('Y-m-d H:i', strtotime($Dat));
+									array_push($AllDates, $SingleDate);
+								}
+							}
+						}
+					}
+				}
+
+				// get Time Format
+				$timeformat = JComponentHelper::getParams('com_icagenda')->get('timeformat', '1');
+
+				$lang_time = ($timeformat == 1) ? 'H:i' : 'h:i A';
+
+				if ( ! empty($AllDates))
+				{
+					sort($AllDates);
+				}
+
+				foreach($AllDates as $date)
+				{
+					if (iCDate::isDate($date))
+					{
+						$value_datetime = date('Y-m-d H:i:s', strtotime($date));
+
+						$options.= '<option value="' . $value_datetime . '"';
+
+						if ($reg_date == $value_datetime)
+						{
+							$date_exist = true;
+							$options.= ' selected="selected"';
+						}
+
+						$options.= '>' . self::formatDate($date) . ' - ' . date($lang_time, strtotime($date)) . '</option>';
+					}
+				}
+			}
+
+			return $options;
+		}
+
+		return false;
+	}
+
+
+	// Function to get Format Date (using option format, and translation)
+	public static function formatDate($date)
+	{
+		// Date Format Option (Global Component Option)
+		$date_format_global = JComponentHelper::getParams('com_icagenda')->get('date_format_global', 'Y - m - d');
+		$format             = ($date_format_global != 0) ? $date_format_global : 'Y - m - d'; // Previous 3.5.6 setting
+
+		// Separator Option
+		$separator          = JComponentHelper::getParams('com_icagenda')->get('date_separator', ' ');
+
+		if ( ! is_numeric($format))
+		{
+			// Update old Date Format options of versions before 2.1.7
+			$format = str_replace(array('nosep', 'nosep', 'sepb', 'sepa'), '', $format);
+			$format = str_replace('.', ' .', $format);
+			$format = str_replace(',', ' ,', $format);
+		}
+
+		$dateFormatted = iCGlobalize::dateFormat($date, $format, $separator);
+
+		return $dateFormatted;
+	}
+
+	/**
+	 * Function to return Full name or Username, and Email for registered user selected
+	 *
+	 * @since   3.6.0
+	 */
+	public static function getRegistrationName($userId)
+	{
+		$user = JFactory::getUser($userId);
+		$nameJoomlaUser = JComponentHelper::getParams('com_icagenda')->get('nameJoomlaUser', 1);
+
+		$name  = ($nameJoomlaUser == 1) ? $user->name : $user->username;
+		$email = $user->email;
+
+		echo $name . ',' . $email;
+
+		Jexit();
+	}
+
+	/**
+	 * Function to get total of registered people for one event and one date
+	 *
+	 * @since   3.6.5
+	 */
+	public static function getTicketsBookable($eventID, $regDate, $typeReg, $maxReg, $tickets)
+	{
+		echo icagendaRegistration::getTicketsBookable($eventID, $regDate, $typeReg, $maxReg, $tickets);
+
+		Jexit();
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/ajax/filter.php b/deployed/icagenda/administrator/components/com_icagenda/utilities/ajax/filter.php
new file mode 100644
index 00000000..ac4e45f3
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/ajax/filter.php
@@ -0,0 +1,139 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     iCagenda
+ * @subpackage  utilities
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.6.0 2015-12-15
+ * @since       3.6.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+jimport('joomla.form.formfield');
+
+/**
+ * class icagendaAjaxFilter
+ */
+class icagendaAjaxFilter
+{
+	/**
+	 * Function to save a new custom field group
+	 *
+	 * @since	3.6.0
+	 */
+	static public function saveCustomFieldGroup()
+	{
+		$jinput			= JFactory::getApplication()->input;
+		$group_option	= $jinput->get('group', '', 'raw');
+		$group_value	= JFilterOutput::stringURLSafe($group_option);
+
+		$db	= JFactory::getDbo();
+		$query = $db->getQuery(true);
+		$query->select('f.*');
+		$query->from($db->qn('#__icagenda_filters') . ' AS f');
+		$query->where($db->qn('type') . ' = "customfield"');
+		$query->where($db->qn('filter') . ' = "groups"');
+		$query->where($db->qn('value') . ' = ' . $db->q($group_value));
+		$query->where($db->qn('option') . ' = ' . $db->q($group_option));
+		$db->setQuery($query);
+		$option = $db->loadResult();
+
+		if ( ! $option)
+		{
+			// Create and populate New Group object.
+			$group = new stdClass();
+			$group->state	= 1;
+			$group->type	= 'customfield';
+			$group->filter	= 'groups';
+			$group->value	= $group_value;
+			$group->option	= $group_option;
+
+			// Insert the object into the iCagenda filters table.
+			$result = JFactory::getDbo()->insertObject('#__icagenda_filters', $group);
+
+			echo $group_value;
+		}
+
+		Jexit();
+	}
+
+	/**
+	 * Function to check if a custom field group is set to any custom field
+	 *
+	 * @since	3.6.0
+	 */
+	static public function checkCustomFieldGroup()
+	{
+		$jinput			= JFactory::getApplication()->input;
+		$id				= $jinput->get('id', '');
+		$group_option	= $jinput->get('group', '', 'raw');
+		$group_value	= JFilterOutput::stringURLSafe($group_option);
+		$count = 0;
+
+		$db	= JFactory::getDbo();
+		$query = $db->getQuery(true);
+		$query->select('groups, id');
+		$query->from($db->qn('#__icagenda_customfields'));
+		$query->where($db->qn('groups') . ' <> ""');
+//		$query->where($db->qn('id') . ' <> ' . $db->q($id));
+//		$query->where($db->qn('state') . ' = 1');
+		$db->setQuery($query);
+		$list = $db->loadObjectList();
+
+		foreach ($list AS $l)
+		{
+			$groups = explode(',', $l->groups);
+
+			if (in_array($group_value, $groups)
+				&& $l->id !== $id)
+			{
+				$count++;
+			}
+		}
+
+		if ($count)
+		{
+			echo $count;
+		}
+
+		Jexit();
+	}
+
+	/**
+	 * Function to delete a custom field group
+	 *
+	 * @since	3.6.0
+	 */
+	static public function deleteCustomFieldGroup()
+	{
+		$jinput			= JFactory::getApplication()->input;
+		$group_option	= $jinput->get('group', '', 'raw');
+		$group_value	= JFilterOutput::stringURLSafe($group_option);
+
+		$db = JFactory::getDbo();
+ 		$query = $db->getQuery(true);
+ 		$query->delete($db->qn('#__icagenda_filters'));
+		$query->where($db->qn('type') . ' = "customfield"');
+		$query->where($db->qn('filter') . ' = "groups"');
+		$query->where($db->qn('value') . ' = ' . $db->q($group_value));
+ 		$db->setQuery($query);
+ 		$result = $db->execute();
+
+		if ($result)
+		{
+			echo $group_value;
+		}
+
+		Jexit();
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/ajax/index.html b/deployed/icagenda/administrator/components/com_icagenda/utilities/ajax/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/ajax/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/categories/categories.php b/deployed/icagenda/administrator/components/com_icagenda/utilities/categories/categories.php
new file mode 100644
index 00000000..6ae1c38b
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/categories/categories.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     iCagenda
+ * @subpackage  utilities
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.4.0 2014-05-12
+ * @since       3.4.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+/**
+ * class icagendaCategories
+ */
+class icagendaCategories
+{
+	/**
+	 * Function to return list of categories
+	 *
+	 * @access	public static
+	 * @param	$state (if not defined, state is published ('1'))
+	 * @return	list array of categories
+	 *
+	 * @since   1.0.0
+	 */
+	static public function getList($state = null)
+	{
+		$state = $state ? (int) $state : '1';
+
+		// Preparing connection to db
+		$db		= JFactory::getDbo();
+
+		// Preparing the query
+		$query	= $db->getQuery(true);
+		$query->select('c.color AS color, c.title AS title')
+			->from('#__icagenda_category AS c');
+
+		$query->where('c.state = ' . (int) $state);
+
+		$db->setQuery($query);
+		$list = $db->loadObjectList();
+
+		if ($list)
+		{
+			return $list;
+		}
+
+		return false;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/categories/index.html b/deployed/icagenda/administrator/components/com_icagenda/utilities/categories/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/categories/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/class/class.php b/deployed/icagenda/administrator/components/com_icagenda/utilities/class/class.php
new file mode 100644
index 00000000..b7f64dc2
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/class/class.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     iCagenda
+ * @subpackage  utilities
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.4.0 2014-06-29
+ * @since       3.4.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+/**
+ * class icagendaClass
+ */
+class icagendaClass
+{
+	/**
+	 * Function to set an alert message if a class from Utilities is not loaded
+	 *
+	 * @since	3.4.0
+	 */
+	static public function isLoaded($class = null)
+	{
+		if (!class_exists($class) && $class)
+		{
+			$app = JFactory::getApplication();
+
+			$alert_message = JText::sprintf('ICAGENDA_CLASS_NOT_FOUND', '<strong>' . $class . '</strong>') . '<br />'
+							. JText::_('ICAGENDA_IS_NOT_CORRECTLY_INSTALLED');
+
+			// Get the message queue
+			$messages = $app->getMessageQueue();
+
+			$display_alert_message = false;
+
+			// If we have messages
+			if (is_array($messages) && count($messages))
+			{
+				// Check each message for the one we want
+				foreach ($messages as $key => $value)
+				{
+					if ($value['message'] == $alert_message)
+					{
+						$display_alert_message = true;
+					}
+				}
+			}
+
+			if (!$display_alert_message)
+			{
+				$app->enqueueMessage($alert_message, 'error');
+			}
+
+			return false;
+		}
+		else
+		{
+			return true;
+		}
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/class/index.html b/deployed/icagenda/administrator/components/com_icagenda/utilities/class/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/class/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/customfields/customfields.php b/deployed/icagenda/administrator/components/com_icagenda/utilities/customfields/customfields.php
new file mode 100644
index 00000000..3d17c331
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/customfields/customfields.php
@@ -0,0 +1,864 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.9 2019-05-15
+ *
+ * @package     iCagenda.Admin
+ * @subpackage  Utilities
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.4.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * class icagendaCustomfields
+ */
+class icagendaCustomfields
+{
+	/**
+	 * Function to return array of slugs from object list array of custom fields
+	 *
+	 * @access	public static
+	 * @param	$customFields (self::getCustomFields())
+	 * @return	array
+	 *
+	 * @since   3.6.0
+	 */
+	public static function listSlugs($customFields)
+	{
+		if ($customFields)
+		{
+			$iCparams = JComponentHelper::getParams('com_icagenda');
+
+			$listSlugs = array();
+
+			foreach ($customFields AS $cf)
+			{
+				$listSlugs[]= $cf->slug;
+
+				if ($cf->slug == 'core_email'
+					&& $iCparams->get('emailConfirm', 1))
+				{
+					$listSlugs[]= 'core_email2';
+				}
+			}
+
+			return $listSlugs;
+		}
+
+		return array();
+	}
+
+	/**
+	 * Gets the custom fields for this event (frontend)
+	 *
+	 * @param	$parentForm (1 = registration form; 2 = event form)
+	 * 			$customForm (filtering by selected custom field groups) (since 3.6.0)
+	 *
+	 * @return object list
+	 *
+	 * @since	3.4.0
+	 */
+	public static function getCustomfields($parentForm, $customForm = array())
+	{
+		$app = JFactory::getApplication();
+		$id = $app->input->getInt('id');
+
+		// Get the database connector.
+		$db = JFactory::getDbo();
+
+		$list_slugs			= array();
+
+		if ($id)
+		{
+			// Get the query from the database connector.
+			$query = $db->getQuery(true);
+
+			// Build the query
+			$query->select('id, slug')
+				->from($db->qn('#__icagenda_customfields').' AS cf');
+			$query->where($db->qn('cf.parent_form').' = ' .$db->q($parentForm));
+
+			// Run Query
+			$db->setQuery($query);
+
+			// Invoke the Query
+			$Customfields = $db->loadObjectList();
+
+			// Create array of custom fields slugs for this event
+			foreach ($Customfields as $cf)
+			{
+				$list_slugs[]		= '"' . $cf->slug . '"';
+			}
+
+			$list_slugs			= implode(',', $list_slugs);
+		}
+
+		// Get the query from the database connector.
+		$query = $db->getQuery(true);
+
+		// Build the query
+		$query->select('cf.*')
+			->from($db->qn('#__icagenda_customfields').' AS cf');
+
+		if ($id && $list_slugs)
+		{
+			// Build the query
+			$query->select('cfd.value AS value')
+				->leftJoin($db->qn('#__icagenda_customfields_data') . ' AS cfd'
+					. ' ON (' . $db->qn('cfd.parent_id') . ' = ' . (int)$id
+					. ' AND ' . $db->qn('cfd.slug') . ' = ' .$db->qn('cf.slug') . ')')
+				->where($db->qn('cf.slug').' IN ('.$list_slugs.')');
+		}
+
+		$query->where($db->qn('cf.parent_form') . ' = ' . $db->q($parentForm));
+		$query->where($db->qn('cf.state') . ' = 1');
+
+		$query->order('cf.ordering ASC');
+
+		$db->setQuery($query);
+
+		$list = $db->loadObjectList();
+
+		// Invoke the query.
+		if ($list)
+		{
+			$customForm = ! is_array($customForm) ? explode(',', $customForm) : $customForm;
+
+			foreach ($list AS $l)
+			{
+				$groups = ! is_array($l->groups) ? explode(',', $l->groups) : $l->groups;
+
+				if ( ! array_intersect($customForm, $groups)
+					&& ! in_array('', $groups))
+				{
+					$key = array_search($l, $list);
+
+					if ($key !== false)
+					{
+						unset($list[$key]);
+					}
+				}
+			}
+
+			return $list;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Return the HTML body of Custom fields for this parent form (parent_id)
+	 *
+	 * @param	$parentForm (1 = registration form; 2 = event form)
+	 * 			$customForm (filtering by selected custom form ids) (since 3.6.0)
+	 *
+	 * @return	HTML fields
+	 *
+	 * @since	3.4.0
+	 */
+	public static function loader($parentForm, $customForm = null, $customFields = null)
+	{
+		$app = JFactory::getApplication();
+		$iCparams = JComponentHelper::getParams('com_icagenda');
+
+		if ($parentForm == '1')
+		{
+			$model	= new iCagendaModelRegistration;
+			$form	= $model->getForm();
+		}
+		else
+		{
+			$model	= $app->isSite() ? new iCagendaModelSubmit : new iCagendaModelEvent;
+			$form	= $model->getForm();
+		}
+
+//		$session		= JFactory::getSession();
+//		$custom_fields	= $session->get('custom_fields');
+//		$post			= $session->get('ic_registration', '');
+
+		$customfields	= $customFields
+						? $customFields
+						: icagendaCustomfields::getCustomfields($parentForm, $customForm);
+
+		// New 3.6.0 : Core iCagenda registration fields overrides
+		$iCagendaCoreFields = array('core_name', 'core_email', 'core_phone', 'core_date', 'core_people');
+
+		// Custom fields where options are needed
+		$options_required = array('list', 'radio');
+
+		$cf_display = '';
+
+		if ( $customfields )
+		{
+			foreach ($customfields as $icf)
+			{
+				// Reset the label and input values.
+				$label = null;
+				$input = null;
+
+//				if (empty($icf->value)) $icf->value = '';
+
+				$cf_type = $icf->type;
+
+				// Setup iCagenda core registration fields overrides
+				if ($app->isSite()
+					&& in_array($cf_type, $iCagendaCoreFields))
+				{
+					$core_name	= str_replace('core_', '', $icf->type);
+					$icf->slug	= $core_name;
+
+					switch ($icf->type)
+					{
+						case 'core_name':
+							$icf->type		= 'text';
+							$icf->required	= 'true';
+							break;
+
+						case 'core_email':
+							$icf->type		= 'email';
+							$icf->required	= $iCparams->get('emailRequired', 1) ? 'true' : 'false';
+							$icf->field		= 'id';
+							$icf->filter	= 'string';
+							$icf->validate	= 'email';
+							break;
+
+						case 'core_phone':
+							$icf->type		= 'tel';
+							$icf->required	= $iCparams->get('phoneRequired', 0) ? 'true' : 'false';
+							break;
+
+						case 'core_date':
+							$icf->type		= 'icagenda.registrationdates';
+							break;
+
+						case 'core_people':
+							$icf->type		= 'icagenda.registrationpeople';
+							break;
+
+						default:
+							$icf->type		= 'text';
+							break;
+					}
+
+					if ( $app->isSite() && $parentForm == 1 )
+					{
+						$reg_data	= $app->getUserState('com_icagenda.registration.data', array());
+						$icf->value	= isset($reg_data[$icf->slug]) ? trim($reg_data[$icf->slug]) : '';
+					}
+					elseif ( $app->isSite() && $parentForm == 2 )
+					{
+						$session		= JFactory::getSession();
+						$custom_fields	= $session->get('custom_fields');
+						$icf->value	= isset($custom_fields[$icf->slug]) ? trim($custom_fields[$icf->slug]) : '';
+					}
+				}
+				else
+				{
+					if ( $app->isSite() && $parentForm == 1 )
+					{
+						$reg_data	= $app->getUserState('com_icagenda.registration.data', array());
+						$icf->value	= isset($reg_data['custom_fields'][$icf->slug]) ? trim($reg_data['custom_fields'][$icf->slug]) : '';
+					}
+					elseif ( $app->isSite() && $parentForm == 2 )
+					{
+						$session		= JFactory::getSession();
+						$custom_fields	= $session->get('custom_fields');
+						$icf->value	= isset($custom_fields[$icf->slug]) ? trim($custom_fields[$icf->slug]) : '';
+					}
+
+					// Keep this until Submit frontend refactory
+					$icf->slug	= ($parentForm == 2 && $app->isSite())
+								? 'custom_fields[' . $icf->slug . ']'
+								: 'custom_fields][' . $icf->slug;
+				}
+
+				// If type is list or radio, should have options. Other types, not needed.
+				if ((in_array($icf->type, $options_required) && $icf->options)
+					|| ! in_array($icf->type, $options_required))
+				{
+					switch ($icf->type)
+					{
+						case 'email':
+							$icf->validate    = 'email';
+							break;
+
+						case 'spacer_label':
+							$icf->description = '';
+							$icf->type        = $app->isAdmin() ? 'hidden' : $icf->type;
+							$icf->class       = $icf->options;
+							break;
+
+						case 'spacer_description':
+							$icf->title       = $icf->description;
+							$icf->description = '';
+							$icf->type        = $app->isAdmin() ? 'hidden' : $icf->type;
+							$icf->class       = $icf->options;
+							break;
+
+						default:
+							break;
+					}
+
+					// Generate new form field element
+					$type_field = icagendaCustomfields::setupCustomField($icf);
+
+					if ($type_field)
+					{
+						$form->setField($type_field);
+
+						if ( ! in_array($icf->type, $iCagendaCoreFields) && isset($icf->value))
+						{
+							$form->setValue($icf->slug, null, trim($icf->value));
+						}
+
+						if ($app->isAdmin() && ! in_array($cf_type, $iCagendaCoreFields))
+						{
+							$label = $form->getLabel($icf->slug);
+							$input = $form->getInput($icf->slug);
+
+							// Switch Joomla 2.5 / 3
+							if (version_compare(JVERSION, '3.0', 'lt'))
+							{
+								$cf_display.= '<div>&nbsp;' . $label . $input . '</div>';
+							}
+							else
+							{
+								$cf_display.= JLayoutHelper::render('joomla.form.renderfield',
+										array('input' => $input, 'label' => $label, 'options' => ''));
+							}
+						}
+					}
+
+					// If Override for core email, we set the email2 confirm
+					if ($cf_type == 'core_email'
+						&& $iCparams->get('emailConfirm', 1))
+					{
+						$form->setField($type_field);
+						$email2 = new ArrayObject();
+
+						$email2->slug		= 'email2';
+						$email2->type		= 'email';
+						$email2->title		= JText::_('IC_FORM_EMAIL_CONFIRM_LBL');
+						$email2->required	= $iCparams->get('emailRequired', 1) ? 'true' : 'false';
+						$email2->field		= 'email';
+						$email2->filter		= 'string';
+						$email2->message	= JText::_('COM_ICAGENDA_FORM_VALIDATE_FIELD_EMAIL2_MESSAGE');
+						$email2->validate	= 'equals';
+						$email2->options	= JText::_('IC_FORM_EMAIL_CONFIRM_HINT');
+
+						// Generate new form field element
+						$type_field = icagendaCustomfields::setupCustomField($email2);
+
+						if ($type_field)
+						{
+							$form->setField($type_field);
+
+							if ( ! in_array($icf->type, $iCagendaCoreFields))
+							{
+								$form->setValue($icf->slug, null, trim($icf->value));
+							}
+
+							if ($app->isAdmin() && ! in_array($cf_type, $iCagendaCoreFields))
+							{
+								$label = $form->getLabel($icf->slug);
+								$input = $form->getInput($icf->slug);
+
+								// Switch Joomla 2.5 / 3
+								if (version_compare(JVERSION, '3.0', 'lt'))
+								{
+									$cf_display.= '<div>&nbsp;' . $label . $input . '</div>';
+								}
+								else
+								{
+									$cf_display.= JLayoutHelper::render('joomla.form.renderfield',
+											array('input' => $input, 'label' => $label, 'options' => ''));
+								}
+							}
+						}
+					}
+				}
+			}
+
+			if ($app->isAdmin()) $cf_display.= '<hr>';
+		}
+		elseif ($app->isAdmin())
+		{
+			$cf_display.= '<div class="alert alert-info">';
+			$cf_display.= JText::_('COM_ICAGENDA_CUSTOMFIELDS_NONE');
+			$cf_display.= '</div>';
+		}
+		elseif ($app->isSite())
+		{
+			return false;
+		}
+
+		return $app->isAdmin() ? $cf_display : true;
+	}
+
+	/**
+	 * Create a new SimpleXMLElement field element
+	 *
+	 * @return SimpleXMLElement
+	 *
+	 * @since		3.6.0
+	 */
+	public static function setupCustomField($icf)
+	{
+		if ( ! isset($icf->slug)) return false;
+
+		// Check if Gantry based template (Gantry is not compatible with all Joomla Form Fields)
+		$template = JFactory::getApplication()->getTemplate();
+		$isGantry = is_dir(JPATH_ROOT . '/templates/' . $template . '/gantry/') || $template == 'gantry';
+
+		// Set field classes
+		switch ($icf->type)
+		{
+			case 'radio':
+				$class		= $isGantry ? '' : 'btn-group';
+				$labelclass	= 'control-label';
+				break;
+
+			case 'list':
+				$class		= 'select-large';
+				$labelclass	= '';
+				break;
+
+			default:
+//				$class		= 'input-large';
+				$class		= '';
+				$labelclass	= '';
+//				$size		= '60';
+				$size		= '30';
+				break;
+		}
+
+		// Start the field
+		$type_field = new SimpleXMLElement('<field />');
+
+		// Set the field attributes
+		$attributes = array(
+			'name'			=> $icf->slug,
+			'type'			=> $icf->type,
+			'label'			=> $icf->title,
+			'description'	=> isset($icf->description) ? $icf->description : '',
+			'required'		=> isset($icf->required) ? $icf->required : '',
+			'field'			=> isset($icf->field) ? $icf->field : '',
+			'filter'		=> isset($icf->filter) ? $icf->filter : '',
+			'validate'		=> isset($icf->validate) ? $icf->validate : '',
+			'message'		=> isset($icf->message) ? $icf->message : '',
+			'class'			=> isset($icf->class) ? $icf->class : $class,
+			'labelclass'	=> $labelclass,
+			'size'			=> isset($size) ? $size : '',
+		);
+
+		foreach ($attributes AS $attr => $value)
+		{
+			if ($value)
+			{
+				$type_field->addAttribute($attr, $value);
+			}
+		}
+
+		// Set the field options (if exist)
+		if (isset($icf->options))
+		{
+			if (in_array($icf->type, array('list', 'radio')))
+			{
+				$opts_list = str_replace("\n", "##BREAK##", $icf->options); // Why i did this ?... :|
+				$opts_list = explode("##BREAK##", $opts_list);
+
+				$options	= array();
+				$emptyValue	= 0;
+				$default	= '';
+
+				foreach ($opts_list as $opts)
+				{
+					$opt		= explode("=", $opts);
+					$emptyValue	= (trim($opt[0]) == '') ? $emptyValue+1 : $emptyValue;
+					$default	= (isset($opt[2]) && ($default == '')) ? $opt[0] : $default;
+
+					$options[trim($opt[0])] = isset($opt[1]) ? trim($opt[1]) : trim($opt[0]);
+				}
+
+				// If default is set in options, set this one as selected.
+				if ($default != '')
+				{
+					$type_field->addAttribute('default', $default);
+				}
+
+				// If no option set by default, and no option with an empty value, we add a default "Select an option".
+				if ($icf->type == 'list'
+					&& $emptyValue == 0
+					&& $default == '')
+				{
+					$child = $type_field->addChild('option', '- ' . JText::_('IC_SELECT_AN_OPTION') . ' -');
+					$child->addAttribute('value', '');
+				}
+
+				foreach ($options as $value => $label)
+				{
+					$child = $type_field->addChild('option', $label);
+					$child->addAttribute('value', trim($value));
+
+					if ($icf->type == 'list'
+						&& isset($icf->value) && ! empty($icf->value) && trim($icf->value) == trim($value))
+					{
+						$child->addAttribute('selected', 'selected');
+					}
+					elseif ($icf->type == 'radio'
+						&& isset($icf->value) && ! empty($icf->value) && trim($icf->value) == trim($value))
+					{
+						$child->addAttribute('checked', 'checked');
+						$child->addAttribute('class', 'btn active');
+					}
+				}
+			}
+			else
+			{
+				// Set Placeholder
+				$type_field->addAttribute('hint', $icf->options);
+			}
+		}
+
+		return $type_field;
+	}
+
+	/**
+	 * Create the HTML body of the custom fields
+	 *
+	 * @return object list
+	 *
+	 * @since		3.4.0
+	 * @DEPRECATED	3.6.0
+	 */
+	public static function displayField($type = null, $title = null, $alias = null,
+		$slug = null, $description = null, $value = null, $options = null, $required = null)
+	{
+		$deprecated = 'Method <em>displayField</em> is deprecated. Use <em>setupCustomField</em> instead.';
+
+		return $deprecated;
+	}
+
+
+	/**
+	 * Control if required Custom Fields is empty.
+	 *
+	 * @since	3.6.5
+	 */
+	public static function requiredIsEmpty($custom_fields, $parentForm, $state = 1, $language = '*')
+	{
+		if (isset($custom_fields) && is_array($custom_fields))
+		{
+			$requiredEmpty = array();
+
+			foreach ($custom_fields as $name => $value)
+			{
+				$db     = JFactory::getDbo();
+				$query  = $db->getQuery(true)
+					->select('title')
+					->from($db->qn('#__icagenda_customfields'))
+					->where($db->qn('slug') . ' = ' . $db->q($name))
+					->where($db->qn('required') . ' = 1')
+					->where($db->qn('parent_form') . ' = ' . $db->q($parentForm));
+				$db->setQuery($query);
+				$result = $db->loadResult();
+
+				if ($result && trim($value) == '')
+				{
+					$requiredEmpty[] = $result;
+				}
+			}
+
+			if (count($requiredEmpty) > 0)
+			{
+				return $requiredEmpty;
+			}
+
+			return false;
+		}
+	}
+
+	/**
+	 * Save Custom Fields to the database if at least one is filled
+	 * or update existing data from custom fields.
+	 *
+	 * @since	3.4.0
+	 */
+	public static function saveToData($custom_fields, $parent_id, $parentForm, $state = 1, $language = '*')
+	{
+		// Get the database connector.
+		$db = JFactory::getDbo();
+
+		if (isset($custom_fields) && is_array($custom_fields))
+		{
+			foreach ( $custom_fields as $name => $value )
+			{
+				$customfields_data = new stdClass();
+				$customfields_data->slug = $name;
+				$customfields_data->value = $value;
+				$customfields_data->state = $state;
+				$customfields_data->parent_form = $parentForm;
+				$customfields_data->parent_id = $parent_id;
+				$customfields_data->language = $language;
+
+				$query = $db->getQuery(true)
+					->select('id')
+					->from($db->qn('#__icagenda_customfields_data'))
+					->where($db->qn('slug') . ' = ' . $db->q($customfields_data->slug))
+					->where($db->qn('parent_form') . ' = ' . $db->q($customfields_data->parent_form))
+					->where($db->qn('parent_id') . ' = ' . $db->q($customfields_data->parent_id));
+				$db->setQuery($query);
+				$id_exists = $db->loadResult();
+
+				if ( ! $id_exists && (trim($customfields_data->value) != ''))
+				{
+					$db->insertObject( '#__icagenda_customfields_data', $customfields_data, 'id' );
+				}
+				elseif (trim($customfields_data->value) == '')
+				{
+					$query = $db->getQuery(true);
+
+					// Delete any empty slug records from the __icagenda_customfields_data table if exists
+					$conditions = array(
+    					$db->quoteName('parent_id') . ' = ' . $db->quote($customfields_data->parent_id),
+    					$db->quoteName('slug') . ' = ' . $db->quote($customfields_data->slug)
+					);
+
+					$query->delete($db->quoteName('#__icagenda_customfields_data'));
+					$query->where($conditions);
+
+					$db->setQuery($query);
+					$db->execute($query);
+
+					if ( ! $db->execute())
+					{
+						return false;
+					}
+				}
+				else
+				{
+					$customfields_data->id = $id_exists;
+					$db->updateObject('#__icagenda_customfields_data', $customfields_data, 'id');
+				}
+			}
+		}
+	}
+
+	/**
+	 * Delete Custom Fields from the database
+	 * or update existing data from custom fields.
+	 *
+	 * @since	3.5.6
+	 */
+	public static function deleteData($parent_id, $parentForm)
+	{
+		// Get the database connector.
+		$db = JFactory::getDbo();
+
+		// Delete any unwanted customfields records from the __icagenda_customfields_data table
+		$query = $db->getQuery(true);
+		$query->delete($db->qn('#__icagenda_customfields_data'));
+		$query->where('parent_id = ' . (int) $parent_id);
+		$query->where('parent_form = ' . (int) $parentForm);
+
+		$db->setQuery($query);
+		$db->execute($query);
+
+		if ( ! $db->execute())
+		{
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Clean Custom Fields from the database (fix for previous versions)
+	 *
+	 * @since	3.5.6
+	 */
+	public static function cleanData($parentForm)
+	{
+		// Get the database connector.
+		$db = JFactory::getDbo();
+
+		// Get Registrations ids
+		if ($parentForm == 1)
+		{
+			$query = $db->getQuery(true)
+				->select('id')
+				->from($db->qn('#__icagenda_registration'));
+			$db->setQuery($query);
+			$list = $db->loadColumn();
+		}
+
+		// Get Events ids
+		elseif ($parentForm == 2)
+		{
+			// Get Registrations ids
+			$query = $db->getQuery(true)
+				->select('id')
+				->from($db->qn('#__icagenda_events'));
+			$db->setQuery($query);
+			$list = $db->loadColumn();
+		}
+
+		$parent_ids = isset($list) && is_array($list) ? implode(',', $list) : '';
+
+		// Delete any unwanted customfields records from the __icagenda_customfields_data table
+		$query = $db->getQuery(true);
+		$query->delete($db->qn('#__icagenda_customfields_data'));
+		$query->where('parent_form = ' . (int) $parentForm);
+		$query->where('parent_id NOT IN (' . $parent_ids . ')');
+
+		$db->setQuery($query);
+		$db->execute($query);
+
+		if ( ! $db->execute())
+		{
+			return false;
+		}
+
+		return true;
+	}
+
+
+	/**
+	 * Function to return list of custom fields depending on the item ID
+	 * USED IN : Registrations Export
+	 *
+	 * @access	public static
+	 * @param	$id item ID
+	 * 			$parentForm (1 registration, 2 event edit)
+	 * 			$state (if not defined, state is published ('1'))
+	 * @return	object list array of custom fields depending on the item ID
+	 *
+	 * @since   3.4.0
+	 */
+	public static function getList($id, $parentForm = null, $state = null)
+	{
+		$filter_state = isset($state) ? $state : 1;
+
+		// Create a new query object.
+		$db		= JFactory::getDbo();
+		$query	= $db->getQuery(true);
+		$query->select('cf.slug AS cf_slug, cfd.value AS cf_value, cfd.parent_id AS cf_parent_id, cf.title AS cf_title, cf.required AS cf_required')
+			->from('#__icagenda_customfields AS cf')
+			->leftJoin($db->qn('#__icagenda_customfields_data') . ' AS cfd'
+				. ' ON ' . $db->qn('cfd.parent_id') .' = ' . (int)$id
+				. ' AND ' . $db->qn('cf.slug') .' = ' . $db->qn('cfd.slug'))
+			->where($db->qn('cf.state') . ' = ' . $db->q($filter_state))
+			->where($db->qn('cf.parent_form') . ' = ' . $db->q($parentForm))
+			->order('cf.ordering ASC');
+		$db->setQuery($query);
+		$list = $db->loadObjectList();
+
+		if ($list) return $list;
+
+		return false;
+	}
+
+	/**
+	 * Function to return a list of filled custom fields depending on the item ID
+	 *
+	 * @access	public static
+	 * @param	$id item ID
+	 * 			$parentForm (1 registration, 2 event edit)
+	 * 			$state (if not defined, state is published ('1'))
+	 * @return	object list array of custom fields not empty depending on the item ID
+	 *
+	 * @since   3.4.0
+	 */
+	public static function getListNotEmpty($id, $parentForm = null, $state = null)
+	{
+		$filter_state = isset($state) ? $state : 1;
+
+		// Create a new query object.
+		$db		= JFactory::getDbo();
+		$query	= $db->getQuery(true);
+		$query->select('cfd.slug AS cf_slug, cfd.value AS cf_value, cfd.parent_id AS cf_parent_id, cf.title AS cf_title')
+			->from('#__icagenda_customfields_data AS cfd')
+			->leftJoin($db->qn('#__icagenda_customfields') . ' AS cf'
+				. ' ON ' . $db->qn('cf.slug') .' = ' . $db->qn('cfd.slug'))
+			->where($db->qn('cf.state') . ' = ' . $db->q($filter_state));
+
+		if ($parentForm)
+		{
+			$query->where($db->qn('cfd.parent_form') . ' = ' . $db->q($parentForm));
+		}
+
+		$query->where($db->qn('cfd.parent_id') . ' = ' . (int)$id);
+		$query->order('cf.ordering ASC');
+		$db->setQuery($query);
+		$list = $db->loadObjectList();
+
+		if ($list) return $list;
+
+		return false;
+	}
+
+
+	/**
+	 * Function to return list of custom fields depending on the parent form
+	 *
+	 * @access	public static
+	 * @param	$parentForm (1 registration, 2 event edit)
+	 * 			$customForm (filtering by selected custom field groups) (since 3.6.0)
+	 * 			$state (if not defined, state is published ('1'))
+	 * @return	object list array of custom fields
+	 *
+	 * @since   3.4.0
+	 * @deprecated 3.6.0
+	 */
+	public static function getListCustomFields($parentForm, $customForm = array(), $state = null)
+	{
+		$filter_state = isset($state) ? $state : 1;
+
+		// Create a new query object.
+		$db		= JFactory::getDbo();
+		$query	= $db->getQuery(true);
+		$query->select('cf.*')
+			->from('#__icagenda_customfields AS cf')
+			->where($db->qn('state') . ' = ' . $db->q($filter_state))
+			->where($db->qn('parent_form') . ' = ' . $db->q($parentForm))
+			->order('ordering ASC');
+		$db->setQuery($query);
+		$list = $db->loadObjectList();
+
+		// Invoke the query.
+		if ($list)
+		{
+			$customForm = ! is_array($customForm) ? explode(',', $customForm) : $customForm;
+
+			foreach ($list AS $l)
+			{
+				$groups = ! is_array($l->groups) ? explode(',', $l->groups) : $l->groups;
+
+				if ( ! array_intersect($customForm, $groups)
+					&& ! in_array('', $groups))
+				{
+					$key = array_search($l, $list);
+
+					if ($key !== false)
+					{
+						unset($list[$key]);
+					}
+				}
+			}
+
+			return $list;
+		}
+
+		return array();
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/customfields/index.html b/deployed/icagenda/administrator/components/com_icagenda/utilities/customfields/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/customfields/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/event/data.php b/deployed/icagenda/administrator/components/com_icagenda/utilities/event/data.php
new file mode 100644
index 00000000..8fe510f5
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/event/data.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.12 2020-02-19
+ *
+ * @package     iCagenda.Admin
+ * @subpackage  Utilities
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2020 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.6.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * class icagendaEvent
+ */
+class icagendaEventData
+{
+	/**
+	 * Loads the Event's custom fields for this item
+	 *
+	 * @return object list.
+	 * @since   3.6.0
+	 */
+	static public function loadEventCustomFields($id = null)
+	{
+		// Get the database connector.
+		$db = JFactory::getDbo();
+
+		// Get the query from the database connector.
+		$query = $db->getQuery(true);
+
+		// Build the query programatically (using chaining if desired).
+		$query->select('cfd.*, cf.*')
+			// Use the qn alias for the quoteName method to quote table names.
+			->from($db->qn('#__icagenda_customfields_data') . ' AS cfd');
+
+		$query->leftJoin('#__icagenda_customfields AS cf ON cf.slug = cfd.slug');
+
+		$query->where($db->qn('cfd.parent_id') . ' = ' . (int) $id);
+		$query->where($db->qn('cfd.parent_form') . ' = 2');
+		$query->where($db->qn('cf.parent_form') . ' = 2');
+		$query->where($db->qn('cfd.state') . ' = 1');
+		$query->where($db->qn('cf.state') . ' = 1');
+		$query->where($db->qn('cfd.value') . ' NOT IN ("", "{}")');
+		$query->order('cf.ordering ASC');
+
+		// Tell the database connector what query to run.
+		$db->setQuery($query);
+
+		// Invoke the query or data retrieval helper.
+		return $db->loadObjectList();
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/event/event.php b/deployed/icagenda/administrator/components/com_icagenda/utilities/event/event.php
new file mode 100644
index 00000000..ed9cea57
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/event/event.php
@@ -0,0 +1,1291 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.15 2020-05-18
+ *
+ * @package     iCagenda.Admin
+ * @subpackage  Utilities
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2020 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.6.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * class icagendaEvent
+ */
+class icagendaEvent
+{
+	/**
+	 * Get Next Date (or Last Date) from event dates
+	 *
+	 * @since   3.7.15
+	 */
+	public static function getNextDate($item, $reset = false)
+	{
+		if (is_array($item))
+		{
+			$item = ArrayHelper::toObject($item);
+		}
+
+		$eventTimeZone = null;
+
+		// If no stored datetime for next, or next date is past, we need to update next date
+		if ( ! isset($item->next)
+			|| ($item->next <= JHtml::date('now', 'Y-m-d H:i:s')
+				|| ! iCDate::isDate($item->next))
+			)
+		{
+			$reset = true;
+		}
+
+		if ($reset)
+		{
+			$next_singleDates = $last_singleDates = '';
+			$next_period = $last_period = '';
+
+			// Single Dates Check
+			$singleDates = iCString::isSerialized($item->dates) ? unserialize($item->dates) : array();
+
+			$upcomingSingleDates = array_filter(
+				$singleDates,
+				function($date)
+				{
+					return $date >= JHtml::date('now', 'Y-m-d H:i:s');
+				}
+			);
+
+			if (count($upcomingSingleDates) > 0)
+			{
+				$next_singleDates = min($upcomingSingleDates);
+				$next_singleDates = iCDate::isDate($next_singleDates) ? $next_singleDates : '';
+			}
+			else
+			{
+				$pastSingleDates = array_filter(
+					$singleDates,
+					function ($date)
+					{
+						return $date < JHtml::date('now', 'Y-m-d H:i:s');
+					}
+				);
+
+				if (count($pastSingleDates) > 0)
+				{
+					$last_singleDates = max($pastSingleDates);
+					$last_singleDates = iCDate::isDate($last_singleDates) ? $last_singleDates : '';
+				}
+			}
+
+
+			// Period Check
+			$weekdays = ! is_array($item->weekdays) ? explode(",", $item->weekdays) : $item->weekdays;
+
+			if (count($weekdays) > 0)
+			{
+				$period_all_dates_array = iCDatePeriod::listDates($item->startdate, $item->enddate);
+
+				$period_array = array();
+
+				foreach ($period_all_dates_array AS $date_in_weekdays)
+				{
+					$datetime_period_date = JHtml::date($date_in_weekdays, 'Y-m-d H:i', $eventTimeZone);
+
+					if (in_array(date('w', strtotime($datetime_period_date)), $weekdays))
+					{
+						$period_array[] = $datetime_period_date;
+					}
+				}
+
+				$upcomingPeriodDates = array_filter(
+					$period_array,
+					function($date)
+					{
+						return $date >= JHtml::date('now', 'Y-m-d H:i:s');
+					}
+				);
+
+				if (count($upcomingPeriodDates) > 0)
+				{
+					$next_period = min($upcomingPeriodDates);
+					$next_period = iCDate::isDate($next_period) ? $next_period : '';
+				}
+				else
+				{
+					$last_period = iCDate::isDate($item->startdate) ? $item->startdate : '';
+				}
+			}
+			else
+			{
+				if ($item->startdate >= JHtml::date('now', 'Y-m-d H:i:s'))
+				{
+					$next_period = iCDate::isDate($item->startdate) ? $item->startdate : '';
+				}
+				elseif ($item->enddate >= JHtml::date('now', 'Y-m-d H:i:s'))
+				{
+					$next_period = iCDate::isDate($item->startdate) ? $item->startdate : '';
+				}
+				else
+				{
+					$last_period = iCDate::isDate($item->startdate) ? $item->startdate : '';
+				}
+			}
+
+
+			// Return Next
+			if ($next_singleDates && $next_period)
+			{
+				$next = min($next_singleDates, $next_period);
+			}
+			elseif ($next_singleDates)
+			{
+				$next = $next_singleDates;
+			}
+			elseif ($next_period)
+			{
+				$next = $next_period;
+			}
+			else
+			{
+				$next = max($last_singleDates, $last_period);
+			}
+
+			if ($item->next != $next)
+			{
+				$item->next = $next;
+
+				$db	   = Jfactory::getDbo();
+				$query = $db->getQuery(true);
+
+				$query->update('#__icagenda_events')
+					->set($db->qn('next') . ' = ' . $db->q($next))
+					->where($db->qn('id') . ' = ' . (int) $item->id);
+
+				$db->setQuery($query);
+				$db->query($query);
+			}
+		}
+
+		return $item->next;
+	}
+
+	/**
+	 * Function to get Event Params
+	 *
+	 * @return  JRegistry Event Params
+	 *
+	 * @since   3.6.0
+	 */
+	public static function evtParams($params)
+	{
+		$evtParams = new JRegistry($params);
+
+		return $evtParams;
+	}
+
+	/**
+	 * Function to return the back arrow button (No item needed)
+	 *
+	 * @return  HTML
+	 *
+	 * @since   3.6.0
+	 */
+	public static function backArrow($item = null)
+	{
+		$app    = JFactory::getApplication();
+		$jinput = $app->input;
+		$jview  = $jinput->get('view');
+
+		// Get Current Itemid
+		$this_itemid = $jinput->getInt('Itemid', 0);
+
+		// TODO: Remove jlayout control (3.6)
+		$jlayout       = $jinput->get('layout', '');
+		$layouts_array = array('event', 'registration');
+		$layout        = in_array($jlayout, $layouts_array) ? $jlayout : '';
+
+		$manageraction = $jinput->get('manageraction', '');
+		$referer       = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '';
+
+		// RTL css if site language is RTL
+		$lang      = JFactory::getLanguage();
+		$back_icon = ($lang->isRTL()) ? 'iCicon iCicon-nextic' : 'iCicon iCicon-backic';
+
+		if ( ($layout != '' || $jview == 'event')
+			&& strpos($referer,'registration') === false
+			&& ! $manageraction)
+		{
+			if ($referer != "")
+			{
+				$BackArrow = '<div class="ic-back"><a class="iCtip" href="' . str_replace(array('"', '<', '>', "'"), '', $referer) .'" title="' . JText::_('COM_ICAGENDA_BACK') . '"><span class="' . $back_icon . '"></span> <span style="font-size: 20px !important;">Back to the topics</span></a></div>';
+			}
+			else
+			{
+				$BackArrow = '';
+			}
+		}
+		elseif ($manageraction || strpos($referer,'registration') !== false)
+		{
+			$BackArrow = '<div class="ic-back"><a class="iCtip" href="' . JRoute::_('index.php?option=com_icagenda&Itemid=' . (int) $this_itemid) .'" title="' . JText::_('COM_ICAGENDA_BACK') . '"><span class="' . $back_icon . '"></span> <span class="small">' . JText::_('COM_ICAGENDA_BACK') . '</span></a></div>';
+		}
+		else
+		{
+			$BackArrow = '';
+		}
+
+		// Header Message if event cancelled
+		$evtParams = self::getParams($item->id);
+		$cancellation_info = '';
+
+		if ($evtParams->get('event_cancelled'))
+		{
+			$text        = JText::_('COM_ICAGENDA_EVENT_CANCELLED_TEXT');
+			$description = $evtParams->get('event_cancelled_desc');
+
+			if ($evtParams->get('event_cancelled_customlabel'))
+			{
+				$text  = JText::_($evtParams->get('event_cancelled_customlabel_text', 'COM_ICAGENDA_EVENT_CANCELLED_TEXT'));
+//				$class = $evtParams->get('event_cancelled_customlabel_css', $class);
+			}
+
+			$cancellation_info = '<br /><div class="ic-event-cancelled-alert alert alert-danger">'
+								. '<h2 class="alert-heading">' . $text . '</h2>'
+								. '<div class="alert-message">' . $description . '</div>'
+								. '</div>';
+		}
+
+		return $BackArrow . $cancellation_info;
+	}
+
+	/**
+	 * Set event Url
+	 *
+	 * @since   3.6.0
+	 */
+	public static function url($id, $alias = null)
+	{
+		$app    = JFactory::getApplication();
+		$isSef  = $app->getCfg('sef');
+		$jinput = $app->input;
+
+		$menuID = $jinput->get('Itemid', 0);
+		$date   = $jinput->get('date', '');
+		$view   = $jinput->get('view', '');
+
+		// Get var 'event_date' set to session in event details view
+		$session    = JFactory::getSession();
+		$event_date = $session->get('event_date', '');
+
+		$event_slug = empty($alias) ? (int) $id : (int) $id . ':' . $alias;
+		$this_date  = $event_date ? date('Y-m-d-H-i', strtotime($event_date)) : $date;
+
+		$url = JRoute::_('index.php?option=com_icagenda&view=event&id=' . $event_slug . '&Itemid=' . (int) $menuID);
+
+		if (is_numeric($menuID) && is_numeric($id)
+			&& ! is_array($menuID) && ! is_array($id))
+		{
+			$date_var = ($isSef == '1') ? '?date=' : '&amp;date=';
+			$url      = ($view != 'list' && $this_date) ? $url . $date_var . $this_date : $url;
+		}
+		else
+		{
+			$url = JRoute::_('index.php');
+		}
+
+		return $url;
+	}
+
+	/**
+	 * Title + Manager Icons
+	 *
+	 * @since   3.6.0
+	 * @todo    Review and split into sub-functions
+	 */
+	public static function titleBar($i)
+	{
+		$jinput = JFactory::getApplication()->input;
+
+		$this_itemid       = $jinput->getInt('Itemid');
+		$list_title_length = (int) JComponentHelper::getParams('com_icagenda')->get('list_title_length', '');
+
+		$i_title = icagendaRender::titleToFormat($i->title);
+
+		$jlayout       = $jinput->get('layout', '');
+		$layouts_array = array('event', 'registration');
+		$layout        = in_array($jlayout, $layouts_array) ? $jlayout : '';
+
+		$mbString = extension_loaded('mbstring');
+
+		$title_length = $mbString ? mb_strlen($i_title, 'UTF-8') : strlen($i_title);
+
+		if (empty($layout)
+			&& ! empty($list_title_length))
+		{
+			$title  = $mbString
+					? trim(mb_substr($i_title, 0, $list_title_length, 'UTF-8'))
+					: trim(substr($i_title, 0, $list_title_length));
+
+			$new_title_length = $mbString ? mb_strlen($title, 'UTF-8') : strlen($title);
+
+			if ($new_title_length < $title_length)
+			{
+				$title.= '...';
+			}
+		}
+		else
+		{
+			$title = $i_title;
+		}
+
+		$approval = $i->approval;
+
+		$event_slug = empty($i->alias) ? $i->id : $i->id . ':' . $i->alias;
+
+		// Set Manager Actions Url
+		$managerActionsURL = 'index.php?option=com_icagenda&view=event&id=' . $event_slug . '&Itemid=' . $this_itemid;
+
+		$unapproved = '<a class="iCtip" href="' . JRoute::_($managerActionsURL) . '" title="' . JText::_('COM_ICAGENDA_APPROVE_AN_EVENT_LBL') . '"><small><span class="iCicon-open-details"></span></small></a>';
+
+		$titleBar = '';
+
+		if ($title != NULL && $approval == 1)
+		{
+			$titleBar.= $title . ' ' . $unapproved;
+		}
+		elseif ($title != NULL && $approval != 1)
+		{
+			$titleBar.= $title;
+		}
+
+		$eventIsCancelled = self::cancelledButton($i->id, 'btn btn-danger');
+
+		if ($eventIsCancelled)
+		{
+			$titleBar.= ' ' . $eventIsCancelled;
+		}
+
+		return $titleBar;
+	}
+
+	/**
+	 * Return Event Cancelled button with infotip
+	 *
+	 * @since   3.7.12
+	 */
+	public static function cancelledButton($id, $class = 'label label-important')
+	{
+		$evtParams = self::getParams($id);
+
+		if ($evtParams->get('event_cancelled'))
+		{
+			$language = JFactory::getLanguage();
+			$language->load('com_icagenda', JPATH_SITE, 'en-GB', false, true);
+			$language->load('com_icagenda', JPATH_SITE, null, true);
+
+			$text        = JText::_('COM_ICAGENDA_EVENT_CANCELLED_TEXT');
+			$description = $evtParams->get('event_cancelled_desc');
+
+			if ($evtParams->get('event_cancelled_customlabel'))
+			{
+				$text  = JText::_($evtParams->get('event_cancelled_customlabel_text', 'COM_ICAGENDA_EVENT_CANCELLED_TEXT'));
+				$class = $evtParams->get('event_cancelled_customlabel_css', $class);
+			}
+
+			$title = $tipclass = $position = '';
+
+			if (!empty($description))
+			{
+				if ($text && $text !== $description)
+				{
+					JHtml::_('bootstrap.popover');
+					$tipclass = ' hasPopover';
+					$title    = ' title="' . htmlspecialchars(trim($text, ':')) . '"'
+						. ' data-content="'. htmlspecialchars($description) . '"';
+
+					if (!$position && JFactory::getLanguage()->isRtl())
+					{
+						$position = ' data-placement="left" ';
+					}
+				}
+				else
+				{
+					JHtml::_('bootstrap.tooltip');
+					$tipclass = ' hasTooltip';
+					$title    = ' title="' . JHtml::_('tooltipText', trim($text, ':'), JText::_($description), 0) . '"';
+					$position = 'top';
+				}
+			}
+
+			$cancelledButton = '<span class="ic-event-cancelled ' . $class . $tipclass . '"' . $title . $position . '>' . $text . '</span>';
+
+			return $cancelledButton;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Next Date Text
+	 *
+	 * @since   3.6.0
+	 */
+	public static function dateText($i)
+	{
+		$eventTimeZone = null;
+
+		$dates         = iCString::isSerialized($i->dates) ? unserialize($i->dates) : array(); // returns array
+		$period        = iCString::isSerialized($i->period) ? unserialize($i->period) : array(); // returns array
+		$weekdays      = $i->weekdays;
+		$startdatetime = iCDate::isDate($i->startdate) ? date('Y-m-d H:i', strtotime($i->startdate)) : '';
+
+		$site_date     = JHtml::date('now', 'Y-m-d');
+		$site_datetime = JHtml::date('now', 'Y-m-d H:i');
+
+		$alldates_array = array_merge($dates, $period);
+ 		$alldates       = array_filter($alldates_array, function($var) {return $var == iCDate::isDate($var);});
+
+		$next_date     = date('Y-m-d', strtotime($i->next));
+		$next_datetime = date('Y-m-d H:i', strtotime($i->next));
+
+		$next_is_in_period = in_array($next_datetime, $period) ? true : false;
+
+		$totDates = count($alldates);
+
+		if ($totDates > 1
+			&& $next_date > $site_date)
+		{
+			rsort($alldates);
+
+			$last_date = JHtml::date($alldates[0], 'Y-m-d', $eventTimeZone);
+
+			if ( ! $next_is_in_period
+				&& $last_date == $next_date)
+			{
+				$dateText = JText::_('COM_ICAGENDA_EVENT_DATE_LAST');
+			}
+			elseif ( ! $next_is_in_period)
+			{
+				$dateText = JText::_('COM_ICAGENDA_EVENT_DATE_FUTUR');
+			}
+			elseif ($next_is_in_period
+				&& $weekdays == NULL)
+			{
+				$dateText = JText::_('COM_ICAGENDA_LEGEND_DATES');
+			}
+			else
+			{
+				$dateText = JText::_('COM_ICAGENDA_EVENT_DATE');
+			}
+		}
+		elseif ($totDates > 1
+			&& $next_date < $site_date)
+		{
+			if ($totDates == 2)
+			{
+				$dateText   = $next_is_in_period
+							? JText::_('COM_ICAGENDA_EVENT_DATE')
+							: JText::_('COM_ICAGENDA_EVENT_DATE_PAST');
+			}
+			else
+			{
+				$dateText   = ($next_is_in_period && $weekdays == NULL)
+							? JText::_('COM_ICAGENDA_LEGEND_DATES')
+							: JText::_('COM_ICAGENDA_EVENT_DATE_PAST');
+			}
+		}
+		elseif ($next_date == $site_date)
+		{
+			$dateText   = ($next_is_in_period && ($next_datetime < $site_datetime || $next_datetime != $startdatetime))
+						? JText::_('COM_ICAGENDA_EVENT_DATE_PERIOD_NOW')
+						: JText::_('COM_ICAGENDA_EVENT_DATE_TODAY');
+		}
+		else
+		{
+			$dateText = JText::_( 'COM_ICAGENDA_EVENT_DATE' );
+		}
+
+		return $dateText;
+	}
+
+	/**
+	 * Get Next Date (or Last Date)
+	 *
+	 * @since   3.4.0
+	 */
+	public static function nextDate($evt, $i)
+	{
+		$eventTimeZone = null;
+
+//		$singledates   = iCString::isSerialized($i->dates) ? unserialize($i->dates) : array(); // returns array
+		$period        = iCString::isSerialized($i->period) ? unserialize($i->period) : array(); // returns array
+		$startdatetime = $i->startdate;
+		$enddatetime   = $i->enddate;
+		$weekdays      = $i->weekdays;
+
+		$site_date      = JHtml::date('now', 'Y-m-d');
+		$UTC_today_date = JHtml::date('now', 'Y-m-d', $eventTimeZone);
+
+		$next_date     = JHtml::date($evt, 'Y-m-d', $eventTimeZone);
+		$next_datetime = JHtml::date($evt, 'Y-m-d H:i', $eventTimeZone);
+
+		$start_date = JHtml::date($i->startdate, 'Y-m-d', $eventTimeZone);
+		$end_date   = JHtml::date($i->enddate, 'Y-m-d', $eventTimeZone);
+
+		// Check if date from a period with weekdays has end time of the period set in next.
+//		$time_next_datetime = JHtml::date($next_datetime, 'H:i', $eventTimeZone);
+		$time_next_datetime = date('H:i', strtotime($next_datetime));
+		$time_startdate     = JHtml::date($i->startdate, 'H:i', $eventTimeZone);
+		$time_enddate       = JHtml::date($i->enddate, 'H:i', $eventTimeZone);
+
+		$data_next_datetime = date('Y-m-d H:i', strtotime($evt));
+
+		if ($next_date == $site_date
+			&& $time_next_datetime == $time_enddate)
+		{
+			$next_datetime = $next_date . ' ' . $time_startdate;
+		}
+
+		if ($period != NULL
+			&& in_array($data_next_datetime, $period))
+		{
+			$next_is_in_period = true;
+		}
+		else
+		{
+			$next_is_in_period = false;
+		}
+
+		// Highlight event in progress
+		if ($next_date == $site_date)
+		{
+			$start_span = '<span class="ic-next-today">';
+			$end_span   = '</span>';
+		}
+		else
+		{
+			$start_span = $end_span = '';
+		}
+
+		$separator = '<span class="ic-datetime-separator"> - </span>';
+
+		// Format Next Date
+		if ($next_is_in_period
+			&& ($start_date == $end_date || $weekdays != null))
+		{
+			// Next in the period & (same start/end date OR one or more weekday selected)
+			$nextDate = $start_span;
+			$nextDate.= '<span class="ic-single-startdate">';
+			$nextDate.= icagendaRender::dateToFormat($evt);
+			$nextDate.= '</span>';
+
+			if ($i->displaytime == 1)
+			{
+				$nextDate.= ' <span class="ic-single-starttime">' . icagendaRender::dateToTime($i->startdate) . '</span>';
+
+				if (icagendaRender::dateToTime($i->startdate) != icagendaRender::dateToTime($i->enddate))
+				{
+					$nextDate.= $separator . '<span class="ic-single-endtime">' . icagendaRender::dateToTime($i->enddate) . '</span>';
+				}
+			}
+
+			$nextDate.= $end_span;
+		}
+		elseif ($next_is_in_period
+			&& ($weekdays == null))
+		{
+			// Next in the period & different start/end date & no weekday selected
+			$start = '<span class="ic-period-startdate">';
+			$start.= icagendaRender::dateToFormat($i->startdate);
+			$start.= '</span>';
+
+			$end = '<span class="ic-period-enddate">';
+			$end.= icagendaRender::dateToFormat($i->enddate);
+			$end.= '</span>';
+
+			if ($i->displaytime == 1)
+			{
+				$start.= ' <span class="ic-period-starttime">' . icagendaRender::dateToTime($i->startdate) . '</span>';
+
+				$end.= ' <span class="ic-period-endtime">' . icagendaRender::dateToTime($i->enddate) . '</span>';
+			}
+
+			$nextDate = $start_span . $start . $separator . $end . $end_span;
+		}
+		else
+		{
+			// Next is a single date
+			$nextDate = $start_span;
+			$nextDate.= '<span class="ic-single-next">';
+			$nextDate.= icagendaRender::dateToFormat($evt);
+			$nextDate.= '</span>';
+
+			if ($i->displaytime == 1)
+			{
+				$nextDate.= ' <span class="ic-single-starttime">' . icagendaRender::dateToTime($evt) . '</span>';
+			}
+
+			$nextDate.= $end_span;
+		}
+
+		return $nextDate;
+	}
+
+	/*
+	 * Function to detect if info details exist in an event,
+	 * and to hide or show it depending of Options (display and access levels)
+	 *
+	 * @since   3.6.0
+	 */
+	public static function infoDetails($item, $CUSTOM_FIELDS)
+	{
+		// Hide/Show Option
+		$infoDetails = JComponentHelper::getParams('com_icagenda')->get('infoDetails', 1);
+
+		// Access Levels Option
+		$accessInfoDetails = JComponentHelper::getParams('com_icagenda')->get('accessInfoDetails', 1);
+
+		if ( ($infoDetails == 1 && icagendaEvents::accessLevels($accessInfoDetails))
+			&& ( ($item->params->get('statutReg', '') == '1' && $item->params->get('maxReg'))
+				|| $item->phone
+				|| $item->email
+				|| $item->website
+				|| $item->address
+				|| $item->file
+				|| $CUSTOM_FIELDS )
+			)
+		{
+			return true;
+		}
+
+		return false;
+	}
+
+	/*
+	 * Function to return a list of all single dates, HTML formatted.
+	 * TO BE REFACTORED
+	 *
+	 * @since   3.6.0
+	 */
+	public static function displayListSingleDates($item)
+	{
+		$iCparams   = JComponentHelper::getParams('com_icagenda');
+		$timeformat = JFactory::getApplication()->getParams()->get('timeformat', 1);
+
+		// Hide/Show Option
+		$SingleDates = $iCparams->get('SingleDates', 1);
+
+		// Access Levels Option (to be checked!)
+//		$accessSingleDates = $iCparams->get('accessSingleDates', 1);
+
+		// Order by Dates
+		$SingleDatesOrder = $iCparams->get('SingleDatesOrder', 1);
+
+		// List Model
+		$SingleDatesListModel = $iCparams->get('SingleDatesListModel', 1);
+
+		if ($SingleDates == 1)
+		{
+//			if ($this->accessLevels($accessSingleDates))
+//			{
+				$days = iCString::isSerialized($item->dates) ? unserialize($item->dates) : array(); // returns array
+
+				if ($SingleDatesOrder == 1)
+				{
+					rsort($days);
+				}
+				elseif ($SingleDatesOrder == 2)
+				{
+					sort($days);
+				}
+
+				$totDates = count($days);
+
+				if ($timeformat == 1)
+				{
+					$lang_time = 'H:i';
+				}
+				else
+				{
+					$lang_time = 'h:i A';
+				}
+
+				// Detect if Singles Dates, and no single date with null value
+				$displayDates = false;
+				$nbDays       = count($days);
+
+				foreach ($days as $k => $d)
+				{
+					if (iCDate::isDate($d) && $nbDays != 0)
+					{
+						$displayDates = true;
+					}
+				}
+
+				$daysUl = '';
+
+				if ($displayDates)
+				{
+					if ($SingleDatesListModel == '2')
+					{
+						$n = 0;
+						$daysUl.= '<div class="alldates"><i>' . JText::_('COM_ICAGENDA_LEGEND_DATES') . ': </i>';
+
+						foreach ($days as $k => $d)
+						{
+							$n  = $n+1;
+							$fd = icagendaRender::dateToFormat($d);
+
+							$timeDate   = ($item->displaytime == 1)
+										? ' <span class="evttime">' . date($lang_time, strtotime($d)) . '</span>'
+										: '';
+
+							if ($n <= ($totDates-1))
+							{
+								$daysUl.= '<span class="alldates">' . $fd . $timeDate . '</span> - ';
+							}
+							elseif ($n == $totDates)
+							{
+	   							$daysUl.= '<span class="alldates">' . $fd . $timeDate . '</span>';
+							}
+						}
+
+						$daysUl.= '</div>';
+					}
+					else
+					{
+						$daysUl.= '<ul class="alldates">';
+
+						foreach ($days as $k => $d)
+						{
+							$fd = icagendaRender::dateToFormat($d);
+
+							$timeDate   = ($item->displaytime == 1)
+										? ' <span class="evttime">' . date($lang_time, strtotime($d)) . '</span>'
+										: '';
+
+							$daysUl.= '<li class="alldates">' . $fd . $timeDate . '</li>';
+						}
+
+						$daysUl.= '</ul>';
+					}
+				}
+
+				if ($totDates > '0')
+				{
+					return $daysUl;
+				}
+				else
+				{
+					return false;
+				}
+//			}
+//			else
+//			{
+//				return false;
+//			}
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/*
+	 * Function to display the period text width formatted dates (eg. from 00-00-0000 to 00-00-0000).
+	 * TO BE REFACTORED
+	 * @TODO remove inline style html tags (check css and add class declarations)
+	 * @TODO (3.7) remove old deprecated class names
+	 *
+	 * @since   3.6.0
+	 */
+	public static function displayPeriodDates($item)
+	{
+		$iCparams = JComponentHelper::getParams('com_icagenda');
+
+		// Hide/Show Option
+		$PeriodDates = $iCparams->get('PeriodDates', 1);
+
+		// List Model
+		$SingleDatesListModel = $iCparams->get('SingleDatesListModel', 1);
+
+		// First day of the week
+		$firstday_week_global = $iCparams->get('firstday_week_global', 1);
+
+		// Predefined variables
+		$wdays = $showDays = $timeOneDay = $end = '';
+
+		// WeekDays
+		$weekdays    = $item->weekdays;
+		$weekdaysall = empty($weekdays) ? true : false;
+
+		if ($firstday_week_global == '1')
+		{
+			$weekdays_array = explode (',', $weekdays);
+
+			if (in_array('0', $weekdays_array))
+			{
+				$weekdays = str_replace('0', '', $weekdays);
+				$weekdays = $weekdays . ',7';
+			}
+		}
+
+		if ( ! $weekdaysall)
+		{
+			$weekdays_array = explode (',', $weekdays);
+			$wdaysArray     = array();
+
+			foreach ($weekdays_array AS $wd)
+			{
+				if ($firstday_week_global != '1')
+				{
+					if ($wd == 0) $wdaysArray[] = JText::_('SUNDAY');
+				}
+				if ($wd == 1) $wdaysArray[] = JText::_('MONDAY');
+				if ($wd == 2) $wdaysArray[] = JText::_('TUESDAY');
+				if ($wd == 3) $wdaysArray[] = JText::_('WEDNESDAY');
+				if ($wd == 4) $wdaysArray[] = JText::_('THURSDAY');
+				if ($wd == 5) $wdaysArray[] = JText::_('FRIDAY');
+				if ($wd == 6) $wdaysArray[] = JText::_('SATURDAY');
+				if ($firstday_week_global == '1')
+				{
+					if ($wd == 7) $wdaysArray[] = JText::_('SUNDAY');
+				}
+			}
+
+			$last  = array_slice($wdaysArray, -1);
+			$first = join(', ', array_slice($wdaysArray, 0, -1));
+			$both  = array_filter(array_merge(array($first), $last));
+
+			// RTL css if site language is RTL
+			$lang       = JFactory::getLanguage();
+			$arrow_list = $lang->isRTL() ? '&#8629;' : '&#8627;';
+
+			$wdays = $arrow_list . ' <small><i><span class="ic-period-weekdays">' . join(' & ', $both) . '</span></i></small>';
+		}
+
+		if ($PeriodDates == 1
+			&& self::eventHasPeriod($item->period, $item->startdate, $item->enddate)
+			)
+		{
+			$startDate = icagendaRender::dateToFormat($item->startdate);
+			$endDate   = icagendaRender::dateToFormat($item->enddate);
+			$startTime = icagendaRender::dateToTime($item->startdate);
+			$endTime   = icagendaRender::dateToTime($item->enddate);
+
+			if ($startDate == $endDate)
+			{
+				$start = '<span class="ic-period-startdate">';
+				$start.= $startDate;
+				$start.= '</span>';
+
+				if ($item->displaytime == 1)
+				{
+					$timeOneDay = '<span class="evttime ic-period-time">' . $startTime;
+					$timeOneDay.= ($startTime !== $endTime) ? ' - ' . $endTime : '';
+					$timeOneDay.= '</span>';
+				}
+			}
+			else
+			{
+				$start = '<span class="ic-period-text-from">'
+						. ucfirst(JText::_('COM_ICAGENDA_PERIOD_FROM'))
+						. '</span> ';
+				$start.= '<span class="ic-period-startdate">'
+						. $startDate
+						. '</span>';
+
+				if ($item->displaytime == 1)
+				{
+					$start.= ' <span class="evttime ic-period-starttime">'
+							. $startTime
+							. '</span>';
+				}
+
+				$end = '<span class="ic-period-text-to">'
+						. JText::_('COM_ICAGENDA_PERIOD_TO')
+						. '</span> ';
+				$end.= '<span class="ic-period-enddate">'
+						. $endDate
+						. '</span>';
+
+				if ($item->displaytime == 1)
+				{
+					$end.= ' <span class="evttime ic-period-endtime">'
+							. $endTime
+							. '</span>';
+				}
+
+				$showDays = $wdays;
+			}
+
+			// Horizontal List
+			if ($SingleDatesListModel == 2)
+			{
+				$period = '<div class="ic-date-horizontal">' . JText::_('COM_ICAGENDA_EVENT_PERIOD') . ': ';
+				$period.= $start . ' ' . $end . ' ' . $timeOneDay;
+
+				if ( ! empty($showDays))
+				{
+					$period.= '<br /><span style="margin-left:30px">' . $showDays . '</span>';
+				}
+
+				$period.= '</div>';
+			}
+
+			// Vertical List
+			else
+			{
+				$period = '<ul class="ic-date-vertical"><li>';
+				$period.= $start . ' ' . $end . ' ' . $timeOneDay;
+
+				if ( ! empty($showDays))
+				{
+					$period.= '<br/>' . $showDays;
+				}
+
+				$period.= '</li></ul>';
+			}
+
+			return $period;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/*
+	 * Function to check if period dates exist for this event
+	 *
+	 * @since   3.6.0
+	 */
+	public static function eventHasPeriod($period, $startdate, $enddate)
+	{
+		$period_dates = iCString::isSerialized($period) ? unserialize($period) : array(); // returns array
+
+		if (count($period_dates) > 0
+			&& iCDate::isDate($startdate)
+			&& iCDate::isDate($enddate))
+		{
+			return true;
+		}
+
+		return false;
+	}
+
+	/*
+	 * Function to check if period is not finished
+	 *
+	 * @since   3.6.0
+	 */
+	public static function periodIsNotFinished($enddate)
+	{
+		$eventTimeZone    = null;
+		$datetime_today   = JHtml::date('now', 'Y-m-d H:i');
+		$datetime_enddate = JHtml::date($enddate, 'Y-m-d H:i', $eventTimeZone);
+
+		if (strtotime($datetime_enddate) > strtotime($datetime_today))
+		{
+			return true;
+		}
+
+		return false;
+	}
+
+	/*
+	 * Function to set Meta-title for an event
+	 *
+	 * @since   3.6.0
+	 */
+	public static function setMetaTitle($item)
+	{
+		$limit     = '60';
+		$metaTitle = iCFilterOutput::fullCleanHTML($item->title);
+
+		if (strlen($metaTitle) > $limit)
+		{
+			$string_cut = substr($metaTitle, 0, $limit);
+			$last_space = strrpos($string_cut, ' ');
+			$string_ok  = substr($string_cut, 0, $last_space);
+			$metaTitle  = $string_ok;
+		}
+
+		return $metaTitle;
+	}
+
+	/*
+	 * Function to set Meta-description for an event
+	 *
+	 * @since   3.6.0
+	 */
+	public static function setMetaDesc($item)
+	{
+		$iCparams = JComponentHelper::getParams('com_icagenda');
+		$limit    = $iCparams->get('char_limit_meta_description', '320');
+
+		$metaDesc = iCFilterOutput::fullCleanHTML($item->metadesc);
+		$metaDesc = (empty($metaDesc)) ? iCFilterOutput::fullCleanHTML($item->desc) : $metaDesc;
+
+		if (strlen($metaDesc) > $limit)
+		{
+			$string_cut = substr($metaDesc, 0, $limit);
+			$last_space = strrpos($string_cut, ' ');
+			$string_ok  = substr($string_cut, 0, $last_space);
+			$metaDesc   = $string_ok;
+		}
+
+		return $metaDesc;
+	}
+
+	/*
+	 * Function to return event Url
+	 *
+	 * @since   3.6.0
+	 */
+	public static function eventURL($i)
+	{
+		$app    = JFactory::getApplication();
+		$jinput = $app->input;
+
+		$itemID = $jinput->get('Itemid', '0');
+
+		$eventnumber = $i->id;
+		$event_slug  = empty($i->alias) ? $i->id : $i->id . ':' . $i->alias;
+		$date        = $i->next;
+
+		// Get the "event" URL
+		$baseURL    = JURI::base();
+		$subpathURL = JURI::base(true);
+
+		$baseURL    = str_replace('/administrator', '', $baseURL);
+		$subpathURL = str_replace('/administrator', '', $subpathURL);
+
+		$urlevent = str_replace('&amp;','&', JRoute::_('index.php?option=com_icagenda&view=event&Itemid=' . (int) $itemID . '&id=' . $event_slug));
+
+		// Sub Path filtering
+		$subpathURL = ltrim($subpathURL, '/');
+
+		// URL Event Details filtering
+		$urlevent = ltrim($urlevent, '/');
+
+		if (substr($urlevent, 0, strlen($subpathURL)+1) == "$subpathURL/")
+		{
+			$urlevent = substr($urlevent, strlen($subpathURL)+1);
+		}
+
+		$urlevent = rtrim($baseURL,'/') . '/' . ltrim($urlevent,'/');
+
+		$url = $urlevent;
+
+		if (is_numeric($itemID) && is_numeric($eventnumber)
+			&& ! is_array($itemID) && ! is_array($eventnumber)
+			)
+		{
+			return $url;
+		}
+		else
+		{
+			$url = JRoute::_('index.php');
+
+			return JURI::base() . $url;
+		}
+	}
+
+	/*
+	 * Function to convert a datetime to URL alias
+	 * (see iCDate::dateToAlias from iC Library for general function)
+	 *
+	 * @since   3.6.0
+	 */
+	public static function urlDateVar($datetime)
+	{
+		if ( ! iCDate::isDate($datetime)) return false;
+
+		$datetime     = date('Y-m-d H:i', strtotime($datetime));
+		$date_explode = explode(' ', $datetime);
+
+		$dateAlias = $date_explode['0'] . '-' . str_replace(':', '-', $date_explode['1']);
+
+		return $dateAlias;
+	}
+
+	/*
+	 * Function to convert a URL date alias in an SQL datetime string.
+	 *
+	 * @return  string  The date string in SQL datetime format.
+	 *
+	 * @since   3.6.0
+	 */
+	public static function convertDateAliasToSQLDatetime($dateAlias)
+	{
+		if (strlen(iCDate::dateToNumeric($dateAlias)) != '12') return '';
+
+		$ex         = explode('-', $dateAlias);
+		$datetime   = (count($ex) == 5)
+					? $ex['0'] . '-' . $ex['1'] . '-' . $ex['2'] . ' ' . $ex['3'] . ':' . $ex['4'] . ':00'
+					: '';
+
+		return $datetime;
+	}
+
+	/*
+	 * Function to generate the read more for introduction description
+	 *
+	 * @since   3.6.0
+	 */
+	public static function readMore ($url, $desc, $content = '')
+	{
+		$iCparams    = JComponentHelper::getParams('com_icagenda');
+		$limitGlobal = $iCparams->get('limitGlobal', 0);
+
+		if ($limitGlobal == 1)
+		{
+			$limit = $iCparams->get('ShortDescLimit', '100');
+		}
+		elseif ($limitGlobal == 0)
+		{
+			$customlimit = $iCparams->get('limit', '100');
+
+			$limit = is_numeric($customlimit) ? $customlimit : $iCparams->get('ShortDescLimit', '100');
+		}
+
+		$limit = is_numeric($limit) ? $limit : '1';
+
+		$readmore = '';
+
+		$readmore = ($limit <= 1) ? '' : $content;
+		$text     = preg_replace('/<img[^>]*>/Ui', '', $desc);
+
+		if (strlen($text) > $limit)
+		{
+			$string_cut = substr($text, 0, $limit);
+			$last_space = strrpos($string_cut, ' ');
+			$string_ok  = substr($string_cut, 0, $last_space);
+			$text       = $string_ok . ' ';
+			$url        = $url;
+			$text       = '<a href="' . $url . '" class="more">' . $readmore . '</a>';
+		}
+		else
+		{
+			$text = '';
+		}
+
+		return $text;
+	}
+
+	/**
+	 * Loads the list of filled custom fields for this event
+	 *
+	 * @return  array
+	 *
+	 * @since   3.6.0
+	 */
+	public static function getCustomFields($id = null)
+	{
+		$customFields = icagendaEventData::loadEventCustomFields($id);
+
+		foreach ($customFields as $cf)
+		{
+			if ($cf->title && $cf->value)
+			{
+				switch ($cf->type)
+				{
+					case 'url':
+						$cf->value = iCRender::urlTag($cf->value);
+						break;
+
+					case 'email':
+						$cf->value = JHtml::_('email.cloak', $cf->value);
+						break;
+
+					default:
+						$cf->value = JText::_($cf->value);
+						break;
+				}
+			}
+
+			$cf->title = JText::_($cf->title);
+		}
+
+		return $customFields;
+	}
+
+	/**
+	 * Function to get custom field groups of an event
+	 *
+	 * @param   integer  $id  Event id
+	 *
+	 * @return  array
+	 *
+	 * @since   3.6.0
+	 */
+	public static function getCustomfieldGroups($id = null)
+	{
+		// Create a new query object.
+		$db    = JFactory::getDbo();
+		$query = $db->getQuery(true);
+
+		$query->select('e.params')
+			->from('#__icagenda_events AS e')
+			->where($db->qn('id') . ' = ' . $db->q($id));
+		$db->setQuery($query);
+
+		$result = json_decode($db->loadResult());
+
+		if (isset($result->custom_form))
+		{
+			return $result->custom_form;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Function to get event params
+	 *
+	 * @param   integer  $id  Event id
+	 *
+	 * @return  object
+	 *
+	 * @since   3.6.5
+	 */
+	public static function getParams($id = null)
+	{
+		$db     = JFactory::getDbo();
+
+		$query  = $db->getQuery(true)
+				->select('e.params')
+				->from($db->qn('#__icagenda_events', 'e'))
+				->where($db->qn('e.id') . ' = ' . (int) $id);
+
+		$db->setQuery($query);
+
+		$params = json_decode($db->loadResult(), true);
+
+		$evtParams = new JRegistry($params);
+
+		return $evtParams;
+	}
+
+	public static function getCustomField($id, $field)
+	{
+		$db     = JFactory::getDbo();
+
+		$query  = $db->getQuery(true)
+				->select('d.value')
+				->from($db->qn('#__icagenda_customfields_data', 'd'))
+				->where($db->qn('d.parent_id') . ' = ' . (int) $id)
+				->where($db->qn('d.slug') . ' = "'.$field.'"');
+
+		$db->setQuery($query);
+		return $db->loadResult();
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/event/index.html b/deployed/icagenda/administrator/components/com_icagenda/utilities/event/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/event/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/events/data.php b/deployed/icagenda/administrator/components/com_icagenda/utilities/events/data.php
new file mode 100644
index 00000000..cce82414
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/events/data.php
@@ -0,0 +1,1564 @@
+<?php
+
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.15 2020-05-30
+ *
+ * @package     iCagenda.Admin
+ * @subpackage  Utilities
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2020 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.5.0
+ *----------------------------------------------------------------------------
+ */
+
+defined('_JEXEC') or die();
+
+/**
+ * class icagendaEventsData
+ * Transitional class and functions
+ *
+ * TO BE DEPRECATED and TO BE REMOVED in 4.0
+ */
+class icagendaEventsData
+{
+	/**
+	 * ALL DATES
+	 *
+	 * @since 3.5.0
+	 */
+	public static function getAllDates($filterTime = null, $datesDisplay = null, $orderby = null, $mcatid = null, $moduleParams = false)
+	{
+		$app	= JFactory::getApplication();
+		$jinput = $app->input;
+		$params = $app->getParams();
+
+		$search_filters = $params->get('search_filters', 0);
+
+		if (!$moduleParams) {
+			$activeMenu = $app->getMenu()->getActive();
+
+			$menu_search_filters    = $activeMenu
+				? $activeMenu->params->get('search_filters')
+				: '';
+
+			$filters_mode   = ($menu_search_filters == 1)
+				? $params->get('filters_mode', 1)
+				: JComponentHelper::getParams('com_icagenda')->get('filters_mode', 1);
+		} else {
+			$menu_search_filters = '0';
+			$filters_mode   = '';
+		}
+
+
+		// Filter time : upcoming, past, today...
+		$filterTime		= ($filterTime == 'no') ? '0' : $filterTime;
+
+		if ($menu_search_filters == 1) {
+			$filterTime		= (isset($filterTime) || $filterTime == '0')
+				? $filterTime
+				: (($menu_search_filters == 1)
+					? $params->get('time', 1)
+					: JComponentHelper::getParams('com_icagenda')->get('time', 1));
+		} else {
+			$filterTime		= (isset($filterTime) || $filterTime == '0')
+				? $filterTime
+				: $params->get('time', 1);
+		}
+
+		// Dates display : all dates OR only next/last date per event
+		$datesDisplay	= $datesDisplay ? $datesDisplay : $params->get('datesDisplay', 1);
+
+		// Ordering : date order ASC OR DESC
+		$orderby		= $orderby ? $orderby : $params->get('orderby', 2);
+
+		// Filter category : multiple categories filtering
+		if ($mcatid !== 'all') {
+			$mcatid	= $mcatid ? $mcatid : $params->get('mcatid', '');
+		}
+
+		// Set vars
+		$nodate 		= '0000-00-00 00:00:00';
+		$ic_nodate		= '0000-00-00 00:00';
+		$eventTimeZone	= null;
+		$datetime_today	= JHtml::date('now', 'Y-m-d H:i'); // Joomla Time Zone
+		$date_today		= JHtml::date('now', 'Y-m-d'); // Joomla Time Zone
+
+		// Get Data
+		$db		= Jfactory::getDbo();
+		$query	= $db->getQuery(true);
+		//		$query->select('e.next, e.dates, e.startdate, e.enddate, e.period, e.weekdays, e.displaytime, e.id, e.catid');
+		$query->select('e.*');
+		$query->from('#__icagenda_events AS e');
+		$query->leftJoin('#__icagenda_category AS c ON c.id = e.catid');
+		$query->leftJoin('#__icagenda_customfields_data AS cfd ON cfd.parent_id = e.id');
+
+		// CATEGORY STATE Filtering
+		$query->where('c.state = 1');
+
+		// EVENT STATE Filtering
+		$query->where('e.state = 1');
+
+		// Search in current list (menu filtered list)
+		$currentListSearch = ($filters_mode == 1 && $search_filters);
+
+		// Filter by category
+		if ($mcatid != 'all') {
+			//			$filterCategory = $jinput->getInt('filter_category', '');
+			$filterCategory = $moduleParams ? '' : $jinput->getInt('filter_category', '');
+
+			if (is_numeric($filterCategory) && !empty($filterCategory)) {
+				$query->where('e.catid = ' . $filterCategory . '');
+			} elseif (is_array($filterCategory) && !empty($filterCategory) && !in_array('0', $filterCategory)) {
+				JArrayHelper::toInteger($filterCategory);
+				$categoryId = implode(',', $filterCategory);
+				$query->where('e.catid IN (' . $categoryId . ')');
+			}
+
+			// No category search filter active, use menu Filter by Category option
+			elseif (is_numeric($mcatid) && !empty($mcatid)) {
+				$query->where('e.catid = ' . $db->quote($mcatid));
+			} elseif (is_array($mcatid) &&  !empty($mcatid) && !in_array('0', $mcatid)) {
+				JArrayHelper::toInteger($mcatid);
+				$list_catid = implode(',', $mcatid);
+				$query->where('e.catid IN (' . $list_catid . ')');
+			}
+
+			if (
+				$jinput->get('filter_category')
+				&& !$currentListSearch
+				&& !$moduleParams
+			) {
+				$filterTime = '0';
+			}
+		}
+
+
+		// Frontend Search settings (not in modules)
+		if ($moduleParams) {
+			$filterFrom		= '';
+			$filterTo		= '';
+			$filterMonth	= '';
+			$filterYear		= '';
+		} else {
+			// Filter by search
+			$search = $jinput->getString('filter_search');
+
+			if (!empty($search)) {
+				// Check if Falang installed
+				$tag = JFactory::getLanguage()->getTag();
+				$defaultSiteLang = JComponentHelper::getParams('com_languages')->get('site', 'en-GB');
+
+				//$falang = defined('FALANG_PATH');
+				$falang = is_a($db, 'JFalangDatabase');
+
+				$falangSearch = ($falang && ($tag != $defaultSiteLang));
+
+				// Run Falang query if needed
+				if ($falang && $falangSearch) {
+					$query->join('LEFT', $db->quoteName('#__falang_content', 'f') . ' ON (' . $db->quoteName('f.reference_id') . ' = ' . $db->quoteName('e.id') . ')');
+					$query->join('LEFT', $db->quoteName('#__languages', 'l') . ' ON (' . $db->quoteName('f.language_id') . ' = ' . $db->quoteName('l.lang_id') . ')');
+					$query->where('f.reference_table IN (' . $db->quote('icagenda_events') . ', ' . $db->quote('icagenda_category') . ', ' . $db->quote('icagenda_customfields_data') . ')');
+					$query->where('l.lang_code in (' . $db->quote($tag) . ',' . $db->quote('*') . ')');
+				}
+
+				if (stripos($search, 'id:') === 0) {
+					$query->where('e.id = ' . (int) substr($search, 3));
+				} elseif ($falang && $falangSearch) {
+					$search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%'));
+					$query->where('( f.value LIKE ' . $search . ')');
+				} else {
+					$search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%'));
+
+					$query->where('( e.title LIKE ' . $search .
+						' OR e.id LIKE ' . $search .
+						' OR e.shortdesc LIKE ' . $search .
+						' OR e.desc LIKE ' . $search .
+						' OR e.place LIKE ' . $search .
+						' OR e.address LIKE ' . $search .
+						' OR e.city LIKE ' . $search .
+						' OR e.country LIKE ' . $search .
+						' OR c.title LIKE ' . $search .
+						' OR cfd.value LIKE ' . $search .
+						')');
+				}
+			}
+
+			// Get filters by dates
+			$filterFrom	    = $jinput->get('filter_from');
+			$filterTo       = $jinput->get('filter_to');
+			$filterMonth    = $jinput->getInt('filter_month');
+			$filterYear     = $jinput->getInt('filter_year');
+		}
+
+		// FEATURES Filtering
+		//		$query->where(self::getFeaturesFilter());
+		$query->where(icagendaEventsData::getFeaturesFilter($moduleParams));
+
+		// LANGUAGE Filtering
+		$query->where('e.language IN (' . $db->q(JFactory::getLanguage()->getTag()) . ',' . $db->q('*') . ')');
+
+		// ACCESS Filtering
+		$user		= JFactory::getUser();
+		$userID		= $user->id;
+		$userLevels	= $user->getAuthorisedViewLevels();
+		$userGroups = $user->getAuthorisedGroups();
+
+		$groupid	= JComponentHelper::getParams('com_icagenda')->get('approvalGroups', array("8"));
+		$groupid	= is_array($groupid) ? $groupid : array($groupid);
+
+		if (!in_array('8', $userGroups)) {
+			$useraccess	= implode(', ', $userLevels);
+			$query->where('e.access IN (' . $useraccess . ')');
+		}
+
+		// APPROVAL RIGHTS Filtering
+		if (
+			!array_intersect($userGroups, $groupid)
+			&& !in_array('8', $userGroups)
+		) {
+			$query->where('e.approval <> 1');
+		} else {
+			$query->where('e.approval < 2');
+		}
+
+		// Prevents duplicated results when search in Falang category translations
+		$query->group('e.id');
+
+		$db->setQuery($query);
+		$list = $db->loadObjectList();
+
+		$list_all_dates = array();
+
+		foreach ($list as $i) {
+			$hasUpcomingDate = false;
+
+			$i_id			= $i->id;
+			$i_startdate	= $i->startdate;
+			$i_enddate		= $i->enddate;
+			$i_weekdays		= $i->weekdays;
+			$i_dates		= $i->dates;
+			$i_displaytime	= $i->displaytime;
+
+			// Declare AllDates array
+			$AllDatesDisplay	= array();
+
+			// Get WeekDays Array
+			$WeeksDays			= iCDatePeriod::weekdaysToArray($i_weekdays);
+
+			// If Single Dates, added each one to All Dates for this event
+			$singledates 		= iCString::isSerialized($i_dates) ? unserialize($i_dates) : array();
+			$singleDatesArray	= array();
+
+			$no_filtering		= '0';
+
+			foreach ($singledates as $sd) {
+				$isValid = iCDate::isDate($sd);
+
+				if ($isValid) {
+					$date_Dat			= JHtml::date($sd, 'Y-m-d', $eventTimeZone);
+					$SingleDate			= JHtml::date($sd, 'Y-m-d H:i', $eventTimeZone);
+
+					$data_SingleDate	= date('Y-m-d H:i', strtotime($sd));
+
+					if (strtotime($sd) >= strtotime($datetime_today)) {
+						$hasUpcomingDate = true;
+					}
+
+					// Frontend Filtering
+					if (
+						!empty($filterFrom)
+						|| !empty($filterTo)
+						|| !empty($filterMonth)
+						|| !empty($filterYear)
+						|| !empty($search)
+					) {
+						$dateToDisplay = true;
+
+						$controlDate = $SingleDate;
+
+
+						// Filter by period - From
+						if (!empty($filterFrom) && $dateToDisplay) {
+							$dateToDisplay = (strtotime($controlDate) >= strtotime($filterFrom)) ? true : false;
+						}
+
+						// Filter by period - To
+						if (!empty($filterTo) && $dateToDisplay) {
+							$dateToDisplay = (strtotime($controlDate) <= (strtotime($filterTo) + 86400)) ? true : false;
+						}
+
+						// Filter by Month
+						if (!empty($filterMonth) && $dateToDisplay) {
+							$dateToDisplay = (date('n', strtotime($controlDate)) == $filterMonth) ? true : false;
+						}
+
+						// Filter by Year
+						if (!empty($filterYear) && $dateToDisplay) {
+							$dateToDisplay = (date('Y', strtotime($controlDate)) == $filterYear) ? true : false;
+						}
+
+						if ($currentListSearch && $dateToDisplay) {
+							$controlDate = $SingleDate;
+
+							// (1) Filter Dates : Ongoing and Upcoming
+							if ($filterTime == 1) {
+								$dateToDisplay = (strtotime($controlDate) >= strtotime($date_today)) ? true : false;
+							}
+							// (2) Filter Dates : Past Dates
+							elseif ($filterTime == 2) {
+								$dateToDisplay = (strtotime($controlDate) < strtotime($datetime_today)) ? true : false;
+							}
+							// (3) Filter Dates : Upcoming
+							elseif ($filterTime == 3) {
+								$dateToDisplay = (strtotime($controlDate) > strtotime($datetime_today)) ? true : false;
+							}
+							// (4) Filter Dates : Ongoing Events today
+							elseif ($filterTime == 4) {
+								$dateToDisplay = ((strtotime($controlDate) >= strtotime($date_today))
+									&& (strtotime($controlDate) <= (strtotime($date_today) + 86400))) ? true : false;
+							}
+						}
+
+						if ($dateToDisplay) {
+							$singleDatesArray[] = $data_SingleDate . '_' . $i_id;
+						}
+					}
+
+					// All Dates for each event
+					elseif ($datesDisplay == 1) {
+						$singleDatesArray[] = $data_SingleDate . '_' . $i_id;
+					}
+
+					// Current Today
+					elseif (
+						$filterTime == 4
+						&& strtotime($SingleDate) >= strtotime($date_today)
+					) {
+						$singleDatesArray[] = $data_SingleDate . '_' . $i_id;
+					}
+
+					// Upcoming Events
+					elseif (
+						$filterTime == 3
+						&& strtotime($SingleDate) > strtotime($datetime_today)
+					) {
+						$singleDatesArray[] = $data_SingleDate . '_' . $i_id;
+					}
+
+					// Past event
+					elseif (
+						$filterTime == 2
+						&& strtotime($SingleDate) < strtotime($datetime_today)
+					) {
+						$singleDatesArray[] = $data_SingleDate . '_' . $i_id;
+					}
+
+					// Current and Upcoming Events
+					elseif (
+						$filterTime == 1
+						&& strtotime($SingleDate) >= strtotime($date_today)
+					) {
+						$singleDatesArray[] = $data_SingleDate . '_' . $i_id;
+					}
+
+					// All Dates
+					elseif (!$filterTime) {
+						// All Upcoming dates
+						if (strtotime($SingleDate) >= strtotime($datetime_today)) {
+							$no_filtering = $no_filtering + 1;
+
+							$singleDatesArray[] = $data_SingleDate . '_' . $i_id;
+						}
+
+						// If no Upcoming dates, get the last date
+						elseif (
+							$no_filtering == 0
+							&& strtotime($SingleDate) < strtotime($datetime_today)
+						) {
+							$no_filtering = $no_filtering + 1;
+
+							$singleDatesArray[] = $data_SingleDate . '_' . $i_id;
+						}
+					}
+				}
+			}
+
+			if (
+				$datesDisplay == 2
+				&& $filterTime == 2
+				&& count($singleDatesArray) > 0
+			) // Past Events
+			{
+				$AllDatesDisplay[] = max($singleDatesArray);
+			} elseif (
+				$datesDisplay == 2
+				&& count($singleDatesArray) > 0
+			) {
+				$AllDatesDisplay[] = min($singleDatesArray);
+			} else {
+				$AllDatesDisplay = array_merge($AllDatesDisplay, $singleDatesArray);
+			}
+
+			// If Period Dates, added each one to All Dates for this event (filter week Days, and if date not null)
+			$perioddates = iCDatePeriod::listDates($i_startdate, $i_enddate);
+
+			$period_array = array();
+
+			foreach ($perioddates as $date_in_weekdays) {
+				if (
+					in_array(date('w', strtotime($date_in_weekdays)), $WeeksDays)
+					&& iCDate::isDate($date_in_weekdays)
+				) {
+					$period_array[] = $date_in_weekdays;
+				}
+			}
+
+			$only_startdate = ($i_weekdays || $i_weekdays == '0') ? false : true;
+
+			$StDate = JHtml::date($i_startdate, 'Y-m-d H:i', $eventTimeZone);
+			$EnDate = JHtml::date($i_enddate, 'Y-m-d H:i', $eventTimeZone);
+
+			$date_startdate	= JHtml::date($i_startdate, 'Y-m-d', $eventTimeZone);
+			$date_enddate	= JHtml::date($i_enddate, 'Y-m-d', $eventTimeZone);
+			$time_startdate	= JHtml::date($i_startdate, 'H:i', $eventTimeZone);
+			$time_enddate	= JHtml::date($i_enddate, 'H:i', $eventTimeZone);
+
+			$data_StDate = date('Y-m-d H:i', strtotime($i_startdate));
+			$data_time_startdate	= date('H:i', strtotime($i_startdate));
+
+			if (
+				isset($period_array)
+				&& ($period_array != NULL && $period_array)
+			) {
+				if ($only_startdate) {
+					// Frontend Filtering
+					if (
+						!empty($filterFrom)
+						|| !empty($filterTo)
+						|| !empty($filterMonth)
+						|| !empty($filterYear)
+					) {
+						$dateToDisplay = true;
+
+						// Full Period with no weekdays selected, ongoing events
+						$ongoing_filter = in_array($filterTime, array('1', '4'));
+
+						if (
+							$ongoing_filter
+							&& in_array($date_today . ' ' . $time_startdate, $perioddates)
+							&& strtotime($EnDate) >= strtotime($datetime_today)
+							&& strtotime($StDate) <= strtotime($datetime_today)
+						) {
+							$controlDate = $date_today;
+						} else {
+							$controlDate = $date_startdate;
+						}
+
+						// Filter by period - From
+						if (!empty($filterFrom) && $dateToDisplay) {
+							//							$dateToDisplay = (strtotime($controlDate) >= strtotime($filterFrom)) ? true : false;
+							$dateToDisplay = ((strtotime($controlDate) >= strtotime($filterFrom))
+								|| ($ongoing_filter
+									&& (strtotime($controlDate) <= strtotime($filterFrom))
+									&& (strtotime($date_enddate) >= strtotime($filterFrom))
+								)
+							) ? true : false;
+						}
+
+						// Filter by period - To
+						if (!empty($filterTo) && $dateToDisplay) {
+							$dateToDisplay = (strtotime($controlDate) < (strtotime($filterTo) + 86400)) ? true : false;
+						}
+
+						// Filter by Month and/or Year
+						if (!empty($filterMonth) || !empty($filterYear)) {
+							$new_startdate = new DateTime($i_startdate);
+							$new_enddate   = new DateTime($i_enddate);
+							$start         = $new_startdate->modify('first day of this month');
+							$end           = $new_enddate->modify('last day of this month');
+							$interval      = DateInterval::createFromDateString('1 month');
+							$period        = new DatePeriod($start, $interval, $end);
+						}
+
+						// Filter by Month
+						if (!empty($filterMonth) && empty($filterYear) && $dateToDisplay) {
+							//							$dateToDisplay = (date('n', strtotime($controlDate)) == $filterMonth) ? true : false;
+
+							$months_period = array('');
+
+							foreach ($period as $dt) {
+								$months_period[] = $dt->format('n');
+							}
+
+							$dateToDisplay = in_array($filterMonth, $months_period);
+						}
+
+						// Filter by Year
+						if (!empty($filterYear) && empty($filterMonth) && $dateToDisplay) {
+							//							$dateToDisplay = (date('Y', strtotime($controlDate)) == $filterYear) ? true : false;
+
+							$years_period = array('');
+
+							foreach ($period as $dt) {
+								$years_period[] = $dt->format('Y');
+							}
+
+							$dateToDisplay = in_array($filterYear, $years_period);
+						}
+
+						// Filter by Month & Year
+						if (!empty($filterMonth) && !empty($filterYear) && $dateToDisplay) {
+							//							$dateToDisplay = (date('Y', strtotime($controlDate)) == $filterYear) ? true : false;
+
+							$monthsYears_period = array('');
+
+							foreach ($period as $dt) {
+								$monthsYears_period[] = $dt->format('n-Y');
+							}
+
+							$dateToDisplay = in_array($filterMonth . '-' . $filterYear, $monthsYears_period);
+						}
+
+						if ($dateToDisplay) {
+							$AllDatesDisplay[] = $data_StDate . '_' . $i_id;
+						}
+					} else {
+						$AllDatesDisplay[] = $data_StDate . '_' . $i_id;
+					}
+				} else {
+					$dp = 0;
+					$count_period = count($period_array);
+					$cp = 0;
+					$no_filtering = 0;
+
+					foreach ($period_array as $Dat) {
+						$date_Dat	= JHtml::date($Dat, 'Y-m-d', $eventTimeZone);
+						$SingleDate	= JHtml::date($Dat, 'Y-m-d H:i', $eventTimeZone);
+
+						$data_date_Dat		= date('Y-m-d', strtotime($Dat));
+						$data_SingleDate	= date('Y-m-d H:i', strtotime($Dat));
+
+						if (strtotime($Dat) >= strtotime($datetime_today)) {
+							$hasUpcomingDate = true;
+						}
+
+						if (
+							in_array(date('w', strtotime($Dat)), $WeeksDays)
+							&& $dp == 0
+						) {
+							// Frontend Filtering
+							if (
+								!empty($filterFrom)
+								|| !empty($filterTo)
+								|| !empty($filterMonth)
+								|| !empty($filterYear)
+								|| !empty($search)
+							) {
+								$dateToDisplay = true;
+
+								$controlDate = $date_Dat;
+
+
+								// Filter by period - From
+								if (!empty($filterFrom) && $dateToDisplay) {
+									$dateToDisplay = (strtotime($controlDate) >= strtotime($filterFrom)) ? true : false;
+								}
+
+								// Filter by period - To
+								if (!empty($filterTo) && $dateToDisplay) {
+									$dateToDisplay = (strtotime($controlDate) <= strtotime($filterTo)) ? true : false;
+								}
+
+								// Filter by Month
+								if (!empty($filterMonth) && $dateToDisplay) {
+									$dateToDisplay = (date('n', strtotime($controlDate)) == $filterMonth) ? true : false;
+								}
+
+								// Filter by Year
+								if (!empty($filterYear) && $dateToDisplay) {
+									$dateToDisplay = (date('Y', strtotime($controlDate)) == $filterYear) ? true : false;
+								}
+
+								if ($currentListSearch && $dateToDisplay) {
+									// Full Period with no weekdays selected, ongoing events
+									if (
+										$only_startdate
+										&& in_array($filterTime, array('1', '4'))
+										&& in_array($date_get_datetime, $perioddates)
+										&& strtotime($EnDate) >= strtotime($datetime_today)
+										&& strtotime($StDate) <= strtotime($datetime_today)
+									) {
+										$controlDate = $datetime_today;
+									} else {
+										$controlDate = $SingleDate;
+									}
+
+									// (1) Filter Dates : Ongoing and Upcoming
+									if ($filterTime == 1) {
+										$dateToDisplay = (strtotime($controlDate) >= strtotime($date_today)) ? true : false;
+									}
+									// (2) Filter Dates : Past Dates
+									elseif ($filterTime == 2) {
+										$dateToDisplay = (strtotime($controlDate) < strtotime($datetime_today)) ? true : false;
+									}
+									// (3) Filter Dates : Upcoming
+									elseif ($filterTime == 3) {
+										$dateToDisplay = (strtotime($controlDate) > strtotime($datetime_today)) ? true : false;
+									}
+									// (4) Filter Dates : Ongoing Events today
+									elseif ($filterTime == 4) {
+										$dateToDisplay = ((strtotime($controlDate) >= strtotime($date_today))
+											&& (strtotime($controlDate) < (strtotime($date_today) + 86400))) ? true : false;
+									}
+								}
+
+								if ($dateToDisplay) {
+									$AllDatesDisplay[] = $data_SingleDate . '_' . $i_id;
+								}
+							}
+
+							// Current Today and Upcoming Today
+							elseif (
+								$filterTime == 4
+								&& strtotime($date_Dat) == strtotime($date_today)
+							) {
+								if (
+									$i_displaytime == 1
+									&& strtotime($date_Dat . ' ' . $time_enddate) >= strtotime($datetime_today)
+								) {
+									$dp = ($datesDisplay == 2) ? $dp + 1 : 0;
+
+									$AllDatesDisplay[] = $data_SingleDate . '_' . $i_id;
+								} else {
+									$dp = ($datesDisplay == 2) ? $dp + 1 : 0;
+
+									$AllDatesDisplay[] = $data_SingleDate . '_' . $i_id;
+								}
+							}
+
+							// Upcoming
+							elseif (
+								$filterTime == 3
+								&& strtotime($SingleDate) > strtotime($datetime_today)
+							) {
+								$dp = ($datesDisplay == 2) ? $dp + 1 : 0;
+
+								$AllDatesDisplay[] = $data_SingleDate . '_' . $i_id;
+							}
+
+							// Past
+							elseif (
+								$filterTime == 2
+								&& strtotime($date_Dat) < strtotime($date_today)
+							) {
+								$dp = ($datesDisplay == 2) ? $dp + 1 : 0;
+
+								$AllDatesDisplay[] = $data_SingleDate . '_' . $i_id;
+							}
+
+							// Current Today and Upcoming
+							elseif ($filterTime == 1) {
+								if (
+									$i_displaytime == 1
+									&& strtotime($date_Dat . ' ' . $time_enddate) >= strtotime($datetime_today)
+								) {
+									$dp = ($datesDisplay == 2) ? $dp + 1 : 0;
+
+									$AllDatesDisplay[] = $data_SingleDate . '_' . $i_id;
+								} elseif (
+									$i_displaytime != 1
+									&& strtotime($date_Dat) >= strtotime($date_today)
+								) {
+									$dp = ($datesDisplay == 2) ? $dp + 1 : 0;
+
+									$AllDatesDisplay[] = $data_SingleDate . '_' . $i_id;
+								}
+							}
+
+							// No Filtering
+							elseif (!$filterTime) {
+								// All Upcoming dates
+								if (strtotime($SingleDate) >= strtotime($datetime_today)) {
+									$dp = ($datesDisplay == 2) ? $dp + 1 : 0;
+									$no_filtering = ($datesDisplay == 2) ? $no_filtering + 1 : 0;
+
+									$AllDatesDisplay[] = $data_SingleDate . '_' . $i_id;
+								}
+
+								// If no Upcoming dates, get the last date
+								elseif (
+									$no_filtering == 0 && $datesDisplay == 2
+									&& strtotime($SingleDate) < strtotime($datetime_today)
+								) {
+									$dp = $dp + 1;
+
+									$AllDatesDisplay[] = $data_SingleDate . '_' . $i_id;
+								}
+
+								// If display All Dates, get the last dates
+								elseif (
+									$datesDisplay == 1
+									&& strtotime($SingleDate) < strtotime($datetime_today)
+								) {
+									$dp = 0;
+
+									$AllDatesDisplay[] = $data_SingleDate . '_' . $i_id;
+								}
+							}
+						}
+					}
+				}
+			}
+
+			// If not All Dates display (select only one date for each event)
+			if (
+				$datesDisplay == 2
+				&& count($AllDatesDisplay) > 0
+			) {
+				$ex_min         = explode('_', min($AllDatesDisplay));
+				$min_datetime   = JHtml::date($ex_min[0], 'Y-m-d H:i', null);
+				$min_date       = JHtml::date($ex_min[0], 'Y-m-d', null);
+
+				$ex_max         = explode('_', max($AllDatesDisplay));
+				$max_date       = JHtml::date($ex_max[0], 'Y-m-d H:i', null);
+
+				if ($filterTime != '4') {
+					// Past Events and max date is upcoming
+					if (
+						$filterTime == '2'
+						&& $hasUpcomingDate
+					) {
+						$AllDatesDisplay = array();
+					}
+
+					// min date is today or upcoming
+					elseif (
+						$filterTime == '1'
+						&& $min_datetime >= $date_today
+					) {
+						$AllDatesDisplay = array(min($AllDatesDisplay));
+					}
+
+					// min date is upcoming
+					elseif ($min_datetime >= $datetime_today) {
+						$AllDatesDisplay = array(min($AllDatesDisplay));
+					}
+
+					// All events
+					elseif ($filterTime == '0') {
+						// min date in Period and upcoming
+						if (
+							in_array($min_datetime, $period_array)
+							&& $min_datetime >= $datetime_today
+						) {
+							$AllDatesDisplay = array(min($AllDatesDisplay));
+						}
+
+						// min date is Single date and not past
+						elseif (
+							!in_array($min_datetime, $period_array)
+							&& ($min_datetime > $datetime_today)
+						) {
+							$AllDatesDisplay = array(min($AllDatesDisplay));
+						}
+
+						// min date is Single date and past
+						else {
+							$AllDatesDisplay = array(max($AllDatesDisplay));
+						}
+					} else {
+						$AllDatesDisplay = array(max($AllDatesDisplay));
+					}
+				} else {
+					$AllDatesDisplay = array(min($AllDatesDisplay));
+				}
+			}
+
+			$AllDatesFilterTime = array();
+
+
+			foreach ($AllDatesDisplay as $fD) {
+				$ex_date			= explode('_', $fD);
+				$get_date			= $ex_date['0'];
+				$date_get_date		= JHtml::date($get_date, 'Y-m-d', $eventTimeZone);
+				$date_get_datetime	= JHtml::date($get_date, 'Y-m-d H:i', $eventTimeZone);
+				$data_date_get_date	= date('Y-m-d', strtotime($get_date));
+
+				// Frontend Filtering
+				if (
+					!empty($filterFrom)
+					|| !empty($filterTo)
+					|| !empty($filterMonth)
+					|| !empty($filterYear)
+					|| !empty($search)
+				) {
+					$dateToDisplay = true;
+					$controlDate = $date_get_date;
+
+					// Filter by period - From
+					if (!empty($filterFrom) && $dateToDisplay) {
+						$dateToDisplay = (strtotime($controlDate) >= strtotime($filterFrom)) ? true : false;
+					}
+
+					// Filter by period - To
+					if (!empty($filterTo) && $dateToDisplay) {
+						$dateToDisplay = (strtotime($controlDate) <= strtotime($filterTo)) ? true : false;
+					}
+
+					// Filter by Month
+					if (!empty($filterMonth) && $dateToDisplay) {
+						$dateToDisplay = (date('n', strtotime($controlDate)) == $filterMonth) ? true : false;
+					}
+
+					// Filter by Year
+					if (!empty($filterYear) && $dateToDisplay) {
+						$dateToDisplay = (date('Y', strtotime($controlDate)) == $filterYear) ? true : false;
+					}
+
+					if ($currentListSearch) {
+						// Full Period with no weekdays selected, ongoing events
+						if (
+							$only_startdate
+							&& in_array($filterTime, array('1', '4'))
+							&& in_array($date_get_datetime, $perioddates)
+							&& strtotime($EnDate) >= strtotime($datetime_today)
+							&& strtotime($StDate) <= strtotime($datetime_today)
+						) {
+							$controlDate = $datetime_today;
+						} else {
+							$controlDate = $date_get_datetime;
+						}
+
+						// (1) Filter Dates : Ongoing and Upcoming
+						if ($filterTime == 1) {
+							$dateToDisplay = (strtotime($controlDate) >= strtotime($date_today)) ? true : false;
+						}
+						// (2) Filter Dates : Past Dates
+						elseif ($filterTime == 2) {
+							$dateToDisplay = (strtotime($controlDate) < strtotime($datetime_today)) ? true : false;
+						}
+						// (3) Filter Dates : Upcoming
+						elseif ($filterTime == 3) {
+							$dateToDisplay = (strtotime($controlDate) > strtotime($datetime_today)) ? true : false;
+						}
+						// (4) Filter Dates : Ongoing Events today
+						elseif ($filterTime == 4) {
+							$dateToDisplay = ((strtotime($controlDate) >= strtotime($date_today))
+								&& (strtotime($controlDate) < (strtotime($date_today) + 86400))) ? true : false;
+						}
+					}
+
+					if ($dateToDisplay) {
+						$AllDatesFilterTime[] = $fD;
+					}
+				}
+
+				// (0) Filter Dates : All Dates
+				elseif ($filterTime == 0) {
+					// Period with no weekdays selected
+					if (
+						in_array($get_date, $perioddates)
+						&& $only_startdate
+						&& !in_array($StDate . '_' . $i_id, $AllDatesFilterTime)
+					) {
+						$AllDatesFilterTime[] = $data_StDate . '_' . $i_id;
+					}
+
+					// Period with weekdays selected
+					elseif (
+						in_array($get_date, $perioddates)
+						&& !$only_startdate
+					) {
+						$AllDatesFilterTime[] = $fD;
+					}
+
+					// Single Dates
+					elseif (!in_array($get_date, $perioddates)) {
+						$AllDatesFilterTime[] = $fD;
+					}
+				}
+
+				// (1) Filter Dates : Ongoing and Upcoming
+				elseif ($filterTime == 1) {
+					// Period with no weekdays selected
+					if (
+						in_array($get_date, $perioddates)
+						&& $only_startdate
+						&& strtotime($EnDate) >= strtotime($datetime_today)
+						&& !in_array($StDate . '_' . $i_id, $AllDatesFilterTime)
+					) {
+						$AllDatesFilterTime[] = $data_StDate . '_' . $i_id;
+					}
+
+					// Period with weekdays selected
+					elseif (
+						in_array($get_date, $perioddates)
+						&& !$only_startdate
+					) {
+						// If display time, control end time of the day
+						if (
+							$i_displaytime == 1
+							&& strtotime($date_get_date . ' ' . $time_enddate) >= strtotime($datetime_today)
+						) {
+							$AllDatesFilterTime[] = $fD;
+						}
+
+						// If do not display time, control start time of the day
+						elseif (
+							$i_displaytime != 1
+							&& strtotime($date_get_date) >= strtotime($date_today)
+						) {
+							$AllDatesFilterTime[] = $fD;
+						}
+					}
+
+					// Single Dates
+					elseif (
+						!in_array($get_date, $perioddates)
+						//						&& strtotime($get_date) >= strtotime($datetime_today)
+						// Changed because single dates have no end time, so admitted end time is midnight.
+						&& strtotime($get_date) >= strtotime($date_today)
+					) {
+						$AllDatesFilterTime[] = $fD;
+					}
+				}
+
+				// (2) Filter Dates : Past Dates
+				elseif ($filterTime == 2) {
+					// Period with no weekdays selected
+					if (
+						in_array($get_date, $perioddates)
+						&& $only_startdate
+						&& (strtotime($EnDate) < strtotime($datetime_today))
+					) {
+						$AllDatesFilterTime[] = $fD;
+					}
+
+					// Period with weekdays selected
+					elseif (
+						in_array($get_date, $perioddates)
+						&& !$only_startdate
+						&&  strtotime($get_date) < strtotime($datetime_today)
+						&&  strtotime($date_get_date . ' ' . $time_enddate) < strtotime($datetime_today)
+					) {
+						$AllDatesFilterTime[] = $fD;
+					}
+
+					// Single Dates
+					elseif (
+						!in_array($get_date, $perioddates)
+						&& strtotime($get_date) < strtotime($datetime_today)
+					) {
+						$AllDatesFilterTime[] = $fD;
+					}
+				}
+
+				// (3) Filter Dates : Upcoming
+				elseif ($filterTime == 3) {
+					// Period with no weekdays selected
+					if (
+						in_array($get_date, $perioddates)
+						&& $only_startdate
+						&& (strtotime($StDate) > strtotime($datetime_today))
+					) {
+						$AllDatesFilterTime[] = $fD;
+					}
+
+					// Period with weekdays selected
+					elseif (
+						in_array($get_date, $perioddates)
+						&& !$only_startdate
+						&&  strtotime($get_date) > strtotime($datetime_today)
+						&&  strtotime($date_get_date . ' ' . $time_startdate) > strtotime($datetime_today)
+					) {
+						$AllDatesFilterTime[] = $fD;
+					}
+
+					// Single Dates
+					elseif (
+						!in_array($get_date, $perioddates)
+						&& strtotime($get_date) > strtotime($datetime_today)
+					) {
+						$AllDatesFilterTime[] = $fD;
+					}
+				}
+
+				// (4) Filter Dates : Ongoing Events today
+				elseif ($filterTime == 4) {
+					// Period with no weekdays selected
+					if (
+						in_array($get_date, $perioddates)
+						&& $only_startdate
+						&& strtotime($EnDate) > strtotime($datetime_today)
+						&& strtotime($StDate) < (strtotime($date_today) + 86400)
+					) {
+						$AllDatesFilterTime[] = $data_date_get_date . ' ' . $data_time_startdate . '_' . $i_id;
+					}
+
+					// Period with weekdays selected
+					elseif (
+						in_array($get_date, $perioddates)
+						&& !$only_startdate
+						&& (strtotime($date_get_date) == strtotime($date_today)
+							&& strtotime($date_get_date . ' ' . $time_enddate) < (strtotime($date_today) + 86400))
+					) {
+						$AllDatesFilterTime[] = $fD;
+					}
+
+					// Single Dates
+					elseif (
+						!in_array($get_date, $perioddates)
+						//						&& ( strtotime($get_date) >= strtotime($datetime_today)
+						// Changed because single dates have no end time, so admitted end time is midnight.
+						&& (strtotime($get_date) >= strtotime($date_today)
+							&& strtotime($get_date) < (strtotime($date_today) + 86400))
+					) {
+						$AllDatesFilterTime[] = $fD;
+					}
+				}
+			}
+
+			$list_all_dates = array_merge($list_all_dates, $AllDatesFilterTime);
+		}
+
+		if ($orderby == 2) {
+			sort($list_all_dates);
+		} else {
+			rsort($list_all_dates);
+		}
+
+		return $list_all_dates;
+	}
+
+	/**
+	 * Get and update NEXT DATE
+	 *
+	 * @since 3.5.4
+	 */
+
+	public static function getNext()
+	{
+		$app = JFactory::getApplication();
+		$params = $app->getParams();
+
+		// Get Settings
+		$filterTime		= $params->get('time', 1);
+
+		// Set vars
+		$nodate			= '0000-00-00 00:00:00';
+		$eventTimeZone	= null;
+		$datetime_today	= JHtml::date('now', 'Y-m-d H:i:s'); // Joomla Time Zone
+		$date_today		= JHtml::date('now', 'Y-m-d'); // Joomla Time Zone
+		$time_today		= JHtml::date('now', 'H:i:s'); // Joomla Time Zone
+
+		// Preparing connection to db
+		$db	= Jfactory::getDbo();
+
+		// Preparing the query
+		$query = $db->getQuery(true);
+
+		$query->select('next AS tNext, dates AS tDates, startdate AS tStartdate, enddate AS tEnddate,
+						weekdays AS tWeekdays, id AS tId, state AS tState, access AS tAccess');
+		$query->from('#__icagenda_events AS e');
+		//		$query->where(' e.state = 1 OR e.state = 0 ');
+		$query->where('e.state = 1');
+		$query->where('e.next < ' . $db->quote($datetime_today) . ' AND e.next > (DATE(NOW() - INTERVAL 2 MONTH))');
+		//		$query->where('e.next < ' . $db->quote($datetime_today));
+		$db->setQuery($query);
+
+		$all_next_dates = $db->loadObjectList();
+
+		foreach ($all_next_dates as $nd) {
+			$nd_next		= $nd->tNext;
+			$nd_id			= $nd->tId;
+			$nd_state		= $nd->tState;
+			$nd_dates		= $nd->tDates;
+			$nd_startdate	= $nd->tStartdate;
+			$nd_enddate		= $nd->tEnddate;
+			$nd_weekdays	= $nd->tWeekdays;
+
+			// If Single Dates, added to all dates for this event
+			$singleDates	= iCString::isSerialized($nd_dates) ? unserialize($nd_dates) : array();
+
+			$AllDates = array();
+
+			// Get WeekDays Array
+			$WeeksDays = iCDatePeriod::weekdaysToArray($nd_weekdays);
+
+			if (
+				isset($singleDates)
+				&& $singleDates != NULL
+				&& !in_array($nodate, $singleDates)
+				&& !in_array('', $singleDates)
+			) {
+				$AllDates = array_merge($AllDates, $singleDates);
+			} elseif (in_array('', $singleDates)) {
+				$datesarray		= array();
+				$nodate			= array('0000-00-00 00:00');
+				$datesmerger	= array_push($datesarray, $nodate);
+				$DatesUpdate	= serialize($nodate);
+
+				$query	= $db->getQuery(true);
+				$query->update('#__icagenda_events');
+				$query->set("dates='" . (string)$DatesUpdate . "'");
+				$query->where('id=' . (int)$nd_id);
+				$db->setQuery($query);
+				$db->query($query);
+
+				$nosingledates	= unserialize($DatesUpdate);
+				$AllDates		= array_merge($AllDates, $nosingledates);
+			}
+
+			$StDate			= date('Y-m-d H:i', strtotime($nd_startdate));
+			$EnDate			= date('Y-m-d H:i', strtotime($nd_enddate));
+
+			$date_enddate	= date('Y-m-d', strtotime($nd_enddate));
+			$time_enddate	= date('H:i', strtotime($nd_enddate));
+			$date_startdate = date('Y-m-d', strtotime($nd_startdate));
+			$time_startdate = date('H:i', strtotime($nd_startdate));
+
+			$perioddates	= iCDatePeriod::listDates($nd_startdate, $nd_enddate);
+
+			$only_startdate	= ($nd_weekdays || $nd_weekdays == '0') ? false : true;
+
+			if (
+				isset($perioddates)
+				&& $perioddates != NULL
+			) {
+				// Period with no weekdays in Upcoming and Past options
+				if (
+					$only_startdate
+					&& ($filterTime == '3' || $filterTime == '2')
+				) {
+					array_push($AllDates, $StDate);
+				} else {
+					foreach ($perioddates as $Dat) {
+						if (in_array(date('w', strtotime($Dat)), $WeeksDays)) {
+							$date_Dat	= date('Y-m-d', strtotime($Dat));
+							$SingleDate	= date('Y-m-d H:i', strtotime($Dat));
+
+							if ($date_Dat == $date_today && $filterTime != 3) {
+								// Next in Period is today, so set end time
+								array_push($AllDates, $date_Dat . ' ' . $time_startdate);
+							} else {
+								array_push($AllDates, $SingleDate);
+							}
+						}
+					}
+				}
+			}
+
+			rsort($AllDates);
+
+			if ($AllDates == NULL) {
+				$next = '0000-00-00 00:00:00';
+			} else {
+				$date_lastdate		= date('Y-m-d', strtotime($AllDates[0]));
+				$datetime_lastdate	= date('Y-m-d H:i:s', strtotime($AllDates[0]));
+
+				$date_startdate		= date('Y-m-d', strtotime($nd_startdate));
+				$date_enddate		= date('Y-m-d', strtotime($nd_enddate));
+
+				$time_startdate		= date('H:i:s', strtotime($nd_startdate));
+				$time_enddate		= date('H:i:s', strtotime($nd_enddate));
+
+				$returnNext			= $nd_next;
+
+				$next_is_set		= '0';
+
+				$today_upcoming_SD	= '0';
+				$upcoming_SD		= '0';
+
+				foreach ($AllDates as $a) {
+					$tsdate_a = date('Y-m-d', strtotime($a));
+
+					if ($tsdate_a == $date_today) {
+						// All single dates today and not yet started
+						$today_upcoming_SD	= (strtotime($a) > strtotime($datetime_today)) ? ($today_upcoming_SD + 1) : $today_upcoming_SD;
+					}
+
+					if ($tsdate_a >= $datetime_today) {
+						// All upcoming single dates
+						$upcoming_SD	= $upcoming_SD + 1;
+					}
+				}
+
+				$total_today_SD = $today_upcoming_SD;
+
+				foreach ($AllDates as $a) {
+					$tsdatetime_a	= date('Y-m-d H:i:s', strtotime($a));
+					$tsdate_a		= date('Y-m-d', strtotime($a));
+
+					// Only past single dates
+					if (
+						$datetime_lastdate < $datetime_today
+						&& $date_lastdate != $date_today
+						&& $next_is_set == '0'
+					) {
+						$returnNext = date('Y-m-d H:i:s', strtotime($AllDates[0]));
+						$next_is_set = $next_is_set + 1;
+					}
+
+					// The last date is today
+					elseif (
+						$date_lastdate == $date_today
+						&& $next_is_set == '0'
+						&& $total_today_SD == 1
+					) {
+						// Period divided into days
+						if (
+							$nd_startdate != $nodate
+							&& $nd_enddate != $nodate
+							&& in_array($a, $perioddates)
+							&& !$only_startdate
+						) {
+							$returnNext = date('Y-m-d', strtotime($nd_enddate)) . ' ' . $time_startdate;
+							$next_is_set = $next_is_set + 1;
+						}
+
+						// Full period (from ... to ...)
+						elseif (
+							$nd_startdate != $nodate
+							&& $nd_enddate != $nodate
+							&& in_array($a, $perioddates)
+							&& $only_startdate
+						) {
+							$returnNext = date('Y-m-d', strtotime($nd_startdate)) . ' ' . $time_startdate;
+							$next_is_set = $next_is_set + 1;
+						}
+
+						// Single date
+						else {
+							if ($datetime_lastdate > $datetime_today) {
+								$today_upcoming_SD = $today_upcoming_SD - 1;
+							}
+
+							if (
+								$datetime_lastdate > $datetime_today
+								&& $today_upcoming_SD == '0'
+							) {
+								$returnNext = date('Y-m-d H:i:s', strtotime($AllDates[0]));
+								$next_is_set = $next_is_set + 1;
+							}
+						}
+					}
+
+					// Multiple upcoming single dates
+					//					elseif ($tsdatetime_a > $datetime_today)
+					// Changed because single dates have no end time, so admitted end time is midnight.
+					elseif (
+						$tsdatetime_a > $date_today
+						&& $next_is_set == '0'
+					) {
+						// Remaining Today's upcoming dates
+						if ($tsdate_a == $date_today) {
+							if ($tsdatetime_a > $datetime_today) {
+								$today_upcoming_SD = $today_upcoming_SD - 1;
+							}
+						}
+
+						// Remaining Upcoming dates
+						if ($tsdate_a >= $datetime_today) {
+							$upcoming_SD = $upcoming_SD - 1;
+						}
+
+						if (
+							$today_upcoming_SD == '0'
+							&& $upcoming_SD == '0'
+						) {
+							$returnNext = date('Y-m-d H:i:s', strtotime($a));
+							$next_is_set = $next_is_set + 1;
+						}
+					}
+				}
+
+				// Test End Date if Next Date or Last Date (3.1.5)
+				$date_returnNext	= date('Y-m-d', strtotime($returnNext));
+				$time_returnNext	= date('H:i:s', strtotime($returnNext));
+
+				if (($date_enddate != '0000-00-00')
+					&& ($date_today == $date_enddate || $date_today == $date_returnNext)
+				) {
+					$time_LastTime = $time_startdate;
+				} else {
+					$time_LastTime = $time_returnNext;
+				}
+
+				// Fix 3.1.12 (removed isset($tPeriod))
+				if (($nd_enddate != $nodate)
+					&& ($date_startdate < $date_today)
+					&& ($date_enddate == $date_today)
+					&& ($time_LastTime >= $time_today)
+				) {
+					$returnNextPediod = date('Y-m-d', strtotime($nd_enddate)) . ' ' . $time_startdate;
+				} else {
+					$returnNextPediod = $returnNext;
+				}
+
+				// Set next var
+				if (($date_returnNext == $date_enddate)
+					&& ($date_enddate == $date_today)
+				) {
+					$next = $returnNextPediod;
+				} elseif (
+					strtotime($date_startdate) < strtotime($date_today)
+					&& strtotime($date_enddate) >= strtotime($date_today)
+					&& strtotime($time_enddate) != strtotime($time_returnNext)
+					&& strtotime($time_LastTime) > strtotime($time_today)
+				) {
+					$next = $date_returnNext . ' ' . date('H:i:s', strtotime($time_LastTime));
+				} else {
+					$next = $returnNext;
+				}
+			}
+			// 3.1.12 Fixed and update events with bug
+			if (
+				$nd_next == $nodate
+				&& $nd_state == 0
+				&& $nd_startdate != $nodate
+				&& $nd_enddate != $nodate
+				&& strtotime($nd_enddate) >= strtotime($nd_startdate)
+			) {
+				$next = $returnNext;
+
+				$query	= $db->getQuery(true);
+				$query->update('#__icagenda_events');
+				$query->set('state=1');
+				$query->where('id=' . (int)$nd_id);
+				$db->setQuery($query);
+				$db->query($query);
+			}
+
+			if ($next != $nd_next) {
+				$query	= $db->getQuery(true);
+				$query->update('#__icagenda_events');
+				$query->set("next='" . $next . "'");
+				$query->where('id=' . (int)$nd_id);
+				$db->setQuery($query);
+				$db->query($query);
+			}
+		}
+	}
+
+	/**
+	 * Returns the element of a SQL query WHERE clause to support filtering the selection of Events using Event Features
+	 *
+	 * Controlled by menu parameters:
+	 *  features_filter - array of Feature IDs
+	 *  features_incl_excl - indicates whether the Feature IDs are to be used to include or exclude Events
+	 *  features_any_all - indicates whether any Feature ID or all Feature IDs required to include or exclude an Event
+	 *
+	 * One or more sub-queries is referenced in a WHERE clause with IN() or NOT IN() to include or exclude Events.
+	 *
+	 * If any Feature ID in isolation is to include or exclude Event records then a single sub-query is used that
+	 * uses a simple inner join between the feature and feature_xref tables to identify the distinct set of Event IDs
+	 * linked to any one of the spacific Feature IDs.
+	 *
+	 * If all Feature IDs combined are required to include or exclude Events then separate sub-queries are used for
+	 * each of the spacific Feature IDs. For this case, a more efficient option is available involving a direct join
+	 * with either an inner or outer join, according to whether records are being included or excluded but this
+	 * puts an unreasonable constraint on the overall syntax of the query.
+	 */
+	public static function getFeaturesFilter($params = null)
+	{
+		// Get the params
+		if (!$params) {
+			$app = JFactory::getApplication();
+			$params = $app->getParams();
+		}
+
+		// Initialise a return value that can be included harmlessly in a WHERE clause, if necessary
+		$filter = ' TRUE ';
+		$featureids = $params->get('features_filter', '');
+
+		if (is_array($featureids) && !empty($featureids)) {
+			$db = Jfactory::getDbo();
+			$incl_excl = $params->get('features_incl_excl', '1') == '1' ? '' : 'NOT';
+
+			if ($params->get('features_any_all', '1') == '1') {
+				// Any single Feature ID will include or exclude events
+				// Create comma separated list of Feature IDs
+				$featureids = implode(',', $featureids);
+				// Create a single sub-query
+				$sub_query = $db->getQuery(true);
+				$sub_query->select('fx.event_id')
+					->from('#__icagenda_feature_xref AS fx')
+					->innerJoin("#__icagenda_feature AS f ON fx.feature_id=f.id AND f.state=1 AND f.show_filter=1 AND f.id IN($featureids)");
+				// Join the sub-query to the main query
+				$filter = "(e.id $incl_excl IN(" . (string) $sub_query . '))';
+			} else {
+				// All Feature IDs combined will include or exclude events
+				// Create a separate sub-query for each of the Feature IDs
+				$sub_queries = array();
+
+				foreach ($featureids as $featureid) {
+					$sub_query = $db->getQuery(true);
+					$sub_query->select('fx.event_id')
+						->from('#__icagenda_feature_xref AS fx')
+						->innerJoin("#__icagenda_feature AS f ON fx.feature_id=f.id AND f.state=1 AND f.show_filter=1 AND f.id=$featureid");
+					$sub_queries[] = "e.id $incl_excl IN(" . (string) $sub_query . ')';
+				}
+
+				// Combine the sub-queries depending on inclusion or exclusion of events
+				$filter = "(" . implode($incl_excl == 'NOT' ? " \nOR " : " \nAND ", $sub_queries) . ')';
+			}
+		}
+
+		return $filter;
+	}
+
+	/**
+	 * Return Array of all registrations from an event (date@@people)
+	 * date : registered date
+	 * people : nb of tickets for this registration
+	 *
+	 * @since	3.5.0
+	 * @version 3.6.6
+	 */
+	public static function registeredList($id = null)
+	{
+		// Registrations total
+		$db		= Jfactory::getDbo();
+		$query	= $db->getQuery(true);
+		$query->select('r.date AS date, r.period AS period, r.eventid AS eventid, r.people AS people');
+		$query->from('#__icagenda_registration AS r');
+		$query->where('r.state = 1');
+
+		if ($id) {
+			$query->where('r.eventid = ' . $db->q($id));
+		}
+
+		$db->setQuery($query);
+		$result = $db->loadObjectList();
+
+		$registeredList = array();
+
+		foreach ($result as $r) {
+			$reg_date = $r->date ? $r->date : 'period';
+			$registeredList[] = $r->eventid . '@@' . $reg_date . '@@' . $r->period . '@@' . $r->people;
+		}
+
+		return $registeredList;
+	}
+
+	/**
+	 * Return list of all dates (singles and period) from an event
+	 *
+	 * @since	3.5.0 (Not Yet Used)
+	 */
+	public static function thisEventDates($id)
+	{
+		// Set vars
+		$nodate			= '0000-00-00 00:00:00';
+		$ic_nodate		= '0000-00-00 00:00';
+		$eventTimeZone	= null;
+
+		// Get Data
+		$db		= Jfactory::getDbo();
+		$query	= $db->getQuery(true);
+		$query->select('e.next, e.dates, e.startdate, e.enddate, e.period, e.weekdays, e.displaytime, e.id');
+		$query->from('#__icagenda_events AS e');
+		$query->leftJoin('#__icagenda_category AS c ON c.id = e.catid');
+		$query->where('c.state = 1');
+		$query->where('e.id = ' . $db->q($id));
+		$db->setQuery($query);
+		$result = $db->loadObjectList();
+
+		// Get Data
+		$tId			= $id;
+		$tDates			= $result->dates;
+		$tStartdate		= $result->startdate;
+		$tEnddate		= $result->enddate;
+		$tWeekdays		= $result->weekdays;
+
+		// Declare AllDates array
+		$thisEventDates = array();
+
+		// Get WeekDays Array
+		$WeeksDays = iCDatePeriod::weekdaysToArray($tWeekdays);
+
+		// If Single Dates, added each one to All Dates for this event
+		$singledates = unserialize($tDates);
+
+		foreach ($singledates as $sd) {
+			$isValid = iCDate::isDate($sd);
+
+			if ($isValid) {
+				array_push($thisEventDates, $sd);
+			}
+		}
+
+		$perioddates = iCDatePeriod::listDates($tStartdate, $tEnddate, $eventTimeZone);
+
+		if (
+			isset($perioddates)
+			&& $perioddates != NULL
+		) {
+			foreach ($perioddates as $Dat) {
+				if (in_array(date('w', strtotime($Dat)), $WeeksDays)) {
+					$isValid = iCDate::isDate($Dat);
+
+					if ($isValid) {
+						$SingleDate = date('Y-m-d H:i:s', strtotime($Dat));
+
+						array_push($thisEventDates, $SingleDate);
+					}
+				}
+			}
+		}
+
+		return $thisEventDates;
+	}
+
+	public static function getAllTimeZone($decrease = 0)
+	{
+		$zones_array = array();
+		$timestamp = strtotime('-1 hour');
+		foreach (timezone_identifiers_list() as $key => $zone) {
+			date_default_timezone_set($zone);
+			$zones_array[$key]['zone'] = $zone;
+			$zones_array[$key]['offset'] = (int) ((int) date('O', $timestamp)) / 100 - $decrease;
+			$zones_array[$key]['diff_from_GMT'] = 'GMT' . date('P', $timestamp);
+			$zones_array[$key]['id'] = date('O', $timestamp) / 100 - $decrease . '_' . $zone;
+		}
+
+		return $zones_array;
+	}
+
+	public static function changeDate($offset = 0, &$nextDate, &$endDate)
+	{
+		if ($offset != 0) {
+			if (strpos($offset, '.3') !== false || strpos($offset, '.45') !== false) {
+				if (strpos($offset, '.3') !== false)
+					$offset .= '0';
+
+				$prefix 		= substr($offset, 0, 1) == '-' ? '-' : '+';
+				$minuteOffset	= $text = explode('.', $offset, 2);
+
+				$nextDate = new DateTime($nextDate);
+				$nextDate->modify($minuteOffset[0] . ' hours');
+				$nextDate->modify($prefix . $minuteOffset[1] . ' minutes');
+
+				$endDate = new DateTime($endDate);
+				$endDate->modify($minuteOffset[0] . ' hours');
+				$endDate->modify($prefix . $minuteOffset[1] . ' minutes');
+			} else {
+				$nextDate = new DateTime($nextDate);
+				$nextDate->modify($offset . ' hours');
+
+				$endDate = new DateTime($endDate);
+				$endDate->modify($offset . ' hours');
+			}
+
+			$nextDate 	= $nextDate->format('Y-m-d H:i:s');
+			$endDate	= $endDate->format('Y-m-d H:i:s');
+		}
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/events/event.php b/deployed/icagenda/administrator/components/com_icagenda/utilities/events/event.php
new file mode 100644
index 00000000..7c2fef44
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/events/event.php
@@ -0,0 +1,1277 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.15 2020-05-18
+ *
+ * @package     iCagenda.Admin
+ * @subpackage  Utilities
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2020 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.6.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * class icagendaEvent
+ */
+class icagendaEvent
+{
+	/**
+	 * Get Next Date (or Last Date) from event dates
+	 *
+	 * @since   3.7.15
+	 */
+	public static function getNextDate($item, $reset = false)
+	{
+		if (is_array($item))
+		{
+			$item = ArrayHelper::toObject($item);
+		}
+
+		$eventTimeZone = null;
+
+		// If no stored datetime for next, or next date is past, we need to update next date
+		if ( ! isset($item->next)
+			|| ($item->next <= JHtml::date('now', 'Y-m-d H:i:s')
+				|| ! iCDate::isDate($item->next))
+			)
+		{
+			$reset = true;
+		}
+
+		if ($reset)
+		{
+			$next_singleDates = $last_singleDates = '';
+			$next_period = $last_period = '';
+
+			// Single Dates Check
+			$singleDates = iCString::isSerialized($item->dates) ? unserialize($item->dates) : array();
+
+			$upcomingSingleDates = array_filter(
+				$singleDates,
+				function($date)
+				{
+					return $date >= JHtml::date('now', 'Y-m-d H:i:s');
+				}
+			);
+
+			if (count($upcomingSingleDates) > 0)
+			{
+				$next_singleDates = min($upcomingSingleDates);
+				$next_singleDates = iCDate::isDate($next_singleDates) ? $next_singleDates : '';
+			}
+			else
+			{
+				$pastSingleDates = array_filter(
+					$singleDates,
+					function ($date)
+					{
+						return $date < JHtml::date('now', 'Y-m-d H:i:s');
+					}
+				);
+
+				if (count($pastSingleDates) > 0)
+				{
+					$last_singleDates = max($pastSingleDates);
+					$last_singleDates = iCDate::isDate($last_singleDates) ? $last_singleDates : '';
+				}
+			}
+
+
+			// Period Check
+			$weekdays = ! is_array($item->weekdays) ? explode(",", $item->weekdays) : $item->weekdays;
+
+			if (count($weekdays) > 0)
+			{
+				$period_all_dates_array = iCDatePeriod::listDates($item->startdate, $item->enddate);
+
+				$period_array = array();
+
+				foreach ($period_all_dates_array AS $date_in_weekdays)
+				{
+					$datetime_period_date = JHtml::date($date_in_weekdays, 'Y-m-d H:i', $eventTimeZone);
+
+					if (in_array(date('w', strtotime($datetime_period_date)), $weekdays))
+					{
+						$period_array[] = $datetime_period_date;
+					}
+				}
+
+				$upcomingPeriodDates = array_filter(
+					$period_array,
+					function($date)
+					{
+						return $date >= JHtml::date('now', 'Y-m-d H:i:s');
+					}
+				);
+
+				if (count($upcomingPeriodDates) > 0)
+				{
+					$next_period = min($upcomingPeriodDates);
+					$next_period = iCDate::isDate($next_period) ? $next_period : '';
+				}
+				else
+				{
+					$last_period = iCDate::isDate($item->startdate) ? $item->startdate : '';
+				}
+			}
+			else
+			{
+				if ($item->startdate >= JHtml::date('now', 'Y-m-d H:i:s'))
+				{
+					$next_period = iCDate::isDate($item->startdate) ? $item->startdate : '';
+				}
+				elseif ($item->enddate >= JHtml::date('now', 'Y-m-d H:i:s'))
+				{
+					$next_period = iCDate::isDate($item->startdate) ? $item->startdate : '';
+				}
+				else
+				{
+					$last_period = iCDate::isDate($item->startdate) ? $item->startdate : '';
+				}
+			}
+
+
+			// Return Next
+			if ($next_singleDates && $next_period)
+			{
+				$next = min($next_singleDates, $next_period);
+			}
+			elseif ($next_singleDates)
+			{
+				$next = $next_singleDates;
+			}
+			elseif ($next_period)
+			{
+				$next = $next_period;
+			}
+			else
+			{
+				$next = max($last_singleDates, $last_period);
+			}
+
+			if ($item->next != $next)
+			{
+				$item->next = $next;
+
+				$db	   = Jfactory::getDbo();
+				$query = $db->getQuery(true);
+
+				$query->update('#__icagenda_events')
+					->set($db->qn('next') . ' = ' . $db->q($next))
+					->where($db->qn('id') . ' = ' . (int) $item->id);
+
+				$db->setQuery($query);
+				$db->query($query);
+			}
+		}
+
+		return $item->next;
+	}
+
+	/**
+	 * Function to get Event Params
+	 *
+	 * @return  JRegistry Event Params
+	 *
+	 * @since   3.6.0
+	 */
+	public static function evtParams($params)
+	{
+		$evtParams = new JRegistry($params);
+
+		return $evtParams;
+	}
+
+	/**
+	 * Function to return the back arrow button (No item needed)
+	 *
+	 * @return  HTML
+	 *
+	 * @since   3.6.0
+	 */
+	public static function backArrow($item = null)
+	{
+		$app    = JFactory::getApplication();
+		$jinput = $app->input;
+		$jview  = $jinput->get('view');
+
+		// Get Current Itemid
+		$this_itemid = $jinput->getInt('Itemid', 0);
+
+		// TODO: Remove jlayout control (3.6)
+		$jlayout       = $jinput->get('layout', '');
+		$layouts_array = array('event', 'registration');
+		$layout        = in_array($jlayout, $layouts_array) ? $jlayout : '';
+
+		$manageraction = $jinput->get('manageraction', '');
+		$referer       = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '';
+
+		// RTL css if site language is RTL
+		$lang      = JFactory::getLanguage();
+		$back_icon = ($lang->isRTL()) ? 'iCicon iCicon-nextic' : 'iCicon iCicon-backic';
+
+		if ( ($layout != '' || $jview == 'event')
+			&& strpos($referer,'registration') === false
+			&& ! $manageraction)
+		{
+			if ($referer != "")
+			{
+				$BackArrow = '<div class="ic-back"><a class="iCtip" href="' . str_replace(array('"', '<', '>', "'"), '', $referer) .'" title="' . JText::_('COM_ICAGENDA_BACK') . '"><span class="' . $back_icon . '"></span> <span style="font-size: 50px !important;">Back to the topics</span></a></div>';
+			}
+			else
+			{
+				$BackArrow = '';
+			}
+		}
+		elseif ($manageraction || strpos($referer,'registration') !== false)
+		{
+			$BackArrow = '<div class="ic-back"><a class="iCtip" href="' . JRoute::_('index.php?option=com_icagenda&Itemid=' . (int) $this_itemid) .'" title="' . JText::_('COM_ICAGENDA_BACK') . '"><span class="' . $back_icon . '"></span> <span class="small">' . JText::_('COM_ICAGENDA_BACK') . '</span></a></div>';
+		}
+		else
+		{
+			$BackArrow = '';
+		}
+
+		// Header Message if event cancelled
+		$evtParams = self::getParams($item->id);
+		$cancellation_info = '';
+
+		if ($evtParams->get('event_cancelled'))
+		{
+			$text        = JText::_('COM_ICAGENDA_EVENT_CANCELLED_TEXT');
+			$description = $evtParams->get('event_cancelled_desc');
+
+			if ($evtParams->get('event_cancelled_customlabel'))
+			{
+				$text  = JText::_($evtParams->get('event_cancelled_customlabel_text', 'COM_ICAGENDA_EVENT_CANCELLED_TEXT'));
+//				$class = $evtParams->get('event_cancelled_customlabel_css', $class);
+			}
+
+			$cancellation_info = '<br /><div class="ic-event-cancelled-alert alert alert-danger">'
+								. '<h2 class="alert-heading">' . $text . '</h2>'
+								. '<div class="alert-message">' . $description . '</div>'
+								. '</div>';
+		}
+
+		return $BackArrow . $cancellation_info;
+	}
+
+	/**
+	 * Set event Url
+	 *
+	 * @since   3.6.0
+	 */
+	public static function url($id, $alias = null)
+	{
+		$app    = JFactory::getApplication();
+		$isSef  = $app->getCfg('sef');
+		$jinput = $app->input;
+
+		$menuID = $jinput->get('Itemid', 0);
+		$date   = $jinput->get('date', '');
+		$view   = $jinput->get('view', '');
+
+		// Get var 'event_date' set to session in event details view
+		$session    = JFactory::getSession();
+		$event_date = $session->get('event_date', '');
+
+		$event_slug = empty($alias) ? (int) $id : (int) $id . ':' . $alias;
+		$this_date  = $event_date ? date('Y-m-d-H-i', strtotime($event_date)) : $date;
+
+		$url = JRoute::_('index.php?option=com_icagenda&view=event&id=' . $event_slug . '&Itemid=' . (int) $menuID);
+
+		if (is_numeric($menuID) && is_numeric($id)
+			&& ! is_array($menuID) && ! is_array($id))
+		{
+			$date_var = ($isSef == '1') ? '?date=' : '&amp;date=';
+			$url      = ($view != 'list' && $this_date) ? $url . $date_var . $this_date : $url;
+		}
+		else
+		{
+			$url = JRoute::_('index.php');
+		}
+
+		return $url;
+	}
+
+	/**
+	 * Title + Manager Icons
+	 *
+	 * @since   3.6.0
+	 * @todo    Review and split into sub-functions
+	 */
+	public static function titleBar($i)
+	{
+		$jinput = JFactory::getApplication()->input;
+
+		$this_itemid       = $jinput->getInt('Itemid');
+		$list_title_length = (int) JComponentHelper::getParams('com_icagenda')->get('list_title_length', '');
+
+		$i_title = icagendaRender::titleToFormat($i->title);
+
+		$jlayout       = $jinput->get('layout', '');
+		$layouts_array = array('event', 'registration');
+		$layout        = in_array($jlayout, $layouts_array) ? $jlayout : '';
+
+		$mbString = extension_loaded('mbstring');
+
+		$title_length = $mbString ? mb_strlen($i_title, 'UTF-8') : strlen($i_title);
+
+		if (empty($layout)
+			&& ! empty($list_title_length))
+		{
+			$title  = $mbString
+					? trim(mb_substr($i_title, 0, $list_title_length, 'UTF-8'))
+					: trim(substr($i_title, 0, $list_title_length));
+
+			$new_title_length = $mbString ? mb_strlen($title, 'UTF-8') : strlen($title);
+
+			if ($new_title_length < $title_length)
+			{
+				$title.= '...';
+			}
+		}
+		else
+		{
+			$title = $i_title;
+		}
+
+		$approval = $i->approval;
+
+		$event_slug = empty($i->alias) ? $i->id : $i->id . ':' . $i->alias;
+
+		// Set Manager Actions Url
+		$managerActionsURL = 'index.php?option=com_icagenda&view=event&id=' . $event_slug . '&Itemid=' . $this_itemid;
+
+		$unapproved = '<a class="iCtip" href="' . JRoute::_($managerActionsURL) . '" title="' . JText::_('COM_ICAGENDA_APPROVE_AN_EVENT_LBL') . '"><small><span class="iCicon-open-details"></span></small></a>';
+
+		$titleBar = '';
+
+		if ($title != NULL && $approval == 1)
+		{
+			$titleBar.= $title . ' ' . $unapproved;
+		}
+		elseif ($title != NULL && $approval != 1)
+		{
+			$titleBar.= $title;
+		}
+
+		$eventIsCancelled = self::cancelledButton($i->id, 'btn btn-danger');
+
+		if ($eventIsCancelled)
+		{
+			$titleBar.= ' ' . $eventIsCancelled;
+		}
+
+		return $titleBar;
+	}
+
+	/**
+	 * Return Event Cancelled button with infotip
+	 *
+	 * @since   3.7.12
+	 */
+	public static function cancelledButton($id, $class = 'label label-important')
+	{
+		$evtParams = self::getParams($id);
+
+		if ($evtParams->get('event_cancelled'))
+		{
+			$language = JFactory::getLanguage();
+			$language->load('com_icagenda', JPATH_SITE, 'en-GB', false, true);
+			$language->load('com_icagenda', JPATH_SITE, null, true);
+
+			$text        = JText::_('COM_ICAGENDA_EVENT_CANCELLED_TEXT');
+			$description = $evtParams->get('event_cancelled_desc');
+
+			if ($evtParams->get('event_cancelled_customlabel'))
+			{
+				$text  = JText::_($evtParams->get('event_cancelled_customlabel_text', 'COM_ICAGENDA_EVENT_CANCELLED_TEXT'));
+				$class = $evtParams->get('event_cancelled_customlabel_css', $class);
+			}
+
+			$title = $tipclass = $position = '';
+
+			if (!empty($description))
+			{
+				if ($text && $text !== $description)
+				{
+					JHtml::_('bootstrap.popover');
+					$tipclass = ' hasPopover';
+					$title    = ' title="' . htmlspecialchars(trim($text, ':')) . '"'
+						. ' data-content="'. htmlspecialchars($description) . '"';
+
+					if (!$position && JFactory::getLanguage()->isRtl())
+					{
+						$position = ' data-placement="left" ';
+					}
+				}
+				else
+				{
+					JHtml::_('bootstrap.tooltip');
+					$tipclass = ' hasTooltip';
+					$title    = ' title="' . JHtml::_('tooltipText', trim($text, ':'), JText::_($description), 0) . '"';
+					$position = 'top';
+				}
+			}
+
+			$cancelledButton = '<span class="ic-event-cancelled ' . $class . $tipclass . '"' . $title . $position . '>' . $text . '</span>';
+
+			return $cancelledButton;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Next Date Text
+	 *
+	 * @since   3.6.0
+	 */
+	public static function dateText($i)
+	{
+		$eventTimeZone = null;
+
+		$dates         = iCString::isSerialized($i->dates) ? unserialize($i->dates) : array(); // returns array
+		$period        = iCString::isSerialized($i->period) ? unserialize($i->period) : array(); // returns array
+		$weekdays      = $i->weekdays;
+		$startdatetime = iCDate::isDate($i->startdate) ? date('Y-m-d H:i', strtotime($i->startdate)) : '';
+
+		$site_date     = JHtml::date('now', 'Y-m-d');
+		$site_datetime = JHtml::date('now', 'Y-m-d H:i');
+
+		$alldates_array = array_merge($dates, $period);
+ 		$alldates       = array_filter($alldates_array, function($var) {return $var == iCDate::isDate($var);});
+
+		$next_date     = date('Y-m-d', strtotime($i->next));
+		$next_datetime = date('Y-m-d H:i', strtotime($i->next));
+
+		$next_is_in_period = in_array($next_datetime, $period) ? true : false;
+
+		$totDates = count($alldates);
+
+		if ($totDates > 1
+			&& $next_date > $site_date)
+		{
+			rsort($alldates);
+
+			$last_date = JHtml::date($alldates[0], 'Y-m-d', $eventTimeZone);
+
+			if ( ! $next_is_in_period
+				&& $last_date == $next_date)
+			{
+				$dateText = JText::_('COM_ICAGENDA_EVENT_DATE_LAST');
+			}
+			elseif ( ! $next_is_in_period)
+			{
+				$dateText = JText::_('COM_ICAGENDA_EVENT_DATE_FUTUR');
+			}
+			elseif ($next_is_in_period
+				&& $weekdays == NULL)
+			{
+				$dateText = JText::_('COM_ICAGENDA_LEGEND_DATES');
+			}
+			else
+			{
+				$dateText = JText::_('COM_ICAGENDA_EVENT_DATE');
+			}
+		}
+		elseif ($totDates > 1
+			&& $next_date < $site_date)
+		{
+			if ($totDates == 2)
+			{
+				$dateText   = $next_is_in_period
+							? JText::_('COM_ICAGENDA_EVENT_DATE')
+							: JText::_('COM_ICAGENDA_EVENT_DATE_PAST');
+			}
+			else
+			{
+				$dateText   = ($next_is_in_period && $weekdays == NULL)
+							? JText::_('COM_ICAGENDA_LEGEND_DATES')
+							: JText::_('COM_ICAGENDA_EVENT_DATE_PAST');
+			}
+		}
+		elseif ($next_date == $site_date)
+		{
+			$dateText   = ($next_is_in_period && ($next_datetime < $site_datetime || $next_datetime != $startdatetime))
+						? JText::_('COM_ICAGENDA_EVENT_DATE_PERIOD_NOW')
+						: JText::_('COM_ICAGENDA_EVENT_DATE_TODAY');
+		}
+		else
+		{
+			$dateText = JText::_( 'COM_ICAGENDA_EVENT_DATE' );
+		}
+
+		return $dateText;
+	}
+
+	/**
+	 * Get Next Date (or Last Date)
+	 *
+	 * @since   3.4.0
+	 */
+	public static function nextDate($evt, $i)
+	{
+		$eventTimeZone = null;
+
+//		$singledates   = iCString::isSerialized($i->dates) ? unserialize($i->dates) : array(); // returns array
+		$period        = iCString::isSerialized($i->period) ? unserialize($i->period) : array(); // returns array
+		$startdatetime = $i->startdate;
+		$enddatetime   = $i->enddate;
+		$weekdays      = $i->weekdays;
+
+		$site_date      = JHtml::date('now', 'Y-m-d');
+		$UTC_today_date = JHtml::date('now', 'Y-m-d', $eventTimeZone);
+
+		$next_date     = JHtml::date($evt, 'Y-m-d', $eventTimeZone);
+		$next_datetime = JHtml::date($evt, 'Y-m-d H:i', $eventTimeZone);
+
+		$start_date = JHtml::date($i->startdate, 'Y-m-d', $eventTimeZone);
+		$end_date   = JHtml::date($i->enddate, 'Y-m-d', $eventTimeZone);
+
+		// Check if date from a period with weekdays has end time of the period set in next.
+//		$time_next_datetime = JHtml::date($next_datetime, 'H:i', $eventTimeZone);
+		$time_next_datetime = date('H:i', strtotime($next_datetime));
+		$time_startdate     = JHtml::date($i->startdate, 'H:i', $eventTimeZone);
+		$time_enddate       = JHtml::date($i->enddate, 'H:i', $eventTimeZone);
+
+		$data_next_datetime = date('Y-m-d H:i', strtotime($evt));
+
+		if ($next_date == $site_date
+			&& $time_next_datetime == $time_enddate)
+		{
+			$next_datetime = $next_date . ' ' . $time_startdate;
+		}
+
+		if ($period != NULL
+			&& in_array($data_next_datetime, $period))
+		{
+			$next_is_in_period = true;
+		}
+		else
+		{
+			$next_is_in_period = false;
+		}
+
+		// Highlight event in progress
+		if ($next_date == $site_date)
+		{
+			$start_span = '<span class="ic-next-today">';
+			$end_span   = '</span>';
+		}
+		else
+		{
+			$start_span = $end_span = '';
+		}
+
+		$separator = '<span class="ic-datetime-separator"> - </span>';
+
+		// Format Next Date
+		if ($next_is_in_period
+			&& ($start_date == $end_date || $weekdays != null))
+		{
+			// Next in the period & (same start/end date OR one or more weekday selected)
+			$nextDate = $start_span;
+			$nextDate.= '<span class="ic-single-startdate">';
+			$nextDate.= icagendaRender::dateToFormat($evt);
+			$nextDate.= '</span>';
+
+			if ($i->displaytime == 1)
+			{
+				$nextDate.= ' <span class="ic-single-starttime">' . icagendaRender::dateToTime($i->startdate) . '</span>';
+
+				if (icagendaRender::dateToTime($i->startdate) != icagendaRender::dateToTime($i->enddate))
+				{
+					$nextDate.= $separator . '<span class="ic-single-endtime">' . icagendaRender::dateToTime($i->enddate) . '</span>';
+				}
+			}
+
+			$nextDate.= $end_span;
+		}
+		elseif ($next_is_in_period
+			&& ($weekdays == null))
+		{
+			// Next in the period & different start/end date & no weekday selected
+			$start = '<span class="ic-period-startdate">';
+			$start.= icagendaRender::dateToFormat($i->startdate);
+			$start.= '</span>';
+
+			$end = '<span class="ic-period-enddate">';
+			$end.= icagendaRender::dateToFormat($i->enddate);
+			$end.= '</span>';
+
+			if ($i->displaytime == 1)
+			{
+				$start.= ' <span class="ic-period-starttime">' . icagendaRender::dateToTime($i->startdate) . '</span>';
+
+				$end.= ' <span class="ic-period-endtime">' . icagendaRender::dateToTime($i->enddate) . '</span>';
+			}
+
+			$nextDate = $start_span . $start . $separator . $end . $end_span;
+		}
+		else
+		{
+			// Next is a single date
+			$nextDate = $start_span;
+			$nextDate.= '<span class="ic-single-next">';
+			$nextDate.= icagendaRender::dateToFormat($evt);
+			$nextDate.= '</span>';
+
+			if ($i->displaytime == 1)
+			{
+				$nextDate.= ' <span class="ic-single-starttime">' . icagendaRender::dateToTime($evt) . '</span>';
+			}
+
+			$nextDate.= $end_span;
+		}
+
+		return $nextDate;
+	}
+
+	/*
+	 * Function to detect if info details exist in an event,
+	 * and to hide or show it depending of Options (display and access levels)
+	 *
+	 * @since   3.6.0
+	 */
+	public static function infoDetails($item, $CUSTOM_FIELDS)
+	{
+		// Hide/Show Option
+		$infoDetails = JComponentHelper::getParams('com_icagenda')->get('infoDetails', 1);
+
+		// Access Levels Option
+		$accessInfoDetails = JComponentHelper::getParams('com_icagenda')->get('accessInfoDetails', 1);
+
+		if ( ($infoDetails == 1 && icagendaEvents::accessLevels($accessInfoDetails))
+			&& ( ($item->params->get('statutReg', '') == '1' && $item->params->get('maxReg'))
+				|| $item->phone
+				|| $item->email
+				|| $item->website
+				|| $item->address
+				|| $item->file
+				|| $CUSTOM_FIELDS )
+			)
+		{
+			return true;
+		}
+
+		return false;
+	}
+
+	/*
+	 * Function to return a list of all single dates, HTML formatted.
+	 * TO BE REFACTORED
+	 *
+	 * @since   3.6.0
+	 */
+	public static function displayListSingleDates($item)
+	{
+		$iCparams   = JComponentHelper::getParams('com_icagenda');
+		$timeformat = JFactory::getApplication()->getParams()->get('timeformat', 1);
+
+		// Hide/Show Option
+		$SingleDates = $iCparams->get('SingleDates', 1);
+
+		// Access Levels Option (to be checked!)
+//		$accessSingleDates = $iCparams->get('accessSingleDates', 1);
+
+		// Order by Dates
+		$SingleDatesOrder = $iCparams->get('SingleDatesOrder', 1);
+
+		// List Model
+		$SingleDatesListModel = $iCparams->get('SingleDatesListModel', 1);
+
+		if ($SingleDates == 1)
+		{
+//			if ($this->accessLevels($accessSingleDates))
+//			{
+				$days = iCString::isSerialized($item->dates) ? unserialize($item->dates) : array(); // returns array
+
+				if ($SingleDatesOrder == 1)
+				{
+					rsort($days);
+				}
+				elseif ($SingleDatesOrder == 2)
+				{
+					sort($days);
+				}
+
+				$totDates = count($days);
+
+				if ($timeformat == 1)
+				{
+					$lang_time = 'H:i';
+				}
+				else
+				{
+					$lang_time = 'h:i A';
+				}
+
+				// Detect if Singles Dates, and no single date with null value
+				$displayDates = false;
+				$nbDays       = count($days);
+
+				foreach ($days as $k => $d)
+				{
+					if (iCDate::isDate($d) && $nbDays != 0)
+					{
+						$displayDates = true;
+					}
+				}
+
+				$daysUl = '';
+
+				if ($displayDates)
+				{
+					if ($SingleDatesListModel == '2')
+					{
+						$n = 0;
+						$daysUl.= '<div class="alldates"><i>' . JText::_('COM_ICAGENDA_LEGEND_DATES') . ': </i>';
+
+						foreach ($days as $k => $d)
+						{
+							$n  = $n+1;
+							$fd = icagendaRender::dateToFormat($d);
+
+							$timeDate   = ($item->displaytime == 1)
+										? ' <span class="evttime">' . date($lang_time, strtotime($d)) . '</span>'
+										: '';
+
+							if ($n <= ($totDates-1))
+							{
+								$daysUl.= '<span class="alldates">' . $fd . $timeDate . '</span> - ';
+							}
+							elseif ($n == $totDates)
+							{
+	   							$daysUl.= '<span class="alldates">' . $fd . $timeDate . '</span>';
+							}
+						}
+
+						$daysUl.= '</div>';
+					}
+					else
+					{
+						$daysUl.= '<ul class="alldates">';
+
+						foreach ($days as $k => $d)
+						{
+							$fd = icagendaRender::dateToFormat($d);
+
+							$timeDate   = ($item->displaytime == 1)
+										? ' <span class="evttime">' . date($lang_time, strtotime($d)) . '</span>'
+										: '';
+
+							$daysUl.= '<li class="alldates">' . $fd . $timeDate . '</li>';
+						}
+
+						$daysUl.= '</ul>';
+					}
+				}
+
+				if ($totDates > '0')
+				{
+					return $daysUl;
+				}
+				else
+				{
+					return false;
+				}
+//			}
+//			else
+//			{
+//				return false;
+//			}
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/*
+	 * Function to display the period text width formatted dates (eg. from 00-00-0000 to 00-00-0000).
+	 * TO BE REFACTORED
+	 * @TODO remove inline style html tags (check css and add class declarations)
+	 * @TODO (3.7) remove old deprecated class names
+	 *
+	 * @since   3.6.0
+	 */
+	public static function displayPeriodDates($item)
+	{
+		$iCparams = JComponentHelper::getParams('com_icagenda');
+
+		// Hide/Show Option
+		$PeriodDates = $iCparams->get('PeriodDates', 1);
+
+		// List Model
+		$SingleDatesListModel = $iCparams->get('SingleDatesListModel', 1);
+
+		// First day of the week
+		$firstday_week_global = $iCparams->get('firstday_week_global', 1);
+
+		// Predefined variables
+		$wdays = $showDays = $timeOneDay = $end = '';
+
+		// WeekDays
+		$weekdays    = $item->weekdays;
+		$weekdaysall = empty($weekdays) ? true : false;
+
+		if ($firstday_week_global == '1')
+		{
+			$weekdays_array = explode (',', $weekdays);
+
+			if (in_array('0', $weekdays_array))
+			{
+				$weekdays = str_replace('0', '', $weekdays);
+				$weekdays = $weekdays . ',7';
+			}
+		}
+
+		if ( ! $weekdaysall)
+		{
+			$weekdays_array = explode (',', $weekdays);
+			$wdaysArray     = array();
+
+			foreach ($weekdays_array AS $wd)
+			{
+				if ($firstday_week_global != '1')
+				{
+					if ($wd == 0) $wdaysArray[] = JText::_('SUNDAY');
+				}
+				if ($wd == 1) $wdaysArray[] = JText::_('MONDAY');
+				if ($wd == 2) $wdaysArray[] = JText::_('TUESDAY');
+				if ($wd == 3) $wdaysArray[] = JText::_('WEDNESDAY');
+				if ($wd == 4) $wdaysArray[] = JText::_('THURSDAY');
+				if ($wd == 5) $wdaysArray[] = JText::_('FRIDAY');
+				if ($wd == 6) $wdaysArray[] = JText::_('SATURDAY');
+				if ($firstday_week_global == '1')
+				{
+					if ($wd == 7) $wdaysArray[] = JText::_('SUNDAY');
+				}
+			}
+
+			$last  = array_slice($wdaysArray, -1);
+			$first = join(', ', array_slice($wdaysArray, 0, -1));
+			$both  = array_filter(array_merge(array($first), $last));
+
+			// RTL css if site language is RTL
+			$lang       = JFactory::getLanguage();
+			$arrow_list = $lang->isRTL() ? '&#8629;' : '&#8627;';
+
+			$wdays = $arrow_list . ' <small><i><span class="ic-period-weekdays">' . join(' & ', $both) . '</span></i></small>';
+		}
+
+		if ($PeriodDates == 1
+			&& self::eventHasPeriod($item->period, $item->startdate, $item->enddate)
+			)
+		{
+			$startDate = icagendaRender::dateToFormat($item->startdate);
+			$endDate   = icagendaRender::dateToFormat($item->enddate);
+			$startTime = icagendaRender::dateToTime($item->startdate);
+			$endTime   = icagendaRender::dateToTime($item->enddate);
+
+			if ($startDate == $endDate)
+			{
+				$start = '<span class="ic-period-startdate">';
+				$start.= $startDate;
+				$start.= '</span>';
+
+				if ($item->displaytime == 1)
+				{
+					$timeOneDay = '<span class="evttime ic-period-time">' . $startTime;
+					$timeOneDay.= ($startTime !== $endTime) ? ' - ' . $endTime : '';
+					$timeOneDay.= '</span>';
+				}
+			}
+			else
+			{
+				$start = '<span class="ic-period-text-from">'
+						. ucfirst(JText::_('COM_ICAGENDA_PERIOD_FROM'))
+						. '</span> ';
+				$start.= '<span class="ic-period-startdate">'
+						. $startDate
+						. '</span>';
+
+				if ($item->displaytime == 1)
+				{
+					$start.= ' <span class="evttime ic-period-starttime">'
+							. $startTime
+							. '</span>';
+				}
+
+				$end = '<span class="ic-period-text-to">'
+						. JText::_('COM_ICAGENDA_PERIOD_TO')
+						. '</span> ';
+				$end.= '<span class="ic-period-enddate">'
+						. $endDate
+						. '</span>';
+
+				if ($item->displaytime == 1)
+				{
+					$end.= ' <span class="evttime ic-period-endtime">'
+							. $endTime
+							. '</span>';
+				}
+
+				$showDays = $wdays;
+			}
+
+			// Horizontal List
+			if ($SingleDatesListModel == 2)
+			{
+				$period = '<div class="ic-date-horizontal">' . JText::_('COM_ICAGENDA_EVENT_PERIOD') . ': ';
+				$period.= $start . ' ' . $end . ' ' . $timeOneDay;
+
+				if ( ! empty($showDays))
+				{
+					$period.= '<br /><span style="margin-left:30px">' . $showDays . '</span>';
+				}
+
+				$period.= '</div>';
+			}
+
+			// Vertical List
+			else
+			{
+				$period = '<ul class="ic-date-vertical"><li>';
+				$period.= $start . ' ' . $end . ' ' . $timeOneDay;
+
+				if ( ! empty($showDays))
+				{
+					$period.= '<br/>' . $showDays;
+				}
+
+				$period.= '</li></ul>';
+			}
+
+			return $period;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/*
+	 * Function to check if period dates exist for this event
+	 *
+	 * @since   3.6.0
+	 */
+	public static function eventHasPeriod($period, $startdate, $enddate)
+	{
+		$period_dates = iCString::isSerialized($period) ? unserialize($period) : array(); // returns array
+
+		if (count($period_dates) > 0
+			&& iCDate::isDate($startdate)
+			&& iCDate::isDate($enddate))
+		{
+			return true;
+		}
+
+		return false;
+	}
+
+	/*
+	 * Function to check if period is not finished
+	 *
+	 * @since   3.6.0
+	 */
+	public static function periodIsNotFinished($enddate)
+	{
+		$eventTimeZone    = null;
+		$datetime_today   = JHtml::date('now', 'Y-m-d H:i');
+		$datetime_enddate = JHtml::date($enddate, 'Y-m-d H:i', $eventTimeZone);
+
+		if (strtotime($datetime_enddate) > strtotime($datetime_today))
+		{
+			return true;
+		}
+
+		return false;
+	}
+
+	/*
+	 * Function to set Meta-title for an event
+	 *
+	 * @since   3.6.0
+	 */
+	public static function setMetaTitle($item)
+	{
+		$limit     = '60';
+		$metaTitle = iCFilterOutput::fullCleanHTML($item->title);
+
+		if (strlen($metaTitle) > $limit)
+		{
+			$string_cut = substr($metaTitle, 0, $limit);
+			$last_space = strrpos($string_cut, ' ');
+			$string_ok  = substr($string_cut, 0, $last_space);
+			$metaTitle  = $string_ok;
+		}
+
+		return $metaTitle;
+	}
+
+	/*
+	 * Function to set Meta-description for an event
+	 *
+	 * @since   3.6.0
+	 */
+	public static function setMetaDesc($item)
+	{
+		$iCparams = JComponentHelper::getParams('com_icagenda');
+		$limit    = $iCparams->get('char_limit_meta_description', '320');
+
+		$metaDesc = iCFilterOutput::fullCleanHTML($item->metadesc);
+		$metaDesc = (empty($metaDesc)) ? iCFilterOutput::fullCleanHTML($item->desc) : $metaDesc;
+
+		if (strlen($metaDesc) > $limit)
+		{
+			$string_cut = substr($metaDesc, 0, $limit);
+			$last_space = strrpos($string_cut, ' ');
+			$string_ok  = substr($string_cut, 0, $last_space);
+			$metaDesc   = $string_ok;
+		}
+
+		return $metaDesc;
+	}
+
+	/*
+	 * Function to return event Url
+	 *
+	 * @since   3.6.0
+	 */
+	public static function eventURL($i)
+	{
+		$app    = JFactory::getApplication();
+		$jinput = $app->input;
+
+		$itemID = $jinput->get('Itemid', '0');
+
+		$eventnumber = $i->id;
+		$event_slug  = empty($i->alias) ? $i->id : $i->id . ':' . $i->alias;
+		$date        = $i->next;
+
+		// Get the "event" URL
+		$baseURL    = JURI::base();
+		$subpathURL = JURI::base(true);
+
+		$baseURL    = str_replace('/administrator', '', $baseURL);
+		$subpathURL = str_replace('/administrator', '', $subpathURL);
+
+		$urlevent = str_replace('&amp;','&', JRoute::_('index.php?option=com_icagenda&view=event&Itemid=' . (int) $itemID . '&id=' . $event_slug));
+
+		// Sub Path filtering
+		$subpathURL = ltrim($subpathURL, '/');
+
+		// URL Event Details filtering
+		$urlevent = ltrim($urlevent, '/');
+
+		if (substr($urlevent, 0, strlen($subpathURL)+1) == "$subpathURL/")
+		{
+			$urlevent = substr($urlevent, strlen($subpathURL)+1);
+		}
+
+		$urlevent = rtrim($baseURL,'/') . '/' . ltrim($urlevent,'/');
+
+		$url = $urlevent;
+
+		if (is_numeric($itemID) && is_numeric($eventnumber)
+			&& ! is_array($itemID) && ! is_array($eventnumber)
+			)
+		{
+			return $url;
+		}
+		else
+		{
+			$url = JRoute::_('index.php');
+
+			return JURI::base() . $url;
+		}
+	}
+
+	/*
+	 * Function to convert a datetime to URL alias
+	 * (see iCDate::dateToAlias from iC Library for general function)
+	 *
+	 * @since   3.6.0
+	 */
+	public static function urlDateVar($datetime)
+	{
+		if ( ! iCDate::isDate($datetime)) return false;
+
+		$datetime     = date('Y-m-d H:i', strtotime($datetime));
+		$date_explode = explode(' ', $datetime);
+
+		$dateAlias = $date_explode['0'] . '-' . str_replace(':', '-', $date_explode['1']);
+
+		return $dateAlias;
+	}
+
+	/*
+	 * Function to convert a URL date alias in an SQL datetime string.
+	 *
+	 * @return  string  The date string in SQL datetime format.
+	 *
+	 * @since   3.6.0
+	 */
+	public static function convertDateAliasToSQLDatetime($dateAlias)
+	{
+		if (strlen(iCDate::dateToNumeric($dateAlias)) != '12') return '';
+
+		$ex         = explode('-', $dateAlias);
+		$datetime   = (count($ex) == 5)
+					? $ex['0'] . '-' . $ex['1'] . '-' . $ex['2'] . ' ' . $ex['3'] . ':' . $ex['4'] . ':00'
+					: '';
+
+		return $datetime;
+	}
+
+	/*
+	 * Function to generate the read more for introduction description
+	 *
+	 * @since   3.6.0
+	 */
+	public static function readMore ($url, $desc, $content = '')
+	{
+		$iCparams    = JComponentHelper::getParams('com_icagenda');
+		$limitGlobal = $iCparams->get('limitGlobal', 0);
+
+		if ($limitGlobal == 1)
+		{
+			$limit = $iCparams->get('ShortDescLimit', '100');
+		}
+		elseif ($limitGlobal == 0)
+		{
+			$customlimit = $iCparams->get('limit', '100');
+
+			$limit = is_numeric($customlimit) ? $customlimit : $iCparams->get('ShortDescLimit', '100');
+		}
+
+		$limit = is_numeric($limit) ? $limit : '1';
+
+		$readmore = '';
+
+		$readmore = ($limit <= 1) ? '' : $content;
+		$text     = preg_replace('/<img[^>]*>/Ui', '', $desc);
+
+		if (strlen($text) > $limit)
+		{
+			$string_cut = substr($text, 0, $limit);
+			$last_space = strrpos($string_cut, ' ');
+			$string_ok  = substr($string_cut, 0, $last_space);
+			$text       = $string_ok . ' ';
+			$url        = $url;
+			$text       = '<a href="' . $url . '" class="more">' . $readmore . '</a>';
+		}
+		else
+		{
+			$text = '';
+		}
+
+		return $text;
+	}
+
+	/**
+	 * Loads the list of filled custom fields for this event
+	 *
+	 * @return  array
+	 *
+	 * @since   3.6.0
+	 */
+	public static function getCustomFields($id = null)
+	{
+		$customFields = icagendaEventData::loadEventCustomFields($id);
+
+		foreach ($customFields as $cf)
+		{
+			if ($cf->title && $cf->value)
+			{
+				switch ($cf->type)
+				{
+					case 'url':
+						$cf->value = iCRender::urlTag($cf->value);
+						break;
+
+					case 'email':
+						$cf->value = JHtml::_('email.cloak', $cf->value);
+						break;
+
+					default:
+						$cf->value = JText::_($cf->value);
+						break;
+				}
+			}
+
+			$cf->title = JText::_($cf->title);
+		}
+
+		return $customFields;
+	}
+
+	/**
+	 * Function to get custom field groups of an event
+	 *
+	 * @param   integer  $id  Event id
+	 *
+	 * @return  array
+	 *
+	 * @since   3.6.0
+	 */
+	public static function getCustomfieldGroups($id = null)
+	{
+		// Create a new query object.
+		$db    = JFactory::getDbo();
+		$query = $db->getQuery(true);
+
+		$query->select('e.params')
+			->from('#__icagenda_events AS e')
+			->where($db->qn('id') . ' = ' . $db->q($id));
+		$db->setQuery($query);
+
+		$result = json_decode($db->loadResult());
+
+		if (isset($result->custom_form))
+		{
+			return $result->custom_form;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Function to get event params
+	 *
+	 * @param   integer  $id  Event id
+	 *
+	 * @return  object
+	 *
+	 * @since   3.6.5
+	 */
+	public static function getParams($id = null)
+	{
+		$db     = JFactory::getDbo();
+
+		$query  = $db->getQuery(true)
+				->select('e.params')
+				->from($db->qn('#__icagenda_events', 'e'))
+				->where($db->qn('e.id') . ' = ' . (int) $id);
+
+		$db->setQuery($query);
+
+		$params = json_decode($db->loadResult(), true);
+
+		$evtParams = new JRegistry($params);
+
+		return $evtParams;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/events/events.php b/deployed/icagenda/administrator/components/com_icagenda/utilities/events/events.php
new file mode 100644
index 00000000..8280b733
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/events/events.php
@@ -0,0 +1,497 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     iCagenda
+ * @subpackage  utilities
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.6.6 2016-12-06
+ * @since       3.4.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+/**
+ * class icagendaEvents
+ */
+class icagendaEvents
+{
+// DEPRECATED 3.6
+	/**
+	 * Function to return event access (access levels, approval and event access status)
+	 *
+	 * @access	public static
+	 * @param	$id - id of the event
+	 * @return	list array of access levels, approval and event access status
+	 *
+	 * @since	3.4.0
+	 * @deprecated 3.6.0 TO BE REMOVED!
+	 */
+	static public function eventAccess($id = null)
+	{
+		// Preparing connection to db
+		$db = Jfactory::getDbo();
+
+		// Preparing the query
+		$query = $db->getQuery(true);
+		$query->select('e.state AS evtState, e.approval AS evtApproval, e.access AS evtAccess')
+			->from($db->qn('#__icagenda_events').' AS e')
+			->where($db->qn('e.id').' = '.$db->q($id));
+		$query->select('v.title AS accessName')
+			->join('LEFT', $db->quoteName('#__viewlevels') . ' AS v ON v.id = e.access');
+		$db->setQuery($query);
+		$eventAccess = $db->loadObject();
+
+		if ($eventAccess)
+		{
+			return $eventAccess;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Function to return feature Icons for an event
+	 *
+	 * @access	public static
+	 * @param	$id - id of the event
+	 * @return	list array of feature icons
+	 *
+	 * @since	3.4.0
+	 */
+	public static function featureIcons($id = null)
+	{
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true);
+		$query->select('DISTINCT f.icon, f.icon_alt');
+		$query->from('`#__icagenda_feature_xref` AS fx');
+		$query->innerJoin("`#__icagenda_feature` AS f ON fx.feature_id=f.id AND f.state=1 AND f.icon<>'-1'");
+		$query->where('fx.event_id=' . $id);
+		$query->order('f.ordering DESC'); // Order descending because the icons are floated right
+		$db->setQuery($query);
+		$feature_icons = $db->loadObjectList();
+
+		return $feature_icons;
+	}
+
+	/**
+	 * Function to return footer list of events
+	 *
+	 * @since	3.4.0
+	 */
+	public static function isListOfEvents()
+	{
+		$app = JFactory::getApplication();
+		$params = $app->getParams();
+		$list_of_events = $params->get('copy', '');
+		$core = $params->get('icsys');
+		$string = '<a href="ht';
+		$string.= 'tp://icag';
+		$string.= 'enda.jooml';
+		$string.= 'ic.com" target="_blank" style="font-weight: bold; text-decoration: none !important;">';
+		$string.= 'iCagenda';
+		$string.= '</a>';
+		$icagenda = JText::sprintf('ICAGENDA_THANK_YOU_NOT_TO_REMOVE', $string);
+		$default = '&#80;&#111;&#119;&#101;&#114;&#101;&#100;&nbsp;&#98;&#121;&nbsp;';
+		$footer = '<div style="text-align: center; font-size: 10px; text-decoration: none"><p>';
+		$footer.= preg_match('/iCagenda/',$icagenda) ? $icagenda : $default . $string;
+		$footer.= '</p></div>';
+
+		if ($list_of_events || $core == 'core')
+		{
+			echo $footer;
+		}
+	}
+
+	/**
+	 * DAY in Date Box (list of events)
+	 *
+	 * @since 3.5.0
+	 */
+	public static function day($date, $item = null)
+	{
+		$eventTimeZone	= null;
+
+		$this_date		= JHtml::date($date, 'Y-m-d H:i', $eventTimeZone);
+		$day_date		= JHtml::date($date, 'd', $eventTimeZone);
+		$day_today		= JHtml::date('now', 'd');
+		$date_today		= JHtml::date('now', 'Y-m-d');
+
+		if ($item)
+		{
+			$weekdays		= $item->weekdays;
+			$period			= unserialize($item->period);
+			$period			= is_array($period) ? $period : array();
+			$is_in_period	= (in_array($this_date, $period)) ? true : false;
+			$startdate		= $item->startdate;
+			$day_startdate	= JHtml::date($startdate, 'd', $eventTimeZone);
+			$enddate		= $item->enddate;
+			$day_enddate	= JHtml::date($enddate, 'd', $eventTimeZone);
+		}
+
+		if ($item && $is_in_period
+			&& $weekdays == ''
+			&& strtotime($startdate) <= strtotime($date_today)
+			&& strtotime($enddate) >= strtotime($date_today)
+			)
+		{
+			$day = '';
+
+			if ($day_today > $day_startdate)
+			{
+//				$day.= '<span style="font-size: 14px; vertical-align: middle">' . $day_startdate . '&nbsp;</span>';
+//				$day.= '<span style="font-size: 16px; vertical-align: middle">&#8676;</span>';
+			}
+			else
+			{
+//				$day.= '<span style="font-size: 14px; vertical-align: middle; color: transparent; text-shadow: none; text-decoration: none;">' . $day_startdate . '&nbsp;</span>';
+//				$day.= '<span style="font-size: 16px; vertical-align: middle; color: transparent; text-shadow: none; text-decoration: none;">&#8676;</span>';
+			}
+
+//			$day.= '<span style="border-radius: 10px; padding: 0 5px; border: 2px dotted gray;">' . $day_today . '</span>';
+//			$day.= '<span style="text-decoration: overline">' . $day_today . '</span>';
+			$day.= '<span class="ic-current-period">' . $day_today . '</span>';
+//			$day.= $day_today;
+
+			if ($day_today < $day_enddate)
+			{
+//				$day.= '<span style="font-size: 16px; vertical-align: middle">&#8677;</span>';
+//				$day.= '<span style="font-size: 14px; vertical-align: middle">&nbsp;' . $day_enddate . '</span>';
+			}
+			else
+			{
+//				$day.= '<span style="font-size: 16px; vertical-align: middle; color: transparent; text-shadow: none; text-decoration: none;">&#8677;</span>';
+//				$day.= '<span style="font-size: 14px; vertical-align: middle; color: transparent; text-shadow: none; text-decoration: none;">' . $day_enddate . '&nbsp;</span>';
+			}
+
+			return $day;
+		}
+		else
+		{
+			return $day_date;
+		}
+	}
+
+	/**
+	 * MONTH SHORT in Date Box (list of events)
+	 *
+	 * @since 3.5.0
+	 */
+	public static function dateBox($date, $type, $ongoing = null)
+	{
+		$datetime_today   = JHtml::date('now', 'Y-m-d H:i');
+
+		$month_date       = iCDate::monthJoomla($date);
+		$month_today      = iCDate::monthJoomla($datetime_today);
+		$monthshort_date  = iCDate::monthShortJoomla($date);
+		$monthshort_today = iCDate::monthShortJoomla($datetime_today);
+		$year_date        = JHtml::date($date, 'Y', null);
+		$year_today       = JHtml::date('now', 'Y');
+
+		if ($ongoing)
+		{
+			switch($type)
+			{
+				case 'month':
+					$value = $month_today;
+					break;
+
+				case 'monthshort':
+					$value = $monthshort_today;
+					break;
+
+				case 'year':
+					$value = $year_today;
+					break;
+
+				default :
+					$value = JHtml::date('now', $type, null);
+					break;
+			}
+		}
+		else
+		{
+			switch($type)
+			{
+				case 'month':
+					$value = $month_date;
+					break;
+
+				case 'monthshort':
+					$value = $monthshort_date;
+					break;
+
+				case 'year':
+					$value = $year_date;
+					break;
+
+				default :
+					$value = JHtml::date($date, $type, null);
+					break;
+			}
+		}
+
+		return $value;
+	}
+
+// DEPRECATED 3.6 (see icagendaRender::dateToTime)
+	/**
+	 * Function to return time formated depending on AM/PM option
+	 * Format Time (eg. 00:00 (AM/PM))
+	 * $oldtime to be removed (not used since 2.0.0)
+	 *
+	 * @since 3.4.1
+	 * @deprecated 3.6.0 TO BE REMOVED (after all old usage migrated to icagendaRender::dateToTime)!
+	 */
+	public static function dateToTimeFormat($evt, $oldtime = null)
+	{
+		$app			= JFactory::getApplication();
+		$params			= $app->getParams();
+		$timeformat		= $params->get('timeformat', 1);
+		$eventTimeZone	= null;
+
+		$date_time		= strtotime(JHtml::date($evt, 'Y-m-d H:i', $eventTimeZone));
+ 		$t_time			= date('H:i', $date_time);
+
+		$time_format	= ($timeformat == 1) ? '%H:%M' : '%I:%M %p';
+		$lang_time		= strftime($time_format, strtotime($t_time));
+
+		$time = ($oldtime != NULL && $t_time == '00:00') ? $oldtime : JText::_($lang_time);
+
+		return $time;
+	}
+
+	/**
+	 * Function to return Auto Short Description (Full Description > Short)
+	 *
+	 * @version 3.6.6
+	 * @since   3.5.6
+	 */
+	public static function shortDescription($text, $isModule = null, $option = null, $limit = null)
+	{
+//		$descdata		= $text;
+//		$desc_full		= self::deleteAllBetween('{', '}', $descdata);
+		$desc_full		= $text;
+
+		// Menu Options
+		$app			= JFactory::getApplication();
+		$params			= $app->getParams();
+
+//		$limitGlobal	= ! $isModule ? $params->get('limitGlobal', 0) : 1;
+//		$customlimit	= ! $isModule ? $params->get('limit', '100') : false;
+		$limitGlobal	= ! $isModule ? $params->get('limitGlobal', 0) : 0;
+		$customlimit	= ! $isModule ? $params->get('limit', '100') : $limit;
+
+		// Global Options Component iCagenda
+		$iCparams		= JComponentHelper::getParams('com_icagenda');
+
+		if ($limitGlobal == 1)
+		{
+			$limit = $params->get('ShortDescLimit', '100');
+		}
+		else
+		{
+			$limit_global_option = $iCparams->get('ShortDescLimit', '100');
+			$limit = is_numeric($customlimit) ? $customlimit : $limit_global_option;
+		}
+
+		// Html tags removal Global Option (component iCagenda) - Short Description
+		$Filtering_ShortDesc_Global	= $iCparams->get('Filtering_ShortDesc_Global', '');
+		$HTMLTags_ShortDesc_Global	= $iCparams->get('HTMLTags_ShortDesc_Global', array());
+
+		// Get Module Option
+		$Filtering_ShortDesc_Module	= $isModule ? $option : '';
+
+		/**
+		 * START Filtering HTML method
+		 */
+		$limit				= is_numeric($limit) ? $limit : false;
+
+		// Gets length of the short desc, when not filtered
+		$limit_not_filtered	= substr($desc_full, 0, $limit);
+		$text_length		= strlen($limit_not_filtered);
+
+		// Gets length of the short desc, after html filtering
+		$limit_filtered		= preg_replace('/[\p{Z}\s]{2,}/u', ' ', $limit_not_filtered);
+		$limit_filtered		= strip_tags($limit_filtered);
+		$text_short_length	= strlen($limit_filtered);
+
+		// Sets Limit + special tags authorized
+		$limit_short		= $limit + ($text_length - $text_short_length);
+
+		// Replaces all authorized html tags with tag strings
+		if (empty($Filtering_ShortDesc_Module)
+			&& ($Filtering_ShortDesc_Global == '1') )
+		{
+			$desc_full = str_replace('+', '@@', $desc_full);
+			$desc_full = in_array('1', $HTMLTags_ShortDesc_Global) ? str_replace('<br>', '+@br@', $desc_full) : $desc_full;
+			$desc_full = in_array('1', $HTMLTags_ShortDesc_Global) ? str_replace('<br/>', '+@br@', $desc_full) : $desc_full;
+			$desc_full = in_array('1', $HTMLTags_ShortDesc_Global) ? str_replace('<br />', '+@br@', $desc_full) : $desc_full;
+			$desc_full = in_array('2', $HTMLTags_ShortDesc_Global) ? str_replace('<b>', '+@b@', $desc_full) : $desc_full;
+			$desc_full = in_array('2', $HTMLTags_ShortDesc_Global) ? str_replace('</b>', '@bc@', $desc_full) : $desc_full;
+			$desc_full = in_array('3', $HTMLTags_ShortDesc_Global) ? str_replace('<strong>', '@strong@', $desc_full) : $desc_full;
+			$desc_full = in_array('3', $HTMLTags_ShortDesc_Global) ? str_replace('</strong>', '@strongc@', $desc_full) : $desc_full;
+			$desc_full = in_array('4', $HTMLTags_ShortDesc_Global) ? str_replace('<i>', '@i@', $desc_full) : $desc_full;
+			$desc_full = in_array('4', $HTMLTags_ShortDesc_Global) ? str_replace('</i>', '@ic@', $desc_full) : $desc_full;
+			$desc_full = in_array('5', $HTMLTags_ShortDesc_Global) ? str_replace('<em>', '@em@', $desc_full) : $desc_full;
+			$desc_full = in_array('5', $HTMLTags_ShortDesc_Global) ? str_replace('</em>', '@emc@', $desc_full) : $desc_full;
+			$desc_full = in_array('6', $HTMLTags_ShortDesc_Global) ? str_replace('<u>', '@u@', $desc_full) : $desc_full;
+			$desc_full = in_array('6', $HTMLTags_ShortDesc_Global) ? str_replace('</u>', '@uc@', $desc_full) : $desc_full;
+		}
+		elseif ( $Filtering_ShortDesc_Module == '2'
+			|| (($Filtering_ShortDesc_Global == '') && empty($Filtering_ShortDesc_Module)) )
+		{
+			$desc_full		= '@i@'.$desc_full.'@ic@';
+			$limit_short	= $limit_short + 7;
+		}
+		else
+		{
+			$desc_full		= $desc_full;
+		}
+
+		// Removes HTML tags
+		$desc_nohtml	= strip_tags($desc_full);
+
+		// Replaces all sequences of two or more spaces, tabs, and/or line breaks with a single space
+		$desc_nohtml	= preg_replace('/[\p{Z}\s]{2,}/u', ' ', $desc_nohtml);
+
+		// Replaces all spaces with a single +
+		$desc_nohtml	= str_replace(' ', '+', $desc_nohtml);
+
+		if (strlen($desc_nohtml) > $limit_short)
+		{
+			// Cuts full description, to get short description
+			$string_cut	= substr($desc_nohtml, 0, $limit_short);
+
+			// Detects last space of the short description
+			$last_space	= strrpos($string_cut, '+');
+
+			// Cuts the short description after last space
+			$string_ok	= substr($string_cut, 0, $last_space);
+
+			// Counts number of tags converted to string, and returns lenght
+			$nb_br			= substr_count($string_ok, '+@br@');
+			$nb_plus		= substr_count($string_ok, '@@');
+			$nb_bopen		= substr_count($string_ok, '@b@');
+			$nb_bclose		= substr_count($string_ok, '@bc@');
+			$nb_strongopen	= substr_count($string_ok, '@strong@');
+			$nb_strongclose	= substr_count($string_ok, '@strongc@');
+			$nb_iopen		= substr_count($string_ok, '@i@');
+			$nb_iclose		= substr_count($string_ok, '@ic@');
+			$nb_emopen		= substr_count($string_ok, '@em@');
+			$nb_emclose		= substr_count($string_ok, '@emc@');
+			$nb_uopen		= substr_count($string_ok, '@u@');
+			$nb_uclose		= substr_count($string_ok, '@uc@');
+
+			// Replaces tag strings with html tags
+			$string_ok	= str_replace('@br@', '<br />', $string_ok);
+			$string_ok	= str_replace('@b@', '<b>', $string_ok);
+			$string_ok	= str_replace('@bc@', '</b>', $string_ok);
+			$string_ok	= str_replace('@strong@', '<strong>', $string_ok);
+			$string_ok	= str_replace('@strongc@', '</strong>', $string_ok);
+			$string_ok	= str_replace('@i@', '<i>', $string_ok);
+			$string_ok	= str_replace('@ic@', '</i>', $string_ok);
+			$string_ok	= str_replace('@em@', '<em>', $string_ok);
+			$string_ok	= str_replace('@emc@', '</em>', $string_ok);
+			$string_ok	= str_replace('@u@', '<u>', $string_ok);
+			$string_ok	= str_replace('@uc@', '</u>', $string_ok);
+			$string_ok	= str_replace('+', ' ', $string_ok);
+			$string_ok	= str_replace('@@', '+', $string_ok);
+
+			$text = $string_ok;
+
+			// Close html tags if not closed
+			if ($nb_bclose < $nb_bopen) $text = $string_ok.'</b>';
+			if ($nb_strongclose < $nb_strongopen) $text = $string_ok.'</strong>';
+			if ($nb_iclose < $nb_iopen) $text = $string_ok.'</i>';
+			if ($nb_emclose < $nb_emopen) $text = $string_ok.'</em>';
+			if ($nb_uclose < $nb_uopen) $text = $string_ok.'</u>';
+
+			$return_text = $text.' ';
+
+			$descShort	= $limit ? $return_text : '';
+		}
+		else
+		{
+			$desc_full	= $desc_nohtml;
+			$desc_full	= str_replace('@br@', '<br />', $desc_full);
+			$desc_full	= str_replace('@b@', '<b>', $desc_full);
+			$desc_full	= str_replace('@bc@', '</b>', $desc_full);
+			$desc_full	= str_replace('@strong@', '<strong>', $desc_full);
+			$desc_full	= str_replace('@strongc@', '</strong>', $desc_full);
+			$desc_full	= str_replace('@i@', '<i>', $desc_full);
+			$desc_full	= str_replace('@ic@', '</i>', $desc_full);
+			$desc_full	= str_replace('@em@', '<em>', $desc_full);
+			$desc_full	= str_replace('@emc@', '</em>', $desc_full);
+			$desc_full	= str_replace('@u@', '<u>', $desc_full);
+			$desc_full	= str_replace('@uc@', '</u>', $desc_full);
+			$desc_full	= str_replace('+', ' ', $desc_full);
+			$desc_full	= str_replace('@@', '+', $desc_full);
+
+			$descShort	= $limit ? $desc_full : '';
+		}
+		/** END Filtering HTML function */
+
+		return $descShort;
+	}
+
+	/**
+	 * Function to check if user has access rights to defined access
+	 *
+	 * $accessLevel		Access level of the item to check User Permissions
+	 *
+	 * If in super user group, always allowed
+	 */
+	static public function accessLevels($accessLevel)
+	{
+		// Get User Access Levels
+		$user		= JFactory::getUser();
+		$userLevels	= $user->getAuthorisedViewLevels();
+		$userGroups = $user->getAuthorisedGroups();
+
+		// Control: if access level, or Super User
+		if (in_array($accessLevel, $userLevels)
+			|| in_array('8', $userGroups))
+		{
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Process a string in a JOOMLA_TRANSLATION_STRING standard.
+	 * This method processes a string and replaces all accented UTF-8 characters by unaccented
+	 * ASCII-7 "equivalents" and the string is uppercase. Spaces replaced by underscore.
+	 *
+	 * @param   string  $string  String to process
+	 *
+	 * @return  string  Processed string
+	 *
+	 * @since   3.3.3
+	 */
+	public static function deleteAllBetween($start, $end, $string)
+	{
+		$startPos = strpos($string, $start);
+		$endPos = strpos($string, $end);
+
+		if (!$startPos || !$endPos)
+		{
+			return $string;
+		}
+
+		$textToDelete = substr($string, $startPos, ($endPos + strlen($end)) - $startPos);
+
+		return str_replace($textToDelete, '', $string);
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/events/index.html b/deployed/icagenda/administrator/components/com_icagenda/utilities/events/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/events/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/form/field/configtermsdefault.php b/deployed/icagenda/administrator/components/com_icagenda/utilities/form/field/configtermsdefault.php
new file mode 100644
index 00000000..ee6d27c9
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/form/field/configtermsdefault.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.0 2018-05-22
+ *
+ * @package     iCagenda.Admin
+ * @subpackage  Utilities.Form
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.7.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Registration form: Terms and Conditions - By Default (ADMIN)
+ */
+class icagendaFormFieldConfigTermsDefault extends JFormField
+{
+	/**
+	 * The form field type.
+	 */
+	protected $type = 'configtermsdefault';
+
+	/**
+	 * Method to create a blank label.
+	 */
+	protected function getLabel()
+	{
+		return ' ';
+	}
+
+	/**
+	 * Method to get the field input markup.
+	 */
+	protected function getInput()
+	{
+		$html   = array();
+
+		$html[] = '<fieldset class="span9 iCleft">';
+		$html[] = '<div class="alert alert-error">';
+		$html[] = '<i class="icon-warning-2"></i> ' . JText::sprintf('COM_ICAGENDA_TERMS_IMPORTANT_INFOS', $this->description) . '</div>';
+		$html[] = '<div>' . JText::_('COM_ICAGENDA_SUBMIT_TOS_TYPE_DEFAULT_LBL') . '<br /><small>' . $this->description . '</small></div>';
+		$html[] = '<div class="alert alert-info">' . JText::_($this->description) . '</div>';
+		$html[] = '</fieldset>';
+
+		return implode("\n", $html);
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/form/field/customfieldgroups.php b/deployed/icagenda/administrator/components/com_icagenda/utilities/form/field/customfieldgroups.php
new file mode 100644
index 00000000..e8804e7b
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/form/field/customfieldgroups.php
@@ -0,0 +1,306 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-28
+ *
+ * @package     iCagenda.Admin
+ * @subpackage  Utilities.Form
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.6.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+//jimport('joomla.form.formfield');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Custom Field Groups multiple select form field
+ */
+class icagendaFormFieldCustomfieldGroups extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var     string
+	 * @since   3.6.0
+	 */
+	protected $type = 'customfieldgroups';
+
+	/**
+	 * Method to get the field input markup.
+	 *
+	 * @return  string  The field input markup.
+	 * @since   3.6.0
+	 */
+	protected function getInput()
+	{
+		$jinput = JFactory::getApplication()->input;
+		$view   = $jinput->get('view', '');
+		$id     = $jinput->get('id', '');
+
+		$value = isset($this->value) ? $this->value : '';
+
+		$getOptions = $this->getOptions();
+
+		$options = array();
+
+		foreach ($getOptions as $opt)
+		{
+			$options[] = JHTML::_('select.option', $opt->value, $opt->option);
+		}
+
+		$attr = '';
+
+		// Initialize some field attributes.
+		$attr .= $this->multiple ? ' multiple' : '';
+		$attr .= ! empty($this->class) ? ' class="' . $this->class . '"' : '';
+		$attr .= count($options)
+				? ' data-placeholder="' . JText::_('COM_ICAGENDA_CUSTOMFIELD_GROUPS_SELECT') . '"'
+				: ' data-placeholder="' . JText::_('COM_ICAGENDA_CUSTOMFIELD_GROUPS_NONE') . '"';
+
+		$html = '<div id="groups-select">' . JHtml::_('select.genericlist', $options, $this->name, $attr, 'value', 'text', $value) . '</div>';
+
+		// Custom Field Groups Manager
+		$html.= '<div id="groups-manager" class="alert alert-info" style="margin-top: 10px; margin-left: -15px;">';
+
+		$html.= '<div style="border-bottom: 1px solid #bce8f1; padding-bottom: 5px;">';
+		$html.= '<strong>' . JText::_('COM_ICAGENDA_CUSTOMFIELD_GROUPS_MANAGER_LABEL') . '</strong>';
+		$html.= '</div>';
+
+		// Add a new group
+		$html.= '<div style="margin-top: 10px;">';
+		$html.= JText::_('COM_ICAGENDA_CUSTOMFIELD_GROUPS_ADD_LABEL') . '<br />';
+		$html.= '<div class="input-append" style="width:141px;">';
+		$html.= '<input name="a" type="text" id="newgroup" style="width:100%;" /> ';
+		$html.= '<button class="add-group btn btn-normal btn-success" type="button">' . JText::_('JACTION_CREATE') . '</button>';
+		$html.= '</div>';
+		$html.= '<div class="add-group-info" style="margin: 5px 0;"></div>';
+		$html.= '</div>';
+
+		// Delete an existing group
+		$html.= '<div style="margin-top: 10px;">';
+		$html.= JText::_('COM_ICAGENDA_CUSTOMFIELD_GROUPS_DELETE_LABEL') . '<br />';
+		$html.= '<div class="input-append" style="width:155px;">';
+		$html.= '<select id="deletegroup">';
+
+		// Switch Joomla 3 / 2.5
+		if (version_compare(JVERSION, '3.0', 'ge'))
+		{
+			$html.= '<option value="">' . JText::_('JGLOBAL_SELECT_AN_OPTION') . '</option>';
+		}
+		else
+		{
+			$html.= '<option value="">- ' . JText::_('JSELECT') . ' -</option>';
+		}
+
+		foreach($getOptions as $opt)
+		{
+			$html.= '<option value="' . $opt->value . '">' . $opt->option . '</option>';
+		}
+
+		$html.= '</select>';
+		$html.= '<button class="delete-group btn btn-danger" type="button">' . JText::_('JACTION_DELETE') . '</button>';
+		$html.= '</div>';
+		$html.= '<div class="delete-group-info" style="margin: 5px 0;"></div>';
+		$html.= '</div>';
+
+		$html.= '</div>';
+
+		// ShowOn script for Joomla 2.5, extended to Joomla 3 up to version 3.4.1 to patch Joomla bug(*).
+		// * Issue if usage of 'multiple' and 'showon' (not working) xml attributes for same form field in Joomla 3.2.4 > 3.4.1
+		if (version_compare(JVERSION, '3.4.1', 'le'))
+		{
+			JFactory::getDocument()->addScriptDeclaration('
+				jQuery(document).ready(function($) {
+					var parent_form = $("#jform_parent_form");
+					if (parent_form.val() == "1") {
+						$("#cf_groups").show();
+						$("#jform_groups-lbl").show();
+						$("#groups-select").show();
+						$("#groups-manager").show();
+					} else {
+						$("#cf_groups").hide();
+						$("#jform_groups-lbl").hide();
+						$("#groups-select").hide();
+						$("#groups-manager").hide();
+					}
+					$(parent_form).on("change",function(e){
+						if (parent_form.val() == "1") {
+							$("#cf_groups").show(300);
+							$("#jform_groups-lbl").show(300);
+							$("#groups-select").show(300);
+							$("#groups-manager").show(300);
+						} else {
+							$("#cf_groups").hide(300);
+							$("#jform_groups-lbl").hide();
+							$("#groups-select").hide(300);
+							$("#groups-manager").hide(300);
+						}
+					});
+				});
+			');
+		}
+		?>
+
+		<script>
+			jQuery(document).ready(function($) {
+
+				var view = '<?php echo $view; ?>',
+					id = '<?php echo $id; ?>',
+					fieldid = '<?php echo str_replace("jform_", "jform", $this->id); ?>',
+					url = 'index.php?option=com_icagenda&task=customfield';
+
+				$(".add-group").on("click",function(e){
+					e.preventDefault();
+
+					var newgroup = $('#newgroup').val();
+
+					if (newgroup == "") {
+						$(".add-group-info").html('<div class="alert alert-warning alert-small"><?php echo JText::_("COM_ICAGENDA_CUSTOMFIELD_GROUPS_ADD_WARNING"); ?></div>').show().delay(2000).fadeOut(500);
+						$(".delete-group-info").hide();
+					} else {
+						newGroup(url, newgroup, fieldid)
+					}
+				});
+
+				$(".delete-group").on("click",function(e){
+					e.preventDefault();
+
+					var deletegroup = $('#deletegroup').val();
+
+					if (deletegroup == "") {
+						$(".delete-group-info").html('<div class="alert alert-warning alert-small"><?php echo JText::_("COM_ICAGENDA_CUSTOMFIELD_GROUPS_DELETE_WARNING"); ?></div>').show().delay(2000).fadeOut(500);
+					} else {
+						$.ajax({
+							url: url+'.checkGroup',
+							data : {
+								group : deletegroup,
+								id : id,
+							},
+							success: function( output ) {
+								if (output) {
+									$(".delete-group-info").html('<div class="alert alert-error alert-small"><p><?php echo JText::sprintf("COM_ICAGENDA_CUSTOMFIELD_GROUPS_DELETE_ERROR", "'+output+'"); ?></p><p><strong><?php echo JText::_("COM_ICAGENDA_CUSTOMFIELD_GROUPS_DELETE_ALERT"); ?></strong></p><div id="force-delete" class="btn btn-success"><?php echo JText::_("JYES"); ?></div> <div id="no-delete" class="btn btn-danger"><?php echo JText::_("JNO"); ?></div></div>').show();
+									$("#force-delete").on("click",function(){
+										deleteGroup(url, deletegroup, id, fieldid)
+									});
+									$("#no-delete").on("click",function(){
+										$('#deletegroup').val("").trigger("liszt:updated.chosen");
+										$(".delete-group-info").fadeOut(500);
+									});
+								} else {
+									deleteGroup(url, deletegroup, id, fieldid)
+								}
+							},
+							error: function() {
+								alert("An error occurred");
+							}
+						});
+					}
+				});
+
+				function newGroup(url, newgroup, fieldid) {
+					$.ajax({
+						url: url+'.newGroup',
+						data : {
+							group : newgroup
+						},
+						success: function( value ) {
+							if (value) {
+								$(".add-group-info").html('<div class="alert alert-success alert-small"><?php echo JText::_("COM_ICAGENDA_CUSTOMFIELD_GROUPS_ADD_SUCCESS"); ?></div>').show().delay(2000).fadeOut(500);
+								$('#'+fieldid).prepend('<option value="'+value+'" selected="selected">'+newgroup+'</option>');
+								$('#deletegroup').append('<option value="'+value+'" style="font-weight: bold">'+newgroup+'</option>');
+								$('#'+fieldid).attr("data-placeholder", "<?php echo JText::_('COM_ICAGENDA_CUSTOMFIELD_GROUPS_SELECT'); ?>");
+								$('#'+fieldid).trigger("liszt:updated.chosen");
+								$('#deletegroup').trigger("liszt:updated.chosen");
+								$('#newgroup').val("");
+							} else {
+								$(".add-group-info").html('<div class="alert alert-error alert-small"><?php echo JText::sprintf("COM_ICAGENDA_CUSTOMFIELD_GROUPS_ADD_ERROR", "<strong>'+newgroup+'</strong>"); ?></div>').show().delay(2000).fadeOut(500);
+							}
+
+							$('#deletegroup').val("").trigger("liszt:updated.chosen");
+							$(".delete-group-info").hide();
+						},
+						error: function() {
+							alert("An error occurred");
+						}
+					});
+				}
+
+				function deleteGroup(url, deletegroup, id, fieldid) {
+					$.ajax({
+						url: url+'.deleteGroup',
+						data : {
+							group : deletegroup,
+							id : id,
+						},
+						success: function( value ) {
+							if (value) {
+								$(".delete-group-info").html('<div class="alert alert-success alert-small"><?php echo JText::_("COM_ICAGENDA_CUSTOMFIELD_GROUPS_DELETE_SUCCESS"); ?></div>').show().delay(2000).fadeOut(500);
+								$('#'+fieldid+' option[value="'+value+'"]').remove();
+								$('#deletegroup option[value="'+value+'"]').remove();
+								$('#'+fieldid).trigger("liszt:updated.chosen");
+								$('#deletegroup').trigger("liszt:updated.chosen");
+								$('#deletegroup').val("");
+							}
+						},
+						error: function() {
+							alert("An error occurred");
+						}
+					});
+				}
+
+			});
+		</script>
+		<?php
+		$document = JFactory::getDocument();
+
+		$document->addStyleDeclaration('
+		');
+
+		return $html;
+	}
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return  array  The field option objects.
+	 * @since   3.6.0
+	 */
+	protected function getOptions()
+	{
+		$options = array();
+
+		$db    = JFactory::getDbo();
+		$query = $db->getQuery(true);
+
+		$query->select('f.*');
+		$query->from($db->qn('#__icagenda_filters') . ' AS f');
+		$query->where($db->qn('type') . ' = "customfield"');
+		$query->where($db->qn('filter') . ' = "groups"');
+		$query->where($db->qn('state') . ' = 1');
+
+		$query->order('f.option ASC');
+
+		// Get the options.
+		$db->setQuery($query);
+
+		$options = $db->loadObjectList();
+
+		// Check for a database error.
+		if ($db->getErrorNum())
+		{
+			throw new Exception($db->getErrorMsg(), 500);
+		}
+
+		return $options;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/form/field/customform.php b/deployed/icagenda/administrator/components/com_icagenda/utilities/form/field/customform.php
new file mode 100644
index 00000000..66061e52
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/form/field/customform.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-28
+ *
+ * @package     iCagenda.Admin
+ * @subpackage  Utilities.Form
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.6.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+//jimport('joomla.form.formfield');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Custom form groups multiple select form field
+ */
+class icagendaFormFieldCustomform extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var     string
+	 * @since   3.6.0
+	 */
+	protected $type = 'customform';
+
+	/**
+	 * Method to get the field input markup.
+	 *
+	 * @return  string  The field input markup.
+	 * @since   3.6.0
+	 */
+	protected function getInput()
+	{
+		$value = isset($this->value) ? $this->value : '';
+
+		$options = array();
+
+		foreach($this->getOptions() as $opt)
+		{
+			$options[] = JHTML::_('select.option', $opt->value, $opt->option);
+		}
+
+		return JHtml::_('select.genericlist', $options, $this->name, 'class="inputbox" multiple', 'value', 'text', $value);
+	}
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return  array  The field option objects.
+	 * @since   3.6.0
+	 */
+	protected function getOptions()
+	{
+		$options = array();
+
+		$db    = JFactory::getDbo();
+		$query = $db->getQuery(true);
+
+		$query->select('f.*');
+		$query->from($db->qn('#__icagenda_filters') . ' AS f');
+		$query->where($db->qn('type') . ' = "customfield"');
+		$query->where($db->qn('filter') . ' = "groups"');
+		$query->where($db->qn('state') . ' = 1');
+
+		$query->order('f.option ASC');
+
+		// Get the options.
+		$db->setQuery($query);
+
+		$options = $db->loadObjectList();
+
+		// Check for a database error.
+		if ($db->getErrorNum())
+		{
+			throw new Exception($db->getErrorMsg(), 500);
+		}
+
+		return $options;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/form/field/index.html b/deployed/icagenda/administrator/components/com_icagenda/utilities/form/field/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/form/field/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/form/field/registrationdates.php b/deployed/icagenda/administrator/components/com_icagenda/utilities/form/field/registrationdates.php
new file mode 100644
index 00000000..f255f4c7
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/form/field/registrationdates.php
@@ -0,0 +1,171 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.13 2017-10-14
+ *
+ * @package     iCagenda.Admin
+ * @subpackage  Utilities.Form
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.6.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+//jimport('joomla.form.formfield');
+JFormHelper::loadFieldClass('list');
+
+if (version_compare(JVERSION, '3.0', 'lt'))
+{
+	jimport('joomla.application.component.modelform');
+	jimport('joomla.registry.registry');
+}
+
+use Joomla\Registry\Registry;
+
+/**
+ * Application :        SITE
+ * Registration form :  dates select list/all dates form field
+ */
+class icagendaFormFieldRegistrationDates extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since   3.6.0
+	 */
+	protected $item;
+
+	protected $type = 'registrationdates';
+
+	/**
+	 * Method to get the field input markup.
+	 *
+	 * @return  string  The field input markup.
+	 * @since   3.6.0
+	 */
+	protected function getInput()
+	{
+		$app        = JFactory::getApplication();
+		$session    = JFactory::getSession();
+
+		$model      = new iCagendaModelRegistration();
+		$this->item = $model->getItem();
+
+		$item       = $this->item;
+		$typeReg    = $item->params->get('typeReg', '');
+
+		// Get date from url if set, and from session if set
+		$url_date       = $app->input->get('date', '');
+		$session_date   = $session->get('session_date', '');
+
+		if ($url_date)
+		{
+			$ex_date		= explode('-', $url_date);
+			$defaultDate	= $ex_date[0] . '-' . $ex_date[1] . '-' . $ex_date[2] . ' ' . $ex_date[3] . ':' . $ex_date[4] . ':00';
+		}
+		else
+		{
+			$defaultDate	= $session_date;
+		}
+
+//		$session->set('session_date', '');
+
+		$value = ! empty($this->value) ? $this->value : $defaultDate;
+
+		$html = '';
+
+		// Return Select list of dates
+		if ($typeReg == 1)
+		{
+			$options = array();
+
+			if ( ! $this->getOptions()) return false;
+
+			if (count($this->getOptions()) > 1)
+			{
+				foreach ($this->getOptions() as $opt)
+				{
+					$date_get = explode('@@', $opt);
+					$date_value = $date_get[0];
+					$date_option = $date_get[1];
+//					$options[] = JHTML::_('select.option', $opt->value, $opt->option);
+					$options[] = JHtml::_('select.option', $date_value, $date_option);
+				}
+
+				$html.= JHtml::_('select.genericlist', $options, $this->name, 'class="select-large"', 'value', 'text', $value, $this->id);
+
+				$html.= '<span class="iCFormTip iCicon iCicon-info-circle" title="';
+				$html.= htmlspecialchars('<strong>' . JText::_($this->element['label']) . '</strong><br />'
+						. JText::_($this->element['label'] . '_DESC'));
+				$html.= '"></span>';
+
+				return $html;
+			}
+			else
+			{
+				foreach ($this->getOptions() as $opt)
+				{
+					$date_get = explode('@@', $opt);
+					$date_value = $date_get[0];
+					$date_option = $date_get[1];
+				}
+
+				$html.= '<input id="' . $this->id . '" type="hidden" name="' . $this->name . '" value="' . $date_value . '" />';
+				$html.= '<div style="padding-top: 5px;" class="ic-inlinetext-input">' . $date_option . '</div>';
+
+				return $html;
+			}
+		}
+
+		// Return for all dates
+		else
+		{
+			$html.= '<div style="float:left">';
+
+			$EVENT_SINGLE_DATES	= icagendaEvent::displayListSingleDates($item);
+			$EVENT_PERIOD		= icagendaEvent::displayPeriodDates($item);
+
+			if ($EVENT_PERIOD)
+			{
+				$html.= $EVENT_PERIOD;
+			}
+
+			if ($EVENT_SINGLE_DATES)
+			{
+				$html.= $EVENT_SINGLE_DATES;
+			}
+
+			$html.= '<input id="jform_period" type="hidden" name="jform[period]" value="1" />';
+			$html.= '</div>';
+
+			return $html;
+		}
+	}
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return	array	The field option objects.
+	 * @since	3.6.0
+	 */
+	protected function getOptions()
+	{
+		$options = array();
+
+		if ($this->item)
+		{
+			$options = icagendaRegistration::formDatesList($this->item);
+		}
+
+		return $options;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/form/field/registrationpeople.php b/deployed/icagenda/administrator/components/com_icagenda/utilities/form/field/registrationpeople.php
new file mode 100644
index 00000000..79c82356
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/form/field/registrationpeople.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.13 2017-10-14
+ *
+ * @package     iCagenda.Admin
+ * @subpackage  Utilities.Form
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.6.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+//jimport('joomla.form.formfield');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Application :        SITE
+ * Registration form :  Nb of people select form field
+ */
+class icagendaFormFieldRegistrationPeople extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since   3.6.0
+	 */
+	protected $type = 'registrationpeople';
+
+	/**
+	 * Method to get the field input markup.
+	 *
+	 * @return  string  The field input markup.
+	 * @since   3.6.0
+	 */
+	protected function getInput()
+	{
+		$model				= new iCagendaModelRegistration();
+		$item				= $model->getItem();
+		$tickets			= isset($item->default_tickets) ? $item->default_tickets : $item->tickets;
+
+		$options = array();
+		$i = '';
+
+		// Ajax update of number of tickets bookable per registration, depending on date selected.
+		JFactory::getDocument()->addScriptDeclaration('
+			jQuery(document).ready(function($) {
+				var date = $("#jform_date");
+				$(date).change(function() {
+					var selectedDate = $(date).val().replace(/ /g, "space").replace(/:/g, "_");
+					$.ajax({
+						type: "POST",
+						url: "index.php?option=com_icagenda&task=registration.ticketsBookable",
+						data: {
+								eventID: "' . $item->id . '",
+								regDate: selectedDate,
+								typeReg: "' . $item->params->get('typeReg', '1') . '",
+								maxReg: "' . $item->params->get('maxReg', '1000000') . '",
+								tickets: "' . $item->tickets . '"
+							},
+						dataType: "text"
+					})
+					.done(function( data ) {
+						var tickets = parseInt(data),
+							sel = $( "#' . $this->id . '" );
+						sel.empty();
+						for (var i = 1; i <= tickets; i++) {
+							$selected = (i == "' . $this->value . '") ? " selected" : "";
+							sel.append($("<option"+$selected+">").attr("value",i).text(i));
+						}
+					})
+					.fail(function( data ) {
+						if ( data.responseCode ) {
+							console.log( data.responseCode );
+						}
+					});
+				})
+			});
+		');
+
+		for ($i = 1; $i <= $tickets; $i++)
+		{
+			$options[] = JHtml::_('select.option', $i, $i);
+		}
+
+		if ($tickets > 1)
+		{
+			return JHtml::_('select.genericlist', $options, $this->name, 'class="select-large"', 'value', 'text', $this->value, $this->id);
+		}
+		else
+		{
+			return '<input type="hidden" name="' . $this->name . '" value="1" />';
+		}
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/form/field/registrationterms.php b/deployed/icagenda/administrator/components/com_icagenda/utilities/form/field/registrationterms.php
new file mode 100644
index 00000000..a0a3ed4c
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/form/field/registrationterms.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.3 2016-09-05
+ *
+ * @package     iCagenda.Admin
+ * @subpackage  Utilities.Form
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.6.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+//jimport('joomla.form.formfield');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Registration form: Terms and Conditions
+ */
+class icagendaFormFieldRegistrationTerms extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since   3.6.0
+	 */
+	protected $type = 'Registrationterms';
+
+	protected $terms = 0;
+
+	/**
+	 * Method to get the field input markup.
+	 *
+	 * @return  string  The field input markup.
+	 * @since   3.6.0
+	 */
+	protected function getLabel()
+	{
+		$app		= JFactory::getApplication();
+
+		$model		= new iCagendaModelRegistration();
+		$item		= $model->getItem();
+
+		// Get the site name
+		$sitename	= $app->getCfg('sitename');
+
+		// Terms options
+		$terms_Type		= $item->params->get('terms_Type', '');
+		$termsArticle	= $item->params->get('termsArticle', '');
+		$termsContent	= $item->params->get('termsContent', '');
+
+		$DEFAULT_STRING	= JText::_('COM_ICAGENDA_REGISTRATION_TERMS');
+		$default		= str_replace('[SITENAME]', $sitename, $DEFAULT_STRING);
+		$article		= 'index.php?option=com_content&view=article&id=' . $termsArticle . '&tmpl=component';
+		$custom			= $termsContent;
+
+		$html = '';
+		$html.= '<div class="controls ic-registration-terms-title">' . JText::_('COM_ICAGENDA_TERMS_AND_CONDITIONS') . '</div>';
+		$html.= '<div class="ic-tos-text">';
+
+		if ($terms_Type == 1)
+		{
+			$html.= '<iframe src="' . htmlentities($article) . '" width="98%" height="150"></iframe>';
+		}
+		elseif ($terms_Type == 2)
+		{
+			$html.= $custom;
+		}
+		else
+		{
+			$html.= $default;
+		}
+
+		return '</div>' . $html;
+	}
+
+	/**
+	 * Method to get the field input markup.
+	 *
+	 * @return  string  The field input markup.
+	 * @since   3.6.0
+	 */
+	protected function getInput()
+	{
+		// Initialize some field attributes.
+		$class		= ! empty($this->class) ? ' class="' . $this->class . '"' : '';
+		$disabled	= $this->disabled ? ' disabled' : '';
+		$value		= ! empty($this->default) ? $this->default : '0';
+		$required	= $this->required ? ' required aria-required="true"' : '';
+		$autofocus	= $this->autofocus ? ' autofocus' : '';
+		$checked	= $this->checked || ! empty($this->value) ? ' checked' : '';
+
+		// Initialize JavaScript field attributes.
+		$onclick	= ! empty($this->onclick) ? ' onclick="' . $this->onclick . '"' : '';
+		$onchange	= ! empty($this->onchange) ? ' onchange="' . $this->onchange . '"' : '';
+
+		$html = '';
+
+		// Terms of Service
+		$checkbox = '<input type="checkbox" name="' . $this->name . '" id="' . $this->id . '" value="'
+					. htmlspecialchars($value, ENT_COMPAT, 'UTF-8') . '"' . $class . $checked . $disabled . $onclick . $onchange
+					. $required . $autofocus . ' />';
+
+		$html.= '</div><hr>';
+		$html.= '<div class="controls checkbox">';
+		$html.= '<label id="' . $this->id . '-lbl" for="' . $this->name . '" class="ic-terms-agree">'
+				. $checkbox . JText::_('COM_ICAGENDA_TERMS_AND_CONDITIONS_AGREE') . ' *</label>';
+		$html.= '</div>';
+		$html.= '<hr><div>';
+
+		return $html;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/form/field/terms.php b/deployed/icagenda/administrator/components/com_icagenda/utilities/form/field/terms.php
new file mode 100644
index 00000000..ff455ba0
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/form/field/terms.php
@@ -0,0 +1,243 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.0 2018-05-23
+ *
+ * @package     iCagenda.Admin
+ * @subpackage  Utilities.Form
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.7.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+JFormHelper::loadFieldClass('checkboxes');
+
+/**
+ * Form Field class for the Joomla Platform.
+ * Displays options as a list of check boxes.
+ * Multiselect may be forced to be true.
+ *
+ * @see    JFormFieldCheckbox
+ * @since   3.7.0
+ */
+class icagendaFormFieldTerms extends JFormFieldCheckboxes
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var     string
+	 * @since   3.7.0
+	 */
+	protected $type = 'terms';
+
+	/**
+	 * Method to get the field input markup.
+	 *
+	 * @return  string  The field input markup.
+	 * @since   3.7.0
+	 */
+	protected function getLabel()
+	{
+		$app = JFactory::getApplication();
+
+		$model = new iCagendaModelRegistration();
+		$item  = $model->getItem();
+
+		// Get the site name
+		$sitename = $app->getCfg('sitename');
+
+		// Terms options
+		$terms_type   = $item->params->get('terms_type', '');
+		$termsArticle = $item->params->get('termsArticle', '');
+		$termsContent = $item->params->get('termsContent', '');
+
+		$DEFAULT_STRING = JText::_('COM_ICAGENDA_REGISTRATION_TERMS');
+
+		$default = str_replace('[SITENAME]', $sitename, $DEFAULT_STRING);
+		$article = 'index.php?option=com_content&view=article&id=' . $termsArticle . '&tmpl=component';
+		$custom  = $termsContent;
+
+		$html = '';
+
+		$legend  = '<legend class="ic-terms-legend" id="' . $this->id . '-lbl" for="' . $this->name . '">';
+		$legend .= '	' . JText::_('COM_ICAGENDA_REGISTRATION_CONSENT_TERMS_LABEL');
+		$legend .= '</legend>';
+
+		$html .= $legend;
+
+		$html .= '<div class="ic-terms-text">';
+
+		if ($terms_type == 1)
+		{
+			$html .= '<iframe src="' . htmlentities($article) . '" width="100%" height="200"></iframe>';
+		}
+		elseif ($terms_type == 2)
+		{
+			$html .= $custom;
+		}
+		elseif ($terms_type == 3)
+		{
+			$html .= $default;
+		}
+		else
+		{
+			return '</div>' . $legend . '<div>';
+		}
+
+		return '</div>' . $html;
+	}
+
+	/**
+	 * Method to get the field input markup for check boxes.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   3.7.0
+	 */
+	protected function getInput()
+	{
+		// True if the field has 'value' set. In other words, it has been stored, don't use the default values.
+		$hasValue = (isset($this->value) && ! empty($this->value));
+
+		// Initialize some field attributes.
+		$class          = ! empty($this->class) ? ' class="checkboxes ' . trim($this->class) . '"' : ' class="checkboxes"';
+		$checkedOptions = explode(',', (string) $this->checkedOptions);
+		$required       = $this->required ? ' required aria-required="true"' : '';
+		$autofocus      = $this->autofocus ? ' autofocus' : '';
+
+		// Including fallback code for HTML5 non supported browsers.
+		JHtml::_('jquery.framework');
+		JHtml::_('script', 'system/html5fallback.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9'));
+
+		// Get the field options.
+		$options = $this->getOptions();
+
+		/**
+		 * The format of the input tag to be filled in using sprintf.
+		 *     %1 - id
+		 *     %2 - name
+		 *     %3 - value
+		 *     %4 = any other attributes
+		 */
+		$format = '<input type="checkbox" id="%1$s" name="%2$s" value="%3$s" %4$s />';
+
+		// Start the checkbox field output.
+		$html = '<fieldset id="' . $this->id . '"' . $class . $required . $autofocus . '>';
+
+
+		$app    = JFactory::getApplication();
+		$params = $app->getParams();
+
+		$terms_type   = $params->get('terms_type', '');
+		$termsArticle = $params->get('termsArticle', '');
+		$termsContent = $params->get('termsContent', '');
+
+
+		if ($params->get('terms_mode', '') == 1) // IN DEV.
+		{
+			if (in_array($terms_type, array(1,2,3)))
+			{
+				// Terms Modal link
+				$terms_link = '<a data-toggle="modal"'
+					. ' role="button"'
+					. ' href="#ModalTerms' . $this->id . '">'
+					. $this->title
+					. '</a>';
+			}
+			else
+			{
+				$terms_link = JText::sprintf('COM_ICAGENDA_REGISTRATION_CONSENT_TERMS_OF_THIS_WEBSITE', $this->title);
+			}
+
+			if ($terms_type == 1)
+			{
+				// Terms Modal: Article
+				$html .= JHtml::_(
+					'bootstrap.renderModal',
+					'ModalTerms' . $this->id,
+					array(
+						'title'       => $this->title,
+						'url'         => 'index.php?option=com_content&view=article&id=' . $termsArticle . '&tmpl=component',
+						'height'      => '400px',
+						'width'       => '800px',
+						'bodyHeight'  => '70',
+						'modalWidth'  => '80',
+						'footer'      => '<a role="button" class="btn" data-dismiss="modal" aria-hidden="true">' . JText::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</a>',
+					)
+				);
+			}
+			elseif ($terms_type == 2)
+			{
+				// Terms Modal: Custom Content
+				$termsContentModal = array(
+					'selector' => 'ModalTerms' . $this->id,
+					'params'   => array(
+						'title'  => $this->title,
+						'footer' => '<a role="button" class="btn" data-dismiss="modal" aria-hidden="true">' . JText::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</a>',
+					),
+					'body'     => $termsContent,
+				);
+
+				$html .= JLayoutHelper::render('joomla.modal.main', $termsContentModal);
+			}
+			elseif ($terms_type == 3)
+			{
+				// Terms Modal: Custom Content
+				$termsContentModal = array(
+					'selector' => 'ModalTerms' . $this->id,
+					'params'   => array(
+						'title'  => $this->title,
+						'footer' => '<a role="button" class="btn" data-dismiss="modal" aria-hidden="true">' . JText::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</a>',
+					),
+					'body'     => JText::_('COM_ICAGENDA_REGISTRATION_TERMS'),
+				);
+
+				$html .= JLayoutHelper::render('joomla.modal.main', $termsContentModal);
+			}
+		}
+		else
+		{
+			$terms_link = JText::sprintf('COM_ICAGENDA_REGISTRATION_CONSENT_TERMS_OF_THIS_WEBSITE', $this->title);
+		}
+
+
+		foreach ($options as $i => $option)
+		{
+			// Initialize some option attributes.
+			$checked = in_array((string) $option->value, $checkedOptions, true) ? 'checked' : '';
+
+			// In case there is no stored value, use the option's default state.
+			$checked        = ( ! $hasValue && $option->checked) ? 'checked' : $checked;
+			$optionClass    = ! empty($option->class) ? 'class="' . $option->class . '"' : '';
+			$optionDisabled = ! empty($option->disable) || $this->disabled ? 'disabled' : '';
+
+			// Initialize some JavaScript option attributes.
+			$onclick  = ! empty($option->onclick) ? 'onclick="' . $option->onclick . '"' : '';
+			$onchange = ! empty($option->onchange) ? 'onchange="' . $option->onchange . '"' : '';
+
+			$oid        = $this->id . $i;
+			$value      = htmlspecialchars($option->value, ENT_COMPAT, 'UTF-8');
+			$attributes = array_filter(array($checked, $optionClass, $optionDisabled, $onchange, $onclick));
+
+//			$html .= '<label for="' . $oid . '" class="checkbox">';
+			$html .= '<label class="checkbox ic-terms-consent">';
+			$html .= sprintf($format, $oid, $this->name, $value, implode(' ', $attributes));
+
+			$html .= ' ' . JText::sprintf($option->text, $terms_link) . '</label>';
+		}
+
+		// End the checkbox field output.
+		$html .= '</fieldset>';
+
+		return $html;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/form/form.php b/deployed/icagenda/administrator/components/com_icagenda/utilities/form/form.php
new file mode 100644
index 00000000..fbcafe98
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/form/form.php
@@ -0,0 +1,381 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     iCagenda
+ * @subpackage  utilities
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.5.18 2016-05-19
+ * @since       3.4.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+/**
+ * class icagendaForm
+ */
+class icagendaForm
+{
+	/**
+	 * Function to return script validation for a form used in iCagenda
+	 *
+	 * @access	public static
+	 * @param	$parent_form form type ID ('1' registration, '2' event edit or new)
+	 * 			// $form_location ('site' or 'admin')
+	 * @return	script
+	 *
+	 * @since   3.4.0
+	 */
+	static public function submit($parent_form = null)
+	{
+		if (!$parent_form) return false;
+		if ($parent_form == 1) $parent_name = 'registration';
+		if ($parent_form == 2) $parent_name = 'event';
+
+		$app	= JFactory::getApplication();
+		$lang	= JFactory::getLanguage();
+
+		$id_suffix = ($lang->getTag() == 'fa-IR') ? '_jalali' : '';
+
+		if ($app->isAdmin())
+		{
+			$params		= JComponentHelper::getParams('com_icagenda');
+		}
+		elseif ($app->isSite())
+		{
+			$params		= $app->getParams();
+		}
+
+		$submit_periodDisplay = $params->get('submit_periodDisplay', 1);
+		$submit_datesDisplay = $params->get('submit_datesDisplay', 1);
+
+		JText::script('COM_ICAGENDA_REGISTRATION_NO_EVENT_SELECTED_ALERT');
+		JText::script('COM_ICAGENDA_FORM_NC');
+		JText::script('COM_ICAGENDA_FORM_NO_DATES_ALERT');
+		JText::script('COM_ICAGENDA_TERMS_AND_CONDITIONS_NOT_CHECKED_REGISTRATION');
+		JText::script('COM_ICAGENDA_ALERT_TEXT_EXCEEDS_CHARACTER_LIMIT');
+
+		$prefix_id = $app->isAdmin() ? 'jform_' : '';
+
+		// Copyleft function strpos
+		// +   original by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
+		// +   improved by: Onno Marsman
+		// +   bugfixed by: Daniel Esteban
+		// +   improved by: Brett Zamir (http://brett-zamir.me)
+		// +     edited by: Cyril Rezé (http://www.joomlic.com)
+		// *     example 1: strpos('Kevin van Zonneveld', 'e', 5);
+		// *     returns 1: 14
+
+		$ic_script = array();
+
+		if ( $app->isSite() )
+		{
+			$ic_script[] = '	function iCheckForm() {';
+			$ic_script[] = '		var agree = document.getElementById("formAgree");';
+
+			if ($parent_form == 2)
+			{
+				$ic_script[] = '		if (agree.checked) {';
+				$ic_script[] = '			document.getElementById("tos").value = "checked";';
+				$ic_script[] = '		}';
+			}
+		}
+		elseif ( $app->isAdmin() )
+		{
+			$ic_script[] = 'jQuery(document).ready(function() {';
+			$ic_script[] = '	Joomla.submitbutton = function(task) {';
+		}
+
+		if ($parent_form == 1 && $app->isAdmin())
+		{
+			$ic_script[] = '		var eventid = document.getElementById("' . $prefix_id . 'eventid_id");';
+			$ic_script[] = '		if ((eventid.value == "") && (task != "' . $parent_name . '.cancel")) {';
+			$ic_script[] = '			alert(Joomla.JText._("COM_ICAGENDA_REGISTRATION_NO_EVENT_SELECTED_ALERT"));';
+			$ic_script[] = '			return false;';
+			$ic_script[] = '		}';
+		}
+
+		if ($parent_form == 2)
+		{
+			$ic_script[] = '		function strpos (haystack, needle, offset) {';
+			$ic_script[] = '			var i = (haystack + "").indexOf(needle, (offset || 0));';
+			$ic_script[] = '			return i === -1 ? false : i;';
+			$ic_script[] = '		}';
+
+			$ic_script[] = '		var nodate = "0";';
+			$ic_script[] = '		var noserialdate = \'a:1:{i:0;s:19:"0000-00-00 00:00:00";}\';';
+			$ic_script[] = '		var noserialdate2 = \'a:1:{i:0;s:16:"0000-00-00 00:00";}\';';
+			$ic_script[] = '		var emptydatetime = "0000-00-00 00:00:00";';
+
+			if ($submit_periodDisplay && $app->isSite())
+			{
+				$ic_script[] = '		var startDate = document.getElementById("startdate' . $id_suffix . '");';
+				$ic_script[] = '		var endDate = document.getElementById("enddate' . $id_suffix . '");';
+				$ic_script[] = '		var isValidStartDate = strpos(startDate.value, nodate, 0);';
+				$ic_script[] = '		var isValidEndDate = strpos(endDate.value, nodate, 0);';
+			}
+			elseif ($app->isAdmin())
+			{
+				$ic_script[] = '		var startDate = document.getElementById("startdate' . $id_suffix . '");';
+				$ic_script[] = '		var endDate = document.getElementById("enddate' . $id_suffix . '");';
+				$ic_script[] = '		var isValidStartDate = strpos(startDate.value, nodate, 0);';
+				$ic_script[] = '		var isValidEndDate = strpos(endDate.value, nodate, 0);';
+			}
+			if ($submit_datesDisplay && $app->isSite())
+			{
+				$ic_script[] = '		var Dates = document.getElementById("' . $prefix_id . 'dates_id");';
+				$ic_script[] = '		var isValidSingleDate = strpos(Dates.value, nodate, 2);';
+			}
+			elseif ($app->isAdmin())
+			{
+				$ic_script[] = '		var Dates = document.getElementById("' . $prefix_id . 'dates_id");';
+				$ic_script[] = '		var isValidSingleDate = strpos(Dates.value, nodate, 2);';
+			}
+
+			$ic_script[] = '		if (';
+
+			if ($submit_datesDisplay && $app->isSite())
+			{
+				$ic_script[] = '			( !isValidSingleDate';
+				$ic_script[] = '			|| (Dates.value == noserialdate && isValidSingleDate)';
+				$ic_script[] = '			|| (Dates.value == noserialdate2 && isValidSingleDate)';
+				$ic_script[] = '			|| Dates.value == "" )';
+			}
+			elseif ($app->isAdmin())
+			{
+				$ic_script[] = '			( !isValidSingleDate';
+				$ic_script[] = '			|| (Dates.value == noserialdate && isValidSingleDate)';
+				$ic_script[] = '			|| (Dates.value == noserialdate2 && isValidSingleDate)';
+				$ic_script[] = '			|| Dates.value == "" )';
+			}
+
+			if ($submit_periodDisplay && $submit_datesDisplay && $app->isSite())
+			{
+				$ic_script[] = '			&& ';
+			}
+
+			if ($submit_periodDisplay && $app->isSite())
+			{
+				$ic_script[] = '			( (!isValidStartDate || (startDate.value == emptydatetime)) )';
+			}
+			elseif ($app->isAdmin())
+			{
+				$ic_script[] = '			&& ( (!isValidStartDate || (startDate.value == emptydatetime)) )';
+			}
+
+			if ($app->isAdmin()) $ic_script[] = '			&& ( task != "' . $parent_name . '.cancel" ) ';
+
+			$ic_script[] = '		) {';
+			$ic_script[] = '			alert(Joomla.JText._("COM_ICAGENDA_FORM_NO_DATES_ALERT"));';
+			$ic_script[] = '			document.getElementById("message_error").innerHTML = "'
+											. JText::_("COM_ICAGENDA_FORM_NO_DATES_ALERT") . '";';
+			$ic_script[] = '			document.getElementById("form_errors").style.display = "block";';
+
+			if ($submit_periodDisplay && $app->isSite())
+			{
+				$ic_script[] = '			document.getElementById("startdate' . $id_suffix . '").value = emptydatetime;';
+				$ic_script[] = '			document.getElementById("enddate' . $id_suffix . '").value = emptydatetime;';
+				$ic_script[] = '			document.getElementById("startdate' . $id_suffix . '").addClass("ic-date-invalid");';
+				$ic_script[] = '			document.getElementById("enddate' . $id_suffix . '").addClass("ic-date-invalid");';
+			}
+			elseif ($app->isAdmin())
+			{
+				$ic_script[] = '			document.getElementById("startdate' . $id_suffix . '").value = emptydatetime;';
+				$ic_script[] = '			document.getElementById("enddate' . $id_suffix . '").value = emptydatetime;';
+				$ic_script[] = '			document.getElementById("startdate' . $id_suffix . '").addClass("ic-date-invalid");';
+				$ic_script[] = '			document.getElementById("enddate' . $id_suffix . '").addClass("ic-date-invalid");';
+			}
+
+			if ($submit_datesDisplay && $app->isSite())
+			{
+				$ic_script[] = '			document.getElementById("dTable' . $id_suffix . '").addClass("ic-date-invalid");';
+			}
+			elseif ($app->isAdmin())
+			{
+				$ic_script[] = '			document.getElementById("dTable' . $id_suffix . '").addClass("ic-date-invalid");';
+			}
+
+			$ic_script[] = '			scroll_to = document.getElementById("ic-dates-fieldset");';
+			$ic_script[] = '			scroll_to.scrollIntoView();';
+			$ic_script[] = '			return false;';
+			$ic_script[] = '		}';
+			$ic_script[] = '		else {';
+
+			if ($app->isSite())
+			{
+				// Disable submit button after first click
+				$ic_script[] = '
+					jQuery(function($) {
+						$("#submitevent").one("submit", function() {
+							$(this).find(\'button[type="submit"]\')
+								.attr("disabled","disabled")
+								.css({
+									"background-color": "transparent",
+									"color": "grey"
+								});
+							$("#submit").addClass("ic-loader");
+						});
+					});
+				';
+			}
+
+			$ic_script[] = '			document.getElementById("form_errors").style.display = "none";';
+
+			if ($submit_periodDisplay && $app->isSite())
+			{
+				$ic_script[] = '			document.getElementById("startdate' . $id_suffix . '").removeClass("ic-date-invalid");';
+				$ic_script[] = '			document.getElementById("enddate' . $id_suffix . '").removeClass("ic-date-invalid");';
+			}
+			elseif ($app->isAdmin())
+			{
+				$ic_script[] = '			document.getElementById("startdate' . $id_suffix . '").removeClass("ic-date-invalid");';
+				$ic_script[] = '			document.getElementById("enddate' . $id_suffix . '").removeClass("ic-date-invalid");';
+			}
+
+			if ($submit_datesDisplay && $app->isSite())
+			{
+				$ic_script[] = '			document.getElementById("dTable' . $id_suffix . '").removeClass("ic-date-invalid");';
+			}
+			elseif ($app->isAdmin())
+			{
+				$ic_script[] = '			document.getElementById("dTable' . $id_suffix . '").removeClass("ic-date-invalid");';
+			}
+
+			$ic_script[] = '		}';
+
+			if ($submit_periodDisplay && $app->isSite())
+			{
+				$ic_script[] = '		if (isValidStartDate && !isValidEndDate) {';
+				$ic_script[] = '			document.getElementById("enddate' . $id_suffix . '").value = startDate.value;';
+				$ic_script[] = '		}';
+			}
+			elseif ($app->isAdmin())
+			{
+				$ic_script[] = '		if (isValidStartDate && !isValidEndDate) {';
+				$ic_script[] = '			document.getElementById("enddate' . $id_suffix . '").value = startDate.value;';
+				$ic_script[] = '		}';
+			}
+		}
+
+//		$customfields = icagendaCustomfields::getCustomfields($parent_form);
+
+//		if ($customfields && $app->isAdmin())
+//		{
+//			$options_required = array('list', 'radio');
+
+//			foreach ($customfields as $icf)
+//			{
+				// If type is list or radio, should have options. All, field required.
+//				if (((in_array($icf->type, $options_required) && $icf->options)
+//					|| ! in_array($icf->type, $options_required))
+//					&& $icf->required)
+//				{
+//					$ic_script[] = '		var ' . $icf->slug . '_slug = document.getElementById("' . $icf->slug . '_slug");';
+//					$ic_script[] = '		if ( ( ' . $icf->slug . '_slug.value == "" ) ';
+
+//					if ($app->isAdmin()) $ic_script[] = '			&& ( task != "' . $parent_name . '.cancel" ) ';
+
+//					$ic_script[] = '		) {';
+//					$ic_script[] = '			alert(Joomla.JText._("COM_ICAGENDA_FORM_NC"));';
+//					$ic_script[] = '			document.getElementById("message_error").innerHTML = "'
+//												. JText::sprintf("COM_ICAGENDA_FORM_VALIDATE_FIELD_REQUIRED_NAME", $icf->title) . '";';
+//					$ic_script[] = '			document.getElementById("form_errors").style.display = "block";';
+//					$ic_script[] = '			document.getElementById("' . $icf->alias . '_alias").addClass("ic-field-invalid");';
+//					$ic_script[] = '			document.getElementById("' . $icf->slug . '_slug").addClass("ic-field-invalid");';
+//					$ic_script[] = '			scroll_to = document.getElementById("' . $icf->alias . '_alias");';
+//					$ic_script[] = '			scroll_to.scrollIntoView();';
+//					$ic_script[] = '			return false;';
+//					$ic_script[] = '		}';
+//					$ic_script[] = '		else {';
+//					$ic_script[] = '			document.getElementById("form_errors").style.display = "none";';
+//					$ic_script[] = '			document.getElementById("' . $icf->alias . '_alias").removeClass("ic-field-invalid");';
+//					$ic_script[] = '			document.getElementById("' . $icf->slug . '_slug").removeClass("ic-field-invalid");';
+//					$ic_script[] = '		}';
+//				}
+//			}
+//		}
+
+		if ($app->isAdmin())
+		{
+			$ic_script[] = '		if (task == "' . $parent_name . '.cancel"';
+			$ic_script[] = '			|| document.formvalidator.isValid(document.id("' . $parent_name . '-form")))';
+			$ic_script[] = '		{';
+			$ic_script[] = '			// do field validation';
+			$ic_script[] = '			Joomla.submitform(task, document.getElementById("' . $parent_name . '-form"));';
+			$ic_script[] = '		}';
+			$ic_script[] = '		else {';
+			$ic_script[] = '			alert("' . JText::_("JGLOBAL_VALIDATION_FORM_FAILED") . '");';
+			$ic_script[] = '		}';
+		}
+
+		if ($app->isSite())
+		{
+			$ic_script[] = '		if (!agree.checked) {';
+			if ($parent_form == 1) $ic_script[] = '			alert(Joomla.JText._("COM_ICAGENDA_TERMS_AND_CONDITIONS_NOT_CHECKED_REGISTRATION"));';
+			if ($parent_form == 2) $ic_script[] = '			alert(Joomla.JText._("COM_ICAGENDA_TERMS_OF_SERVICE_NOT_CHECKED_SUBMIT_EVENT"));';
+			$ic_script[] = '			scroll_to = document.getElementById("content");';
+			$ic_script[] = '			scroll_to.scrollIntoView();';
+			$ic_script[] = '			return false;';
+			$ic_script[] = '		}';
+		}
+
+		$ic_script[] = '	}';
+
+		if ($app->isAdmin())
+		{
+			$ic_script[] = '});';
+		}
+
+		return implode("\n", $ic_script);
+	}
+
+	/**
+	 * Function to set timepicker.js and date function strings of translation
+	 *
+	 * @access	public static
+	 *
+	 * @since   3.4.1
+	 */
+	static public function loadDateTimePickerJSLanguage()
+	{
+		// icdates.js Strings of Translation
+		JText::script('COM_ICAGENDA_DELETE_DATE');
+
+		// timepicker.js Strings of Translation
+		JText::script('JANUARY');
+		JText::script('FEBRUARY');
+		JText::script('MARCH');
+		JText::script('APRIL');
+		JText::script('MAY');
+		JText::script('JUNE');
+		JText::script('JULY');
+		JText::script('AUGUST');
+		JText::script('SEPTEMBER');
+		JText::script('OCTOBER');
+		JText::script('NOVEMBER');
+		JText::script('DECEMBER');
+
+		JText::script('SA');
+		JText::script('SU');
+		JText::script('MO');
+		JText::script('TU');
+		JText::script('WE');
+		JText::script('TH');
+		JText::script('FR');
+
+		JText::script('COM_ICAGENDA_TP_CURRENT');
+		JText::script('COM_ICAGENDA_TP_CLOSE');
+		JText::script('COM_ICAGENDA_TP_TITLE');
+		JText::script('COM_ICAGENDA_TP_TIME');
+		JText::script('COM_ICAGENDA_TP_HOUR');
+		JText::script('COM_ICAGENDA_TP_MINUTE');
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/form/index.html b/deployed/icagenda/administrator/components/com_icagenda/utilities/form/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/form/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/googlemaps/googlemaps.php b/deployed/icagenda/administrator/components/com_icagenda/utilities/googlemaps/googlemaps.php
new file mode 100644
index 00000000..0a9ad191
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/googlemaps/googlemaps.php
@@ -0,0 +1,204 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.3 2018-06-30
+ *
+ * @package     iCagenda.Admin
+ * @subpackage  Utilities.googlemaps
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.6.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * class icagendaGooglemaps
+ */
+class icagendaGooglemaps
+{
+	/**
+	 * Function to display Google Map
+	 *
+	 * @since   3.6.0
+	 */
+	static public function display($item)
+	{
+		$iCparams = JComponentHelper::getParams('com_icagenda');
+
+		// Hide/Show Option
+		$GoogleMaps = $iCparams->get('GoogleMaps', 1);
+
+		// Access Levels Option
+		$accessGoogleMaps = $iCparams->get('accessGoogleMaps', 1);
+
+		$markerLat = self::lat($item);
+		$markerLng = self::lng($item);
+
+		if ($GoogleMaps == 1
+			&& icagendaEvents::accessLevels($accessGoogleMaps)
+			&& (($markerLat != NULL && $markerLng != NULL) || ($item->address && $iCparams->get('maps_service', '') == '2'))
+			)
+		{
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Function to return Google Map (frontend only)
+	 *
+	 * @since   3.6.0
+	 */
+	static public function map($item)
+	{
+		$params       = JFactory::getApplication()->getParams();
+		$map_width    = $params->get('m_width', '100%');
+		$map_height   = $params->get('m_height', '300px');
+		$mapID        = $item->id;
+
+		$iCparams     = JComponentHelper::getParams('com_icagenda');
+		$maps_service = $iCparams->get('maps_service', '');
+
+		$iCgmap = '<!-- Event Map -->';
+
+		if ($maps_service == '2')
+		{
+			$embedKey = $iCparams->get('googlemaps_embed_key', '');
+
+			$iCgmap.= '<div class="icagenda_map" id="embed_map-' . (int) $mapID . '"';
+			$iCgmap.= ' style="width:' . $map_width . '; height:' . $map_height . '">';
+			$iCgmap.= '<iframe
+				width="' . $map_width . '"
+				height="' . $map_height . '"
+				frameborder="0" style="border:0;" class="icagenda_map"
+				src="https://www.google.com/maps/embed/v1/place?key=' . trim($embedKey)
+					. '&q=' . urlencode(strip_tags($item->address)) . '" allowfullscreen>
+				</iframe>';
+			$iCgmap.= '</div>';
+		}
+		elseif ($maps_service == '3')
+		{
+			$markerLat = self::lat($item);
+			$markerLng = self::lng($item);
+
+			$iCgmap.= '<div class="icagenda_map" id="map_canvas' . (int) $mapID . '"';
+			$iCgmap.= ' style="width:' . $map_width . '; height:' . $map_height . '">';
+			$iCgmap.= '</div>';
+			$iCgmap.= '<script type="text/javascript">';
+			$iCgmap.= 'icMapInitialize(' . $markerLat . ', ' . $markerLng . ', ' . (int) $mapID . ');';
+			$iCgmap.= '</script>';
+		}
+
+		return $maps_service ? $iCgmap : JText::_('COM_ICAGENDA_MAPS_SERVICE_NOT_AVAILABLE');
+	}
+
+	/**
+	 * Function to return Latitude
+	 *
+	 * @since   3.6.0
+	 */
+	static public function lat($item)
+	{
+		// Convert old coordinate value to latitude
+		if ($item->coordinate != NULL
+			&& $item->lat == '0.0000000000000000')
+		{
+			$ex = explode(', ', $item->coordinate);
+
+			$latitude = $ex[0];
+		}
+		else
+		{
+			$latitude = ($item->lat != '0.0000000000000000') ? $item->lat : NULL;
+		}
+
+		return $latitude;
+	}
+
+	/**
+	 * Function to return Longitude
+	 *
+	 * @since   3.6.0
+	 */
+	static public function lng($item)
+	{
+		if ($item->coordinate != NULL
+			&& $item->lng == '0.0000000000000000')
+		{
+			$ex = explode(', ', $item->coordinate);
+
+			$longitude = $ex[1];
+		}
+		else
+		{
+			$longitude = ($item->lng != '0.0000000000000000') ? $item->lng : NULL;
+		}
+
+		return $longitude;
+	}
+
+	/**
+	 * Load Google Maps Scripts.
+	 *
+	 * @param   type   show (display map) or edit (create and set map values)
+	 *
+	 * @since   3.6.0
+	 */
+	public static function loadGMapScripts($type = 'show')
+	{
+		$iCparams     = JComponentHelper::getParams('com_icagenda');
+		$maps_service = $iCparams->get('maps_service', '');
+
+		if ($maps_service == '3')
+		{
+			// Google Maps api V3
+			$document      = JFactory::getDocument();
+			$scripts       = array_keys($document->_scripts);
+			$gmapApiLoaded = false;
+
+			for ($i = 0; $i < count($scripts); $i++)
+			{
+    			if ( stripos($scripts[$i], 'maps.googleapis.com') !== false
+    				&& stripos($scripts[$i], 'maps.gstatic.com') !== false )
+				{
+					$gmapApiLoaded = true;
+				}
+			}
+
+			if ( ! $gmapApiLoaded)
+			{
+				$curlang   = $document->language;
+				$lang      = substr($curlang, 0, 2);
+				$key       = $iCparams->get('googlemaps_browser_key', '');
+				$client_id = $iCparams->get('googlemaps_client_id', '');
+				$client    = (substr($client_id, 0, 4) === 'gme-') ? $client_id : 'gme-' . $client_id;
+
+				// Google Maps API variables
+				$apiLang   = '?language=' . trim($lang);
+				$apiLib    = '&librairies=places';
+				$apiKey    = ($key && ! $client_id) ? '&key=' . trim($key) : '';
+				$apiClient = $client_id ? '&client=' . trim($client) : '';
+
+				$document->addScript('https://maps.googleapis.com/maps/api/js' . $apiLang . $apiLib . $apiKey . $apiClient);
+			}
+
+			if ($type == 'show')
+			{
+				JHtml::script('com_icagenda/icmap-front.js', false, true);
+			}
+			else
+			{
+				JHtml::script('com_icagenda/icmap.js', false, true);
+			}
+		}
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/googlemaps/index.html b/deployed/icagenda/administrator/components/com_icagenda/utilities/googlemaps/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/googlemaps/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/index.html b/deployed/icagenda/administrator/components/com_icagenda/utilities/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/info/index.html b/deployed/icagenda/administrator/components/com_icagenda/utilities/info/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/info/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/info/info.php b/deployed/icagenda/administrator/components/com_icagenda/utilities/info/info.php
new file mode 100644
index 00000000..dfde5fc8
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/info/info.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.3 2018-08-09
+ *
+ * @package     iCagenda.Admin
+ * @subpackage  Utilities
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.5.6
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * class icagendaInfo
+ */
+class icagendaInfo
+{
+	/**
+	 * Function to add comment with iCagenda version (used for faster support)
+	 *
+	 * @since	3.4.0
+	 */
+	static public function commentVersion()
+	{
+		$params		= JComponentHelper::getParams('com_icagenda');
+		$release	= $params->get('release', '');
+		$icsys		= $params->get('icsys', 'core');
+
+		$icagenda	= 'iCagenda ' . strtoupper($icsys) . ' ' . $release;
+
+		if ($icsys == 'core')
+		{
+			$icagenda.= ' by Jooml!C - https://www.joomlic.com';
+		}
+
+		echo "<!-- " . $icagenda . " -->";
+
+		return true;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/list/index.html b/deployed/icagenda/administrator/components/com_icagenda/utilities/list/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/list/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/list/list.php b/deployed/icagenda/administrator/components/com_icagenda/utilities/list/list.php
new file mode 100644
index 00000000..8353d2b8
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/list/list.php
@@ -0,0 +1,359 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-28
+ *
+ * @package     iCagenda.Admin
+ * @subpackage  Utilities
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.6.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * class icagendaList
+ */
+class icagendaList
+{
+	/**
+	 * Function to return iCagenda header (Title/Subtitle) for list of events
+	 *
+	 * @since   3.6.0
+	 */
+	public static function header($total, $number_per_page, $search = false)
+	{
+		// loading iCagenda PARAMS
+		$app     = JFactory::getApplication();
+		$jinput  = $app->input;
+
+		$getpage = $jinput->get('page', '1');
+
+		$params  = $app->getParams();
+
+		$time       = $params->get('time', '1');
+		$headerList = $params->get('headerList', 1);
+
+		if ($search)
+		{
+			$header_title = JText::_('COM_ICAGENDA_HEADER_SEARCH_TITLE');
+			$header_many  = JText::sprintf('COM_ICAGENDA_HEADER_SEARCH_MANY_EVENTS', $total);
+			$header_one   = JText::sprintf('COM_ICAGENDA_HEADER_SEARCH_ONE_EVENT', $total);
+			$header_noevt = JText::_('COM_ICAGENDA_HEADER_SEARCH_NO_EVENT');
+		}
+		elseif ($time == '0')
+		{
+			// COM_ICAGENDA_ALL
+			$header_title = JText::_('COM_ICAGENDA_HEADER_ALL_TITLE');
+			$header_many  = JText::sprintf('COM_ICAGENDA_HEADER_ALL_MANY_EVENTS', $total);
+			$header_one   = JText::sprintf('COM_ICAGENDA_HEADER_ALL_ONE_EVENT', $total);
+			$header_noevt = JText::_('COM_ICAGENDA_HEADER_ALL_NO_EVENT');
+		}
+		elseif ($time == '1')
+		{
+			// COM_ICAGENDA_OPTION_TODAY_AND_UPCOMING
+			$header_title = JText::_('COM_ICAGENDA_HEADER_TODAY_AND_UPCOMING_TITLE');
+			$header_many  = JText::sprintf('COM_ICAGENDA_HEADER_TODAY_AND_UPCOMING_MANY_EVENTS', $total);
+			$header_one   = JText::sprintf('COM_ICAGENDA_HEADER_TODAY_AND_UPCOMING_ONE_EVENT', $total);
+			$header_noevt = JText::_('COM_ICAGENDA_HEADER_TODAY_AND_UPCOMING_NO_EVENT');
+		}
+		elseif ($time == '2')
+		{
+			// COM_ICAGENDA_OPTION_PAST
+			$header_title = JText::_('COM_ICAGENDA_HEADER_PAST_TITLE');
+			$header_many  = JText::sprintf('COM_ICAGENDA_HEADER_PAST_MANY_EVENTS', $total);
+			$header_one   = JText::sprintf('COM_ICAGENDA_HEADER_PAST_ONE_EVENT', $total);
+			$header_noevt = JText::_('COM_ICAGENDA_HEADER_PAST_NO_EVENT');
+		}
+		elseif ($time == '3')
+		{
+			// COM_ICAGENDA_OPTION_FUTURE
+			$header_title = JText::_('COM_ICAGENDA_HEADER_UPCOMING_TITLE');
+			$header_many  = JText::sprintf('COM_ICAGENDA_HEADER_UPCOMING_MANY_EVENTS', $total);
+			$header_one   = JText::sprintf('COM_ICAGENDA_HEADER_UPCOMING_ONE_EVENT', $total);
+			$header_noevt = JText::_('COM_ICAGENDA_HEADER_UPCOMING_NO_EVENT');
+		}
+		elseif ($time == '4')
+		{
+			// COM_ICAGENDA_OPTION_TODAY
+			$header_title = JText::_('COM_ICAGENDA_HEADER_TODAY_TITLE');
+			$header_many  = JText::sprintf('COM_ICAGENDA_HEADER_TODAY_MANY_EVENTS', $total);
+			$header_one   = JText::sprintf('COM_ICAGENDA_HEADER_TODAY_ONE_EVENT', $total);
+			$header_noevt = JText::_('COM_ICAGENDA_HEADER_TODAY_NO_EVENT');
+		}
+
+		$report = $report2 = '';
+
+		if ($total == 1)
+		{
+			$report.= '<span class="ic-subtitle-string">' . $header_one . '</span>';
+		}
+		elseif ($total == 0)
+		{
+			$report.= '<span class="ic-subtitle-string">' . $header_noevt . '</span>';
+		}
+		elseif ($total > 1)
+		{
+			$report.= '<span class="ic-subtitle-string">' . $header_many . '</span>';
+		}
+
+		$num = $number_per_page;
+
+		// No display if number does not exist
+		$pages = ($num == NULL) ? 1 : ceil($total/$num);
+
+		$page_nb = $getpage;
+
+		if ($getpage == NULL)
+		{
+			$page_nb = 1;
+		}
+
+		$report2.= ($pages <= 1)
+					? ''
+					: ' <span class="ic-subtitle-pages"> - ' . JText::_('COM_ICAGENDA_EVENTS_PAGE') . ' '
+						. $page_nb . ' / ' . $pages . '</span>';
+
+		// Tag for header title depending of show_page_heading setting
+		$menuItem = $app->getMenu()->getActive();
+
+    	if (is_object($menuItem)
+    		&& $menuItem->params->get('show_page_heading', 1))
+    	{
+			$tag = 'h2';
+		}
+		else
+		{
+			$tag = 'h1';
+		}
+
+		$pageNotFound = '<p>'
+					. JText::_('COM_ICAGENDA_PAGE_NOT_FOUND')
+					. '</p>'
+					. '<button class="ic-btn ic-btn-info"'
+					. ' name="' . JText::_('COM_ICAGENDA_EVENTS_PAGE') . ' 1"'
+					. ' type="submit">'
+					. JText::_('COM_ICAGENDA_EVENTS_PAGE') . ' 1'
+					. '</button>';
+
+		// Display Header: title & subtitle
+		if ($headerList == 1)
+		{
+			$header = '<div class="ic-header-container">';
+			$header.= '<' . $tag . ' class="ic-header-title">' . $header_title . '</' . $tag . '>';
+			$header.= ($getpage <= $pages || $getpage == '1')
+					? '<div class="ic-header-subtitle">' . $report . ' ' . $report2 . '</div>'
+					: $pageNotFound;
+		}
+
+		// Display Header: only title
+		elseif ($headerList == 2)
+		{
+			$header = '<div class="ic-header-container">';
+			$header.= '<' . $tag . ' class="ic-header-title">' . $header_title . '</' . $tag . '>';
+			$header.= ($getpage <= $pages || $getpage == '1')
+					? (($search || $total == 0)
+						? '<div class="ic-header-subtitle">' . $report . '</div>'
+						: '')
+					: $pageNotFound;
+		}
+
+		// Display Header: only subtitle
+		elseif ($headerList == 3)
+		{
+			$header = '<div class="ic-header-container">';
+			$header.= ($getpage <= $pages || $getpage == '1')
+					? '<br /><div class="ic-header-subtitle">' . $report . ' ' . $report2 . '</div>'
+					: $pageNotFound;
+		}
+
+		// Display Header: none
+		else
+		{
+			$header = ($getpage <= $pages || $getpage == '1')
+					? (($search || $total == 0)
+						? '<div class="ic-header-container"><br /><div class="ic-header-subtitle">' . $report . '</div>'
+						: '<div>')
+					: $pageNotFound;
+		}
+
+		$header.='</div>';
+		$header.= '<br/>';
+
+		return $header;
+	}
+
+	/**
+	 * Function to return pagination for list of events
+	 *
+	 * @since   3.6.0
+	 */
+	public static function pagination($count_items, $arrowtext, $number_per_page, $pagination)
+	{
+		$app     = JFactory::getApplication();
+		$jinput  = $app->input;
+		$getpage = $jinput->get('page', 1);
+
+		// If number of pages < or = 1, no display of pagination
+		if (($count_items / $number_per_page) <= 1)
+		{
+			$nav = '';
+		}
+		else
+		{
+			// Total pages
+			$pages  = ($number_per_page == NULL) ? 1 : ceil($count_items / $number_per_page);
+
+			// Set display none if page does not exist to hide pagination
+			$style  = ($getpage > ceil($count_items / $number_per_page))
+					? ' style="display: none;"'
+					: '';
+
+			/* Pagination */
+			if ($getpage == 1)
+			{
+				$nav = '<div class="ic-pagination ic-page-first"' . $style . '>';
+			}
+			elseif ($getpage == $pages)
+			{
+				$nav = '<div class="ic-pagination ic-page-last"' . $style . '>';
+			}
+			else
+			{
+				$nav = '<div class="ic-pagination ic-page-mid"' . $style . '>';
+			}
+
+			// In the case of text next/prev
+			// If no text, use w3c recommendation on accessibility: https://www.w3.org/TR/2012/NOTE-WCAG20-TECHS-20120103/C7
+			$textNext   = ($arrowtext == 1)
+						? JText::_('JNEXT') . '&nbsp;'
+						: '<span class="ic-hidden-link-text">' . JText::_('JNEXT') . '</span>';
+
+			$textBack   = ($arrowtext == 1)
+						? '&nbsp;' . JText::_('JPREV')
+						: '<span class="ic-hidden-link-text">' . JText::_('JPREV') . '</span>';
+
+			// Style CSS
+			$style_goto_page    = 'ic-go-to-page';
+			$style_goto_btn     = 'ic-btn ic-btn-small';
+			$style_current_page = 'ic-current-page';
+			$style_current_btn  = 'ic-btn ic-btn-info ic-active';
+
+			// Set page numbers for previous and next
+			$pageBack = ($getpage > 2) ? '&page=' . ($getpage - 1) : '';
+			$pageNext = '&page=' . ($getpage + 1);
+
+			// Set Input vars to URL after filtering
+			$listUrl = 'index.php?option=com_icagenda&view=list';
+
+			$Itemid  = $jinput->get('Itemid', '');
+			$listUrl.= $Itemid ? '&Itemid=' . $Itemid : '';
+
+			$vars    = array(
+							'filter_search'   => '',
+							'filter_from'     => '',
+							'filter_to'       => '',
+							'filter_category' => '',
+							'filter_month'    => '',
+							'filter_year'     => '',
+						);
+
+			$filters = $jinput->getArray($vars);
+
+			foreach ($filters as $key => $value)
+			{
+				if ($value)
+				{
+					$listUrl.= '&' . $key . '=' . $value;
+				}
+			}
+
+			// Set Prev and Next buttons
+			$iC_btnPrev = '<div class="ic-prev">'
+						. '<a rel="prev" href="' . JRoute::_($listUrl . $pageBack) . '" title=" ">'
+						. '<span class="iCicon iCicon-backic"></span>'
+						. '<span class="ic-prev-text">' . $textBack . '</span>'
+						. '</a>'
+						. '</div>';
+
+			$iC_btnNext = '<div class="ic-next">'
+						. '<a rel="next" href="' . JRoute::_($listUrl . $pageNext) . '" title=" ">'
+						. '<span class="ic-next-text">' . $textNext . '</span>'
+						. '<span class="iCicon iCicon-nextic"></span>'
+						. '</a>'
+						. '</div>';
+
+			// Display PREVIOUS button
+			if ($pages > 1
+					&& ($getpage > 1 && $getpage <= $pages))
+			{
+				$nav.= $iC_btnPrev;
+			}
+
+			// Display pages navigation
+			if ($pagination == 1)
+			{
+				$nav.= '<div class="ic-pages">';
+				
+
+				// Generate pagination
+				for ($i = 1 ; $i <= $pages ; $i++)
+				{
+					if ($i==1 || (($getpage-5) < $i && $i < ($getpage+5)) || $i==$pages)
+					{
+						if ($i == $pages && $getpage < ($pages-5))
+						{
+							$nav.= '<span class="ic-hidden-pages">...</span>';
+						}
+
+						$pageVar = ($i > 1) ? '&page=' . $i : '';
+
+						if ($i == $getpage)
+						{
+							$nav.= '<span class="' . $style_current_page . '">'
+								. '<span class="' . $style_current_btn . '">' . $i . '</span>'
+								. '</span>';
+						}
+						else
+						{
+							$nav.= '<span class="' . $style_goto_page . '">'
+								. '<a class="iCtip ' . $style_goto_btn . '"'
+								. ' href="' . JRoute::_($listUrl . $pageVar) . '"'
+								. ' rel="nofollow"'
+								. ' title="' . JText::sprintf('COM_ICAGENDA_EVENTS_PAGE_PER_TOTAL', $i, $pages) . '">'
+								. $i
+								. '</a>'
+								. '</span>';
+						}
+
+						if ($i == 1 && $getpage > 6)
+						{
+							$nav.= '<span class="ic-hidden-pages">...</span>';
+						}
+					}
+				}
+
+				$nav.= '</div>';
+			}
+
+			// Display NEXT button
+			if ($pages > 1
+				&& $getpage < $pages)
+			{
+				$nav.= $iC_btnNext;
+			}
+
+			$nav.= '</div>';
+		}
+
+		return $nav;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/manager/index.html b/deployed/icagenda/administrator/components/com_icagenda/utilities/manager/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/manager/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/manager/manager.php b/deployed/icagenda/administrator/components/com_icagenda/utilities/manager/manager.php
new file mode 100644
index 00000000..e6453f4b
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/manager/manager.php
@@ -0,0 +1,245 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-30
+ *
+ * @package     iCagenda.Admin
+ * @subpackage  Utilities
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.6.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * class icagendaManager
+ */
+class icagendaManager
+{
+	/**
+	 * Function to return manager icons toolbar
+	 *
+	 * @since   3.6.0
+	 */
+	public static function toolBar($item)
+	{
+		$app    = JFactory::getApplication();
+		$jinput = $app->input;
+
+		// Get Current Itemid
+		$this_itemid = $jinput->getInt('Itemid');
+
+		// Set Manager Actions Url
+		$event_slug        = empty($item->alias) ? $item->id : $item->id . ':' . $item->alias;
+		$managerActionsURL = 'index.php?option=com_icagenda&view=event&id=' . $event_slug . '&Itemid=' . $this_itemid;
+
+		// Set Email Notification Url to event
+		$linkEmailUrl = JURI::base() . 'index.php?option=com_icagenda&view=event&id=' . $event_slug . '&Itemid=' . $this_itemid;
+
+		// Get Approval Status
+		$approved = $item->approval;
+
+		// Get User groups allowed to approve event submitted
+		$groupid = JComponentHelper::getParams('com_icagenda')->get('approvalGroups', array("8"));
+
+		$groupid = is_array($groupid) ? $groupid : array($groupid);
+
+		// Get User Infos
+		$user = JFactory::getUser();
+
+		$icid = $user->get('id');
+		$icu  = $user->get('username');
+		$icp  = $user->get('password');
+
+		// Get User groups of the user logged-in
+		$userGroups = $user->getAuthorisedGroups();
+
+		$baseURL = JURI::base();
+		$subpathURL = JURI::base(true);
+
+		$baseURL = str_replace('/administrator', '', $baseURL);
+		$subpathURL = str_replace('/administrator', '', $subpathURL);
+
+		$urlcheck = str_replace('&amp;','&', JRoute::_('administrator/index.php?option=com_icagenda&view=events') . '&icu=' . $icu . '&icp=' . $icp . '&filter_search=' . $item->id);
+
+		// Sub Path filtering
+		$subpathURL = ltrim($subpathURL, '/');
+
+		// URL Event Check filtering
+		$urlcheck = ltrim($urlcheck, '/');
+
+		if (substr($urlcheck, 0, strlen($subpathURL)+1) == "$subpathURL/")
+		{
+			$urlcheck = substr($urlcheck, strlen($subpathURL)+1);
+		}
+
+		$urlcheck = rtrim($baseURL, '/') . '/' . ltrim($urlcheck, '/');
+
+		$icu_approve = $jinput->get('manageraction', '');
+
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			$approveIcon = '<span class="iCicon-16 approval"></span>';
+		}
+		else
+		{
+			$approveIcon = '<button class="btn btn-micro btn-warning btn-xs "><i class="icon-checkmark"></i></button>';
+		}
+
+		$approval_msg   = JText::sprintf('COM_ICAGENDA_APPROVE_AN_EVENT_NOTICE', $approveIcon);
+		$approval_title = JText::_('COM_ICAGENDA_APPROVE_AN_EVENT_LBL');
+		$approval_type  = 'notice';
+
+		$jlayout        = $jinput->get('layout', '');
+		$layouts_array  = array('event', 'registration');
+		$icu_layout     = in_array($jlayout, $layouts_array) ? $jlayout : '';
+
+		if ( array_intersect($userGroups, $groupid)
+			|| in_array('8', $userGroups) )
+		{
+			if ($approved == 1)
+			{
+				if (version_compare(JVERSION, '3.0', 'lt'))
+				{
+					$approvalButton = '<a'
+									. ' class="iCtip"'
+									. ' href="' . JRoute::_($managerActionsURL . '&manageraction=approve') . '"'
+									. ' title="' . JText::_('COM_ICAGENDA_APPROVE_AN_EVENT_LBL') . '">'
+									. '<div class="iCicon-16 approval"></div>'
+									. '</a>';
+ 				}
+ 				else
+ 				{
+					$approvalButton = '<a'
+									. ' class="iCtip"'
+									. ' href="' . JRoute::_($managerActionsURL . '&manageraction=approve') . '"'
+									. ' title="' . JText::_('COM_ICAGENDA_APPROVE_AN_EVENT_LBL') . '">'
+									. '<button type="button" class="btn btn-micro btn-warning btn-xs">'
+									. '<i class="icon-checkmark"></i>'
+									. '</button>'
+									. '</a>';
+				}
+
+				if ($icu_approve != 'approve')
+				{
+					$app->enqueueMessage($approval_msg, $approval_title, $approval_type);
+				}
+
+				if ($icu_approve == 'approve'
+					&& $jinput->get('view', '') == 'event')
+				{
+        			$db    = Jfactory::getDbo();
+					$query = $db->getQuery(true);
+        			$query->clear();
+					$query->update('#__icagenda_events');
+					$query->set('approval = 0');
+					$query->where(' id = ' . (int) $item->id);
+					$db->setQuery((string) $query);
+					$db->query($query);
+
+					$approveSuccess = '"' . $item->title . '"';
+					$alertmsg       = JText::sprintf('COM_ICAGENDA_APPROVED_SUCCESS', $approveSuccess);
+					$alerttitle     = JText::_('COM_ICAGENDA_APPROVED');
+					$alerttype      = 'success';
+					$approvedLink   = JRoute::_($managerActionsURL);
+
+					self::approvalNotification($item->created_by_email, $item->username, $item->title, $linkEmailUrl);
+
+					// Plugin Event handler 'iCagendaOnNewEvent'
+					// JOOMLA 3.x/2.5 SWITCH
+					if (version_compare(JVERSION, '3.0', 'ge'))
+					{
+						$dispatcher = JEventDispatcher::getInstance();
+					}
+					else
+					{
+						$dispatcher = JDispatcher::getInstance();
+					}
+
+					JPluginHelper::importPlugin('icagenda');
+
+					$dispatcher->trigger('iCagendaOnNewEvent', array($item));
+
+					// System Message Approval
+					$app->enqueueMessage($alertmsg, $alerttitle, $alerttype);
+				}
+				else
+				{
+					return $approvalButton;
+				}
+			}
+			else
+			{
+				return false;
+			}
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Function to send approval notification emails
+	 *
+	 * @since   3.6.0
+	 */
+	public static function approvalNotification($creatorEmail, $eventUsername, $eventTitle, $eventLink)
+	{
+		$app = JFactory::getApplication();
+
+		// Load Joomla Config Mail Options
+		$sitename = $app->getCfg('sitename');
+		$mailfrom = $app->getCfg('mailfrom');
+		$fromname = $app->getCfg('fromname');
+
+		// Create User Mailer
+		$approvedmailer = JFactory::getMailer();
+
+		// Set Sender of Notification Email
+		$approvedmailer->setSender(array( $mailfrom, $fromname ));
+
+		// Set Recipient of Notification Email
+		$approvedmailer->addRecipient($creatorEmail);
+
+		// Set Subject of Notification Email
+		$approvedsubject = JText::sprintf('COM_ICAGENDA_APPROVED_USEREMAIL_SUBJECT', $eventTitle);
+		$approvedmailer->setSubject($approvedsubject);
+
+		// Set Body of Notification Email
+		$approvedbodycontent = JText::sprintf('COM_ICAGENDA_SUBMISSION_ADMIN_EMAIL_HELLO', $eventUsername) . ',<br /><br />';
+		$approvedbodycontent.= JText::sprintf('COM_ICAGENDA_APPROVED_USEREMAIL_BODY_INTRO', $sitename) . '<br /><br />';
+//		$approvedbodycontent.= JText::_('COM_ICAGENDA_APPROVED_USEREMAIL_EVENT_LINK').'<br />';
+
+		$eventLink_html = '<br /><a href="' . $eventLink . '">' . $eventLink . '</a>';
+		$approvedbodycontent.= JText::sprintf('COM_ICAGENDA_APPROVED_USEREMAIL_EVENT_LINK', $eventLink_html).'<br /><br />';
+
+//		$approvedbodycontent.= '<a href="' . $eventLink . '">' . $eventLink . '</a><br /><br />';
+		$approvedbodycontent.= '<hr><small>' . JText::_('COM_ICAGENDA_APPROVED_USEREMAIL_EVENT_LINK_INFO') . '</small><br /><br />';
+
+		$approvedbody = rtrim($approvedbodycontent);
+
+		$approvedmailer->isHTML(true);
+
+		// JDocs: When sending HTML emails you should normally set the Encoding to base64
+		//        in order to avoid unwanted characters in the output.
+		//        See https://docs.joomla.org/Sending_email_from_extensions
+		$approvedmailer->Encoding = 'base64'; // JDocs Sending HTML Email
+
+		$approvedmailer->setBody($approvedbody);
+
+		// Send User Notification Email
+		if (isset($creatorEmail))
+		{
+			$send = $approvedmailer->Send();
+		}
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/menus/index.html b/deployed/icagenda/administrator/components/com_icagenda/utilities/menus/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/menus/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/menus/menus.php b/deployed/icagenda/administrator/components/com_icagenda/utilities/menus/menus.php
new file mode 100644
index 00000000..709039aa
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/menus/menus.php
@@ -0,0 +1,403 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-26
+ *
+ * @package     iCagenda.Admin
+ * @subpackage  Utilities
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.4.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die();
+
+/**
+ * class icagendaCategories
+ */
+class icagendaMenus
+{
+	/**
+	 * Function to return all published 'List of Events' menu items
+	 *
+	 * @access	public static
+	 * @param	none
+	 * @return	array of menu item info this way : Itemid-mcatid-lang
+	 *
+	 * @since	3.4.0
+	 */
+	public static function iClistMenuItemsInfo()
+	{
+		$app			= JFactory::getApplication();
+//		$params			= $app->getParams();
+
+		$options_time	= JComponentHelper::getParams('com_icagenda')->get('time', '0');
+
+		// List all menu items linking to list of events
+		$db		= JFactory::getDbo();
+		$query	= $db->getQuery(true);
+		$query->select('m.title, m.published, m.id, m.params, m.language')
+			->from('#__menu AS m')
+			->where( "(m.link = 'index.php?option=com_icagenda&view=list') AND (m.published = 1)" );
+
+		if (JLanguageMultilang::isEnabled())
+		{
+			$query->where('m.language in (' . $db->quote(JFactory::getLanguage()->getTag()) . ',' . $db->quote('*') . ')');
+		}
+
+		$db->setQuery($query);
+		$link = $db->loadObjectList();
+
+		$iC_list_menus = array();
+
+		foreach ($link as $iClistMenu)
+		{
+			$menuitemid	= $iClistMenu->id;
+
+			if ($menuitemid)
+			{
+				$menu		= $app->getMenu();
+				$menuparams	= $menu->getParams($menuitemid);
+
+				$mcatid		= $menuparams->get('mcatid', '');
+				$menufilter	= ($menuparams->get('time', '') != '')
+							? $menuparams->get('time')
+							: $options_time;
+
+				if (is_array($mcatid))
+				{
+					$mcatid	= implode(',', $mcatid);
+				}
+
+				array_push($iC_list_menus, $menuitemid . '_' . $mcatid . '_' . $menufilter);
+			}
+		}
+
+		return $iC_list_menus;
+	}
+
+	/**
+	 * Function to return all published 'List of Events' menu items
+	 *
+	 * @access	public static
+	 * @param	none
+	 * @return	array of menu item info this way : Itemid-mcatid-lang
+	 *
+	 * @since	3.4.0
+	 */
+	public static function iClistMenuItems()
+	{
+		$app = JFactory::getApplication();
+
+		// List all menu items linking to list of events
+		$db		= JFactory::getDbo();
+		$query	= $db->getQuery(true);
+		$query->select('m.title, m.published, m.id, m.params, m.language')
+			->from('#__menu AS m')
+			->where( "(m.link = 'index.php?option=com_icagenda&view=list') AND (m.published = 1)" );
+
+		if (JLanguageMultilang::isEnabled())
+		{
+			$query->where('m.language in (' . $db->quote(JFactory::getLanguage()->getTag()) . ',' . $db->quote('*') . ')');
+		}
+
+		$query->order('m.id ASC');
+
+		$db->setQuery($query);
+		$iC_list_menu_items = $db->loadObjectList();
+
+		if ($iC_list_menu_items)
+		{
+			return $iC_list_menu_items;
+		}
+		else
+		{
+			return array();
+		}
+	}
+
+	/**
+	 * Function to return menu Itemid to display an event
+	 *
+	 * @access	public static
+	 * @return	menu Itemid
+	 *
+	 * @since	3.5.7
+	 */
+	public static function thisEventItemid($date, $category, $array_menuitems = null)
+	{
+		$iC_list_menus = $array_menuitems ? $array_menuitems : self::iClistMenuItemsInfo();
+
+		$datetime_today	= JHtml::date('now', 'Y-m-d H:i');
+		$date_today		= JHtml::date('now', 'Y-m-d');
+
+		// set menu link for each event (itemID) depending of category and/or language
+		$onecat		= $multicat		= '0';
+		$link_one	= $link_multi	= '';
+
+		$menu_IDs_category	= array();
+		$menu_IDs_all		= array();
+		$itemID_is_set		= 0;
+
+		foreach ($iC_list_menus as &$iCm)
+		{
+			$value			= explode('_', $iCm);
+			$iCmenu_id		= $value['0'];
+			$iCmenu_mcatid	= $value['1'];
+			$iCmenu_filter	= $value['2'];
+
+			$iCmenu_mcatid_array = ! is_array($iCmenu_mcatid) ? explode(',', $iCmenu_mcatid) : array();
+
+			// Menu can display past events
+			if ($iCmenu_filter == 2
+				&& strtotime($date) < strtotime($datetime_today)
+				&& ! $itemID_is_set)
+			{
+				// If menu category filter is set, and item category is in filtered categories
+				if (in_array($category, $iCmenu_mcatid_array))
+				{
+					$menu_IDs_category[] = $iCmenu_id;
+					$itemID_is_set = $itemID_is_set + 1;
+				}
+				elseif ( ! $iCmenu_mcatid)
+				{
+					$menu_IDs_all[] = $iCmenu_id;
+				}
+			}
+
+			// Menu can display today's events
+			elseif ($iCmenu_filter == 4
+				&& strtotime($date) > strtotime($date_today)
+				&& strtotime($date) < strtotime("+1 DAY", strtotime($date_today))
+				&& ! $itemID_is_set)
+			{
+				// If menu category filter is set, and item category is in filtered categories
+				if (in_array($category, $iCmenu_mcatid_array))
+				{
+					$menu_IDs_category[] = $iCmenu_id;
+					$itemID_is_set = $itemID_is_set + 1;
+				}
+				elseif ( ! $iCmenu_mcatid)
+				{
+					$menu_IDs_all[] = $iCmenu_id;
+				}
+			}
+
+			// Menu can display today's events and upcoming events
+			elseif ($iCmenu_filter == 1
+				&& strtotime($date) >= strtotime($date_today)
+				&& ! $itemID_is_set)
+			{
+				// If menu category filter is set, and item category is in filtered categories
+				if (in_array($category, $iCmenu_mcatid_array))
+				{
+					$menu_IDs_category[] = $iCmenu_id;
+					$itemID_is_set = $itemID_is_set + 1;
+				}
+				elseif ( ! $iCmenu_mcatid)
+				{
+					$menu_IDs_all[] = $iCmenu_id;
+				}
+			}
+
+			// Menu can display upcoming events
+			elseif ($iCmenu_filter == 3
+				&& strtotime($date) > strtotime($datetime_today)
+				&& ! $itemID_is_set)
+			{
+				// If menu category filter is set, and item category is in filtered categories
+				if (in_array($category, $iCmenu_mcatid_array))
+				{
+					$menu_IDs_category[] = $iCmenu_id;
+					$itemID_is_set = $itemID_is_set + 1;
+				}
+				elseif ( ! $iCmenu_mcatid)
+				{
+					$menu_IDs_all[] = $iCmenu_id;
+				}
+			}
+
+			// Menu can display all events
+			elseif ($iCmenu_filter == '0'
+				&&  ! $itemID_is_set)
+			{
+				// If menu category filter is set, and item category is in filtered categories
+				if (in_array($category, $iCmenu_mcatid_array))
+				{
+					$menu_IDs_category[] = $iCmenu_id;
+					$itemID_is_set = $itemID_is_set + 1;
+				}
+				elseif ( ! $iCmenu_mcatid)
+				{
+					$menu_IDs_all[] = $iCmenu_id;
+				}
+			}
+
+			if ($iCmenu_mcatid)
+			{
+				$nb_cat_filter = count($iCmenu_mcatid_array);
+
+				for ($i = $category; in_array($i, $iCmenu_mcatid_array); $i++)
+				{
+					if ($nb_cat_filter == 1)
+					{
+						$link_one = $iCmenu_id;
+					}
+					elseif ($nb_cat_filter > 1)
+					{
+						$link_multi = $iCmenu_id;
+					}
+				}
+			}
+		}
+
+		if (count($menu_IDs_category))
+		{
+			if ($link_one)
+			{
+				$linkid = $link_one;
+			}
+			elseif ($link_multi)
+			{
+				$linkid = $link_multi;
+			}
+			else
+			{
+				$linkid = $menu_IDs_category[0];
+			}
+		}
+		elseif (count($menu_IDs_all))
+		{
+			$linkid = $menu_IDs_all[0];
+		}
+		else
+		{
+//			$linkid = '#';
+			$linkid = null;
+		}
+
+		return $linkid;
+	}
+
+	/**
+	 * Function to return menu Itemid to display an event
+	 *
+	 * @access	public static
+	 * @return	menu Itemid
+	 *
+	 * @since	3.6.4
+	 */
+	public static function displayEventItemid($Itemid, $event_filters)
+	{
+		$menu_filters   = self::getFiltersMenuItem($Itemid);
+		$datetime_today = JHtml::date('now', 'Y-m-d H:i');
+		$date_today     = JHtml::date('now', 'Y-m-d');
+		$linkid         = null;
+
+		$iCmenu_id      = $Itemid;
+		$iCmenu_time    = $menu_filters['time'];
+		$iCmenu_mcatid  = ! is_array($menu_filters['mcatid'])
+						? explode(',', $menu_filters['mcatid'])
+						: $menu_filters['mcatid'];
+
+		$event_date     = $event_filters['date'];
+		$event_category = $event_filters['catid'];
+
+		// Language and Access not currently used as items already filtered in frontend
+		$event_language = $event_filters['language'];
+		$event_access   = $event_filters['access'];
+
+		// If menu category filter is set, and item category is in filtered categories OR No category filter (display all)
+		if (in_array($event_category, $iCmenu_mcatid)
+			|| in_array('', $iCmenu_mcatid))
+		{
+			// Menu can display past events
+			if ($iCmenu_time == 2
+				&& strtotime($event_date) < strtotime($datetime_today)
+				)
+			{
+				$linkid = $iCmenu_id;
+			}
+
+			// Menu can display today's events
+			elseif ($iCmenu_time == 4
+				&& strtotime($event_date) > strtotime($date_today)
+				&& strtotime($event_date) < strtotime("+1 DAY", strtotime($date_today))
+				)
+			{
+				$linkid = $iCmenu_id;
+			}
+
+			// Menu can display today's events and upcoming events
+			elseif ($iCmenu_time == 1
+				&& strtotime($event_date) >= strtotime($date_today)
+				)
+			{
+				$linkid = $iCmenu_id;
+			}
+
+			// Menu can display upcoming events
+			elseif ($iCmenu_time == 3
+				&& strtotime($event_date) > strtotime($datetime_today)
+				)
+			{
+				$linkid = $iCmenu_id;
+			}
+
+			// Menu can display all events
+			elseif ($iCmenu_time == '0')
+			{
+				$linkid = $iCmenu_id;
+			}
+		}
+
+		return $linkid;
+	}
+
+	/**
+	 * Function to return filtering settings of one menu item
+	 *
+	 * @access	public static
+	 * @param	none
+	 * @return	array of menu item info this way : Itemid-mcatid-lang
+	 *
+	 * @since	3.6.4
+	 */
+	public static function getFiltersMenuItem($Itemid)
+	{
+		if ($Itemid)
+		{
+			$app			= JFactory::getApplication();
+			$menu			= $app->getMenu();
+			$menuItem		= $menu->getItem($Itemid);
+			$menuParams		= $menu->getParams($Itemid);
+
+			$iCparams_time	= JComponentHelper::getParams('com_icagenda')->get('time', '0');
+
+			$mcatid			= $menuParams->get('mcatid', '');
+			$time			= ($menuParams->get('time', '') != '')
+							? $menuParams->get('time')
+							: $iCparams_time;
+			$language		= $menuItem->language;
+			$access			= $menuItem->access;
+
+			$ItemidFilters = array(
+				'mcatid'	=> $mcatid,
+				'time'		=> $time,
+				'language'	=> $language,
+				'access'	=> $access,
+			);
+
+			return $ItemidFilters;
+		}
+
+		return false;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/params/index.html b/deployed/icagenda/administrator/components/com_icagenda/utilities/params/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/params/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/params/params.php b/deployed/icagenda/administrator/components/com_icagenda/utilities/params/params.php
new file mode 100644
index 00000000..883eff11
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/params/params.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-30
+ *
+ * @package     iCagenda.Admin
+ * @subpackage  Utilities
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.4.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * class icagendaParams
+ */
+class icagendaParams
+{
+	/**
+	 * Function to encrypt user pro password
+	 *
+	 * @access  public static
+	 * @param   $id - id of the event
+	 * @return  list array of access levels, approval and event access status
+	 *
+	 * @since   3.4.0
+	 */
+	static public function encryptPassword()
+	{
+		$params = JComponentHelper::getParams( 'com_icagenda' );
+		$icsys  = $params->get('icsys', 'core');
+
+		if ($icsys == 'pro')
+		{
+			jimport('joomla.user.helper');
+
+			$crypt1  = JUserHelper::genRandomPassword(2);
+			$crypt2  = JUserHelper::genRandomPassword(2);
+			$salt_8  = JUserHelper::genRandomPassword(8);
+			$salt_16 = JUserHelper::genRandomPassword(16);
+			$salt_32 = JUserHelper::genRandomPassword(32);
+
+			$password = $params->get('password', '');
+
+			$is_crypted = substr_count($password, '$');
+
+			if ($is_crypted != 3 && strlen($password) != 0)
+			{
+				$encoded = base64_encode($password); // Encode Password Data Storage
+
+				if (strlen($encoded) > 32)
+				{
+					$salt1 = $salt_16;
+					$salt2 = $salt_8;
+				}
+				elseif (strlen($encoded) < 32 && strlen($encoded) > 16)
+				{
+					$salt1 = $salt_16;
+					$salt2 = $salt_8;
+				}
+				else
+				{
+					$salt1 = $salt_32;
+					$salt2 = $salt_16;
+				}
+
+				$pass_encoded = '$' . $crypt1 . '$' . $crypt2 . '$' . $salt1 . '.' . $encoded . '/' . $salt2;
+				$password     = $pass_encoded;
+
+				// Get the params and set the new values
+				$params->set('password', $password);
+
+				// Get a new database query instance
+				$db = JFactory::getDBO();
+				$query = $db->getQuery(true);
+
+				// Build the query
+				$query->update('#__extensions AS a');
+				$query->set('a.params = ' . $db->quote((string)$params));
+				$query->where('a.element = "com_icagenda"');
+
+				// Execute the query
+				$db->setQuery($query);
+				$db->query();
+			}
+		}
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/registration/index.html b/deployed/icagenda/administrator/components/com_icagenda/utilities/registration/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/registration/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/registration/participants.php b/deployed/icagenda/administrator/components/com_icagenda/utilities/registration/participants.php
new file mode 100644
index 00000000..99155d47
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/registration/participants.php
@@ -0,0 +1,596 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.12 2020-03-09
+ *
+ * @package     iCagenda.Admin
+ * @subpackage  Utilities
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2020 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.6.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * class icagendaRegistrationParticipants
+ */
+class icagendaRegistrationParticipants
+{
+	/**
+	 * Function to check if display of participants list
+	 *
+	 * @since   3.6.0
+	 */
+	static public function listDisplay($item)
+	{
+		$iCparams = JComponentHelper::getParams('com_icagenda');
+
+		// Get Option if usage of iCagenda registration form for this event
+		$evtParams = icagendaEvent::evtParams($item);
+		$regLink   = $evtParams->get('RegButtonLink', '');
+
+		// Hide/Show Option
+		$participantList = $iCparams->get('participantList', 0);
+
+		// Access Levels Option
+		$accessParticipantList = $iCparams->get('accessParticipantList', 1);
+
+		if ($participantList == 1
+			&& ! $regLink
+			&& icagendaEvents::accessLevels($accessParticipantList)
+			)
+		{
+			return $participantList;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Function to display title List of Participants (if no slide effect)
+	 *
+	 * @since   3.6.0
+	 */
+	static public function listTitle($item)
+	{
+		$params = JFactory::getApplication()->getParams();
+
+		// Get Option if usage of iCagenda registration form for this event
+		$evtParams = icagendaEvent::evtParams($item);
+		$regLink   = $evtParams->get('RegButtonLink', '');
+
+		$participantList  = $params->get('participantList', 0);
+		$participantSlide = $params->get('participantSlide', '');
+
+		$registration = $item->params->get('statutReg', '');
+
+		if ($participantSlide == 0
+			&& $registration == 1
+			&& $participantList == 1
+			&& ! $regLink
+			)
+		{
+			return JText::_('COM_ICAGENDA_EVENT_LIST_OF_PARTICIPANTS');
+		}
+	}
+
+	/**
+	 * Function to display list of participants
+	 * TO BE REFACTORED (in process)
+	 *
+	 * @since   3.6.0
+	 * @version 3.6.6
+	 */
+	static public function registeredUsers($i)
+	{
+		$app   = JFactory::getApplication();
+		$input = $app->input;
+
+		$eventTimeZone = null;
+
+		// Get Component PARAMS
+		$iCparams = JComponentHelper::getParams('com_icagenda');
+
+		// Get Type Registration (for all dates or per date)
+		$typeReg = $i->params->get('typeReg', 1);
+
+		// Preparing connection to db
+		$db = JFactory::getDbo();
+
+		// Preparing the query
+		$query = $db->getQuery(true);
+		$query->select(' r.id AS regID, r.userid AS userid, r.name AS registeredUsers, r.date as regDate, r.people as regPeople, r.email as regEmail,
+						u.name AS name, u.username AS username, GROUP_CONCAT(ua.user_action) AS user_action')
+			->from('#__icagenda_registration AS r')
+			->leftJoin('#__users as u ON u.id = r.userid')
+			->leftJoin('#__icagenda_user_actions as ua ON ua.parent_id = r.id')
+			->group('r.id, ua.parent_id')
+			->where('r.eventid = ' . (int) $i->id)
+			->where('r.state = 1');
+
+		// Get var event date alias if set or var 'event_date' set to session in event details view
+		$session    = JFactory::getSession();
+		$event_date = $session->get('event_date', '');
+		$get_date   = $input->get('date', ($event_date ? date('Y-m-d-H-i', strtotime($event_date)) : ''));
+
+		// Convert to SQL datetime if set, or return empty.
+		$dateday = icagendaEvent::convertDateAliasToSQLDatetime($get_date);
+
+		// Registration type: by single date/period (1)
+		if ($dateday && $typeReg == 1)
+		{
+//			$query->where('r.date = ' . $db->q($dateday)); // This is the good logic if correctly set
+			$query->where('(r.date = ' . $db->q($dateday) . ' OR (r.date = "" AND r.period = 1))');
+		}
+		elseif ( ! $dateday && $typeReg == 1)
+		{
+//			$query->where('r.date = "" AND r.period = 0'); // This is the good logic if correctly set
+			$query->where('r.date = ""');
+		}
+
+		$db->setQuery($query);
+
+		$registeredUsers = $db->loadObjectList();
+		$nbusers         = count($registeredUsers);
+//		$nbusers         = $i->registered;
+		$nbmax           = $nbusers-1;
+		$registration    = $i->params->get('statutReg', '');
+		$n               = '0';
+
+		// Slide Params
+		$participantList    = $iCparams->get('participantList', 0);
+		$participantSlide   = $iCparams->get('participantSlide', 1);
+		$participantDisplay = $iCparams->get('participantDisplay', 1);
+		$fullListColumns    = $iCparams->get('fullListColumns', 'tiers');
+
+		// logged-in Users: Name/User Name Option
+		$nameJoomlaUser = $iCparams->get('nameJoomlaUser', 1);
+
+		$this_date = JHtml::date($dateday, 'Y-m-d H:i', $eventTimeZone);
+
+		// Start List of Participants
+		jimport( 'joomla.html.html.sliders' );
+		$slider_c = '';
+
+		$list_participants = '';
+
+		if ($participantList == 1 && $registration == 1)
+		{
+			$n_list='names_noslide';
+
+			// Check Admin / Organiser permissions to access registration data
+			$organiser_rights = JFactory::getUser()->authorise('icagenda.access.registrations', 'com_icagenda');
+
+
+			if ($participantSlide == 1)
+			{
+				$n_list   = 'names_slide';
+				$slider_c = 'class="pane-slider content"';
+
+				$list_participants.= JHtml::_('sliders.start', 'icagenda', array('useCookie'=>0, 'startOffset'=>-1, 'startTransition'=>1));
+				$list_participants.= JHtml::_('sliders.panel', JText::_('COM_ICAGENDA_EVENT_LIST_OF_PARTICIPANTS'), 'slide1');
+			}
+
+			foreach ($registeredUsers as $reguser)
+			{
+				$this_reg_date  = strtotime($reguser->regDate)
+								? JHtml::date($reguser->regDate, 'Y-m-d H:i', $eventTimeZone)
+								: $reguser->regDate;
+
+				if ( ($this_reg_date == $this_date)
+					|| ($typeReg == 2)
+					)
+				{
+					$n = $n+1;
+				}
+
+				// Registration by dates, and registration date is not filled
+				elseif ($typeReg == 1
+					&& ! $this_reg_date)
+				{
+					$n = $n+1;
+				}
+			}
+
+			if ($nbusers == NULL || ($n == 0 && ! empty($get_date)))
+			{
+				$list_participants.= '<div ' . $slider_c . '>';
+				$list_participants.= '&nbsp;' . JText::_('COM_ICAGENDA_NO_REGISTRATION') . '&nbsp;';
+				$list_participants.= '</div>';
+			}
+
+			// Full display
+			elseif ($participantDisplay == 1)
+			{
+				$column = isset($fullListColumns) ? $fullListColumns : 'tiers';
+
+				$list_participants.= '<div ' . $slider_c . '>';
+
+				foreach ($registeredUsers as $reguser)
+				{
+					$this_reg_date  = strtotime($reguser->regDate)
+									? JHtml::date($reguser->regDate, 'Y-m-d H:i', $eventTimeZone)
+									: $reguser->regDate;
+
+					if ( ($this_reg_date == $this_date || empty($get_date))
+						|| $typeReg == 2
+						|| ($typeReg == 1 && ! $this_reg_date)
+						)
+					{
+						// Get participant privacy consents
+						$user_actions = explode(',', $reguser->user_action);
+
+						// Get Name consent
+						$name_consents = array();
+
+//						foreach ($user_actions AS $k => $action)
+//						{
+//							$ex_action = explode('__', $action);
+
+//							if ($ex_action[0] == 'consent_name'
+//								&& isset($ex_action[1]))
+//							{
+//								$name_consents = explode('_', $ex_action[1]);
+//							}
+//						}
+
+						if (in_array('consent_name_public', $user_actions)) $name_consents = array('public');
+						if (in_array('consent_name_users', $user_actions)) $name_consents = array('users');
+
+						$force_name_visibility = $iCparams->get('participant_name_consent', '');
+
+						if ($force_name_visibility == '0')
+						{
+							$participant_name_visibility = $iCparams->get('participant_name_visibility', '');
+
+							if ($participant_name_visibility == 1)
+							{
+								$name_consents = array('public');
+							}
+							elseif ($participant_name_visibility == 2)
+							{
+								$name_consents = array('users');
+							}
+						}
+
+						if (in_array('public', $name_consents)
+							|| (in_array('users', $name_consents) && JFactory::getUser()->id > 0))
+						{
+							// Get Username and name (To check: Is it needed ?)
+							if ( ! empty($reguser->userid))
+							{
+								$data_name     = $reguser->name;
+								$data_username = $reguser->username;
+
+								if ($nameJoomlaUser == 1)
+								{
+									$reguser->registeredUsers = $reguser->registeredUsers;
+								}
+								else
+								{
+									$reguser->registeredUsers = $data_username;
+								}
+							}
+
+							$participant_name = $reguser->registeredUsers;
+						}
+						elseif($organiser_rights)
+						{
+							// Information to be extended for logged-in user with admin/organiser permissions...
+							$participant_name = $reguser->registeredUsers;
+						}
+						else
+						{
+							$participant_name = JText::_('IC_ANONYMOUS');
+						}
+
+						// Get Gravatar consent
+						if (in_array('consent_gravatar', $user_actions))
+						{
+							$avatar             = md5(strtolower(trim($reguser->regEmail)));
+							$participant_avatar = '<img alt="' . $participant_name . '"  src="https://www.gravatar.com/avatar/' . $avatar . '?s=36&d=mm"/>';
+						}
+						else
+						{
+							$participant_avatar = '<span class="iCicon-avatar ic-avatar"></span>';
+						}
+
+						$regDate = '';
+
+
+						// Test if registered date before 3.3.3 could be converted
+						if (strtotime($reguser->regDate))
+						{
+							// Control if date valid format (Y-m-d H:i)
+							$datetime_format   = 'Y-m-d H:i:s';
+							$datetime_input    = $reguser->regDate;
+							$datetime_input    = trim($datetime_input);
+							$datetime_is_valid = date($datetime_format, strtotime($datetime_input)) == $datetime_input;
+
+							if ($datetime_is_valid) // New Data value (since 3.3.3)
+							{
+								$ex_reg_datetime_db = explode (' ', $datetime_input);
+								$registered_date    = icagendaRender::dateToFormat(date('Y-m-d', strtotime($ex_reg_datetime_db['0'])));
+								$reg_time_get       = isset($ex_reg_datetime_db['1']) ? $ex_reg_datetime_db['1'] : '';
+							}
+							else // Test if old date format (before 3.3.3) could be converted. If not, displays old format.
+							{
+								$ex_reg_datetime    = explode (' - ', trim($reguser->regDate));
+
+								// Control if date valid format (Y-m-d) - Means could be converted
+								$date_format   = 'Y-m-d H:i:s';
+								$date_input    = $ex_reg_datetime['0'];
+								$date_input    = trim($date_input);
+								$date_str      = strtotime($date_input);
+								$date_is_valid = date($date_format, $date_str) == $date_input;
+
+								if ($date_is_valid)
+								{
+									$registered_date = icagendaRender::dateToFormat(date('Y-m-d', $date_str));
+								}
+								else
+								{
+									$registered_date = $ex_reg_datetime['0'];
+								}
+
+								$reg_time_get = isset($ex_reg_datetime['1']) ? $ex_reg_datetime['1'] : '';
+							}
+
+							$regDate.= $registered_date;
+
+							if ($reg_time_get)
+							{
+								$regDate.= ' - ' . date('H:i', strtotime($reg_time_get));
+							}
+						}
+						else
+						{
+							$regDate.= $reguser->regDate;
+						}
+
+						// Display List of Participants
+						if ($n <= $nbmax || $n == $nbusers)
+						{
+							$list_participants.= '<table class="list_table ' . $column . '" cellpadding="0">'
+												. '<tbody>'
+												. '<tr>';
+
+							$list_participants.= '<td class="imgbox">';
+							$list_participants.= $participant_avatar;
+							$list_participants.= '</td>';
+
+							$list_participants.= '<td valign="middle">'
+												. '<span class="list_name">' . $participant_name . '</span>'
+												. '<span class="list_places"> (' . $reguser->regPeople . ')</span><br />'
+												. '<span class="list_date">' . $regDate . '</span>'
+												. '</td>';
+
+							$list_participants.= '</tr></tbody></table>';
+						}
+					}
+				}
+
+				$list_participants.= '</div>';
+			}
+
+			// Avatar display
+			elseif ($participantDisplay == 2)
+			{
+				$list_participants.= '<div ' . $slider_c . '>';
+
+				foreach ($registeredUsers as $reguser)
+				{
+					$this_reg_date = strtotime($reguser->regDate)
+									? JHtml::date($reguser->regDate, 'Y-m-d H:i', $eventTimeZone)
+									: $reguser->regDate;
+
+					if ( ($this_reg_date == $this_date || empty($get_date))
+						|| $typeReg == 2
+						|| ($typeReg == 1 && ! $this_reg_date)
+						)
+					{
+						// Get participant privacy consents
+						$user_actions = explode(',', $reguser->user_action);
+
+						// Get Name consent
+						$name_consents = array();
+
+//						foreach ($user_actions AS $k => $action)
+//						{
+//							$ex_action = explode('__', $action);
+
+//							if ($ex_action[0] == 'consent_name'
+//								&& isset($ex_action[1]))
+//							{
+//								$name_consents = explode('_', $ex_action[1]);
+//							}
+//						}
+
+						if (in_array('consent_name_public', $user_actions)) $name_consents = array('public');
+						if (in_array('consent_name_users', $user_actions)) $name_consents = array('users');
+
+						$force_name_visibility = $iCparams->get('participant_name_consent', '');
+
+						if ($force_name_visibility == '0')
+						{
+							$participant_name_visibility = $iCparams->get('participant_name_visibility', '');
+
+							if ($participant_name_visibility == 1)
+							{
+								$name_consents = array('public');
+							}
+							elseif ($participant_name_visibility == 2)
+							{
+								$name_consents = array('users');
+							}
+						}
+
+						if (in_array('public', $name_consents)
+							|| (in_array('users', $name_consents) && JFactory::getUser()->id > 0))
+						{
+							// Get Username and name (To check: Is it needed ?)
+							if ( ! empty($reguser->userid))
+							{
+								$data_name     = $reguser->name;
+								$data_username = $reguser->username;
+
+								if ($nameJoomlaUser == 1)
+								{
+									$reguser->registeredUsers = $reguser->registeredUsers;
+								}
+								else
+								{
+									$reguser->registeredUsers = $data_username;
+								}
+							}
+
+							$participant_name = $reguser->registeredUsers;
+						}
+						elseif($organiser_rights)
+						{
+							// Information to be extended for logged-in user with admin/organiser permissions...
+							$participant_name = $reguser->registeredUsers;
+						}
+						else
+						{
+							$participant_name = JText::_('IC_ANONYMOUS');
+						}
+
+						// Get Gravatar consent
+						if (in_array('consent_gravatar', $user_actions))
+						{
+							$avatar             = md5(strtolower(trim($reguser->regEmail)));
+							$participant_avatar = '<img alt="' . $participant_name . '"  src="https://www.gravatar.com/avatar/' . $avatar . '?s=36&d=mm"/>';
+						}
+						else
+						{
+							$participant_avatar = '<span class="iCicon-avatar ic-avatar"></span>';
+						}
+
+						if ($n <= $nbmax || $n == $nbusers)
+						{
+							$list_participants.= '<div style="float:left; margin:3px; padding: 5px 0; text-align:center;"><div class="imgbox">' . $participant_avatar . '</div><strong style="text-align:center; font-size:9px;">' . $participant_name . '</strong></div>';
+						}
+					}
+				}
+				$list_participants.= '</div>';
+			}
+
+			// Name/username display
+			elseif ($participantDisplay == 3)
+			{
+				$list_participants.= '<div ' . $slider_c . '>';
+				$list_participants.= '<div class="' . $n_list . '">';
+
+				$list_username = '';
+
+				foreach ($registeredUsers as $reguser)
+				{
+					$this_reg_date  = strtotime($reguser->regDate)
+									? JHtml::date($reguser->regDate, 'Y-m-d H:i', $eventTimeZone)
+									: $reguser->regDate;
+
+					if ( ($this_reg_date == $this_date ||empty($get_date))
+						|| $typeReg == 2
+						|| ($typeReg == 1 && ! $this_reg_date)
+						)
+					{
+						// Get participant privacy consents
+						$user_actions = explode(',', $reguser->user_action);
+
+						// Get Name consent
+						$name_consents = array();
+
+//						foreach ($user_actions AS $k => $action)
+//						{
+//							$ex_action = explode('__', $action);
+
+//							if ($ex_action[0] == 'consent_name'
+//								&& isset($ex_action[1]))
+//							{
+//								$name_consents = explode('_', $ex_action[1]);
+//							}
+//						}
+
+						if (in_array('consent_name_public', $user_actions)) $name_consents = array('public');
+						if (in_array('consent_name_users', $user_actions)) $name_consents = array('users');
+
+						$force_name_visibility = $iCparams->get('participant_name_consent', '');
+
+						if ($force_name_visibility == '0')
+						{
+							$participant_name_visibility = $iCparams->get('participant_name_visibility', '');
+
+							if ($participant_name_visibility == 1)
+							{
+								$name_consents = array('public');
+							}
+							elseif ($participant_name_visibility == 2)
+							{
+								$name_consents = array('users');
+							}
+						}
+
+						if (in_array('public', $name_consents)
+							|| (in_array('users', $name_consents) && JFactory::getUser()->id > 0))
+						{
+							// Get Username and name (To check: Is it needed ?)
+							if ( ! empty($reguser->userid))
+							{
+								$data_name     = $reguser->name;
+								$data_username = $reguser->username;
+
+								if ($nameJoomlaUser == 1)
+								{
+									$reguser->registeredUsers = $reguser->registeredUsers;
+								}
+								else
+								{
+									$reguser->registeredUsers = $data_username;
+								}
+							}
+
+							$participant_name = $reguser->registeredUsers;
+						}
+						elseif($organiser_rights)
+						{
+							// Information to be extended for logged-in user with admin/organiser permissions...
+							$participant_name = $reguser->registeredUsers;
+						}
+						else
+						{
+							$participant_name = JText::_('IC_ANONYMOUS');
+						}
+
+
+						$list_username.= $participant_name . ', ';
+					}
+				}
+
+				$list_participants.= trim($list_username, ", ");
+
+				$list_participants.= '</div>';
+				$list_participants.= '</div>';
+			}
+
+			if ($participantSlide == 1)
+			{
+				$list_participants.= JHtml::_('sliders.end');
+			}
+		}
+		else
+		{
+			$list_participants.= '';
+		}
+
+		return $list_participants;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/registration/registration.php b/deployed/icagenda/administrator/components/com_icagenda/utilities/registration/registration.php
new file mode 100644
index 00000000..05477606
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/registration/registration.php
@@ -0,0 +1,1257 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.5 2018-10-02
+ *
+ * @package     iCagenda.Admin
+ * @subpackage  Utilities
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.6.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * class icagendaRegistration
+ */
+class icagendaRegistration
+{
+	/**
+	 * Function to get total of registered people for one event/date
+	 *
+	 * @since   3.6.5
+	 */
+	public static function getRegisteredTotal($eventID, $regDate = null, $typeReg = '1')
+	{
+		$db    = JFactory::getDbo();
+		$query = $db->getQuery(true);
+
+		$query->select('sum(' . $db->qn('r.people') . ') AS total')
+			->from($db->qn('#__icagenda_registration', 'r'))
+			->where($db->qn('r.eventid') . ' = ' . (int) $eventID)
+			->where($db->qn('r.state') . ' = 1');
+
+		// Registration type: by single date/period (1)
+		if ($regDate && $typeReg == 1)
+		{
+//			$query->where('r.date = ' . $db->q($regDate)); // This is the good logic if correctly set
+			$query->where('(r.date = ' . $db->q($regDate) . ' OR (r.date = "" AND r.period = 1))');
+		}
+		elseif ( ! $regDate && $typeReg == 1)
+		{
+//			$query->where('r.date = "" AND r.period = 0'); // This is the good logic if correctly set
+			$query->where('r.date = ""');
+		}
+
+		// Registration type: all dates (2)
+//		else
+//		{
+//			$query->where('r.date = "" AND r.period = 1');
+//		}
+
+		$db->setQuery($query);
+
+		$total = $db->loadResult();
+
+		return $total;
+	}
+
+	/**
+	 * Function to get list of registered people per date/period for one event
+	 * Not Use: BETA
+	 *
+	 * @since   3.6.6
+	 */
+	public static function getListRegisteredTotal($eventID)
+	{
+		$db    = JFactory::getDbo();
+		$query = $db->getQuery(true);
+
+		$query->select('sum(' . $db->qn('r.people') . ') AS people, r.date AS date, r.period AS period')
+			->from($db->qn('#__icagenda_registration', 'r'))
+			->where($db->qn('r.eventid') . ' = ' . (int) $eventID)
+			->where($db->qn('r.state') . ' = 1')
+			->group('r.date');
+
+		$db->setQuery($query);
+
+		$list = $db->loadObjectList();
+
+		return $list;
+	}
+
+	/**
+	 * Function to get available tickets for one event/date
+	 *
+	 * @since   3.6.5
+	 */
+	public static function getTicketsAvailable($eventID, $regDate, $typeReg = '1', $maxReg = '1000000')
+	{
+		$regDate          = ($typeReg == 1) ? $regDate : '';
+		$registered       = self::getRegisteredTotal($eventID, $regDate, $typeReg);
+		$ticketsAvailable = ($maxReg - $registered);
+
+		if ($ticketsAvailable < 0) $ticketsAvailable = '0';
+
+		return $ticketsAvailable;
+	}
+
+	/**
+	 * Function to get list of available tickets per date/period for one event
+	 * Not Use: BETA
+	 *
+	 * @since   3.6.6
+	 */
+	public static function getListTicketsAvailable($eventID, $typeReg = '1', $maxReg = '1000000')
+	{
+		$listDatesTicketsAvailable = array();
+
+		$listRegisteredTotal = self::getListRegisteredTotal($eventID);
+
+		foreach ($listRegisteredTotal as $k => $v)
+		{
+			$listDatesTicketsAvailable[$v->date] = ($maxReg - $v->people);
+		}
+
+		return $listDatesTicketsAvailable;
+	}
+
+	/**
+	 * Function to get max number of tickets bookable (people) for one event/date
+	 *
+	 * @since   3.6.5
+	 */
+	public static function getTicketsBookable($eventID, $regDate, $typeReg = '1', $maxReg = '1000000', $tickets = '5')
+	{
+		$ticketsAvailable = self::getTicketsAvailable($eventID, $regDate, $typeReg, $maxReg);
+
+		if ($ticketsAvailable > $tickets)
+		{
+			return $tickets;
+		}
+		else
+		{
+			return $ticketsAvailable;
+		}
+	}
+
+	/**
+	 * Function to return dates drop list for registrable dates
+	 *
+	 * @since   3.6.0 (Migrated from 3.5 - TO BE REVIEWED)
+	 *          version 3.6.5
+	 *
+	 * @TODO    set option/value to array
+	 * @TODO    migrate HTML rendering fot options text to form field type getOptions ($type = registrationdates)
+	 */
+	public static function formDatesList($item)
+	{
+		$app      = JFactory::getApplication();
+		$params   = $app->getParams();
+		$iCparams = JComponentHelper::getParams('com_icagenda');
+
+		$eventTimeZone   = null;
+		$date_today      = JHtml::date('now', 'Y-m-d');
+		$date_time_today = JHtml::date('now', 'Y-m-d H:i');
+		$allDates        = self::eventAllDates($item);
+		$timeformat      = $params->get('timeformat', 1);
+		$perioddates     = iCDatePeriod::listDates($item->startdate, $item->enddate, $eventTimeZone);
+
+//		$evtParams   = icagendaEvent::evtParams($item->params);
+		$typeReg     = $item->params->get('typeReg', '1');
+		$max_tickets = $item->params->get('maxReg', '1000000');
+		$regDeadline = $item->params->get('reg_deadline', 1);
+
+		// Check the period if individual dates
+		$only_startdate = ($item->weekdays || $item->weekdays == '0') ? false : true;
+
+		$lang_time = ($timeformat == 1) ? 'H:i' : 'h:i A';
+
+		sort($allDates);
+
+		$p = 0;
+
+//		print_r(self::getListTicketsAvailable($item->id, $typeReg, $max_tickets));
+// TEST	$listTicketsAvailable = $item->listTicketsAvailable;
+
+		$upDays = array();
+
+		foreach ($allDates as $k => $d)
+		{
+			$date_control = JHtml::date($d, 'Y-m-d H:i', $eventTimeZone);
+
+			if ($only_startdate && in_array($date_control, $perioddates))
+			{
+				$is_full_period = true;
+				$datetime_date  = ($regDeadline == 2)
+								? date('Y-m-d H:i:s', strtotime($item->enddate))
+								: date('Y-m-d H:i:s', strtotime($item->startdate));
+				$datetime_check = $datetime_date;
+			}
+			else
+			{
+				$is_full_period = false;
+				$datetime_date  = date('Y-m-d H:i:s', strtotime($d));
+				$datetime_check = ($regDeadline == 2)
+								? date('Y-m-d', strtotime($d)) . ' 23:59:59'
+								: date('Y-m-d H:i:s', strtotime($d));
+			}
+
+			$regDate         = $is_full_period ? '' : $datetime_date;
+			$nb_tickets_left = self::getTicketsBookable($item->id, $regDate, $typeReg, $max_tickets, $item->params->get('maxNbTicketsPerReg', 5));
+
+// TEST		$nb_tickets_left = isset($listTicketsAvailable[$regDate]) ? $listTicketsAvailable[$regDate] : $max_tickets;
+
+			$date_today_compare = ($item->displaytime == 1) ? $date_time_today : $date_today;
+
+			if (strtotime($datetime_check) > strtotime($date_today_compare)
+				&& $nb_tickets_left > 0)
+			{
+				// Removed for now, as gives confusion (nb of maximum tickets for one registration to selected date)
+//				$tickets_left = ($max_tickets != '1000000') ? ' (&#10003;' . $nb_tickets_left . ')' : '';
+				$tickets_left = '';
+
+				if ($is_full_period)
+				{
+					if ($p == 0)
+					{
+						if (icagendaRender::dateToFormat($item->startdate) == icagendaRender::dateToFormat($item->enddate))
+						{
+							$upDays[$k] = '@@' . strip_tags(icagendaRender::dateToFormat($item->startdate)) . $tickets_left;
+						}
+						else
+						{
+							$upDays[$k] = '@@' . strip_tags(icagendaRender::dateToFormat($item->startdate)) . ' &#x279c; ' . strip_tags(icagendaRender::dateToFormat($item->enddate)) . $tickets_left;
+						}
+
+						$p = $p+1;
+					}
+				}
+				else
+				{
+					$date = strip_tags(icagendaRender::dateToFormat($d));
+
+					$event_time = ($item->displaytime == 1) ? ' - ' . date($lang_time, strtotime($datetime_date)) : '';
+
+					$upDays[$k] = $datetime_date . '@@' . $date . $event_time . $tickets_left;
+				}
+			}
+		}
+
+		return $upDays;
+	}
+
+	/**
+	 * Function to get option setting for max nb of tickets per registration
+	 *
+	 * @since   3.6.0   (Migrated from 3.5)
+	 *          version 3.6.5
+	 */
+	public static function maxNbTicketsPerReg($params)
+	{
+		$iCparams = JComponentHelper::getParams('com_icagenda');
+
+		$useGlobal    = $params->get('maxRlistGlobal', '');
+		$evt_maxRlist = $params->get('maxRlist', '5');
+
+		// Control and edit param values to iCagenda v3
+		if ($useGlobal == '1') $useGlobal = '';
+		elseif ($useGlobal == '0') $useGlobal = '2';
+
+		if ($useGlobal == '2')
+		{
+			$maxNbTicketsPerReg = $evt_maxRlist;
+		}
+		else
+		{
+			$maxNbTicketsPerReg = $iCparams->get('maxRlist', '5');
+		}
+
+		return $maxNbTicketsPerReg;
+	}
+
+
+
+
+	/**
+	 * Function pre-formated to display Register button and registered bubble
+	 *
+	 * @since   3.6.0 (Migrated from 3.5 - TO BE REVIEWED)
+	 *          version 3.6.5
+	 */
+	static public function reg($i)
+	{
+		$statutReg     = $i->params->get('statutReg', '');
+		$regDeadline   = $i->params->get('reg_deadline', 1);
+		$RegButtonText = $i->params->get('RegButtonText', '');
+		$typeReg       = $i->params->get('typeReg', '1');
+		$regLink       = $i->params->get('RegButtonLink', '');
+
+		$accessReg            = self::accessReg($i);
+		$availableDates       = self::upcomingDatesBooking($i);
+		$ticketsCouldBeBooked = self::ticketsCouldBeBooked($i);
+
+		$registered = isset($i->registered) ? $i->registered : '0';
+
+		// Initialize controls
+		$date_today      = JHtml::date('now', 'Y-m-d');
+		$date_time_today = JHtml::date('now', 'Y-m-d H:i');
+
+		$access    = '0';
+		$control   = '';
+		$TextRegBt = '';
+
+		$period             = unserialize($i->period);
+		$period             = is_array($period) ? $period : array();
+		$only_startdate     = ($i->weekdays || $i->weekdays == '0') ? false : true;
+		$datetime_startdate = JHtml::date($i->startdate, 'Y-m-d H:i', null);
+
+		// Get var event date alias if set or var 'event_date' set to session in event details view
+		$session    = JFactory::getSession();
+		$event_date = $session->get('event_date', '');
+		$get_date   = JFactory::getApplication()->input->get('date', ($event_date ? date('Y-m-d-H-i', strtotime($event_date)) : ''));
+
+		if ($get_date)
+		{
+			// Convert to SQL datetime if set, or return empty.
+			$dateday = icagendaEvent::convertDateAliasToSQLDatetime($get_date);
+
+			$date_is_upcoming = (strtotime($dateday) > strtotime($date_time_today)) ? true : false;
+
+			$is_full_period = false;
+
+			// If registration until end date
+			if ($regDeadline == 2)
+			{
+				if (in_array($dateday, $period))
+				{
+					// Case Single Date from period (weekdays):
+					$endDatetime = date('Y-m-d', strtotime($dateday)) . ' ' . date('H:i:s', strtotime($i->enddate));
+				}
+				else
+				{
+					// Case Single Date:
+					$endDatetime = date('Y-m-d', strtotime($dateday)) . ' 23:59:59';
+				}
+			}
+			else
+			{
+				$startDatetime = date('Y-m-d H:i', strtotime($dateday));
+			}
+		}
+		else
+		{
+			if ($only_startdate && in_array($datetime_startdate, $period))
+			{
+				$is_full_period = true;
+			}
+			else
+			{
+				$is_full_period = false;
+			}
+
+			if (count($period) > 0
+				&& $only_startdate
+				&& (strtotime($datetime_startdate) < strtotime($date_time_today))
+				)
+			{
+				$date_is_upcoming	= false;
+			}
+			else
+			{
+				$date_is_upcoming	= true;
+			}
+
+			// If registration until end date
+			if ($regDeadline == 2)
+			{
+				if ($is_full_period)
+				{
+					$endDatetime = date('Y-m-d H:i:s', strtotime($i->enddate));
+				}
+				else
+				{
+					$endDatetime = date('Y-m-d', strtotime($date_today)) . ' ' . date('H:i:s', strtotime($i->enddate));
+				}
+			}
+			else
+			{
+				$startDatetime = date('Y-m-d H:i', strtotime($i->startdate));
+			}
+		}
+
+		// Access Control
+		$user       = JFactory::getUser();
+		$userLevels = $user->getAuthorisedViewLevels();
+
+		if ($i->params->get('RegButtonText'))
+		{
+			$TextRegBt = $i->params->get('RegButtonText');
+		}
+		elseif ($RegButtonText)
+		{
+			$TextRegBt = $RegButtonText;
+		}
+		else
+		{
+			$TextRegBt = JText::_( 'COM_ICAGENDA_REGISTRATION_REGISTER');
+		}
+
+		$regButton_type = ''; // DEV. NOT IN USE
+
+		if ($regButton_type == 'button') // DEV. NOT IN USE
+		{
+			$doc = JFactory::getDocument();
+			$style = '.regis_button {'
+					. 'text-transform: none !important;'
+					. 'padding: 10px 14px 10px;'
+					. '-webkit-border-radius: 10px;'
+					. '-moz-border-radius: 10px;'
+					. 'border-radius: 10px;'
+					. 'color: #FFFFFF;'
+					. 'background-color: #D90000;'
+					. '*background-color: #751616;'
+					. 'background-image: -ms-linear-gradient(top,#D90000,#751616);'
+					. 'background-image: -webkit-gradient(linear,0 0,0 100%,from(#D90000),to(#751616));'
+					. 'background-image: -webkit-linear-gradient(top,#D90000,#751616);'
+					. 'background-image: -o-linear-gradient(top,#D90000,#751616);'
+					. 'background-image: linear-gradient(top,#D90000,#751616);'
+					. 'background-image: -moz-linear-gradient(top,#D90000,#751616);'
+					. 'background-repeat: repeat-x;'
+					. 'filter: progid:dximagetransform.microsoft.gradient(startColorstr="#D90000",endColorstr="#751616",GradientType=0);'
+					. 'filter: progid:dximagetransform.microsoft.gradient(enabled=false);'
+					. '*zoom: 1;'
+					. '-webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);'
+					. '-moz-box-shadow: inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);'
+					. 'box-shadow: inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);'
+					. '}'
+					. '.regis_button:hover {'
+					. 'color: #F9F9F9;'
+					. 'background-color: #b60000;'
+					. '*background-color: #531111;'
+					. 'background-image: -ms-linear-gradient(top,#b60000,#531111);'
+					. 'background-image: -webkit-gradient(linear,0 0,0 100%,from(#b60000),to(#531111));'
+					. 'background-image: -webkit-linear-gradient(top,#b60000,#531111);'
+					. 'background-image: -o-linear-gradient(top,#b60000,#531111);'
+					. 'background-image: linear-gradient(top,#b60000,#531111);'
+					. 'background-image: -moz-linear-gradient(top,#b60000,#531111);'
+					. 'background-repeat: repeat-x;'
+					. 'filter: progid:dximagetransform.microsoft.gradient(startColorstr="#b60000",endColorstr="#531111",GradientType=0);'
+					. 'filter: progid:dximagetransform.microsoft.gradient(enabled=false);'
+					. '*zoom: 1;'
+					. '}';
+			$doc->addStyleDeclaration( $style );
+		}
+
+
+		if ($statutReg == 1)
+		{
+			$formDatesList  = self::formDatesList($i);
+			$dates_bookable = $formDatesList ? $formDatesList : array();
+			$this_event_url = JURI::getInstance()->toString();
+
+			$cleanurl = preg_replace('/&date=[^&]*/', '', $this_event_url);
+			$cleanurl = preg_replace('/\?date=[^\?]*/', '', $cleanurl);
+
+			$isSef    = JFactory::getApplication()->getCfg('sef');
+			$date_var = ($isSef == 1) ? '?date=' :'&amp;date=';
+
+			$select_date = '<div style="display: block; max-height: 130px; width: 180px; overflow-y: auto;">';
+
+			foreach ($dates_bookable AS $d)
+			{
+				$ex_d     = explode('@@', $d);
+				$date_url = date('Y-m-d-H-i', strtotime($ex_d[0]));
+
+				$select_date.= '<div class="ic-tip-link">';
+				$select_date.= '<a href="' . $cleanurl . $date_var . $date_url . '" class="ic-title-cal-tip" rel="nofollow" target="_parent">';
+				$select_date.= '&#160;' . $ex_d[1] . '&#160;';
+				$select_date.= '</a>';
+				$select_date.= '</div>';
+
+				// If the date bookable is the current next date (DEPRECATED ?)
+				$is_next = ($date_url == date('Y-m-d-H-i', strtotime($i->next))) ? true : false;
+			}
+
+			$select_date.= '</div>';
+
+			/*
+			 * Buttons HTML
+			 */
+			// Button Register OK
+			$btn_register_ok = '<a href="' . self::regUrl($i) . '" rel="nofollow">';
+			$btn_register_ok.= '<div class="ic-btn ic-btn-success ic-btn-small ic-event-register regis_button">';
+			$btn_register_ok.= '<i class="iCicon iCicon-register"></i>&nbsp;' . $TextRegBt;
+			$btn_register_ok.= '</div>';
+			$btn_register_ok.= '</a>';
+
+			// Button Register Private
+			$btn_register_vip = '<a href="' . self::regUrl($i) . '" rel="nofollow">';
+			$btn_register_vip.= '<div class="ic-btn ic-btn-danger ic-btn-small ic-event-register regis_button">';
+			$btn_register_vip.= '<i class="iCicon iCicon-private"></i>&nbsp;' . $TextRegBt;
+			$btn_register_vip.= '</div>';
+			$btn_register_vip.= '</a>';
+
+			// Button Select Date
+			$btn_select_date = '<a class="ic-addtocal" title="' . htmlspecialchars($select_date) . '" rel="nofollow">';
+			$btn_select_date.= '<div class="ic-btn ic-btn-info ic-btn-small ic-event-full">';
+			$btn_select_date.= '<i class="iCicon iCicon-people"></i>&nbsp;' . JText::_('COM_ICAGENDA_REGISTRATION_DATE_NO_TICKETS_LEFT');
+			$btn_select_date.= '</div>';
+			$btn_select_date.= '<br />';
+			$btn_select_date.= '<span class="ic-select-another-date">' . JText::_('COM_ICAGENDA_REGISTRATION_REGISTER_ANOTHER_DATE') . '</span>';
+			$btn_select_date.= '</a>';
+
+			// Button Registration Close
+			$btn_reg_close = '<div class="ic-btn ic-btn-default ic-btn-small ic-event-finished">';
+			$btn_reg_close.= '<i class="iCicon iCicon-blocked"></i>&nbsp;' . JText::_('COM_ICAGENDA_REGISTRATION_CLOSED');
+			$btn_reg_close.= '</div>';
+
+			// Button Registration Complete
+			$btn_reg_complete = '<div class="ic-btn ic-btn-info ic-btn-small ic-event-full">';
+			$btn_reg_complete.= '<i class="iCicon iCicon-people"></i>&nbsp;' . JText::_('COM_ICAGENDA_REGISTRATION_EVENT_FULL');
+			$btn_reg_complete.= '</div>';
+
+
+			$reg_button = '<div class="ic-registration-box">';
+
+			// Available date(s) (boolean) and ticket(s) available for this event (boolean)
+			if ($availableDates
+				&& $ticketsCouldBeBooked
+				)
+			{
+				if (in_array($accessReg, $userLevels))
+				{
+					if ($i->registered == self::maxReg($i))
+					{
+						if ($typeReg != '2')
+						{
+							$reg_button.= $btn_select_date;
+						}
+						else
+						{
+							$reg_button.= $btn_reg_close;
+						}
+					}
+
+//					elseif ($date_is_upcoming
+//						|| $is_next)
+					elseif ($date_is_upcoming)
+					{
+						$reg_button.= $btn_register_ok;
+					}
+
+					// Registration Until end date (if registration for all dates, allow to register to a past date)
+					elseif ($regDeadline == 2
+						&& (strtotime($endDatetime) > strtotime($date_time_today) || $typeReg == 2)
+						)
+					{
+						$reg_button.= $btn_register_ok;
+					}
+
+
+					elseif ($regDeadline == 1
+						&& strtotime($startDatetime) < strtotime($date_time_today)
+						)
+					{
+						if ($typeReg != '2' && $availableDates)
+						{
+							$reg_button.= $btn_select_date;
+						}
+						else
+						{
+							$reg_button.= $btn_reg_close;
+						}
+					}
+
+					else
+					{
+						$reg_button.= $btn_select_date;
+					}
+				}
+				else
+				{
+					$reg_button.= $btn_register_vip;
+				}
+			}
+
+			// Available date(s) (boolean) but no ticket left (boolean)
+			elseif ($availableDates
+				&& ! $ticketsCouldBeBooked
+				)
+			{
+				if ( ! $date_is_upcoming && $typeReg == 2)
+				{
+					$reg_button.= $btn_reg_close;
+				}
+				elseif ( ! $date_is_upcoming && $typeReg == 1)
+				{
+					$reg_button.= $btn_reg_complete;
+				}
+				else
+				{
+					$reg_button.= $btn_select_date;
+				}
+			}
+			elseif ( ! $availableDates)
+			{
+				$reg_button.= $btn_reg_close;
+			}
+			else
+			{
+				return false;
+			}
+
+			if ( ! $regLink)
+			{
+				$reg_button.= '&nbsp;<i class="iCicon iCicon-people ic-people"></i>';
+				$reg_button.= '<div class="ic-registered" >' . $registered . '</div>';
+			}
+
+			$reg_button.= '</div>';
+		}
+		else
+		{
+			return false;
+		}
+
+		return $reg_button;
+	}
+
+	/**
+	 * Function to return Registration Status for this event
+	 *
+	 * @todo               check and remove from library, as not needed in modules or list
+	 * DEPRECATED 3.6.0 :  use now $item->params (global + event params merged)
+	 */
+	static public function statutReg($item)
+	{
+		$params       = JFactory::getApplication()->getParams();
+		$gstatutReg   = $params->get('statutReg', '');
+
+		$evtParams    = icagendaEvent::evtParams($item->params);
+		$evtstatutReg = $evtParams->get('statutReg', '');
+
+		// Control and edit param values to iCagenda v3
+		if ($evtstatutReg == '2')
+		{
+			$evtstatutReg = '0';
+		}
+
+		$statutReg = ($evtstatutReg != '') ? $evtstatutReg : $gstatutReg;
+
+		return $statutReg;
+	}
+
+	/**
+	 * Function to return Registration Access Level for this event
+	 *
+	 * @since   3.6.0 (Migrated from 3.5 - TO BE REVIEWED)
+	 */
+	static public function accessReg($item)
+	{
+		$reg_form_access = JComponentHelper::getParams('com_icagenda')->get('reg_form_access', 1);
+//		$evtParams       = icagendaEvent::evtParams($item);
+		$accessReg       = $item->params->get('accessReg', $reg_form_access);
+
+		return $accessReg;
+	}
+
+	/**
+	 * Function return true if upcoming dates for Booking
+	 *
+	 * @since   3.6.0 (Migrated from 3.5 - TO BE REVIEWED)
+	 */
+	public static function upcomingDatesBooking($item)
+	{
+		if (count(self::formDatesList($item)) > 0)
+		{
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Ticket(s) could be booked
+	 *
+	 * @since   3.6.0 (Migrated from 3.5 - TO BE REVIEWED)
+	 */
+	static public function ticketsCouldBeBooked($i)
+	{
+		$eventTimeZone  = null;
+		$date_today     = JHtml::date('now', 'Y-m-d');
+		$datetime_today = JHtml::date('now', 'Y-m-d H:i');
+		$allDates       = self::eventAllDates($i);
+		$maxReg         = $i->params->get('maxReg', '1000000');
+		$typeReg        = $i->params->get('typeReg', '1');
+		$perioddates    = iCDatePeriod::listDates($i->startdate, $i->enddate, $eventTimeZone);
+		$regDeadline    = $i->params->get('reg_deadline', 1);
+
+		// Check the period if individual dates
+		$only_startdate = ($i->weekdays || $i->weekdays == '0') ? false : true;
+
+		sort($allDates);
+
+		// If registration for all dates, and not registration until end of event, no registration if past date(s)
+		if ($typeReg ==  '2'
+			&& $regDeadline != 2)
+		{
+			foreach ($allDates as $k => $d)
+			{
+				if (strtotime($d) < strtotime($datetime_today))
+				{
+					return false;
+				}
+			}
+		}
+
+		$total_tickets_bookable = 0;
+
+		foreach ($allDates as $k => $d)
+		{
+			$date_control = JHtml::date($d, 'Y-m-d H:i', $eventTimeZone);
+			$is_in_period = in_array($date_control, $perioddates) ? true : false;
+
+			if ($only_startdate && $is_in_period)
+			{
+				$is_full_period = true;
+			}
+			else
+			{
+				$is_full_period = false;
+			}
+
+			$datetime_date      = date('Y-m-d H:i:s', strtotime($d));
+			$datetime_startdate = date('Y-m-d H:i:s', strtotime($i->startdate));
+			$datetime_enddate   = date('Y-m-d H:i:s', strtotime($i->enddate));
+
+			// Nb of tickets left
+			$nb_tickets_left = $maxReg - $i->registered;
+
+			// is Full period (& reg.type for all dates) & reg.limit until start date
+			if ($is_full_period
+				&& $typeReg == 2
+				&& $regDeadline == 1
+				&& (strtotime($datetime_startdate) < strtotime($date_today))
+				)
+			{
+				$total_tickets_bookable = 0;
+			}
+
+			// is Full period & reg.limit until end dates
+			elseif ($is_full_period
+				&& $regDeadline == 2
+				&& (strtotime($datetime_enddate) <= strtotime($datetime_today))
+				)
+			{
+				$total_tickets_bookable = 0;
+			}
+
+			// timestamp datetime > timestamp today date & reg.limit until start date
+			elseif ($regDeadline == 1
+				&& strtotime($d) > strtotime($date_today))
+			{
+				if ($nb_tickets_left > 0)
+				{
+					$total_tickets_bookable = $total_tickets_bookable + $nb_tickets_left;
+				}
+			}
+
+			// is in period & timestamp datetime > timestamp today date & reg.limit until end date
+			elseif ($regDeadline == 2
+				&& $is_in_period
+				&& strtotime(date('Y-m-d', strtotime($d)) . ' ' . date('H:i', strtotime($datetime_enddate))) > strtotime($datetime_today)
+				)
+			{
+				if ($nb_tickets_left > 0)
+				{
+					$total_tickets_bookable = $total_tickets_bookable + $nb_tickets_left;
+				}
+			}
+
+			// is single date & timestamp date > timestamp today date & reg.limit until end date
+			elseif ($regDeadline == 2
+				&& ! $is_in_period
+				&& strtotime(date('Y-m-d', strtotime($d))) > strtotime($date_today)
+				)
+			{
+				if ($nb_tickets_left > 0)
+				{
+					$total_tickets_bookable = $total_tickets_bookable + $nb_tickets_left;
+				}
+			}
+		}
+
+		if ($total_tickets_bookable > 0)
+		{
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Function to list all dates of an event
+	 *
+	 * @since   3.6.0 (Migrated from 3.5 - TO BE REVIEWED)
+	 *          version 3.6.6
+	 */
+	static public function eventAllDates($i)
+	{
+		// Declare eventAllDates array
+		$eventAllDates = array();
+
+		// Get WeekDays Array
+		$WeeksDays = iCDatePeriod::weekdaysToArray($i->weekdays);
+
+		// If Single Dates, added each one to All Dates for this event
+		$singledates = iCString::isSerialized($i->dates) ? unserialize($i->dates) : array();
+
+		foreach ($singledates as $sd)
+		{
+			$isValid = iCDate::isDate($sd);
+
+			if ( $isValid )
+			{
+				array_push($eventAllDates, date('Y-m-d H:i:s', strtotime($sd)));
+			}
+		}
+
+		$perioddates = iCDatePeriod::listDates($i->startdate, $i->enddate);
+
+		if ( (isset ($perioddates))
+			&& ($perioddates != NULL) )
+		{
+			foreach ($perioddates as $Dat)
+			{
+				if (in_array(date('w', strtotime($Dat)), $WeeksDays))
+				{
+					$isValid = iCDate::isDate($Dat);
+
+					if ($isValid)
+					{
+						$SingleDate = date('Y-m-d H:i:s', strtotime($Dat));
+
+						array_push($eventAllDates, $SingleDate);
+					}
+				}
+			}
+		}
+
+		return $eventAllDates;
+	}
+
+	/**
+	 * Function to get number of tickets booked (for one date of the event)
+	 *
+	 * @since   3.6.0 (Migrated from 3.5 - TO BE REVIEWED)
+	 */
+	public static function nbTicketsBooked($event_id, $date = null, $typeReg = 1, $is_full_period = false)
+	{
+		// Registrations total
+		$db    = Jfactory::getDbo();
+		$query = $db->getQuery(true);
+		$query->select('sum(r.people) AS count');
+		$query->from('#__icagenda_registration AS r');
+		$query->where('r.state = 1');
+
+		$query->where('r.eventid = ' . $db->q($event_id));
+
+		// Get nb of tickets booked for the date only if registration per date
+		if ($typeReg != 2)
+		{
+			// Single date
+			if ($date && ! $is_full_period)
+			{
+				$query->where('r.date = ' . $db->q($date));
+			}
+
+			// Full Period (DEPRECATED 3.7)
+			else
+			{
+				$query->where('r.date = "" AND r.period = 0');
+			}
+		}
+
+		$db->setQuery($query);
+
+		$result = $db->loadResult();
+
+		return $result;
+	}
+
+	/**
+	 * Function to get link to registration page
+	 *
+	 * @since   3.6.0 (Migrated from 3.5 - TO BE REVIEWED)
+	 */
+	public static function regUrl($i)
+	{
+		$app         = JFactory::getApplication();
+		$isSef       = $app->getCfg('sef');
+		$params      = $app->getParams();
+		$Itemid      = $app->input->get('Itemid');
+		$date        = $app->input->get('date', '');
+		$this_itemid = $params->get('itemid', $Itemid);
+
+		$event_slug  = empty($i->alias) ? $i->id : $i->id . ':' . $i->alias;
+		$date_var    = ($isSef == '1') ? '?date=' : '&amp;date=';
+		$date_slug   = $date ? $date_var . $date : '';
+
+		$icagenda_form = JRoute::_('index.php?option=com_icagenda&view=registration&id=' . $event_slug
+						. '&Itemid=' . (int) $this_itemid)
+//						. $date_slug
+						;
+
+//		$evtParams       = icagendaEvent::evtParams($i->params);
+		$regLink         = $i->params->get('RegButtonLink', '');
+		$regLinkArticle  = $i->params->get('RegButtonLink_Article', $icagenda_form);
+		$regLinkUrl      = $i->params->get('RegButtonLink_Url', $icagenda_form);
+		$RegButtonTarget = $i->params->get('RegButtonTarget', '0');
+
+		if ($RegButtonTarget == 1)
+		{
+			$browserTarget = '_blank';
+		}
+		else
+		{
+			$browserTarget = '_parent';
+		}
+
+		if ($regLink == 1 && is_numeric($regLinkArticle))
+		{
+			$regUrl = JRoute::_('index.php?option=com_content&view=article&id=' . $regLinkArticle) . '" rel="nofollow" target="' . $browserTarget;
+		}
+		elseif ($regLink == 2)
+		{
+			$regUrl = iCUrl::urlParsed($regLinkUrl) . '" rel="nofollow" target="' . $browserTarget;
+		}
+		else
+		{
+			$regUrl = $icagenda_form . '" rel="nofollow" target="' . $browserTarget;
+		}
+
+		return $regUrl;
+	}
+
+	/**
+	 * Function Max Nb Tickets (Control if set)
+	 *
+	 * @todo               check and remove if not needed in modules or list
+	 * DEPRECATED 3.6.0 :  do not use $item->params (global + event params merged)
+	 */
+	static public function maxNbTickets($item)
+	{
+		$evtParams    = icagendaEvent::evtParams($item->params);
+		$maxNbTickets = $evtParams->get('maxReg', '1000000');
+
+		if ($maxNbTickets != '1000000'
+			&& self::statutReg($item) == '1')
+		{
+			return $maxNbTickets;
+		}
+	}
+
+	/**
+	 * Function to check a valid email address
+	 *
+	 * @since   3.6.0 (Migrated from 3.5 - TO BE REVIEWED)
+	 */
+	static public function validEmail($email)
+	{
+		$isValid = true;
+		$atIndex = strrpos($email, "@");
+
+		if (is_bool($atIndex) && !$atIndex)
+		{
+			$isValid = false;
+		}
+		else
+		{
+			$domain    = substr($email, $atIndex+1);
+			$local     = substr($email, 0, $atIndex);
+			$localLen  = strlen($local);
+			$domainLen = strlen($domain);
+
+			if ($localLen < 1 || $localLen > 64)
+			{
+				// local part length exceeded
+				$isValid = false;
+			}
+			elseif ($domainLen < 1 || $domainLen > 255)
+			{
+				// domain part length exceeded
+				$isValid = false;
+			}
+			elseif ($local[0] == '.' || $local[$localLen-1] == '.')
+			{
+				// local part starts or ends with '.'
+				$isValid = false;
+			}
+			elseif (preg_match('/\\.\\./', $local))
+			{
+				// local part has two consecutive dots
+				$isValid = false;
+			}
+			elseif (!preg_match('/^[A-Za-z0-9\\-\\.]+$/', $domain))
+			{
+				// character not valid in domain part
+				$isValid = false;
+			}
+			elseif (preg_match('/\\.\\./', $domain))
+			{
+				// domain part has two consecutive dots
+				$isValid = false;
+			}
+			elseif (!preg_match('/^(\\\\.|[A-Za-z0-9!#%&`_=\\/$\'*+?^{}|~.-])+$/', str_replace("\\\\","",$local)))
+			{
+				// character not valid in local part unless
+				// local part is quoted
+				if (!preg_match('/^"(\\\\"|[^"])+"$/', str_replace("\\\\","",$local)))
+				{
+					$isValid = false;
+				}
+			}
+
+			// Check the domain name
+			if ($isValid
+				&& ! self::is_valid_domain_name($domain))
+			{
+				return false;
+			}
+
+			// Uncommented below to have PHP run a proper DNS check (risky on shared hosts!)
+			/**
+			if ($isValid && !(checkdnsrr($domain,"MX") || checkdnsrr($domain,"A"))) {
+				// domain not found in DNS
+				$isValid = false;
+			}
+			/**/
+		}
+
+		return $isValid;
+	}
+
+	/**
+	 * Function to check if a domain is valid
+	 *
+	 * @since   3.6.0 (Migrated from 3.5 - TO BE REVIEWED)
+	 */
+	static public function is_valid_domain_name($domain_name)
+	{
+		$pieces = explode(".", $domain_name);
+
+		foreach ($pieces as $piece)
+		{
+			if (!preg_match('/^[a-z\d][a-z\d-]{0,62}$/i', $piece)
+				|| preg_match('/-$/', $piece))
+			{
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+
+
+
+	// TO BE CHECKED
+
+	/**
+	 * Function Max Registrations per event (OLD before 3.2.8, for use with old theme packs or custom one)
+	 *
+	 * Keep for B/C : DEPRECATED! (edit: still used... to be checked...)
+	 */
+	static public function maxReg($item)
+	{
+		$maxReg = $item->params->get('maxReg', '1000000');
+
+		return $maxReg;
+	}
+
+
+
+	/**
+	 * DEPRECATED: to be removed 3.7.0
+	 */
+
+	/**
+	 * Ticket(s) booked
+	 *
+	 * @since   3.6.0 (Migrated from 3.5 - TO BE REVIEWED)
+	 *
+	 * @deprecated 3.6.5 - @removed 3.7.0
+	 */
+	static public function totalRegistered($i)
+	{
+		$app     = JFactory::getApplication();
+		$session = JFactory::getSession();
+
+		$eventTimeZone  = null;
+		$date_today     = JHtml::date('now', 'Y-m-d');
+		$allDates       = self::eventAllDates($i);
+		$evtParams      = icagendaEvent::evtParams($i->params);
+		$typeReg        = $evtParams->get('typeReg', '');
+		$perioddates    = iCDatePeriod::listDates($i->startdate, $i->enddate, $eventTimeZone);
+
+		// Check the period if individual dates
+		$only_startdate = ($i->weekdays || $i->weekdays == '0') ? false : true;
+
+		sort($allDates);
+
+		$total_tickets_booked = 0;
+
+		// Get date from url if set, and from session if set
+		$url_date     = $app->input->get('date', '');
+		$session_date = $session->get('session_date', '');
+
+		if ($url_date)
+		{
+			$ex_date        = explode('-', $url_date);
+			$defaultDate    = (count($ex_date) == 5)
+							? $ex_date[0] . '-' . $ex_date[1] . '-' . $ex_date[2] . ' ' . $ex_date[3] . ':' . $ex_date[4] . ':00'
+							: '';
+		}
+		else
+		{
+			$defaultDate	= $session_date;
+		}
+
+		$this_date = ! empty($defaultDate) ? JHtml::date($defaultDate, 'Y-m-d H:i:s', $eventTimeZone) : null;
+
+		// By Single Dates (registration type is not for all dates of the events)
+		if ($typeReg != 2)
+		{
+			foreach ($allDates as $k => $d)
+			{
+				$date_control = JHtml::date($d, 'Y-m-d H:i', $eventTimeZone);
+
+				if ($only_startdate && in_array($date_control, $perioddates))
+				{
+					$is_full_period = true;
+				}
+				else
+				{
+					$is_full_period = false;
+				}
+
+				$datetime_date = date('Y-m-d H:i:s', strtotime($d));
+				$nb_tickets    = self::getNbTicketsBooked($datetime_date, $i->registered, $i->id, $is_full_period);
+
+				// NO Date in URL - FULL PERIOD (no weekdays) - Date IS in the PERIOD
+				if ( ! $defaultDate && $only_startdate && in_array($date_control, $perioddates))
+				{
+					$total_tickets_booked = $nb_tickets;
+				}
+
+				// Date in URL - FULL PERIOD (no weekdays) - Date IS NOT in the PERIOD
+				elseif ($defaultDate && $only_startdate && ! in_array($date_control, $perioddates))
+				{
+					if ($nb_tickets > 0
+						&& strtotime($this_date) == strtotime($datetime_date))
+					{
+						$total_tickets_booked = $total_tickets_booked + $nb_tickets;
+					}
+
+					// Only one date for registration, and the setting option of event is set to list of dates (equals "for all dates of event)
+					elseif (count($allDates) == 1)
+					{
+						$nb_tickets           = self::getNbTicketsBooked(null, $i->registered, $i->id, $is_full_period);
+						$total_tickets_booked = $total_tickets_booked + $nb_tickets;
+					}
+				}
+
+				// Date in URL - PERIOD is Individual DATES (weekdays selected)
+				elseif ($defaultDate && ! $only_startdate)
+				{
+					if ($nb_tickets > 0
+						&& strtotime($this_date) == strtotime($datetime_date))
+					{
+						$total_tickets_booked = $total_tickets_booked + $nb_tickets;
+					}
+				}
+
+				// NO Date in URL (all tickets for the events, not taking into account the dates)
+				elseif ( ! $defaultDate)
+				{
+					if ($nb_tickets > 0)
+					{
+						$total_tickets_booked = self::getNbTicketsBooked(null, $i->registered, $i->id, $is_full_period);
+					}
+				}
+			}
+		}
+		else
+		{
+			$nb_tickets = self::getNbTicketsBooked('period', $i->registered, $i->id);
+
+			$total_tickets_booked = $nb_tickets;
+		}
+
+		return $total_tickets_booked;
+	}
+
+	/**
+	 * Function to get number of tickets booked (for one date)
+	 *
+	 * @since   3.6.0 (Migrated from 3.5)
+	 *
+	 * @deprecated 3.6.5 - @removed 3.7.0
+	 */
+	public static function getNbTicketsBooked($date, $event_registered, $event_id = null, $date_control = null)
+	{
+		$eventTimeZone    = null;
+		$event_registered = is_array($event_registered) ? $event_registered : array();
+		$nb_registrations = 0;
+
+		// Get Date if set in url as var
+		$get_date = JFactory::getApplication()->input->get('date', null);
+
+		if ( ! $get_date && $date_control)
+		{
+			$get_date = null;
+		}
+
+		foreach ($event_registered AS $reg)
+		{
+			$ex_reg = explode('@@', $reg); // eventid@@date@@people
+
+			if ( ! $date || $date == 'period')
+			{
+				$nb_registrations = $nb_registrations + $ex_reg[2];
+			}
+			elseif ($get_date
+				&& $event_id == $ex_reg[0]
+				&& date('Y-m-d H:i', strtotime($date)) == date('Y-m-d H:i', strtotime($ex_reg[1]))
+				)
+			{
+				$nb_registrations = $nb_registrations + $ex_reg[2];
+			}
+			elseif ( ! $get_date
+				&& $event_id == $ex_reg[0]
+				&& $ex_reg[1] == 'period'
+				)
+			{
+				$nb_registrations = $nb_registrations + $ex_reg[2];
+			}
+			elseif ( ! $get_date
+				&& $event_id == $ex_reg[0]
+				&& date('Y-m-d H:i', strtotime($date)) == date('Y-m-d H:i', strtotime($ex_reg[1]))
+				)
+			{
+				$nb_registrations = $nb_registrations + $ex_reg[2];
+			}
+		}
+
+		return $nb_registrations;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/render/index.html b/deployed/icagenda/administrator/components/com_icagenda/utilities/render/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/render/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/render/render.php b/deployed/icagenda/administrator/components/com_icagenda/utilities/render/render.php
new file mode 100644
index 00000000..18873fd0
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/render/render.php
@@ -0,0 +1,174 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.15 2020-06-25
+ *
+ * @package     iCagenda.Admin
+ * @subpackage  Utilities
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.6.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * class icagendaRender
+ */
+class icagendaRender
+{
+	/**
+	 * Function to return formatted title
+	 *
+	 * @since	3.6.0
+	 */
+	static public function titleToFormat($title)
+	{
+		$text_transform	= JComponentHelper::getParams('com_icagenda')->get('titleTransform', '');
+		$mbString		= extension_loaded('mbstring');
+
+		// Escape the output.
+		$title = htmlspecialchars($title, ENT_COMPAT, 'UTF-8');
+
+		if ($text_transform == 1)
+		{
+			$titleFormat = $mbString ? iCString::mb_ucfirst(mb_strtolower($title)) : ucfirst(strtolower($title));
+
+			return $titleFormat;
+		}
+		elseif ($text_transform == 2)
+		{
+			$titleFormat = $mbString ? mb_convert_case($title, MB_CASE_TITLE, "UTF-8") : ucwords(strtolower($title));
+
+			return $titleFormat;
+		}
+		elseif ($text_transform == 3)
+		{
+			$titleFormat = $mbString ? mb_strtoupper($title, "UTF-8") : strtoupper($title);
+
+			return $titleFormat;
+		}
+		elseif ($text_transform == 4)
+		{
+			$titleFormat = $mbString ? mb_strtolower($title, "UTF-8") : strtolower($title);
+
+			return $titleFormat;
+		}
+
+		return $title;
+	}
+
+	/**
+	 * Function to return formatted date (using globalization from iC Library)
+	 *
+	 * @since	3.6.0
+	 */
+	static public function dateToFormat($date)
+	{
+		if (iCDate::isDate($date))
+		{
+			// Date Format Option (Global Component Option)
+			$date_format_global = JComponentHelper::getParams('com_icagenda')->get('date_format_global', 'Y - m - d');
+
+			// Date Format Option (Menu Option)
+			$date_format_menu   = JFactory::getApplication()->getParams()->get('format', '');
+
+			// Set Date Format option to be used
+			$format             = $date_format_menu ? $date_format_menu : $date_format_global;
+
+			// Separator Option
+			$separator          = JFactory::getApplication()->getParams()->get('date_separator', ' ');
+
+			if ( ! is_numeric($format))
+			{
+				// Update old Date Format options of versions before 2.1.7
+				$format = str_replace(array('nosep', 'sepb', 'sepa'), '', $format);
+				$format = str_replace('.', ' .', $format);
+				$format = str_replace(',', ' ,', $format);
+			}
+
+			$dateFormatted      = iCGlobalize::dateFormat($date, $format, $separator);
+
+			return $dateFormatted;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Function to return formatted time
+	 *
+	 * @since	3.6.0
+	 */
+	static public function dateToTime($date)
+	{
+		if (iCDate::isDate($date))
+		{
+			$eventTimeZone = null;
+			$datetime      = JHtml::date($date, 'Y-m-d H:i', $eventTimeZone);
+			$timeformat    = JComponentHelper::getParams('com_icagenda')->get('timeformat', 1);
+
+			$lang_time     = ($timeformat == 1) ? 'H:i' : 'h:i A';
+
+			$time          = date($lang_time, strtotime($datetime));
+
+			return $time;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Function to return Email Cloaked TAG
+	 *
+	 * @since	3.6.8
+	 */
+	static public function emailTag($email)
+	{
+		$plugin = JPluginHelper::getPlugin('content', 'emailcloak');
+
+		if ($plugin)
+		{
+			$params = new JRegistry($plugin->params);
+			$mode   = $params->get('mode', 1);
+
+			return JHtml::_('email.cloak', $email, $mode);
+		}
+
+		return $email;
+	}
+
+	/**
+	 * Function to return Website TAG
+	 *
+	 * @since	3.6.0
+	 */
+	static public function websiteTag($url)
+	{
+		$targetOption = JComponentHelper::getParams('com_icagenda')->get('targetLink', '');
+		$target       = ! empty($targetOption) ? '_blank' : '_parent';
+
+		$link         = iCUrl::urlParsed($url, 'scheme');
+
+		return '<a href="' . $link . '" rel="nofollow" target="' . $target . '">' . $url . '</a>';
+	}
+
+	/**
+	 * Function to return File attachment TAG
+	 *
+	 * @since	3.6.0
+	 */
+	static public function fileTag($file)
+	{
+		return '<a class="icDownload" href="' . $file . '" rel="nofollow" target="_blank">' . JText::_('COM_ICAGENDA_EVENT_DOWNLOAD') . '</a>';
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/theme/index.html b/deployed/icagenda/administrator/components/com_icagenda/utilities/theme/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/theme/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/theme/joomla25.php b/deployed/icagenda/administrator/components/com_icagenda/utilities/theme/joomla25.php
new file mode 100644
index 00000000..cc9e5ed5
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/theme/joomla25.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     iCagenda
+ * @subpackage  utilities
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.6.0 2016-03-03
+ * @since       3.6.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+/**
+ * class icagendaThemeJoomla25
+ */
+class icagendaThemeJoomla25
+{
+	/**
+	 * Load jQuery on Joomla 2.5 sites
+	 *
+	 * @since		3.6.0
+	 * @deprecated	4.0.0
+	 */
+	static public function loadjQuery()
+	{
+		$app		= JFactory::getApplication();
+		$document	= JFactory::getDocument();
+
+		// Joomla 2.5
+		JHtml::stylesheet( 'com_icagenda/icagenda-front.j25.css', false, true );
+
+		JHtml::_('behavior.mootools');
+
+		// Load jQuery, if not loaded before
+		$scripts		= array_keys($document->_scripts);
+		$scriptFound	= false;
+		$count_scripts	= count($scripts);
+
+		for ($i = 0; $i < $count_scripts; $i++)
+		{
+			if (stripos($scripts[$i], 'jquery.min.js') !== false
+				|| stripos($scripts[$i], 'jquery.js') !== false)
+			{
+				$scriptFound = true;
+			}
+		}
+
+		// jQuery Library Loader
+		if ( ! $scriptFound)
+		{
+			// Load jQuery, if not loaded before
+			if ( ! $app->get('jquery'))
+			{
+				$app->set('jquery', true);
+
+				// Add jQuery Library
+				$document->addScript('https://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js');
+				JHtml::script('com_icagenda/jquery.noconflict.js', false, true);
+			}
+		}
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/theme/style.php b/deployed/icagenda/administrator/components/com_icagenda/utilities/theme/style.php
new file mode 100644
index 00000000..eafdb5fa
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/theme/style.php
@@ -0,0 +1,151 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      doorknob
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.6.0 2015-10-13
+ * @since       3.6.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/**
+ * CSS @media class for iCagenda
+ *
+ * @since  3.3.0
+ */
+class icagendaThemeStyle
+{
+	/**
+	 * Builds the CSS to be bracketed by @media statements and then inserts it into the document header
+	 *
+	 * @param   string  $template  The name of the theme
+	 * @param   string  $type      The source of the CSS to be added:
+	 *                             'component' - add the component part of the CSS
+	 *                             'module' - add the module part of the CSS
+	 *
+	 * @return void
+	 */
+	public static function addMediaCss($template='default', $type='component')
+	{
+		// Prepare the CSS
+		$css = self::getMediaCss($template, $type);
+		self::writeMediaCss($css);
+	}
+
+	/**
+	 * Builds the CSS to be bracketed by @media statements from separate files
+	 *
+	 * @param   string  &$template  The name of the theme
+	 * @param   string  &$type      The source of the CSS to be added:
+	 *                              'component' - add the component part of the CSS
+	 *                              'module' - add the module part of the CSS
+	 *
+	 * @return  string CSS to be added to the page
+	 */
+	public static function getMediaCss(&$template, &$type)
+	{
+		/*
+		 * Load the Theme Pack supplements for screen size variants
+		 * This is based on the four screen sized defined by Bootstrap 3 (i.e. large, medium, small and extra small)
+		 * The threshold values are defined in the component parameter set so that the component and any modules can
+		 * use consistent values.
+		 */
+		jimport('joomla.application.component.helper');
+		$com_params = JComponentHelper::getParams('com_icagenda');
+		$media_css = '';
+		$max_threshold = 0;
+		$largethreshold = (int) $com_params->get('largewidththreshold', 0);
+		$mbString     = extension_loaded('mbstring');
+
+		if ($largethreshold > 0)
+		{
+			$css_contents = @file_get_contents(
+				JPATH_ROOT . "/components/com_icagenda/themes/packs/$template/css/{$template}_{$type}_large.css");
+
+			$css = preg_replace('!/\*.*?\*/!s', '', $css_contents);
+			$size_css = $mbString ? mb_strlen($css) : strlen($css);
+
+//			if (is_string($css) && !empty($css) && ($size_css > 10))
+//			{
+				$media_css .= "\n@media screen and (min-width:{$largethreshold}px){\n{$css}\n}\n";
+				$max_threshold = $largethreshold - 1;
+//			}
+		}
+
+		$mediumthreshold = (int) $com_params->get('mediumwidththreshold', 0);
+
+		if ($mediumthreshold > 0)
+		{
+			$css_contents = @file_get_contents(
+				JPATH_ROOT . "/components/com_icagenda/themes/packs/$template/css/{$template}_{$type}_medium.css");
+
+			$css = preg_replace('!/\*.*?\*/!s', '', $css_contents);
+			$size_css = $mbString ? mb_strlen($css) : strlen($css);
+
+//			if (is_string($css) && !empty($css) && ($size_css > 10))
+//			{
+				$upper_limit = $max_threshold > 0 ? " and (max-width:{$max_threshold}px)" : '';
+				$media_css .= "\n@media screen and (min-width:{$mediumthreshold}px)$upper_limit{\n{$css}\n}\n";
+				$max_threshold = $mediumthreshold - 1;
+//			}
+		}
+
+		$smallthreshold = (int) $com_params->get('smallwidththreshold', 0);
+
+		if ($smallthreshold > 0)
+		{
+			$css_contents = @file_get_contents(
+				JPATH_ROOT . "/components/com_icagenda/themes/packs/$template/css/{$template}_{$type}_small.css");
+
+			$css = preg_replace('!/\*.*?\*/!s', '', $css_contents);
+			$size_css = $mbString ? mb_strlen($css) : strlen($css);
+
+//			if (is_string($css) && !empty($css) && ($size_css > 10))
+//			{
+				$upper_limit = $max_threshold > 0 ? " and (max-width:{$max_threshold}px)" : '';
+				$media_css .= "\n@media screen and (min-width:{$smallthreshold}px)$upper_limit{\n{$css}\n}\n";
+				$max_threshold = $smallthreshold - 1;
+//			}
+
+			$css_contents = @file_get_contents(
+				JPATH_ROOT . "/components/com_icagenda/themes/packs/$template/css/{$template}_{$type}_xsmall.css");
+
+			$css = preg_replace('!/\*.*?\*/!s', '', $css_contents);
+			$size_css = $mbString ? mb_strlen($css) : strlen($css);
+
+//			if (is_string($css) && !empty($css) && ($size_css > 10))
+//			{
+				$smallthreshold--;
+				$media_css .= "\n@media screen and (max-width:{$smallthreshold}px){\n{$css}\n}\n";
+//			}
+		}
+
+		return $media_css;
+	}
+
+	/**
+	 * Write the CSS to the document header
+	 *
+	 * @param   string  &$css  The CSS to be written to the document
+	 *
+	 * @return void
+	 */
+	public static function writeMediaCss(&$css)
+	{
+		if (!empty($css))
+		{
+			$document = JFactory::getDocument();
+			$document->addStyleDeclaration($css);
+		}
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/theme/theme.php b/deployed/icagenda/administrator/components/com_icagenda/utilities/theme/theme.php
new file mode 100644
index 00000000..e64fe857
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/theme/theme.php
@@ -0,0 +1,329 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     iCagenda
+ * @subpackage  utilities
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.6.0 2015-10-13
+ * @since       3.4.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+/**
+ * class icagendaTheme
+ */
+class icagendaTheme
+{
+	/**
+	 * Function to Check Theme Packs Compatibility
+	 *
+	 * @return	list of Incompatible Theme Packs
+	 *
+	 * @since	3.4.0
+	 */
+	static public function checkThemePacks()
+	{
+		// Check Theme Packs Compatibility
+		icagendaTheme::checkIncompatibleThemePacks('CUSTOM_FIELDS',
+													'event',
+													'COM_ICAGENDA_TITLE_CUSTOMFIELDS',
+													'http://www.icagenda.com/theme-pack-upgrade/3-4-0-add-custom-fields');
+
+		icagendaTheme::checkIncompatibleThemePacks('FEATURES_ICONS',
+													'events',
+													'COM_ICAGENDA_TITLE_FEATURES',
+													'http://www.icagenda.com/theme-pack-upgrade/3-4-0-add-feature-icons');
+	}
+	/**
+	 * Function to set an alert message if a string is missing in a theme pack
+	 *
+	 * @params	$string				string to be checked
+	 * 			$file_name			file to be tested
+	 * 			$functionnality		functionnality not usable with theme pack
+	 *
+	 * @return	list of Incompatible Theme Packs
+	 *
+	 * @since	3.4.0
+	 */
+	static public function checkIncompatibleThemePacks($string, $file_name, $functionnality, $info_url = null)
+	{
+		$app = JFactory::getApplication();
+
+		// Render list of incompatible Theme Packs
+		$list = self::incompatibleList($string, $file_name);
+
+		if ($list)
+		{
+			if (version_compare(JVERSION, '3.0', 'lt'))
+			{
+				$im_list	= implode('<br /> - ', $list);
+				$setlist	= ' - '.$im_list.' ';
+			}
+			else
+			{
+				$im_list	= implode('</li><li>', $list);
+				$setlist	= '<ul><li>'.$im_list.'</li></ul>';
+			}
+
+			$title = 'COM_ICAGENDA_THEME_PACKS_COMPATIBILITY';
+			$description = 'COM_ICAGENDA_THEME_PACKS_INCOMPATIBLE_ALERT';
+
+			// Set Alert Message
+			$alert	= array();
+
+			if (count($list) >= 1)
+			{
+				$alert[]	= '<div style="clear:both">';
+				$alert[]	=  '<b>'.JText::_( $title ).'</b>';
+				$alert[]	= '<p>';
+				$alert[]	=  JText::sprintf( $description, '<strong>' . JText::_($functionnality) . '</strong>' );
+				if ($info_url) $alert[]	=  ' <a class="modal" rel="{size: {x: 700, y: 500}, handler:\'iframe\'}" href="'.$info_url.'">' .JText::_( 'IC_MORE_INFORMATION' ). '</a>';
+				$alert[]	= '</p>';
+
+				$alert[]	= '<p>';
+				$alert[]	= $setlist;
+				$alert[]	= '</p>';
+
+				$alert[]	= '</div>';
+			}
+
+			$alert_message = implode("\n", $alert);
+
+			$app->enqueueMessage($alert_message, 'warning');
+		}
+	}
+
+	/*
+	 * Function to check if 'string' is defined inside the file THEME_$file.php for each Theme Pack.
+	 *
+	 * @return	list of incompatible Theme Packs.
+	 *
+	 * @since	3.4.0
+	 */
+	static public function incompatibleList($string, $file_name)
+	{
+		$array_themes = Array();
+
+		$dirname = JPATH_SITE.'/components/com_icagenda/themes/packs';
+
+		if (ini_get('allow_url_fopen') && file_exists($dirname))
+		{
+			$handle = opendir($dirname);
+
+			while (false !== ($theme = readdir($handle)))
+			{
+				if ( !is_file($dirname.$theme)
+					&& $theme!= '.'
+					&& $theme!='..'
+					&& $theme!='index.php'
+					&& $theme!='index.html'
+					&& $theme!='.DS_Store'
+					&& $theme!='.thumbs' )
+				{
+					$day_php = $dirname . '/' . $theme . '/' . $theme . '_day.php';
+					$event_php = $dirname . '/' . $theme . '/' . $theme . '_event.php';
+					$events_php = $dirname . '/' . $theme . '/' . $theme . '_events.php';
+					$registration_php = $dirname . '/' . $theme . '/' . $theme . '_registration.php';
+
+					$array_files_php = array($day_php, $event_php, $events_php, $registration_php);
+
+					$count = 0;
+
+					foreach ($array_files_php AS $file_php)
+					{
+						if (iCFile::hasString($string, $file_php))
+						{
+							$count = $count+1;
+						}
+					}
+
+					if ($count < 1)
+					{
+						array_push($array_themes, $theme);
+					}
+				}
+			}
+
+			$handle = closedir($handle);
+		}
+
+		sort($array_themes);
+
+		if ($array_themes) return $array_themes;
+
+		return false;
+	}
+
+	/*
+	 * Function to load the 'list' template of the current Theme Pack.
+	 *
+	 * @return	Path of the 'list' template.
+	 *
+	 * @since	3.6.0
+	 */
+	static public function getThemeLayout($theme, $layout)
+	{
+		$app = JFactory::getApplication();
+
+		$theme_dir = '/components/com_icagenda/themes/packs/';
+
+		switch($layout)
+		{
+			// List
+			case 'list':
+				$file_template_events	= JPATH_SITE . $theme_dir . $theme . '/' . $theme . '_events.php';
+//				$file_template_list		= JPATH_SITE . $theme_dir . $template . '/' . $template . '_list.php';
+				$file_default_layout	= JPATH_SITE . $theme_dir . 'default/default_events.php';
+
+				// List template (4.0.0)
+//				if (file_exists($file_template_list))
+//				{
+//					$theme_list_tpl = $file_template_list;
+//				}
+
+				// Events template (before 4.0.0) - DEPRECATED
+//				elseif ( ! file_exists($file_template_list)
+//					&& file_exists($file_template_events))
+//				{
+				if (file_exists($file_template_events))
+				{
+					$theme_layout = $file_template_events;
+				}
+
+				// No list template found in selected theme pack, so we load 'default' theme pack
+				else
+				{
+					$theme_layout = $file_default_layout;
+				}
+				break;
+
+			// Event
+			case 'event':
+				$file_layout_event		= JPATH_SITE . $theme_dir . $theme . '/' . $theme . '_event.php';
+				$file_default_layout	= JPATH_SITE . $theme_dir . 'default/default_event.php';
+
+				// Event layout
+				if (file_exists($file_layout_event))
+				{
+					$theme_layout = $file_layout_event;
+				}
+
+				// No event layout found in selected theme pack, so we load 'default' theme pack
+				else
+				{
+					$theme_layout = $file_default_layout;
+				}
+				break;
+
+			// Registration
+			case 'registration':
+				$file_layout_registration	= JPATH_SITE . $theme_dir . $theme . '/' . $theme . '_registration.php';
+				$file_default_layout		= JPATH_SITE . $theme_dir . 'default/default_registration.php';
+
+				// Registration layout
+				if (file_exists($file_layout_registration))
+				{
+					$theme_layout = $file_layout_registration;
+				}
+
+				// No registration layout found in selected theme pack, so we load 'default' theme pack
+				else
+				{
+					$theme_layout = $file_default_layout;
+				}
+				break;
+		}
+
+		$error = '';
+
+		if ( ( ! $theme || $theme != 'default')
+			&& ($theme_layout == $file_default_layout)
+			&& file_exists($file_default_layout) )
+		{
+			$error = 'alert';
+		}
+		elseif ( ($theme_layout == $file_default_layout)
+			&& ! file_exists($file_default_layout))
+		{
+			$error = 'error';
+		}
+		elseif (iCFile::hasString('stamp', $theme_layout))
+		{
+			$error = 'deprecated';
+		}
+
+		$layout = array($theme_layout, $error);
+
+		return $layout;
+	}
+
+	/*
+	 * Function to load the current Theme Pack component css file(s).
+	 *
+	 * @return	loads css file(s).
+	 *
+	 * @since	3.6.0
+	 */
+	static public function loadComponentCSS($template)
+	{
+		$document	= JFactory::getDocument();
+		$lang		= JFactory::getLanguage();
+
+		$theme_dir = '/components/com_icagenda/themes/packs/';
+
+		$file_component_css		= JPATH_SITE . $theme_dir . $template . '/css/' . $template . '_component.css';
+
+		// Setting component css file to load
+		if ( file_exists($file_component_css) )
+		{
+			$css_component	= $theme_dir . $template . '/css/' . $template . '_component.css';
+			$css_com_rtl	= $theme_dir . $template . '/css/' . $template . '_component-rtl.css';
+		}
+		else
+		{
+			$css_component	= $theme_dir . 'default/css/default_component.css';
+			$css_com_rtl	= $theme_dir . 'default/css/default_component-rtl.css';
+		}
+
+		// Theme pack component css
+		$document->addStyleSheet( JURI::base( true ) . $css_component );
+
+		// RTL css if site language is RTL
+		if ( $lang->isRTL()
+			&& file_exists( JPATH_SITE . $css_com_rtl) )
+		{
+			$document->addStyleSheet( JURI::base( true ) . $css_com_rtl );
+		}
+
+		$app = JFactory::getApplication();
+		$params = $app->getParams();
+		$list_of_events = $params->get('copy', '');
+		$core = $params->get('icsys');
+		$string = '<a href="ht';
+		$string.= 'tp://icag';
+		$string.= 'enda.jooml';
+		$string.= 'ic.com" target="_blank" style="font-weight: bold; text-decoration: none !important;">';
+		$string.= 'iCagenda';
+		$string.= '</a>';
+		$icagenda = JText::sprintf('ICAGENDA_THANK_YOU_NOT_TO_REMOVE', $string);
+		$default = '&#80;&#111;&#119;&#101;&#114;&#101;&#100;&nbsp;&#98;&#121;&nbsp;';
+		$footer = '<div style="text-align: center; font-size: 10px; text-decoration: none"><p>';
+		$footer.= preg_match('/iCagenda/',$icagenda) ? $icagenda : $default . $string;
+		$footer.= '</p></div>';
+
+		if ($list_of_events || $core == 'core')
+		{
+			echo $footer;
+		}
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/thumb/index.html b/deployed/icagenda/administrator/components/com_icagenda/utilities/thumb/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/thumb/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/utilities/thumb/thumb.php b/deployed/icagenda/administrator/components/com_icagenda/utilities/thumb/thumb.php
new file mode 100644
index 00000000..a7e8bd79
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/utilities/thumb/thumb.php
@@ -0,0 +1,135 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iC Library - Library by Jooml!C, for Joomla!
+ *------------------------------------------------------------------------------
+ * @package     iCagenda
+ * @subpackage  utilities
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.5.0 2015-02-20
+ * @since       3.4.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+/**
+ * class icagendaThumb
+ */
+class icagendaThumb
+{
+	/**
+	 * Return the LARGE thumbnail from an image
+	 * Generated by iCagenda with Global Options settings
+	 *
+	 * @since       3.4.0
+	 */
+	static public function sizeLarge($image, $type = null, $checksize = null)
+	{
+		$thumbsPath = self::iCagendaImagesPath();
+
+		// Options Large Size
+		$thumbOptions = JComponentHelper::getParams('com_icagenda')->get('thumb_large');
+		$width = is_numeric($thumbOptions[0]) ? $thumbOptions[0] : '900';
+		$height = is_numeric($thumbOptions[1]) ? $thumbOptions[1] : '600';
+		$quality = is_numeric($thumbOptions[2]) ? $thumbOptions[2] : '100';
+		$crop = !empty($thumbOptions[3]) ? true : false;
+
+		// Generate large thumb if not exist
+		$sizeLarge = iCThumbGet::thumbnail($image, $thumbsPath, 'themes', $width, $height, $quality, $crop, 'ic_large', $type, $checksize);
+
+		return $sizeLarge;
+	}
+
+	/**
+	 * Return the MEDIUM thumbnail from an image
+	 * Generated by iCagenda with Global Options settings
+	 *
+	 * @since       3.4.0
+	 */
+	static public function sizeMedium($image, $type = null, $checksize = null)
+	{
+		$thumbsPath = self::iCagendaImagesPath();
+
+		// Options Medium Size
+		$thumbOptions = JComponentHelper::getParams('com_icagenda')->get('thumb_medium');
+		$width = is_numeric($thumbOptions[0]) ? $thumbOptions[0] : '300';
+		$height = is_numeric($thumbOptions[1]) ? $thumbOptions[1] : '300';
+		$quality = is_numeric($thumbOptions[2]) ? $thumbOptions[2] : '100';
+		$crop = !empty($thumbOptions[3]) ? true : false;
+
+		// Generate medium thumb if not exist
+		$sizeMedium = iCThumbGet::thumbnail($image, $thumbsPath, 'themes', $width, $height, $quality, $crop, 'ic_medium', $type, $checksize);
+
+		return $sizeMedium;
+	}
+
+	/**
+	 * Return the SMALL thumbnail from an image
+	 * Generated by iCagenda with Global Options settings
+	 *
+	 * @since       3.4.0
+	 */
+	static public function sizeSmall($image, $type = null, $checksize = null)
+	{
+		$thumbsPath = self::iCagendaImagesPath();
+
+		// Options Small Size
+		$thumbOptions = JComponentHelper::getParams('com_icagenda')->get('thumb_small');
+		$width = is_numeric($thumbOptions[0]) ? $thumbOptions[0] : '100';
+		$height = is_numeric($thumbOptions[1]) ? $thumbOptions[1] : '100';
+		$quality = is_numeric($thumbOptions[2]) ? $thumbOptions[2] : '100';
+		$crop = !empty($thumbOptions[3]) ? true : false;
+
+		// Generate small thumb if not exist
+		$sizeSmall = iCThumbGet::thumbnail($image, $thumbsPath, 'themes', $width, $height, $quality, $crop, 'ic_small', $type, $checksize);
+
+		return $sizeSmall;
+	}
+
+	/**
+	 * Return the SMALL thumbnail from an image
+	 * Generated by iCagenda with Global Options settings
+	 *
+	 * @since       3.4.0
+	 */
+	static public function sizeXSmall($image, $type = null, $checksize = null)
+	{
+		$thumbsPath = self::iCagendaImagesPath();
+
+		// Options XSmall Size
+		$thumbOptions = JComponentHelper::getParams('com_icagenda')->get('thumb_xsmall');
+		$width = is_numeric($thumbOptions[0]) ? $thumbOptions[0] : '48';
+		$height = is_numeric($thumbOptions[1]) ? $thumbOptions[1] : '48';
+		$quality = is_numeric($thumbOptions[2]) ? $thumbOptions[2] : '80';
+		$crop = !empty($thumbOptions[3]) ? true : false;
+
+		// Generate xsmall thumb if not exist
+		$sizeXSmall = iCThumbGet::thumbnail($image, $thumbsPath, 'themes', $width, $height, $quality, $crop, 'ic_xsmall', $type, $checksize);
+
+		return $sizeXSmall;
+	}
+
+	/**
+	 * Return the iCagenda images path
+	 *
+	 * @since       3.4.0
+	 */
+	static public function iCagendaImagesPath()
+	{
+		// Get media path
+		$params_media = JComponentHelper::getParams('com_media');
+		$image_path = $params_media->get('image_path', 'images');
+
+		// Paths to thumbs folder
+		$thumbsPath = $image_path . '/icagenda/thumbs';
+
+		return $thumbsPath;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/categories/index.html b/deployed/icagenda/administrator/components/com_icagenda/views/categories/index.html
new file mode 100644
index 00000000..42682b47
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/categories/index.html
@@ -0,0 +1 @@
+<html><body></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/categories/tmpl/default.php b/deployed/icagenda/administrator/components/com_icagenda/views/categories/tmpl/default.php
new file mode 100644
index 00000000..0c130855
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/categories/tmpl/default.php
@@ -0,0 +1,415 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.3.3 2014-04-12
+ * @since       1.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+$app = JFactory::getApplication();
+
+// Access Administration Categories check.
+if (JFactory::getUser()->authorise('icagenda.access.categories', 'com_icagenda'))
+{
+	$user		= JFactory::getUser();
+	$userId		= $user->get('id');
+	$listOrder	= $this->escape($this->state->get('list.ordering'));
+	$listDirn	= $this->escape($this->state->get('list.direction'));
+	$canOrder	= $user->authorise('core.edit.state', 'com_icagenda');
+
+	$saveOrder	= $listOrder == 'a.ordering';
+
+	if (version_compare(JVERSION, '3.0', 'lt'))
+	{
+		JHtml::_('behavior.tooltip');
+		JHtml::_('script','system/multiselect.js',false,true);
+	}
+	else
+	{
+		// Include the component HTML helpers.
+		JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+		JHtml::_('bootstrap.tooltip');
+		JHtml::_('behavior.multiselect');
+		JHtml::_('formbehavior.chosen', 'select');
+		JHtml::_('dropdown.init');
+
+		$extension	= $this->escape($this->state->get('filter.extension'));
+
+		$archived	= $this->state->get('filter.published') == 2 ? true : false;
+		$trashed	= $this->state->get('filter.published') == -2 ? true : false;
+
+		if ($saveOrder)
+		{
+			$saveOrderingUrl = 'index.php?option=com_icagenda&task=categories.saveOrderAjax&tmpl=component';
+			JHtml::_('sortablelist.sortable', 'categoriesList', 'adminForm', strtolower($listDirn), $saveOrderingUrl, false, true);
+		}
+		//$sortFields = $this->getSortFields();
+		$sortFields = array(); // Alchemy - tmp bug fix
+		?>
+		<script type="text/javascript">
+			Joomla.orderTable = function()
+			{
+				table = document.getElementById("sortTable");
+				direction = document.getElementById("directionTable");
+				order = table.options[table.selectedIndex].value;
+				if (order != '<?php echo $listOrder; ?>')
+				{
+					dirn = 'asc';
+				}
+				else
+				{
+					dirn = direction.options[direction.selectedIndex].value;
+				}
+				Joomla.tableOrdering(order, dirn, '');
+			}
+		</script>
+		<?php
+	}
+	?>
+
+	<form action="<?php echo JRoute::_('index.php?option=com_icagenda&view=categories'); ?>" method="post" name="adminForm" id="adminForm">
+	<?php if (!empty( $this->sidebar)) : ?>
+		<div id="j-sidebar-container" class="span2">
+			<?php echo $this->sidebar; ?>
+		</div>
+		<div id="j-main-container" class="span10">
+	<?php else : ?>
+		<div id="j-main-container">
+	<?php endif;?>
+
+		<?php if(version_compare(JVERSION, '3.0', 'lt')) : ?>
+			<fieldset id="filter-bar">
+				<div class="filter-search fltlft">
+					<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></label>
+					<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('Search'); ?>" />
+					<button type="submit"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+					<button type="button" onclick="document.id('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
+				</div>
+				<div class="filter-select fltrt">
+					<select name="filter_published" class="inputbox" onchange="this.form.submit()">
+						<option value=""><?php echo JText::_('JOPTION_SELECT_PUBLISHED');?></option>
+						<?php echo JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), "value", "text", $this->state->get('filter.state'), true);?>
+					</select>
+				</div>
+			</fieldset>
+			<div class="clr"> </div>
+
+		<?php else : ?>
+
+			<div id="filter-bar" class="btn-toolbar">
+				<div class="filter-search btn-group pull-left">
+					<label for="filter_search" class="element-invisible"><?php echo JText::_('COM_ICAGENDA_FILTER_SEARCH_CATEGORIES_DESC'); ?></label>
+					<input type="text" name="filter_search" placeholder="<?php echo JText::_('COM_ICAGENDA_FILTER_SEARCH_CATEGORIES_DESC'); ?>" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('COM_ICAGENDA_FILTER_SEARCH_CATEGORIES_DESC'); ?>" />
+				</div>
+				<div class="btn-group pull-left">
+					<button class="btn tip hasTooltip" type="submit" title="<?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?>"><i class="icon-search"></i></button>
+					<button class="btn tip hasTooltip" type="button" onclick="document.id('filter_search').value='';this.form.submit();" title="<?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?>"><i class="icon-remove"></i></button>
+				</div>
+				<div class="btn-group pull-right hidden-phone">
+					<label for="limit" class="element-invisible"><?php echo JText::_('JFIELD_PLG_SEARCH_SEARCHLIMIT_DESC'); ?></label>
+					<?php echo $this->pagination->getLimitBox(); ?>
+				</div>
+				<!--div class="btn-group pull-right hidden-phone">
+					<label for="directionTable" class="element-invisible"><?php echo JText::_('JFIELD_ORDERING_DESC'); ?></label>
+					<select name="directionTable" id="directionTable" class="input-medium" onchange="Joomla.orderTable()">
+						<option value=""><?php echo JText::_('JFIELD_ORDERING_DESC'); ?></option>
+						<option value="asc" <?php if ($listDirn == 'asc') echo 'selected="selected"'; ?>><?php echo JText::_('JGLOBAL_ORDER_ASCENDING'); ?></option>
+						<option value="desc" <?php if ($listDirn == 'desc') echo 'selected="selected"'; ?>><?php echo JText::_('JGLOBAL_ORDER_DESCENDING');  ?></option>
+					</select>
+				</div-->
+				<!--div class="btn-group pull-right">
+					<label for="sortTable" class="element-invisible"><?php echo JText::_('JGLOBAL_SORT_BY'); ?></label>
+					<select name="sortTable" id="sortTable" class="input-medium" onchange="Joomla.orderTable()">
+						<option value=""><?php echo JText::_('JGLOBAL_SORT_BY');?></option>
+						<?php echo JHtml::_('select.options', $sortFields, 'value', 'text', $listOrder); ?>
+					</select>
+				</div-->
+			</div>
+			<div class="clearfix"> </div>
+
+		<?php endif;?>
+
+
+		<?php if(version_compare(JVERSION, '3.0', 'lt')) : ?>
+			<table class="adminlist">
+		<?php else : ?>
+			<table class="table table-striped" id="categoriesList">
+		<?php endif; ?>
+
+				<thead>
+					<tr>
+	<!-- Ordering HEADER Joomla 3.x (Test) -->
+						<?php if(version_compare(JVERSION, '3.0', 'ge')) : ?>
+ 						<th width="1%" class="nowrap center hidden-phone">
+							<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+						</th>
+						<?php endif; ?>
+
+	<!-- CheckBox HEADER -->
+						<th width="1%" class="hidden-phone">
+							<input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
+						</th>
+
+	<!-- Status HEADER -->
+						<th width="1%" style="min-width:55px" class="nowrap center">
+							<?php echo JHtml::_('grid.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
+						</th>
+
+	<!-- Color HEADER -->
+						<th width="5%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('grid.sort',  'COM_ICAGENDA_CATEGORIES_COLOR', 'a.color', $listDirn, $listOrder); ?>
+						</th>
+
+	<!-- Title HEADER -->
+						<th>
+							<?php echo JHtml::_('grid.sort',  'COM_ICAGENDA_CATEGORIES_TITLE', 'a.title', $listDirn, $listOrder); ?>
+						</th>
+
+
+	<!-- Ordering HEADER Joomla 2.5 -->
+					<?php if(version_compare(JVERSION, '3.0', 'lt')) : ?>
+						<?php if (isset($this->items[0]->ordering)) { ?>
+						<th width="10%">
+							<?php echo JHtml::_('grid.sort',  'JGRID_HEADING_ORDERING', 'a.ordering', $listDirn, $listOrder); ?>
+							<?php if ($canOrder && $saveOrder) :?>
+								<?php echo JHtml::_('grid.order',  $this->items, 'filesave.png', 'categories.saveorder'); ?>
+							<?php endif; ?>
+						</th>
+	                	<?php } ?>
+					<?php endif; ?>
+
+	<!-- ID HEADER -->
+						<th width="1%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+						</th>
+
+
+				</tr>
+			</thead>
+			<tfoot>
+				<tr>
+					<td colspan="10">
+						<?php echo $this->pagination->getListFooter(); ?>
+					</td>
+				</tr>
+			</tfoot>
+			<tbody>
+			<?php foreach ($this->items as $i => $item) :
+				$ordering	= ($listOrder == 'a.ordering');
+				$canCreate	= $user->authorise('core.create',		'com_icagenda');
+				$canEdit	= $user->authorise('core.edit',			'com_icagenda');
+				$canCheckin	= $user->authorise('core.manage',		'com_icagenda');
+				$canChange	= $user->authorise('core.edit.state',	'com_icagenda');
+//				$canEditOwn	= $user->authorise('core.edit.own',		'com_icagenda') && $item->created_by == $userId;
+				$canEditOwn	= $user->authorise('core.edit.own',		'com_icagenda');
+				?>
+				<?php
+	/* (Not in used currently)
+				$originalOrders = array();
+				foreach ($this->items as $i => $item) :
+					$orderkey   = array_search($item->id, $this->ordering[$item->parent_id]);
+					$canEdit    = $user->authorise('core.edit',       $extension . '.category.' . $item->id);
+					$canCheckin = $user->authorise('core.admin',      'com_checkin') || $item->checked_out == $userId || $item->checked_out == 0;
+					$canEditOwn = $user->authorise('core.edit.own',   $extension . '.category.' . $item->id) && $item->created_user_id == $userId;
+					$canChange  = $user->authorise('core.edit.state', $extension . '.category.' . $item->id) && $canCheckin;
+
+					// Get the parents of item for sorting
+					if ($item->level > 1)
+					{
+						$parentsStr = "";
+						$_currentParentId = $item->parent_id;
+						$parentsStr = " " . $_currentParentId;
+						for ($i2 = 0; $i2 < $item->level; $i2++)
+						{
+							foreach ($this->ordering as $k => $v)
+							{
+								$v = implode("-", $v);
+								$v = "-".$v."-";
+								if (strpos($v, "-" . $_currentParentId . "-") !== false)
+								{
+									$parentsStr .= " " . $k;
+									$_currentParentId = $k;
+									break;
+								}
+							}
+						}
+					}
+					else
+					{
+						$parentsStr = "";
+					}
+*/
+					?>
+
+			<!--tr class="row<?php echo $i % 2; ?>" sortable-group-id="<?php //echo $item->parent_id // invalid ?>" item-id="<?php echo $item->id ?>" parents="<?php //echo $parentsStr // invalid ?>" level="<?php //echo $item->level // invalid ?>"-->
+				<tr class="row<?php echo $i % 2; ?>">
+
+	<!-- Ordering Joomla 3.x (Test 3.3.3) -->
+	<?php if(version_compare(JVERSION, '3.0', 'ge')) : ?>
+					<td class="order nowrap center hidden-phone">
+					<?php if ($canChange) :
+						$disableClassName = '';
+						$disabledLabel	  = '';
+
+						if (!$saveOrder) :
+							$disabledLabel    = JText::_('JORDERINGDISABLED');
+							$disableClassName = 'inactive tip-top';
+						endif; ?>
+						<span class="sortable-handler hasTooltip <?php echo $disableClassName; ?>" title="<?php echo $disabledLabel; ?>">
+							<i class="icon-menu"></i>
+						</span>
+						<input type="text" style="display:none" name="order[]" size="5" value="<?php echo $item->ordering; ?>" class="width-20 text-area-order " />
+					<?php else : ?>
+						<span class="sortable-handler inactive" >
+							<i class="icon-menu"></i>
+						</span>
+					<?php endif; ?>
+					</td>
+	<?php endif; ?>
+
+
+	<!-- CheckBox -->
+						<td class="center hidden-phone">
+							<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+						</td>
+
+	<!-- Status -->
+ 	              <?php if (isset($this->items[0]->state)) { ?>
+					    <td class="center">
+						    <?php echo JHtml::_('jgrid.published', $item->state, $i, 'categories.', $canChange, 'cb'); ?>
+					    </td>
+  	              <?php } ?>
+
+	<!-- Color -->
+						<td class="small hidden-phone">
+							<div style="display:block; width:50px; height:40px; border-radius:5px; background:<?php echo $item->color; ?>;"></div>
+						</td>
+
+	<!-- Title -->
+						<td class="nowrap has-context">
+							<div class="pull-left">
+								<?php if ($item->checked_out) : ?>
+									<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'categories.', $canCheckin); ?>
+								<?php endif; ?>
+								<?php //if ($item->language == '*'):?>
+									<?php //$language = JText::alt('JALL', 'language'); ?>
+								<?php //else:?>
+									<?php //$language = $item->language ? $this->escape($item->language) : JText::_('JUNDEFINED'); ?>
+								<?php //endif;?>
+								<?php if ($canEdit) : ?>
+									<a href="<?php echo JRoute::_('index.php?option=com_icagenda&task=category.edit&id=' . $item->id); ?>" title="<?php echo JText::_('JACTION_EDIT'); ?>">
+										<?php echo $this->escape($item->title); ?></a>
+								<?php else : ?>
+									<span title="<?php echo JText::sprintf('JFIELD_ALIAS_LABEL', $this->escape($item->alias)); ?>"><?php echo $this->escape($item->title); ?></span>
+								<?php endif; ?>
+							</div>
+
+	<!-- DropDown Edit Joomla 3 -->
+	<?php if(version_compare(JVERSION, '3.0', 'ge')) : ?>
+							<div class="pull-left">
+								<?php
+									// Create dropdown items
+									JHtml::_('dropdown.edit', $item->id, 'category.');
+									JHtml::_('dropdown.divider');
+									if ($item->state) :
+										JHtml::_('dropdown.unpublish', 'cb' . $i, 'categories.');
+									else :
+										JHtml::_('dropdown.publish', 'cb' . $i, 'categories.');
+									endif;
+
+//									if ($item->featured) :
+//										JHtml::_('dropdown.unfeatured', 'cb' . $i, 'categories.');
+//									else :
+//										JHtml::_('dropdown.featured', 'cb' . $i, 'categories.');
+//									endif;
+
+									JHtml::_('dropdown.divider');
+
+									if ($archived) :
+										JHtml::_('dropdown.unarchive', 'cb' . $i, 'categories.');
+									else :
+										JHtml::_('dropdown.archive', 'cb' . $i, 'categories.');
+									endif;
+
+									if ($item->checked_out) :
+										JHtml::_('dropdown.checkin', 'cb' . $i, 'categories.');
+									endif;
+
+									if ($trashed) :
+										JHtml::_('dropdown.untrash', 'cb' . $i, 'categories.');
+									else :
+										JHtml::_('dropdown.trash', 'cb' . $i, 'categories.');
+									endif;
+
+									// Render dropdown list
+									echo JHtml::_('dropdown.render');
+									?>
+							</div>
+		<?php endif; ?>
+
+
+						</td>
+
+	<!-- Ordering Joomla 2.5 -->
+	<?php if(version_compare(JVERSION, '3.0', 'lt')) : ?>
+             	   <?php if (isset($this->items[0]->ordering)) { ?>
+					    <td class="order">
+						    <?php if ($canChange) : ?>
+							    <?php if ($saveOrder) :?>
+								    <?php if ($listDirn == 'asc') : ?>
+									    <span><?php echo $this->pagination->orderUpIcon($i, true, 'categories.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+									    <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, true, 'categories.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+								    <?php elseif ($listDirn == 'desc') : ?>
+									    <span><?php echo $this->pagination->orderUpIcon($i, true, 'categories.orderdown', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+									    <span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, true, 'categories.orderup', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+								    <?php endif; ?>
+							    <?php endif; ?>
+							    <?php $disabled = $saveOrder ?  '' : 'disabled="disabled"'; ?>
+							    <input type="text" name="order[]" size="5" value="<?php echo $item->ordering;?>" <?php echo $disabled ?> class="text-area-order" />
+						    <?php else : ?>
+							    <?php echo $item->ordering; ?>
+						    <?php endif; ?>
+					    </td>
+             	   <?php } ?>
+		<?php endif; ?>
+
+
+	<!-- ID -->
+						<?php if (isset($this->items[0]->id)) { ?>
+						<td class="center hidden-phone">
+							<?php echo (int) $item->id; ?>
+						</td>
+        	        	<?php } ?>
+					</tr>
+					<?php endforeach; ?>
+				</tbody>
+			</table>
+
+			<div>
+				<input type="hidden" name="task" value="" />
+				<input type="hidden" name="boxchecked" value="0" />
+				<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+				<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+				<?php echo JHtml::_('form.token'); ?>
+			</div>
+		</div>
+	</form>
+	<?php
+}
+else
+{
+	$app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'warning');
+	$app->redirect(htmlspecialchars_decode('index.php?option=com_icagenda&view=icagenda'));
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/categories/tmpl/index.html b/deployed/icagenda/administrator/components/com_icagenda/views/categories/tmpl/index.html
new file mode 100644
index 00000000..42682b47
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/categories/tmpl/index.html
@@ -0,0 +1 @@
+<html><body></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/categories/view.html.php b/deployed/icagenda/administrator/components/com_icagenda/views/categories/view.html.php
new file mode 100644
index 00000000..e74c43c4
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/categories/view.html.php
@@ -0,0 +1,177 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-30
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * View class Admin - List of Categories - iCagenda.
+ */
+class iCagendaViewCategories extends JViewLegacy
+{
+	protected $items;
+	protected $pagination;
+	protected $state;
+
+	/**
+	 * Display the view
+	 *
+	 * @since   1.0
+	 */
+	public function display($tpl = null)
+	{
+		// Joomla 2.5
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			jimport( 'joomla.environment.request' );
+
+			JHtml::stylesheet( 'com_icagenda/icagenda-back.j25.css', false, true );
+		}
+
+		$this->state      = $this->get('State');
+		$this->items      = $this->get('Items');
+		$this->pagination = $this->get('Pagination');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+
+			return false;
+		}
+
+		// We don't need toolbar in the modal window.
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->addToolbar();
+
+			if (version_compare(JVERSION, '3.0', 'ge'))
+			{
+				$this->sidebar = JHtmlSidebar::render();
+			}
+		}
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @since   1.0
+	 */
+	protected function addToolbar()
+	{
+		require_once JPATH_COMPONENT . '/helpers/icagenda.php';
+
+		$state  = $this->get('State');
+		$user   = JFactory::getUser();
+		$userId = $user->get('id');
+		$canDo  = iCagendaHelper::getActions();
+
+		// Set Title
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			JToolBarHelper::title('iCagenda - ' . JText::_('COM_ICAGENDA_TITLE_CATEGORIES'), 'categories.png');
+		}
+		else
+		{
+			JToolBarHelper::title('iCagenda <span style="font-size:14px;">- ' . JText::_('COM_ICAGENDA_TITLE_CATEGORIES') . '</span>', 'folder');
+		}
+
+		$icTitle  = JText::_('COM_ICAGENDA_TITLE_CATEGORIES');
+
+		$document = JFactory::getDocument();
+		$app      = JFactory::getApplication();
+		$sitename = $app->getCfg('sitename');
+		$title    = $app->getCfg('sitename') . ' - ' . JText::_('JADMINISTRATION') . ' - iCagenda: ' . $icTitle;
+
+		$document->setTitle($title);
+
+		//Check if the form exists before showing the add/edit buttons
+		$formPath = JPATH_COMPONENT_ADMINISTRATOR.'/views/category';
+
+		if (file_exists($formPath))
+		{
+			if ($canDo->get('core.create'))
+			{
+				JToolBarHelper::addNew('category.add', 'JTOOLBAR_NEW');
+			}
+
+			if ($canDo->get('core.edit'))
+			{
+				JToolBarHelper::editList('category.edit', 'JTOOLBAR_EDIT');
+			}
+		}
+
+		if ($canDo->get('core.edit.state'))
+		{
+			if (isset($this->items[0]->state))
+			{
+				JToolBarHelper::divider();
+				JToolBarHelper::custom('categories.publish', 'publish.png', 'publish_f2.png', 'JTOOLBAR_PUBLISH', true);
+				JToolBarHelper::custom('categories.unpublish', 'unpublish.png', 'unpublish_f2.png', 'JTOOLBAR_UNPUBLISH', true);
+			}
+			else
+			{
+				// If this component does not use state then show a direct delete button as we can not trash
+				JToolBarHelper::deleteList('', 'categories.delete', 'JTOOLBAR_DELETE');
+			}
+
+			if (isset($this->items[0]->state))
+			{
+				JToolBarHelper::divider();
+				JToolBarHelper::archiveList('categories.archive', 'JTOOLBAR_ARCHIVE');
+			}
+
+			if (isset($this->items[0]->checked_out))
+			{
+				JToolBarHelper::custom('categories.checkin', 'checkin.png', 'checkin_f2.png', 'JTOOLBAR_CHECKIN', true);
+			}
+		}
+
+		// Show trash and delete for components that uses the state field
+		if (isset($this->items[0]->state))
+		{
+			if ($state->get('filter.state') == -2 && $canDo->get('core.delete'))
+			{
+				JToolBarHelper::deleteList('', 'categories.delete','JTOOLBAR_EMPTY_TRASH');
+				JToolBarHelper::divider();
+			}
+			elseif ($canDo->get('core.edit.state'))
+			{
+				JToolBarHelper::trash('categories.trash','JTOOLBAR_TRASH');
+				JToolBarHelper::divider();
+			}
+		}
+
+		if ($canDo->get('core.admin'))
+		{
+			JToolBarHelper::preferences('com_icagenda');
+		}
+
+		if (version_compare(JVERSION, '3.0', 'ge'))
+		{
+			JHtmlSidebar::setAction('index.php?option=com_icagenda&view=categories');
+
+			JHtmlSidebar::addFilter(
+				JText::_('JOPTION_SELECT_PUBLISHED'),
+				'filter_published',
+				JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.state'), true)
+			);
+		}
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/category/index.html b/deployed/icagenda/administrator/components/com_icagenda/views/category/index.html
new file mode 100644
index 00000000..42682b47
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/category/index.html
@@ -0,0 +1 @@
+<html><body></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/category/tmpl/edit.php b/deployed/icagenda/administrator/components/com_icagenda/views/category/tmpl/edit.php
new file mode 100644
index 00000000..eb1802f6
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/category/tmpl/edit.php
@@ -0,0 +1,333 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.6.7 2017-03-24
+ * @since       1.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+JHtml::_('behavior.tooltip');
+JHtml::_('behavior.formvalidation');
+
+$app = JFactory::getApplication();
+$document = JFactory::getDocument();
+
+// Access Administration Categories check.
+if (JFactory::getUser()->authorise('icagenda.access.categories', 'com_icagenda'))
+{
+	$bootstrapType		= '1';
+	$CategoryTag		='category';
+	$CategoryTitle		= JText::_('COM_ICAGENDA_TITLE_CATEGORY', true);
+	$DescTag			= 'desc';
+	$DescTitle			= JText::_('COM_ICAGENDA_LEGEND_DESC', true);
+	$PublishingTag		= 'publishing';
+	$PublishingTitle	= JText::_('JGLOBAL_FIELDSET_PUBLISHING', true);
+
+	// Joomla 2.5
+	if (version_compare(JVERSION, '3.0', 'lt'))
+	{
+		jimport('joomla.html.html.tabs');
+
+		$iCmapDisplay		= '3';
+
+		$icPanCategory		= JText::_('COM_ICAGENDA_TITLE_CATEGORY');
+		$icPanDesc			= JText::_('COM_ICAGENDA_LEGEND_DESC');
+		$icPanPublishing	= JText::_('JGLOBAL_FIELDSET_PUBLISHING');
+		$startPane			= 'tabs.start';
+		$addPanel			= 'tabs.panel';
+		$endPanel			= 'tabs.end';
+		$endPane			= 'tabs.end';
+		$CategoryTag1		= $CategoryTag;
+		$CategoryTag2		= $CategoryTitle;
+		$DescTag1			= $DescTag;
+		$DescTag2			= $DescTitle;
+		$PublishingTag1		= $PublishingTag;
+		$PublishingTag2		= $PublishingTitle;
+	}
+
+	// Joomla 3
+	else
+	{
+		JHtml::_('formbehavior.chosen', 'select');
+		jimport('joomla.html.html.bootstrap');
+
+		$icPanCategory		= 'icTab';
+		$icPanDesc			= 'icTab';
+		$icPanPublishing	= 'icTab';
+
+		if ($bootstrapType == '1')
+		{
+			$iCmapDisplay	= '1';
+			$startPane		= 'bootstrap.startTabSet';
+			$addPanel		= 'bootstrap.addTab';
+			$endPanel		= 'bootstrap.endTab';
+			$endPane		= 'bootstrap.endTabSet';
+			$CategoryTag1	= $CategoryTag;
+			$CategoryTag2	= $CategoryTitle;
+			$DescTag1		= $DescTag;
+			$DescTag2		= $DescTitle;
+			$PublishingTag1	= $PublishingTag;
+			$PublishingTag2	= $PublishingTitle;
+		}
+		elseif ($bootstrapType == '2')
+		{
+			$iCmapDisplay	= '2';
+			$startPane		= 'bootstrap.startAccordion';
+			$addPanel		= 'bootstrap.addSlide';
+			$endPanel		= 'bootstrap.endSlide';
+			$endPane		= 'bootstrap.endAccordion';
+			$CategoryTag1	= $CategoryTitle;
+			$CategoryTag2	= $CategoryTag;
+			$DescTag1		= $DescTitle;
+			$DescTag2		= $DescTag;
+			$PublishingTag1	= $PublishingTitle;
+			$PublishingTag2	= $PublishingTag;
+		}
+	}
+	?>
+
+	<script type="text/javascript">
+		Joomla.submitbutton = function(task)
+		{
+			if (task == 'category.cancel' || document.formvalidator.isValid(document.id('category-form'))) {
+				Joomla.submitform(task, document.getElementById('category-form'));
+			}
+			else {
+				alert('<?php echo $this->escape(JText::_('JGLOBAL_VALIDATION_FORM_FAILED'));?>');
+			}
+		}
+	</script>
+
+	<form action="<?php echo JRoute::_('index.php?option=com_icagenda&layout=edit&id='.(int) $this->item->id); ?>" method="post" name="adminForm" id="category-form" class="form-validate">
+
+		<div class="container">
+
+			<!-- iCheader top bar -->
+			<!--div class="iCheader-top">
+				<a href="#">
+					<strong>&laquo; Previous </strong>event
+				</a>
+				<span class="right">
+					<a href="#">
+						<strong>Next</strong> event <strong>&raquo;</strong>
+					</a>
+				</span>
+				<div class="clr"></div>
+			</div-->
+			<!--/ iCheader top bar -->
+
+
+			<!-- iCagenda Header -->
+			<header>
+				<h1>
+					<?php echo empty($this->item->id) ? JText::_('COM_ICAGENDA_LEGEND_NEW_CATEGORY') : JText::sprintf('COM_ICAGENDA_LEGEND_EDIT_CATEGORY', $this->item->id); ?>&nbsp;<span>iCagenda</span>
+				</h1>
+				<h2>
+					<?php echo JText::_('COM_ICAGENDA_COMPONENT_DESC'); ?>
+					<!--nav class="iCheader-videos">
+						<span style="font-variant:small-caps">Tutorial Videos</span>
+						<a href="#">Add a event</a>
+						<a href="#">Video 2</a>
+						<a href="#">Video 3</a>
+					</nav-->
+				</h2>
+			</header>
+
+			<div>&nbsp;</div>
+
+
+			<!-- Begin Content -->
+			<div class="row-fluid">
+				<div class="span10 form-horizontal">
+
+					<!-- Open Panel Set -->
+					<?php echo JHtml::_($startPane, 'icTab', array('active' => 'category')); ?>
+
+						<!-- Panel Event -->
+						<?php echo JHtml::_($addPanel, $icPanCategory, $CategoryTag1, $CategoryTag2); ?>
+
+							<div class="icpanel iCleft">
+								<h1><?php echo empty($this->item->id) ? JText::_('COM_ICAGENDA_LEGEND_NEW_CATEGORY') : JText::sprintf('COM_ICAGENDA_LEGEND_EDIT_CATEGORY', $this->item->id); ?></h1>
+								<hr>
+								<div class="row-fluid">
+									<div class="span6 iCleft">
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('title'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('title'); ?>
+											</div>
+										</div>
+									</div>
+									<div class="span6 iCleft">
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('color'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('color'); ?>
+											</div>
+										</div>
+									</div>
+								</div>
+							</div>
+
+
+						<?php
+						if(version_compare(JVERSION, '3.0', 'ge')) {
+							echo JHtml::_($endPanel);
+						}
+						?>
+
+
+						<!-- Panel Description -->
+						<?php echo JHtml::_($addPanel, $icPanDesc, $DescTag1, $DescTag2); ?>
+
+							<div class="icpanel iCleft">
+								<h1><?php echo JText::_('COM_ICAGENDA_LEGEND_DESC'); ?></h1>
+								<hr>
+								<div class="row-fluid">
+									<div class="span12 iCleft">
+										<h3><?php echo JText::_('COM_ICAGENDA_FORM_DESC_CATEGORY_DESC'); ?></h3>
+										<?php echo $this->form->getInput('desc'); ?>
+									</div>
+								</div>
+							</div>
+
+
+						<?php
+						if(version_compare(JVERSION, '3.0', 'ge')) {
+							echo JHtml::_($endPanel);
+						}
+						?>
+
+						<?php
+						echo JHtml::_($addPanel, $icPanPublishing, $PublishingTag1, $PublishingTag2);
+						?>
+							<div class="icpanel iCleft">
+								<h1><?php echo JText::_('JGLOBAL_FIELDSET_PUBLISHING'); ?></h1>
+								<hr>
+								<div class="row-fluid">
+									<div class="span6 iCleft">
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('alias'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('alias'); ?>
+											</div>
+										</div>
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('id'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('id'); ?>
+											</div>
+										</div>
+										<!--div class="control-group">
+											<?php echo $this->form->getLabel('created_by'); ?>
+											<div class="controls">
+												<?php echo $this->form->getInput('created_by'); ?>
+											</div>
+										</div>
+										<div class="control-group">
+											<?php echo $this->form->getLabel('created_by_alias'); ?>
+											<div class="controls">
+												<?php echo $this->form->getInput('created_by_alias'); ?>
+											</div>
+										</div>
+										<div class="control-group">
+											<?php echo $this->form->getLabel('created'); ?>
+											<div class="controls">
+												<?php echo $this->form->getInput('created'); ?>
+											</div>
+										</div-->
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('checked_out'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('checked_out'); ?>
+											</div>
+										</div>
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('checked_out_time'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('checked_out_time'); ?>
+											</div>
+										</div>
+									</div>
+								</div>
+							</div>
+
+
+						<?php echo JHtml::_($endPanel); ?>
+
+					<?php echo JHtml::_($endPane, 'icTab'); ?>
+				</div>
+
+				<!-- Begin Sidebar -->
+				<div class="span2 iCleft">
+					<h4><?php echo JText::_('COM_ICAGENDA_TITLE_SIDEBAR_DETAILS'); ?></h4>
+					<hr>
+					<div class="control-group">
+						<div class="control-label">
+							<?php echo $this->form->getLabel('state'); ?>
+						</div>
+						<div class="controls">
+							<?php echo $this->form->getInput('state'); ?>
+						</div>
+						<!--div class="control-group">
+							<?php echo $this->form->getLabel('access'); ?>
+							<div class="controls">
+								<?php echo $this->form->getInput('access'); ?>
+							</div>
+						</div>
+						<div class="control-group">
+							<?php echo $this->form->getLabel('language'); ?>
+							<div class="controls">
+								<?php echo $this->form->getInput('language'); ?>
+							</div>
+						</div-->
+					</div>
+				<!-- End Sidebar -->
+				</div>
+
+				<div class="clr"></div>
+
+			</div>
+		</div>
+
+		<input type="hidden" name="task" value="" />
+		<?php echo JHtml::_('form.token'); ?>
+	</form>
+
+	<?php
+	// Joomla 2.5
+	if (version_compare(JVERSION, '3.0', 'lt'))
+	{
+		JHtml::stylesheet('com_icagenda/template.j25.css', false, true);
+		JHtml::stylesheet('com_icagenda/icagenda-back.j25.css', false, true);
+	}
+}
+else
+{
+	$app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'warning');
+	$app->redirect(htmlspecialchars_decode('index.php?option=com_icagenda&view=icagenda'));
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/category/tmpl/index.html b/deployed/icagenda/administrator/components/com_icagenda/views/category/tmpl/index.html
new file mode 100644
index 00000000..42682b47
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/category/tmpl/index.html
@@ -0,0 +1 @@
+<html><body></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/category/view.html.php b/deployed/icagenda/administrator/components/com_icagenda/views/category/view.html.php
new file mode 100644
index 00000000..ef0019f4
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/category/view.html.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-30
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * View class Admin - Edit a Category - iCagenda
+ */
+class iCagendaViewCategory extends JViewLegacy
+{
+	protected $state;
+	protected $item;
+	protected $form;
+
+	/**
+	 * Display the view
+	 */
+	public function display($tpl = null)
+	{
+		$this->state = $this->get('State');
+		$this->item  = $this->get('Item');
+		$this->form  = $this->get('Form');
+
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+
+			return false;
+		}
+
+		$this->addToolbar();
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 */
+	protected function addToolbar()
+	{
+		$app      = JFactory::getApplication();
+		$document = JFactory::getDocument();
+		$jinput   = $app->input;
+
+		$jinput->set('hidemainmenu', true);
+
+		$user  = JFactory::getUser();
+		$isNew = ($this->item->id == 0);
+
+		if (isset($this->item->checked_out))
+		{
+			$checkedOut = ! ($this->item->checked_out == 0 || $this->item->checked_out == $user->get('id'));
+		}
+		else
+		{
+			$checkedOut = false;
+		}
+
+		$canDo = iCagendaHelper::getActions();
+
+		// Set Title
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			JToolBarHelper::title($isNew ? 'iCagenda - ' . JText::_('COM_ICAGENDA_LEGEND_NEW_CATEGORY') : 'iCagenda - ' . JText::_('COM_ICAGENDA_LEGEND_EDIT_CATEGORY'), 'category.png');
+		}
+		else
+		{
+			JToolBarHelper::title($isNew ? 'iCagenda <span style="font-size:14px;">- ' . JText::_('COM_ICAGENDA_LEGEND_NEW_CATEGORY') . '</span>'  : 'iCagenda <span style="font-size:14px;">- ' . JText::_('COM_ICAGENDA_LEGEND_EDIT_CATEGORY') . '</span>' , $isNew ? 'new' : 'pencil-2');
+		}
+
+		$icTitle = $isNew ? JText::_('COM_ICAGENDA_LEGEND_NEW_CATEGORY') : JText::_('COM_ICAGENDA_LEGEND_EDIT_CATEGORY');
+
+		$sitename = $app->getCfg('sitename');
+		$title    = $app->getCfg('sitename') . ' - ' . JText::_('JADMINISTRATION') . ' - iCagenda: ' . $icTitle;
+
+		$document->setTitle($title);
+
+		// If not checked out, can save the item.
+		if ( ! $checkedOut && ($canDo->get('core.edit')||($canDo->get('core.create'))))
+		{
+			JToolBarHelper::apply('category.apply', 'JTOOLBAR_APPLY');
+			JToolBarHelper::save('category.save', 'JTOOLBAR_SAVE');
+		}
+
+		if ( ! $checkedOut && ($canDo->get('core.create'))){
+			JToolBarHelper::custom('category.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+		}
+
+		// If an existing item, can save to a copy.
+		if ( ! $isNew && $canDo->get('core.create'))
+		{
+			JToolBarHelper::custom('category.save2copy', 'save-copy.png', 'save-copy_f2.png', 'JTOOLBAR_SAVE_AS_COPY', false);
+		}
+
+		if (empty($this->item->id))
+		{
+			JToolBarHelper::cancel('category.cancel', 'JTOOLBAR_CANCEL');
+		}
+		else
+		{
+			JToolBarHelper::cancel('category.cancel', 'JTOOLBAR_CLOSE');
+		}
+
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/customfield/index.html b/deployed/icagenda/administrator/components/com_icagenda/views/customfield/index.html
new file mode 100644
index 00000000..42682b47
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/customfield/index.html
@@ -0,0 +1 @@
+<html><body></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/customfield/tmpl/edit.php b/deployed/icagenda/administrator/components/com_icagenda/views/customfield/tmpl/edit.php
new file mode 100644
index 00000000..7803450e
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/customfield/tmpl/edit.php
@@ -0,0 +1,560 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.6.9 2017-06-07
+ * @since       3.4.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+JHtml::_('behavior.tooltip');
+JHtml::_('behavior.formvalidation');
+
+$app = JFactory::getApplication();
+$document = JFactory::getDocument();
+
+// Access Administration Categories check.
+if (JFactory::getUser()->authorise('icagenda.access.customfields', 'com_icagenda'))
+{
+	$bootstrapType		= '1';
+	$PanelOne_Tag		= 'customfield';
+	$PanelOne_Title		= JText::_('COM_ICAGENDA_CUSTOMFIELD_PANEL_TITLE', true);
+	$PanelTwo_Tag		= 'desc';
+	$PanelTwo_Title		= JText::_('COM_ICAGENDA_LEGEND_DESC', true);
+	$PublishingTag		= 'publishing';
+	$PublishingTitle	= JText::_('JGLOBAL_FIELDSET_PUBLISHING', true);
+
+	// Joomla 2.5
+	if (version_compare(JVERSION, '3.0', 'lt'))
+	{
+		jimport( 'joomla.html.html.tabs' );
+
+		$iCmapDisplay		= '3';
+
+		$icPanFirst			= JText::_('COM_ICAGENDA_CUSTOMFIELD_PANEL_TITLE');
+		$icPanDesc			= JText::_('COM_ICAGENDA_LEGEND_DESC');
+		$icPanPublishing	= JText::_('JGLOBAL_FIELDSET_PUBLISHING');
+		$startPane			= 'tabs.start';
+		$addPanel			= 'tabs.panel';
+		$endPanel			= 'tabs.end';
+		$endPane			= 'tabs.end';
+		$PanelOne_Tag1		= $PanelOne_Tag;
+		$PanelOne_Tag2		= $PanelOne_Title;
+		$PanelTwo_Tag1		= $PanelTwo_Tag;
+		$PanelTwo_Tag2		= $PanelTwo_Title;
+		$PublishingTag1		= $PublishingTag;
+		$PublishingTag2		= $PublishingTitle;
+	}
+
+	// Joomla 3
+	else
+	{
+		JHtml::_('formbehavior.chosen', 'select');
+		jimport('joomla.html.html.bootstrap');
+
+		$icPanFirst			= 'icTab';
+		$icPanDesc			= 'icTab';
+		$icPanPublishing	= 'icTab';
+
+		if ($bootstrapType == '1')
+		{
+			$iCmapDisplay	= '1';
+			$startPane		= 'bootstrap.startTabSet';
+			$addPanel		= 'bootstrap.addTab';
+			$endPanel		= 'bootstrap.endTab';
+			$endPane		= 'bootstrap.endTabSet';
+			$PanelOne_Tag1	= $PanelOne_Tag;
+			$PanelOne_Tag2	= $PanelOne_Title;
+			$PanelTwo_Tag1	= $PanelTwo_Tag;
+			$PanelTwo_Tag2	= $PanelTwo_Title;
+			$PublishingTag1	= $PublishingTag;
+			$PublishingTag2	= $PublishingTitle;
+		}
+		elseif ($bootstrapType == '2')
+		{
+			$iCmapDisplay	= '2';
+			$startPane		= 'bootstrap.startAccordion';
+			$addPanel		= 'bootstrap.addSlide';
+			$endPanel		= 'bootstrap.endSlide';
+			$endPane		= 'bootstrap.endAccordion';
+			$PanelOne_Tag1	= $PanelOne_Title;
+			$PanelOne_Tag2	= $PanelOne_Tag;
+			$PanelTwo_Tag1	= $PanelTwo_Title;
+			$PanelTwo_Tag2	= $PanelTwo_Tag;
+			$PublishingTag1	= $PublishingTitle;
+			$PublishingTag2	= $PublishingTag;
+		}
+	}
+	?>
+
+<script type="text/javascript">
+	Joomla.submitbutton = function(task)
+	{
+		if (task == 'customfield.cancel' || document.formvalidator.isValid(document.id('customfield-form'))) {
+			Joomla.submitform(task, document.getElementById('customfield-form'));
+		}
+		else {
+			alert('<?php echo $this->escape(JText::_('JGLOBAL_VALIDATION_FORM_FAILED'));?>');
+		}
+	}
+</script>
+
+<form action="<?php echo JRoute::_('index.php?option=com_icagenda&layout=edit&id='.(int) $this->item->id); ?>" method="post" name="adminForm" id="customfield-form" class="form-validate">
+
+	<div class="container">
+
+		<!-- iCheader top bar -->
+		<!--div class="iCheader-top">
+			<a href="#">
+				<strong>&laquo; Previous </strong>event
+			</a>
+			<span class="right">
+				<a href="#">
+					<strong>Next</strong> event <strong>&raquo;</strong>
+				</a>
+			</span>
+			<div class="clr"></div>
+		</div-->
+		<!--/ iCheader top bar -->
+
+
+		<!-- iCagenda Header -->
+		<header>
+			<h1>
+				<?php echo empty($this->item->id) ? JText::_('COM_ICAGENDA_CUSTOMFIELD_LEGEND_NEW') : JText::sprintf('COM_ICAGENDA_CUSTOMFIELD_LEGEND_EDIT', $this->item->id); ?>&nbsp;<span>iCagenda</span>
+			</h1>
+			<h2>
+				<?php echo JText::_('COM_ICAGENDA_COMPONENT_DESC'); ?>
+				<!--nav class="iCheader-videos">
+					<span style="font-variant:small-caps">Tutorial Videos</span>
+					<a href="#">Add a event</a>
+					<a href="#">Video 2</a>
+					<a href="#">Video 3</a>
+				</nav-->
+			</h2>
+		</header>
+
+		<div>&nbsp;</div>
+
+
+
+		<!-- Begin Content -->
+		<div class="row-fluid">
+			<div class="span10 form-horizontal">
+
+				<!-- Open Panel Set -->
+				<?php echo JHtml::_($startPane, 'icTab', array('active' => 'customfield')); ?>
+
+					<!-- Panel Event -->
+					<?php echo JHtml::_($addPanel, $icPanFirst, $PanelOne_Tag1, $PanelOne_Tag2); ?>
+
+						<div class="icpanel iCleft">
+							<h2><?php echo empty($this->item->id) ? JText::_('COM_ICAGENDA_CUSTOMFIELD_LEGEND_NEW') : JText::sprintf('COM_ICAGENDA_CUSTOMFIELD_LEGEND_EDIT', $this->item->id); ?></h2>
+							<hr>
+							<h3><?php echo JText::_('COM_ICAGENDA_CUSTOMFIELD_FORM_AND_TYPE_LABEL'); ?></h3>
+							<div class="row-fluid">
+								<div class="span6 iCleft">
+									<div class="control-group">
+										<div class="control-label">
+											<?php echo $this->form->getLabel('parent_form'); ?>
+										</div>
+										<div class="controls">
+											<?php echo $this->form->getInput('parent_form'); ?>
+										</div>
+									</div>
+								</div>
+								<div class="span6 iCleft">
+									<div class="control-group">
+										<div class="control-label">
+											<?php echo $this->form->getLabel('type'); ?>
+										</div>
+										<div class="controls">
+											<?php echo $this->form->getInput('type'); ?>
+										</div>
+									</div>
+								</div>
+							</div>
+							<hr>
+							<div class="row-fluid">
+								<div class="span6 iCleft">
+									<?php // Switch Joomla 2.5 / 3 ?>
+									<?php if (version_compare(JVERSION, '3.2.4', 'lt')) : ?>
+										<?php echo $this->form->getInput('spacer_settings'); ?>
+									<?php else : ?>
+										<?php echo $this->form->renderField('spacer_settings'); ?>
+									<?php endif; ?>
+									<!--small>Form: <span class="label">Registration</span> | Type: Text</small-->
+									<?php // Switch Joomla 2.5 / 3 ?>
+									<?php if (version_compare(JVERSION, '3.2.4', 'lt')) : ?>
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('title'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('title'); ?>
+											</div>
+										</div>
+									<?php else : ?>
+										<?php echo $this->form->renderField('title'); ?>
+									<?php endif; ?>
+									<?php // Switch Joomla 2.5 / 3 ?>
+									<?php if (version_compare(JVERSION, '3.2.4', 'lt')) : ?>
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('slug'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('slug'); ?>
+											</div>
+										</div>
+									<?php else : ?>
+										<?php echo $this->form->renderField('slug'); ?>
+									<?php endif; ?>
+
+									<?php // Switch Joomla 2.5 / 3 ?>
+									<?php if (version_compare(JVERSION, '3.2.4', 'lt')) : ?>
+										<div class="control-group" id="cf_groups" style="display: none">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('groups'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('groups'); ?>
+											</div>
+										</div>
+									<?php else : ?>
+										<?php echo $this->form->renderField('groups'); ?>
+									<?php endif; ?>
+								</div>
+								<div class="span6 iCleft">
+									<?php // Switch Joomla 2.5 / 3 ?>
+									<?php if (version_compare(JVERSION, '3.2.4', 'lt')) : ?>
+										<?php echo $this->form->getInput('spacer_options'); ?>
+									<?php else : ?>
+										<?php echo $this->form->renderField('spacer_options'); ?>
+									<?php endif; ?>
+									<?php // Switch Joomla 2.5 / 3 ?>
+									<?php if (version_compare(JVERSION, '3.2.4', 'lt')) : ?>
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('options'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('options'); ?>
+											</div>
+										</div>
+									<?php else : ?>
+										<?php echo $this->form->renderField('placeholder'); ?>
+										<?php echo $this->form->renderField('spacer_class'); ?>
+										<?php echo $this->form->renderField('options'); ?>
+									<?php endif; ?>
+									<?php // Switch Joomla 2.5 / 3 ?>
+									<?php if (version_compare(JVERSION, '3.2.4', 'lt')) : ?>
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('required'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('required'); ?>
+											</div>
+										</div>
+									<?php else : ?>
+										<?php echo $this->form->renderField('required'); ?>
+									<?php endif; ?>
+								</div>
+							</div>
+							<hr>
+						</div>
+
+
+					<?php
+					if(version_compare(JVERSION, '3.0', 'ge')) {
+						echo JHtml::_($endPanel);
+					}
+					?>
+
+
+					<!-- Panel Description -->
+					<?php echo JHtml::_($addPanel, $icPanDesc, $PanelTwo_Tag1, $PanelTwo_Tag2); ?>
+
+						<div class="icpanel iCleft">
+							<h1><?php echo JText::_('COM_ICAGENDA_LEGEND_DESC'); ?></h1>
+							<hr>
+							<div class="row-fluid">
+								<div class="span12 iCleft">
+									<h3><?php echo JText::_('COM_ICAGENDA_CUSTOMFIELD_DESCRIPTION_DESC'); ?></h3>
+									<?php echo $this->form->getInput('description'); ?>
+								</div>
+							</div>
+						</div>
+
+
+				<?php
+				if(version_compare(JVERSION, '3.0', 'ge')) {
+					echo JHtml::_($endPanel);
+				}
+				?>
+
+				<?php
+				echo JHtml::_($addPanel, $icPanPublishing, $PublishingTag1, $PublishingTag2);
+				?>
+				<div class="icpanel iCleft">
+					<h1><?php echo JText::_('JGLOBAL_FIELDSET_PUBLISHING'); ?></h1>
+					<hr>
+					<div class="row-fluid">
+						<div class="span6 iCleft">
+							<div class="control-group">
+								<div class="control-label">
+									<?php echo $this->form->getLabel('id'); ?>
+								</div>
+								<div class="controls">
+									<?php echo $this->form->getInput('id'); ?>
+								</div>
+							</div>
+							<div class="control-group">
+								<div class="control-label">
+									<?php echo $this->form->getLabel('alias'); ?>
+								</div>
+								<div class="controls">
+									<?php echo $this->form->getInput('alias'); ?>
+								</div>
+							</div>
+							<div class="control-group">
+								<?php echo $this->form->getLabel('created'); ?>
+								<div class="controls">
+									<?php echo $this->form->getInput('created'); ?>
+								</div>
+							</div>
+							<div class="control-group">
+								<?php echo $this->form->getLabel('created_by'); ?>
+								<div class="controls">
+									<?php echo $this->form->getInput('created_by'); ?>
+								</div>
+							</div>
+							<div class="control-group">
+								<?php echo $this->form->getLabel('created_by_alias'); ?>
+								<div class="controls">
+									<?php echo $this->form->getInput('created_by_alias'); ?>
+								</div>
+							</div>
+							<div class="control-group">
+								<?php echo $this->form->getLabel('modified'); ?>
+								<div class="controls">
+									<?php echo $this->form->getInput('modified'); ?>
+								</div>
+							</div>
+							<div class="control-group">
+								<?php echo $this->form->getLabel('modified_by'); ?>
+								<div class="controls">
+									<?php echo $this->form->getInput('modified_by'); ?>
+								</div>
+							</div>
+							<div class="control-group">
+								<div class="control-label">
+									<?php echo $this->form->getLabel('checked_out'); ?>
+								</div>
+								<div class="controls">
+									<?php echo $this->form->getInput('checked_out'); ?>
+								</div>
+							</div>
+							<div class="control-group">
+								<div class="control-label">
+									<?php echo $this->form->getLabel('checked_out_time'); ?>
+								</div>
+								<div class="controls">
+									<?php echo $this->form->getInput('checked_out_time'); ?>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+
+
+				<?php echo JHtml::_($endPanel); ?>
+
+				<?php echo JHtml::_($endPane, 'icTab'); ?>
+			</div>
+
+		<!-- Begin Sidebar -->
+			<div class="span2 iCleft">
+						<h4><?php echo JText::_('COM_ICAGENDA_TITLE_SIDEBAR_DETAILS'); ?></h4>
+						<hr>
+							<div class="control-group">
+								<div class="control-label">
+									<?php echo $this->form->getLabel('state'); ?>
+								</div>
+								<div class="controls">
+									<?php echo $this->form->getInput('state'); ?>
+								</div>
+							</div>
+							<!--div class="control-group">
+								<?php echo $this->form->getLabel('access'); ?>
+								<div class="controls">
+									<?php echo $this->form->getInput('access'); ?>
+								</div>
+							</div-->
+							<!--div class="control-group">
+								<?php echo $this->form->getLabel('language'); ?>
+								<div class="controls">
+									<?php echo $this->form->getInput('language'); ?>
+								</div>
+							</div-->
+							<input type="hidden" name="language" value="*" />
+			</div>
+		<!-- End Sidebar -->
+		</div>
+
+	</div>
+
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
+
+	<?php
+	// Joomla 2.5
+	if (version_compare(JVERSION, '3.0', 'lt'))
+	{
+		JHtml::stylesheet('com_icagenda/template.j25.css', false, true);
+		JHtml::stylesheet('com_icagenda/icagenda-back.j25.css', false, true);
+
+		JHtml::_('behavior.framework');
+
+		// load jQuery, if not loaded before
+		$scripts = array_keys($document->_scripts);
+		$scriptFound = false;
+		$scriptuiFound = false;
+
+		for ($i = 0; $i < count($scripts); $i++)
+		{
+			if (stripos($scripts[$i], 'jquery.min.js') !== false)
+			{
+				$scriptFound = true;
+			}
+			if (stripos($scripts[$i], 'jquery.js') !== false)
+			{
+				$scriptFound = true;
+			}
+			if (stripos($scripts[$i], 'jquery-ui.min.js') !== false)
+			{
+				$scriptuiFound = true;
+			}
+		}
+
+		// jQuery Library Loader
+		if (!$scriptFound)
+		{
+			// load jQuery, if not loaded before
+			if (!$app->get('jquery'))
+			{
+				$app->set('jquery', true);
+				// add jQuery
+				$document->addScript('https://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js');
+				$document->addScript( JURI::root( true ) . '/media/com_icagenda/js/jquery.noconflict.js' );
+			}
+		}
+
+		if (!$scriptuiFound)
+		{
+			$document->addScript('https://ajax.googleapis.com/ajax/libs/jqueryui/1.9.2/jquery-ui.min.js');
+		}
+
+		$document->addScript( JURI::root( true ) . '/media/com_icagenda/js/template.js' );
+	}
+	else
+	{
+		JHtml::_('bootstrap.framework');
+		JHtml::_('jquery.framework');
+	}
+
+	$js = '
+	(function($){
+		$(window).load(function(){
+
+		var $parent_form = $("#jform_parent_form").val();
+
+		if ($parent_form !== "1") {
+			removeOverrideOptions();
+			updateTypeList();
+		} else {
+			updateTypeList();
+		}
+
+		$("#jform_parent_form").on("change",function(e) {
+
+			var $parent_form = $("#jform_parent_form").val();
+
+			if ($parent_form === "") {
+				$("#jform_slug-lbl").css("display", "none");
+				$("#jform_slug").css("display", "none");
+			} else {
+				$("#jform_slug-lbl").css("display", "block");
+				$("#jform_slug").css("display", "block");
+			}
+
+			if ($parent_form !== "1") {
+				removeOverrideOptions();
+			} else {
+				addOverrideOptions();
+			}
+
+			updateTypeList();
+		})
+
+		function addOverrideOptions() {
+			$("#jform_type").append("<option value=\"core_name\">CORE::NAME</option>");
+			$("#jform_type").append("<option value=\"core_email\">CORE::EMAIL</option>");
+			$("#jform_type").append("<option value=\"core_phone\">CORE::PHONE</option>");
+			$("#jform_type").append("<option value=\"core_date\">CORE::DATE</option>");
+			$("#jform_type").append("<option value=\"core_people\">CORE::TICKETS</option>");
+		}
+
+		function removeOverrideOptions() {
+			$("#jform_type option[value=\"core_name\"]").remove();
+			$("#jform_type option[value=\"core_email\"]").remove();
+			$("#jform_type option[value=\"core_phone\"]").remove();
+			$("#jform_type option[value=\"core_date\"]").remove();
+			$("#jform_type option[value=\"core_people\"]").remove();
+		}
+
+		function updateTypeList() {
+			$("#jform_type option").each(
+				function(){
+					var arr = $(this).html().split("::");
+					if (arr[1]) {
+						var jtext = arr[1] == "NAME"    ? "' . JText::_('COM_ICAGENDA_REGISTRATION_NAME') . '"    :
+									arr[1] == "EMAIL"   ? "' . JText::_('COM_ICAGENDA_REGISTRATION_EMAIL') . '"   :
+									arr[1] == "PHONE"   ? "' . JText::_('COM_ICAGENDA_REGISTRATION_PHONE') . '"   :
+									arr[1] == "DATE"    ? "' . JText::_('COM_ICAGENDA_REGISTRATION_DATE') . '"    :
+									arr[1] == "TICKETS" ? "' . JText::_('COM_ICAGENDA_REGISTRATION_TICKETS') . '" :
+									$(this).html();
+					}
+					var html = arr[1] ? "<span class=\"label label-default\" style=\"display: inline; margin-right: 5px;\">' . JText::_('COM_ICAGENDA_LABEL_OVERRIDE') . '</span>&#160;"+jtext : arr[0];
+					$(this).html(html);
+				}
+			);
+
+			$("#jform_type").trigger("liszt:updated");
+		}
+
+		});
+
+	})(jQuery);
+	';
+
+	JFactory::getDocument()->addScriptDeclaration($js);
+}
+else
+{
+	$app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'warning');
+	$app->redirect(htmlspecialchars_decode('index.php?option=com_icagenda&view=icagenda'));
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/customfield/tmpl/index.html b/deployed/icagenda/administrator/components/com_icagenda/views/customfield/tmpl/index.html
new file mode 100644
index 00000000..42682b47
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/customfield/tmpl/index.html
@@ -0,0 +1 @@
+<html><body></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/customfield/view.html.php b/deployed/icagenda/administrator/components/com_icagenda/views/customfield/view.html.php
new file mode 100644
index 00000000..9a150077
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/customfield/view.html.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-30
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.4.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * View class Admin - Edit a Custom Field - iCagenda
+ */
+class iCagendaViewCustomfield extends JViewLegacy
+{
+	protected $state;
+	protected $item;
+	protected $form;
+
+	/**
+	 * Display the view
+	 */
+	public function display($tpl = null)
+	{
+		$this->state = $this->get('State');
+		$this->item  = $this->get('Item');
+		$this->form  = $this->get('Form');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+
+			return false;
+		}
+
+		$this->addToolbar();
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 */
+	protected function addToolbar()
+	{
+		$app      = JFactory::getApplication();
+		$document = JFactory::getDocument();
+		$jinput   = $app->input;
+
+		$jinput->set('hidemainmenu', true);
+
+		$user  = JFactory::getUser();
+		$isNew = ($this->item->id == 0);
+
+		if (isset($this->item->checked_out))
+		{
+			$checkedOut = ! ($this->item->checked_out == 0 || $this->item->checked_out == $user->get('id'));
+		}
+		else
+		{
+			$checkedOut = false;
+		}
+
+		$canDo = iCagendaHelper::getActions();
+
+		// Set Title
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			JToolBarHelper::title($isNew ? 'iCagenda - ' . JText::_('COM_ICAGENDA_CUSTOMFIELD_LEGEND_NEW') : 'iCagenda - ' . JText::_('COM_ICAGENDA_CUSTOMFIELD_LEGEND_EDIT'), 'category.png');
+		}
+		else
+		{
+			JToolBarHelper::title($isNew ? 'iCagenda <span style="font-size:14px;">- ' . JText::_('COM_ICAGENDA_CUSTOMFIELD_LEGEND_NEW') . '</span>'  : 'iCagenda <span style="font-size:14px;">- ' . JText::_('COM_ICAGENDA_CUSTOMFIELD_LEGEND_EDIT') . '</span>' , $isNew ? 'new' : 'pencil-2');
+		}
+
+		$icTitle = $isNew ? JText::_('COM_ICAGENDA_CUSTOMFIELD_LEGEND_NEW') : JText::_('COM_ICAGENDA_CUSTOMFIELD_LEGEND_EDIT');
+
+		$sitename = $app->getCfg('sitename');
+		$title    = $app->getCfg('sitename') . ' - ' . JText::_('JADMINISTRATION') . ' - iCagenda: ' . $icTitle;
+
+		$document->setTitle($title);
+
+		// If not checked out, can save the item.
+		if ( ! $checkedOut && ($canDo->get('core.edit')||($canDo->get('core.create'))))
+		{
+			JToolBarHelper::apply('customfield.apply', 'JTOOLBAR_APPLY');
+			JToolBarHelper::save('customfield.save', 'JTOOLBAR_SAVE');
+		}
+
+		if ( ! $checkedOut && ($canDo->get('core.create')))
+		{
+			JToolBarHelper::custom('customfield.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+		}
+
+		// If an existing item, can save to a copy.
+		if ( ! $isNew && $canDo->get('core.create'))
+		{
+			JToolBarHelper::custom('customfield.save2copy', 'save-copy.png', 'save-copy_f2.png', 'JTOOLBAR_SAVE_AS_COPY', false);
+		}
+
+		if (empty($this->item->id))
+		{
+			JToolBarHelper::cancel('customfield.cancel', 'JTOOLBAR_CANCEL');
+		}
+		else
+		{
+			JToolBarHelper::cancel('customfield.cancel', 'JTOOLBAR_CLOSE');
+		}
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/customfields/index.html b/deployed/icagenda/administrator/components/com_icagenda/views/customfields/index.html
new file mode 100644
index 00000000..42682b47
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/customfields/index.html
@@ -0,0 +1 @@
+<html><body></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/customfields/tmpl/default.php b/deployed/icagenda/administrator/components/com_icagenda/views/customfields/tmpl/default.php
new file mode 100644
index 00000000..d39e60f0
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/customfields/tmpl/default.php
@@ -0,0 +1,529 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.6.0 2016-07-07
+ * @since		3.4.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+$app = JFactory::getApplication();
+
+// Access Administration Customfields check.
+if (JFactory::getUser()->authorise('icagenda.access.customfields', 'com_icagenda'))
+{
+	// Check Theme Packs Compatibility
+	if (class_exists('icagendaTheme')) icagendaTheme::checkThemePacks();
+
+	$user		= JFactory::getUser();
+	$userId		= $user->get('id');
+	$listOrder	= $this->escape($this->state->get('list.ordering'));
+	$listDirn	= $this->escape($this->state->get('list.direction'));
+	$canOrder	= $user->authorise('core.edit.state', 'com_icagenda');
+
+	$saveOrder	= $listOrder == 'cf.ordering';
+
+	if (version_compare(JVERSION, '3.0', 'lt'))
+	{
+		JHtml::_('behavior.tooltip');
+		JHtml::_('script','system/multiselect.js',false,true);
+	}
+	else
+	{
+		// Include the component HTML helpers.
+		JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+		JHtml::_('bootstrap.tooltip');
+		JHtml::_('behavior.multiselect');
+		JHtml::_('formbehavior.chosen', 'select');
+		JHtml::_('dropdown.init');
+
+		$extension	= $this->escape($this->state->get('filter.extension'));
+		$archived	= $this->state->get('filter.published') == 2 ? true : false;
+		$trashed	= $this->state->get('filter.published') == -2 ? true : false;
+
+		if ($saveOrder)
+		{
+			$saveOrderingUrl = 'index.php?option=com_icagenda&task=customfields.saveOrderAjax&tmpl=component';
+			JHtml::_('sortablelist.sortable', 'customfieldsList', 'adminForm', strtolower($listDirn), $saveOrderingUrl, false, true);
+		}
+		$sortFields = array();
+		?>
+		<script type="text/javascript">
+			Joomla.orderTable = function()
+			{
+				table = document.getElementById("sortTable");
+				direction = document.getElementById("directionTable");
+				order = table.options[table.selectedIndex].value;
+				if (order != '<?php echo $listOrder; ?>')
+				{
+					dirn = 'asc';
+				}
+				else
+				{
+					dirn = direction.options[direction.selectedIndex].value;
+				}
+				Joomla.tableOrdering(order, dirn, '');
+			}
+		</script>
+		<?php
+	}
+	?>
+
+	<form action="<?php echo JRoute::_('index.php?option=com_icagenda&view=customfields'); ?>" method="post" name="adminForm" id="adminForm">
+	<?php if (!empty( $this->sidebar)) : ?>
+		<div id="j-sidebar-container" class="span2">
+			<?php echo $this->sidebar; ?>
+		</div>
+		<div id="j-main-container" class="span10">
+	<?php else : ?>
+		<div id="j-main-container">
+	<?php endif;?>
+
+		<?php if(version_compare(JVERSION, '3.0', 'lt')) : ?>
+			<fieldset id="filter-bar">
+
+				<div class="filter-search fltlft">
+					<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></label>
+					<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('Search'); ?>" />
+					<button type="submit"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+					<button type="button" onclick="document.id('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
+				</div>
+
+				<div class="filter-select fltrt">
+					<select name="filter_published" class="inputbox" onchange="this.form.submit()">
+						<option value=""><?php echo JText::_('JOPTION_SELECT_PUBLISHED');?></option>
+						<?php echo JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), "value", "text", $this->state->get('filter.state'), true);?>
+					</select>
+				</div>
+
+				<div class="filter-select fltrt">
+					<select name="filter_parent_form" class="inputbox" onchange="this.form.submit()">
+						<option value=""><?php echo JText::_('COM_ICAGENDA_CUSTOMFIELDS_FILTER_OPTION_SELECT_PARENT_FORM');?></option>
+						<?php echo JHtml::_('select.options', $this->get('ParentForm'), "value", "text", $this->state->get('filter.parent_form'), true);?>
+					</select>
+				</div>
+
+				<div class="filter-select fltrt">
+					<select name="filter_group" class="inputbox" onchange="this.form.submit()">
+						<option value=""><?php echo JText::_('COM_ICAGENDA_CUSTOMFIELDS_FILTER_OPTION_SELECT_GROUP');?></option>
+						<?php echo JHtml::_('select.options', $this->get('Groups'), "value", "text", $this->state->get('filter.group'), true);?>
+					</select>
+				</div>
+
+				<div class="filter-select fltrt">
+					<select name="filter_type" class="inputbox" onchange="this.form.submit()">
+						<option value=""><?php echo JText::_('COM_ICAGENDA_CUSTOMFIELDS_FILTER_OPTION_SELECT_TYPE');?></option>
+						<?php echo JHtml::_('select.options', $this->get('FieldTypes'), "value", "text", $this->state->get('filter.type'), true);?>
+					</select>
+				</div>
+
+			</fieldset>
+			<div class="clr"> </div>
+
+		<?php else : ?>
+
+			<div id="filter-bar" class="btn-toolbar">
+
+				<div class="filter-search btn-group pull-left">
+					<label for="filter_search" class="element-invisible"><?php echo JText::_('COM_ICAGENDA_CUSTOMFIELDS_FILTER_SEARCH_DESC'); ?></label>
+					<input type="text" name="filter_search" placeholder="<?php echo JText::_('COM_ICAGENDA_CUSTOMFIELDS_FILTER_SEARCH_DESC'); ?>" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('COM_ICAGENDA_CUSTOMFIELDS_FILTER_SEARCH_DESC'); ?>" />
+				</div>
+
+				<div class="btn-group pull-left">
+					<button class="btn tip hasTooltip" type="submit" title="<?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?>"><i class="icon-search"></i></button>
+					<button class="btn tip hasTooltip" type="button" onclick="document.id('filter_search').value='';this.form.submit();" title="<?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?>"><i class="icon-remove"></i></button>
+				</div>
+
+				<div class="btn-group pull-right hidden-phone">
+					<label for="limit" class="element-invisible"><?php echo JText::_('JFIELD_PLG_SEARCH_SEARCHLIMIT_DESC'); ?></label>
+					<?php echo $this->pagination->getLimitBox(); ?>
+				</div>
+
+			</div>
+			<div class="clearfix"> </div>
+
+		<?php endif;?>
+
+		<?php if(version_compare(JVERSION, '3.0', 'lt')) : ?>
+			<table class="adminlist">
+		<?php else : ?>
+			<table class="table table-striped" id="customfieldsList">
+		<?php endif; ?>
+
+				<thead>
+					<tr>
+					<?php // JOOMLA 3.x ?>
+					<?php if(version_compare(JVERSION, '3.0', 'ge')) : ?>
+
+						<?php // Ordering HEADER Joomla 3.x ?>
+ 						<th width="1%" class="nowrap center hidden-phone">
+							<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'cf.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+						</th>
+
+					<?php endif; ?>
+					<?php // END JOOMLA 3.x ?>
+
+						<?php // CheckBox HEADER ?>
+						<th width="1%" class="hidden-phone">
+							<input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
+						</th>
+
+						<?php // Status HEADER ?>
+						<th width="1%" style="min-width:55px" class="nowrap center">
+							<?php echo JHtml::_('grid.sort', 'JSTATUS', 'cf.state', $listDirn, $listOrder); ?>
+						</th>
+
+						<?php // Title HEADER ?>
+						<th>
+							<?php echo JHtml::_('grid.sort',  'COM_ICAGENDA_CUSTOMFIELD_TITLE_LBL', 'cf.title', $listDirn, $listOrder); ?>
+						</th>
+
+						<?php // Slug HEADER ?>
+						<th class="hidden-phone">
+							<?php echo JHtml::_('grid.sort',  'COM_ICAGENDA_CUSTOMFIELD_SLUG_LBL', 'cf.slug', $listDirn, $listOrder); ?>
+						</th>
+
+						<?php // Parent Form HEADER ?>
+						<th width="20%">
+							<?php echo JHtml::_('grid.sort',  'COM_ICAGENDA_CUSTOMFIELD_PARENT_FORM_LBL', 'cf.parent_form', $listDirn, $listOrder); ?>
+						</th>
+
+						<?php // Groups HEADER ?>
+						<th width="10%" class="hidden-phone">
+							<?php echo JText::_('COM_ICAGENDA_CUSTOMFIELDS_GROUPS_LBL'); ?>
+						</th>
+
+						<?php // Field Type HEADER ?>
+						<th width="20%" class="hidden-phone">
+							<?php echo JHtml::_('grid.sort',  'COM_ICAGENDA_CUSTOMFIELD_TYPE_LBL', 'cf.type', $listDirn, $listOrder); ?>
+						</th>
+
+						<?php // Required HEADER ?>
+						<th class="hidden-phone">
+							<?php echo JHtml::_('grid.sort',  'COM_ICAGENDA_CUSTOMFIELD_REQUIRED_LBL', 'cf.required', $listDirn, $listOrder); ?>
+						</th>
+
+				<?php // JOOMLA 2.5 ?>
+				<?php if(version_compare(JVERSION, '3.0', 'lt')) : ?>
+
+						<?php // Ordering HEADER Joomla 2.5 ?>
+					<?php if (isset($this->items[0]->ordering)) { ?>
+						<th width="10%">
+							<?php echo JHtml::_('grid.sort',  'JGRID_HEADING_ORDERING', 'cf.ordering', $listDirn, $listOrder); ?>
+							<?php if ($canOrder && $saveOrder) :?>
+								<?php echo JHtml::_('grid.order',  $this->items, 'filesave.png', 'customfields.saveorder'); ?>
+							<?php endif; ?>
+						</th>
+					<?php } ?>
+
+				<?php // END JOOMLA 2.5 ?>
+				<?php endif; ?>
+
+						<?php // ID HEADER ?>
+						<th width="1%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ID', 'cf.id', $listDirn, $listOrder); ?>
+						</th>
+					</tr>
+				</thead>
+				<tfoot>
+					<tr>
+						<td colspan="10">
+							<?php echo $this->pagination->getListFooter(); ?>
+						</td>
+					</tr>
+				</tfoot>
+				<tbody>
+			<?php foreach ($this->items as $i => $item) : ?>
+				<?php
+				$ordering	= ($listOrder == 'cf.ordering');
+				$canCreate	= $user->authorise('core.create',		'com_icagenda');
+				$canEdit	= $user->authorise('core.edit',			'com_icagenda');
+				$canCheckin	= $user->authorise('core.manage',		'com_icagenda');
+				$canChange	= $user->authorise('core.edit.state',	'com_icagenda');
+				$canEditOwn	= $user->authorise('core.edit.own',		'com_icagenda');
+
+				// Custom Field Groups list
+				$groups			= array();
+
+				if ($item->groups)
+				{
+					$cf_groups		= $this->cfGroups;
+					$array_groups	= explode(',', $item->groups);
+					$groups			= array();
+
+					foreach ($cf_groups as $key)
+					{
+						if (in_array($key->value, $array_groups))
+						{
+							$groups[]= $key->option;
+						}
+					}
+				}
+
+				$overrideCore = (str_replace('core_', '', $item->type) !== $item->type) ? true : false;
+				$separator = (str_replace('spacer_', '', $item->type) !== $item->type) ? true : false;
+
+				if ($overrideCore)
+				{
+					$rowStyle = ' style="background: #d9edf7; color: #31708f;"';
+				}
+				elseif ($separator)
+				{
+					$rowStyle = ' style="background: #e9e9e9; color: #333;"';
+				}
+				else
+				{
+					$rowStyle = '';
+				}
+// Yellow		$rowStyle = $overrideCore ? ' style="background: #fcf8e3; color: #8a6d3b;"' : '';
+// Red			$rowStyle = $overrideCore ? ' style="background: #f2dede; color: #a94442;"' : '';
+// Green		$rowStyle = $overrideCore ? ' style="background: #dff0d8; color: #3c763d;"' :
+//				($item->parent_form == 2 ? ' style="background: #d9edf7;"' : '');
+//				$rowClass = $overrideCore ? ' info' : '';
+				?>
+
+					<tr class="row<?php echo $i % 2; ?>">
+
+					<?php // JOOMLA 3.x ?>
+					<?php if(version_compare(JVERSION, '3.0', 'ge')) : ?>
+
+						<?php // Ordering Joomla 3.x ?>
+						<td class="order nowrap center hidden-phone"<?php echo $rowStyle;?>>
+							<?php if ($canChange) :
+								$disableClassName = '';
+								$disabledLabel	  = '';
+
+								if (!$saveOrder) :
+									$disabledLabel    = JText::_('JORDERINGDISABLED');
+									$disableClassName = 'inactive tip-top';
+								endif;
+								?>
+								<span class="sortable-handler hasTooltip <?php echo $disableClassName; ?>" title="<?php echo $disabledLabel; ?>">
+									<i class="icon-menu"></i>
+								</span>
+								<input type="text" style="display:none" name="order[]" size="5" value="<?php echo $item->ordering; ?>" class="width-20 text-area-order " />
+							<?php else : ?>
+								<span class="sortable-handler inactive" >
+									<i class="icon-menu"></i>
+								</span>
+							<?php endif; ?>
+						</td>
+
+					<?php endif; ?>
+					<?php // END JOOMLA 3.x ?>
+
+						<?php // Ordering Joomla 3.x ?>
+						<td class="center hidden-phone"<?php echo $rowStyle;?>>
+							<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+						</td>
+
+						<?php // Status ?>
+					<?php if (isset($this->items[0]->state)) { ?>
+						<td class="center"<?php echo $rowStyle;?>>
+							<?php echo JHtml::_('jgrid.published', $item->state, $i, 'customfields.', $canChange, 'cb'); ?>
+						</td>
+					<?php } ?>
+
+						<?php // Title ?>
+						<td class="nowrap has-context"<?php echo $rowStyle;?>>
+							<div class="pull-left">
+								<?php if ($item->checked_out) : ?>
+									<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'customfields.', $canCheckin); ?>
+								<?php endif; ?>
+								<?php //if ($item->language == '*'):?>
+									<?php //$language = JText::alt('JALL', 'language'); ?>
+								<?php //else:?>
+									<?php //$language = $item->language ? $this->escape($item->language) : JText::_('JUNDEFINED'); ?>
+								<?php //endif;?>
+								<?php if ($canEdit) : ?>
+									<a href="<?php echo JRoute::_('index.php?option=com_icagenda&task=customfield.edit&id=' . $item->id); ?>" title="<?php echo JText::_('JACTION_EDIT'); ?>">
+									<?php echo $this->escape($item->title); ?></a>
+								<?php else : ?>
+									<span title="<?php echo JText::sprintf('JFIELD_ALIAS_LABEL', $this->escape($item->alias)); ?>"><?php echo $this->escape($item->title); ?></span>
+								<?php endif; ?>
+								<?php if(version_compare(JVERSION, '3.0', 'ge')) : ?>
+								<span class="hidden-desktop">
+									<?php if ($item->slug) : ?>
+										<small>
+											<?php echo ' (' . JText::_('COM_ICAGENDA_CUSTOMFIELD_SLUG_LBL') . ': ' . $this->escape($item->slug) . ')'; ?>
+										</small>
+									<?php endif; ?>
+								</span>
+								<?php endif; ?>
+							</div>
+
+							<?php // DropDown Edit Joomla 3 ?>
+						<?php if(version_compare(JVERSION, '3.0', 'ge')) : ?>
+							<div class="pull-left">
+								<?php
+								// Create dropdown items
+								JHtml::_('dropdown.edit', $item->id, 'customfield.');
+								JHtml::_('dropdown.divider');
+
+								if ($item->state) :
+									JHtml::_('dropdown.unpublish', 'cb' . $i, 'customfields.');
+								else :
+									JHtml::_('dropdown.publish', 'cb' . $i, 'customfields.');
+								endif;
+
+								JHtml::_('dropdown.divider');
+
+								if ($archived) :
+									JHtml::_('dropdown.unarchive', 'cb' . $i, 'customfields.');
+								else :
+									JHtml::_('dropdown.archive', 'cb' . $i, 'customfields.');
+								endif;
+
+								if ($item->checked_out) :
+									JHtml::_('dropdown.checkin', 'cb' . $i, 'customfields.');
+								endif;
+
+								if ($trashed) :
+									JHtml::_('dropdown.untrash', 'cb' . $i, 'customfields.');
+								else :
+									JHtml::_('dropdown.trash', 'cb' . $i, 'customfields.');
+								endif;
+
+								// Render dropdown list
+								echo JHtml::_('dropdown.render');
+								?>
+							</div>
+						<?php endif; ?>
+						</td>
+
+						<?php // Slug ?>
+						<td class="hidden-phone"<?php echo $rowStyle;?>>
+							<?php if ($item->slug) : ?>
+								<?php echo $this->escape($item->slug); ?>
+							<?php endif; ?>
+						</td>
+
+						<?php // Parent Form ?>
+						<td<?php echo $rowStyle;?>>
+							<?php if ($item->parent_form == 1) : ?>
+								<?php
+								$reg_label = $groups ? 'inverse' : 'success';
+								?>
+								<?php echo '<span class="label label-' . $reg_label . '">' . JText::_('COM_ICAGENDA_CUSTOMFIELD_PARENT_REGISTRATION_FORM') . '</span>'; ?>
+								<?php if (count($groups)) : ?>
+									<?php if(version_compare(JVERSION, '3.0', 'ge')) : ?>
+										<?php echo '<span class="hasTooltip badge badge-default" title="' . JText::_('COM_ICAGENDA_CUSTOMFIELDS_GROUPS_LBL') . '">' . count($groups) . '</span>'; ?>
+									<?php endif; ?>
+								<?php endif; ?>
+							<?php elseif ($item->parent_form == 2) : ?>
+								<?php echo '<span class="label label-info">' . JText::_('COM_ICAGENDA_CUSTOMFIELD_PARENT_EVENT_EDIT') . '</span>'; ?>
+							<?php endif; ?>
+						</td>
+
+						<?php // Custom Field Groups ?>
+						<td class="hidden-phone"<?php echo $rowStyle;?>>
+							<?php if ($item->groups) : ?>
+								<?php
+								echo '<span class="label">';
+								echo implode('</span> <span class="label">', array_values($groups));
+								echo '</span>';
+								?>
+							<?php endif; ?>
+						</td>
+
+						<?php // Field Type ?>
+						<td class="hidden-phone"<?php echo $rowStyle;?>>
+							<?php if ($item->type) : ?>
+								<?php
+								$type_ex        = explode('_', $item->type);
+								$type_prefix    = isset($type_ex[1]) ? $type_ex[0] : '';
+								$type_label     = ($type_prefix == 'core')
+												? JText::_('COM_ICAGENDA_LABEL_OVERRIDE')
+												: JText::_('COM_ICAGENDA_LABEL_SPACER');
+								$type           = in_array($type_prefix, array('core', 'spacer'))
+//												? str_replace($type_prefix . '_', '' , $item->type)
+												? JText::_('COM_ICAGENDA_CUSTOMFIELD_TYPE_' . strtoupper(str_replace($type_prefix . '_', '' , $item->type)))
+												: JText::_('COM_ICAGENDA_CUSTOMFIELD_TYPE_' . strtoupper($item->type));
+								if ($type_prefix) :
+									echo '<span class="label' . ($type_prefix == 'core' ? ' label-info' : '') . '">' . $type_label . '</span>';
+								endif;
+								?>
+								<?php echo $this->escape($type); ?>
+							<?php endif; ?>
+						</td>
+
+						<?php // Required ?>
+						<td class="hidden-phone"<?php echo $rowStyle;?>>
+							<?php if ($type_prefix == 'spacer') : ?>
+								<?php echo ''; ?>
+							<?php elseif ($type_prefix == 'core') : ?>
+								<?php echo '<span class="label label-info">' . JText::_('JGLOBAL_USE_GLOBAL') . '</span>'; ?>
+							<?php elseif ($item->required == 1) : ?>
+								<?php echo '<span class="label label-success">' . JText::_('JYES') . '</span>'; ?>
+							<?php else : ?>
+								<?php echo '<span class="label">' . JText::_('JNO') . '</span>'; ?>
+							<?php endif; ?>
+						</td>
+
+				<?php // JOOMLA 2.5 ?>
+				<?php if(version_compare(JVERSION, '3.0', 'lt')) : ?>
+
+						<?php // Ordering Joomla 2.5 ?>
+					<?php if (isset($this->items[0]->ordering)) { ?>
+						<td class="order"<?php echo $rowStyle;?>>
+							<?php if ($canChange) : ?>
+								<?php if ($saveOrder) :?>
+									<?php if ($listDirn == 'asc') : ?>
+										<span><?php echo $this->pagination->orderUpIcon($i, true, 'customfields.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+										<span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, true, 'customfields.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+									<?php elseif ($listDirn == 'desc') : ?>
+										<span><?php echo $this->pagination->orderUpIcon($i, true, 'customfields.orderdown', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+										<span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, true, 'customfields.orderup', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+									<?php endif; ?>
+								<?php endif; ?>
+								<?php $disabled = $saveOrder ?  '' : 'disabled="disabled"'; ?>
+								<?php echo '<input type="text" name="order[]" size="5" value="'
+											. $item->ordering . '" ' . $disabled . ' class="text-area-order" />'; ?>
+							<?php else : ?>
+								<?php echo $item->ordering; ?>
+							<?php endif; ?>
+						</td>
+					<?php } ?>
+
+				<?php endif; ?>
+				<?php // END JOOMLA 2.5 ?>
+
+						<?php // ID ?>
+					<?php if (isset($this->items[0]->id)) { ?>
+						<td class="center hidden-phone"<?php echo $rowStyle;?>>
+							<?php echo (int) $item->id; ?>
+						</td>
+					<?php } ?>
+
+					</tr>
+				<?php endforeach; ?>
+				</tbody>
+			</table>
+
+			<div>
+				<input type="hidden" name="task" value="" />
+				<input type="hidden" name="boxchecked" value="0" />
+				<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+				<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+				<?php echo JHtml::_('form.token'); ?>
+			</div>
+		</div>
+	</form>
+<?php
+}
+else
+{
+	$app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'warning');
+	$app->redirect(htmlspecialchars_decode('index.php?option=com_icagenda&view=icagenda'));
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/customfields/tmpl/index.html b/deployed/icagenda/administrator/components/com_icagenda/views/customfields/tmpl/index.html
new file mode 100644
index 00000000..42682b47
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/customfields/tmpl/index.html
@@ -0,0 +1 @@
+<html><body></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/customfields/view.html.php b/deployed/icagenda/administrator/components/com_icagenda/views/customfields/view.html.php
new file mode 100644
index 00000000..969c02a9
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/customfields/view.html.php
@@ -0,0 +1,200 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-26
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.4.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * View class Admin - List of Custom Fields - iCagenda.
+ */
+class iCagendaViewCustomfields extends JViewLegacy
+{
+	protected $params;
+	protected $state;
+	protected $items;
+	protected $pagination;
+	protected $cfGroups;
+
+	/**
+	 * Display the view
+	 *
+	 * @since   3.4.0
+	 */
+	public function display($tpl = null)
+	{
+		// Joomla 2.5
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			jimport('joomla.environment.request');
+
+			JHtml::stylesheet( 'com_icagenda/icagenda-back.j25.css', false, true );
+		}
+
+		$this->params     = JComponentHelper::getParams('com_icagenda');
+
+		$this->state      = $this->get('State');
+		$this->items      = $this->get('Items');
+		$this->pagination = $this->get('Pagination');
+		$this->cfGroups   = $this->get('CustomFieldGroups');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+
+			return false;
+		}
+
+		// We don't need toolbar in the modal window.
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->addToolbar();
+
+			if (version_compare(JVERSION, '3.0', 'ge'))
+			{
+				$this->sidebar = JHtmlSidebar::render();
+			}
+		}
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @since   3.4.0
+	 */
+	protected function addToolbar()
+	{
+		require_once JPATH_COMPONENT . '/helpers/icagenda.php';
+
+		$state  = $this->get('State');
+		$user   = JFactory::getUser();
+		$userId = $user->get('id');
+		$canDo  = iCagendaHelper::getActions();
+
+		// Set Title
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			JToolBarHelper::title('iCagenda - ' . JText::_('COM_ICAGENDA_CUSTOMFIELDS'), 'customfields.png');
+		}
+		else
+		{
+			JToolBarHelper::title('iCagenda <span style="font-size:14px;">- ' . JText::_('COM_ICAGENDA_CUSTOMFIELDS') . '</span>', 'list-2');
+		}
+
+		$icTitle = JText::_('COM_ICAGENDA_CUSTOMFIELDS');
+
+		$document = JFactory::getDocument();
+		$app      = JFactory::getApplication();
+		$sitename = $app->getCfg('sitename');
+		$title    = $app->getCfg('sitename') . ' - ' . JText::_('JADMINISTRATION') . ' - iCagenda: ' . $icTitle;
+
+		$document->setTitle($title);
+
+		// Check if the form exists before showing the add/edit buttons
+		$formPath = JPATH_COMPONENT_ADMINISTRATOR.'/views/customfield';
+
+		if (file_exists($formPath))
+		{
+			if ($canDo->get('core.create'))
+			{
+				JToolBarHelper::addNew('customfield.add','JTOOLBAR_NEW');
+			}
+
+			if ($canDo->get('core.edit'))
+			{
+				JToolBarHelper::editList('customfield.edit','JTOOLBAR_EDIT');
+			}
+		}
+
+		if ($canDo->get('core.edit.state'))
+		{
+			if (isset($this->items[0]->state))
+			{
+				JToolBarHelper::divider();
+				JToolBarHelper::custom('customfields.publish', 'publish.png', 'publish_f2.png','JTOOLBAR_PUBLISH', true);
+				JToolBarHelper::custom('customfields.unpublish', 'unpublish.png', 'unpublish_f2.png', 'JTOOLBAR_UNPUBLISH', true);
+			}
+			else
+			{
+				// If this component does not use state then show a direct delete button as we can not trash
+				JToolBarHelper::deleteList('', 'customfields.delete','JTOOLBAR_DELETE');
+			}
+
+			if (isset($this->items[0]->state))
+			{
+				JToolBarHelper::divider();
+				JToolBarHelper::archiveList('customfields.archive','JTOOLBAR_ARCHIVE');
+			}
+
+			if (isset($this->items[0]->checked_out))
+			{
+				JToolBarHelper::custom('customfields.checkin', 'checkin.png', 'checkin_f2.png', 'JTOOLBAR_CHECKIN', true);
+			}
+		}
+
+		// Show trash and delete for components that uses the state field
+		if (isset($this->items[0]->state))
+		{
+			if ($state->get('filter.state') == -2 && $canDo->get('core.delete'))
+			{
+				JToolBarHelper::deleteList('', 'customfields.delete','JTOOLBAR_EMPTY_TRASH');
+				JToolBarHelper::divider();
+			}
+			elseif ($canDo->get('core.edit.state'))
+			{
+				JToolBarHelper::trash('customfields.trash','JTOOLBAR_TRASH');
+				JToolBarHelper::divider();
+			}
+		}
+
+		if ($canDo->get('core.admin'))
+		{
+			JToolBarHelper::preferences('com_icagenda');
+		}
+
+		if (version_compare(JVERSION, '3.0', 'ge'))
+		{
+			JHtmlSidebar::setAction('index.php?option=com_icagenda&view=customfields');
+
+			JHtmlSidebar::addFilter(
+				JText::_('JOPTION_SELECT_PUBLISHED'),
+				'filter_published',
+				JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.state'), true)
+			);
+
+			JHtmlSidebar::addFilter(
+				JText::_('COM_ICAGENDA_CUSTOMFIELDS_FILTER_OPTION_SELECT_PARENT_FORM'),
+				'filter_parent_form',
+				JHtml::_('select.options', $this->get('ParentForm'), 'value', 'text', $this->state->get('filter.parent_form'), true)
+			);
+
+			JHtmlSidebar::addFilter(
+				JText::_('COM_ICAGENDA_CUSTOMFIELDS_FILTER_OPTION_SELECT_GROUP'),
+				'filter_group',
+				JHtml::_('select.options', $this->get('Groups'), 'value', 'text', $this->state->get('filter.group'), true)
+			);
+
+			JHtmlSidebar::addFilter(
+				JText::_('COM_ICAGENDA_CUSTOMFIELDS_FILTER_OPTION_SELECT_TYPE'),
+				'filter_type',
+				JHtml::_('select.options', $this->get('FieldTypes'), 'value', 'text', $this->state->get('filter.type'), true)
+			);
+		}
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/download/index.html b/deployed/icagenda/administrator/components/com_icagenda/views/download/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/download/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/download/tmpl/default.php b/deployed/icagenda/administrator/components/com_icagenda/views/download/tmpl/default.php
new file mode 100644
index 00000000..846aa1ea
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/download/tmpl/default.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.13 2018-03-28
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.5.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+?>
+<?php if (version_compare(JVERSION, '3.0', 'lt')) : ?>
+
+<form
+	action="<?php echo JRoute::_('index.php?option=com_icagenda&task=registrations.display&format=raw'); ?>"
+	method="post"
+	name="adminForm"
+	id="download-form"
+	class="form-validate">
+	<fieldset class="adminform">
+		<legend><?php echo JText::_('COM_ICAGENDA_REGISTRATIONS_DOWNLOAD'); ?></legend>
+		<?php foreach ($this->form->getFieldset() as $field) : ?>
+		<div class="control-group">
+			<?php if (!$field->hidden) : ?>
+			<div class="control-label">
+				<?php echo $field->label; ?>
+			</div>
+			<?php endif; ?>
+			<div class="controls">
+				<?php echo $field->input; ?>
+			</div>
+		</div>
+		<?php endforeach; ?>
+		<div class="clr"></div>
+		<button type="button" class="btn" onclick="this.form.submit();window.top.setTimeout('window.parent.jModalClose()', 700);"><?php echo JText::_('COM_ICAGENDA_REGISTRATIONS_EXPORT'); ?></button>
+		<!--button type="button" class="btn" onclick="window.parent.jModalClose()"><?php echo JText::_('COM_ICAGENDA_CANCEL'); ?></button-->
+	</fieldset>
+</form>
+
+<?php else : ?>
+
+<?php
+JHtml::_('bootstrap.tooltip', '.hasTooltip', array('placement' => 'bottom'));
+?>
+<div class="container-popup">
+	<form
+		class="form-horizontal form-validate"
+		id="download-form"
+		name="adminForm"
+		action="<?php echo JRoute::_('index.php?option=com_icagenda&task=registrations.display&format=raw'); ?>"
+		method="post">
+
+		<?php foreach ($this->form->getFieldset() as $field) : ?>
+			<?php echo $this->form->renderField($field->fieldname); ?>
+		<?php endforeach; ?>
+
+		<button class="hidden"
+			id="closeBtn"
+			type="button"
+			onclick="window.parent.jQuery('#modal-download').modal('hide');">
+		</button>
+		<button class="hidden"
+			id="exportBtn"
+			type="button"
+			onclick="this.form.submit();window.top.setTimeout('window.parent.jQuery(\'#downloadModal\').modal(\'hide\')', 700);">
+		</button>
+	</form>
+</div>
+
+<?php endif; ?>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/download/tmpl/index.html b/deployed/icagenda/administrator/components/com_icagenda/views/download/tmpl/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/download/tmpl/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/download/view.html.php b/deployed/icagenda/administrator/components/com_icagenda/views/download/view.html.php
new file mode 100644
index 00000000..98e46bf1
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/download/view.html.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-30
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.5.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * View class for download a list of registered users.
+ */
+class icagendaViewdownload extends JViewLegacy
+{
+	protected $form;
+
+	/**
+	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
+	 */
+	public function display($tpl = null)
+	{
+		$this->form = $this->get('Form');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+
+			return false;
+		}
+
+		parent::display($tpl);
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/event/index.html b/deployed/icagenda/administrator/components/com_icagenda/views/event/index.html
new file mode 100644
index 00000000..42682b47
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/event/index.html
@@ -0,0 +1 @@
+<html><body></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/event/tmpl/edit.php b/deployed/icagenda/administrator/components/com_icagenda/views/event/tmpl/edit.php
new file mode 100644
index 00000000..79ecfd73
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/event/tmpl/edit.php
@@ -0,0 +1,1274 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.12 2020-03-25
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2020 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+$app = JFactory::getApplication();
+$document = JFactory::getDocument();
+
+// Access Administration Events check.
+if (JFactory::getUser()->authorise('icagenda.access.events', 'com_icagenda')
+	&& defined('IC_LIBRARY'))
+{
+	$iCparams     = JComponentHelper::getParams('com_icagenda');
+	$maps_service = $iCparams->get('maps_service', '');
+
+
+	$bootstrapType		= '1';
+
+	$EventTag			= 'event';
+	$EventTitle			= JText::_('COM_ICAGENDA_TITLE_EVENT', true);
+
+	$DatesTag			= 'dates';
+	$DatesTitle			= JText::_('COM_ICAGENDA_LEGEND_DATES', true);
+
+	$DescTag			= 'desc';
+	$DescTitle			= JText::_('COM_ICAGENDA_LEGEND_DESC', true);
+
+	$InfosTag			= 'infos';
+	$InfosTitle			= JText::_('COM_ICAGENDA_LEGEND_INFORMATION', true);
+
+	$GooglemapTag		= 'googlemap';
+	$GooglemapTitle		= JText::_('COM_ICAGENDA_LEGEND_GOOGLE_MAPS', true);
+
+	$RegistrationsTag	= 'registrations';
+	$RegistrationsTitle	= JText::_('COM_ICAGENDA_REGISTRATIONS_LABEL', true);
+
+	$OptionsTag			= 'options';
+	$OptionsTitle		= JText::_('JOPTIONS', true);
+
+	$PublishingTag		= 'publishing';
+	$PublishingTitle	= JText::_('JGLOBAL_FIELDSET_PUBLISHING', true);
+
+	// Joomla 2.5
+	if (version_compare(JVERSION, '3.0', 'lt'))
+	{
+		JHtml::_('behavior.formvalidation');
+		JHtml::_('behavior.keepalive');
+
+		jimport( 'joomla.html.html.tabs' );
+
+		$iCmapDisplay		= '3';
+
+		$icPanEvent			= JText::_('COM_ICAGENDA_TITLE_EVENT', true);
+		$icPanDates			= JText::_('COM_ICAGENDA_LEGEND_DATES', true);
+		$icPanDesc			= JText::_('COM_ICAGENDA_LEGEND_DESC', true);
+		$icPanInfos			= JText::_('COM_ICAGENDA_LEGEND_INFORMATION', true);
+		$icPanGooglemap		= JText::_('COM_ICAGENDA_LEGEND_GOOGLE_MAPS', true);
+		$icPanRegistrations	= JText::_('COM_ICAGENDA_REGISTRATIONS_LABEL', true);
+		$icPanOptions		= JText::_('JOPTIONS', true);
+		$icPanPublishing	= JText::_('JGLOBAL_FIELDSET_PUBLISHING', true);
+		$startPane			= 'tabs.start';
+		$addPanel			= 'tabs.panel';
+		$endPanel			= 'tabs.end';
+		$endPane			= 'tabs.end';
+		$EventTag1			= $EventTag;
+		$EventTag2			= $EventTitle;
+		$DatesTag1			= $DatesTag;
+		$DatesTag2			= $DatesTitle;
+		$DescTag1			= $DescTag;
+		$DescTag2			= $DescTitle;
+		$InfosTag1			= $InfosTag;
+		$InfosTag2			= $InfosTitle;
+		$GooglemapTag1		= $GooglemapTag;
+		$GooglemapTag2		= $GooglemapTitle;
+		$RegistrationsTag1	= $RegistrationsTag;
+		$RegistrationsTag2	= $RegistrationsTitle;
+		$OptionsTag1		= $OptionsTag;
+		$OptionsTag2		= $OptionsTitle;
+		$PublishingTag1		= $PublishingTag;
+		$PublishingTag2		= $PublishingTitle;
+	}
+
+	// Joomla 3
+	else
+	{
+		JHtml::_('behavior.tooltip');
+
+		if (version_compare(JVERSION, '3.4.0', 'lt'))
+		{
+			JHtml::_('behavior.formvalidation');
+		}
+		else
+		{
+			JHtml::_('behavior.formvalidator');
+		}
+
+		JHtml::_('behavior.keepalive');
+		JHtml::_('formbehavior.chosen', 'select');
+
+		jimport('joomla.html.html.bootstrap');
+
+		$icPanEvent			= 'icTab';
+		$icPanDates			= 'icTab';
+		$icPanDesc			= 'icTab';
+		$icPanInfos			= 'icTab';
+		$icPanGooglemap		= 'icTab';
+		$icPanRegistrations	= 'icTab';
+		$icPanOptions		= 'icTab';
+		$icPanPublishing	= 'icTab';
+
+		if ($bootstrapType == '1')
+		{
+			$iCmapDisplay		= '1';
+			$startPane			= 'bootstrap.startTabSet';
+			$addPanel			= 'bootstrap.addTab';
+			$endPanel			= 'bootstrap.endTab';
+			$endPane			= 'bootstrap.endTabSet';
+			$EventTag1			= $EventTag;
+			$EventTag2			= $EventTitle;
+			$DatesTag1			= $DatesTag;
+			$DatesTag2			= $DatesTitle;
+			$DescTag1			= $DescTag;
+			$DescTag2			= $DescTitle;
+			$InfosTag1			= $InfosTag;
+			$InfosTag2			= $InfosTitle;
+			$GooglemapTag1		= $GooglemapTag;
+			$GooglemapTag2		= $GooglemapTitle;
+			$RegistrationsTag1	= $RegistrationsTag;
+			$RegistrationsTag2	= $RegistrationsTitle;
+			$OptionsTag1		= $OptionsTag;
+			$OptionsTag2		= $OptionsTitle;
+			$PublishingTag1		= $PublishingTag;
+			$PublishingTag2		= $PublishingTitle;
+		}
+		elseif ($bootstrapType == '2')
+		{
+			$iCmapDisplay		= '2';
+			$startPane			= 'bootstrap.startAccordion';
+			$addPanel			= 'bootstrap.addSlide';
+			$endPanel			= 'bootstrap.endSlide';
+			$endPane			= 'bootstrap.endAccordion';
+			$EventTag1			= $EventTitle;
+			$EventTag2			= $EventTag;
+			$DatesTag1			= $DatesTitle;
+			$DatesTag2			= $DatesTag;
+			$DescTag1			= $DescTitle;
+			$DescTag2			= $DescTag;
+			$InfosTag1			= $InfosTitle;
+			$InfosTag2			= $InfosTag;
+			$GooglemapTag1		= $GooglemapTitle;
+			$GooglemapTag2		= $GooglemapTag;
+			$RegistrationsTag1	= $RegistrationsTitle;
+			$RegistrationsTag2	= $RegistrationsTag;
+			$OptionsTag1		= $OptionsTitle;
+			$OptionsTag2		= $OptionsTag;
+			$PublishingTag1		= $PublishingTitle;
+			$PublishingTag2		= $PublishingTag;
+		}
+	}
+
+	$params = $this->form->getFieldsets('params');
+
+	// ZOOM
+	$zoom		= '1';
+	// HYBRID, ROADMAP, SATELLITE, TERRAIN
+	$mapTypeId	= 'ROADMAP';
+
+	$coords		= '0, 0';
+	$oldcoordinate = $this->item->coordinate;
+	$lat		= $this->item->lat;
+	$lng		= $this->item->lng;
+
+	if (($oldcoordinate == NULL) && ($lat == '0') && ($lng == '0'))
+	{
+		$zoom = '1';
+	}
+	// Notes: 	zoomControl: false, mapTypeControl: false
+
+	// Control of dates if valid (Alert Messages)
+	$messagealert	= '';
+	$alert			= '';
+	$nodate			= '0000-00-00 00:00:00';
+	$nextget		= $this->item->next;
+
+	if ($nextget == '-3600'
+		|| $nextget == $nodate)
+	{
+		$messagealert = '<div><h4><b>' . JText::_('COM_ICAGENDA_FORM_ALERT_UNPUBLISHED') . '</b></h4></div>';
+
+		if (($this->item->startdate == $nodate) && ($this->item->enddate != $nodate))
+		{
+			$messagealert.= '<p>' . JText::_('COM_ICAGENDA_FORM_ERROR_NO_STARTDATE') . '</p><br>';
+		}
+		if (($this->item->enddate == $nodate) && ($this->item->startdate != $nodate))
+		{
+			$messagealert.= '<p>' . JText::_('COM_ICAGENDA_FORM_ERROR_NO_ENDDATE') . '</p><br>';
+		}
+		if (($this->item->enddate < $this->item->startdate)
+			&& (($this->item->next != '-3600') || ($this->item->next != $nodate)))
+		{
+			$messagealert.= '<p>' . JText::_('COM_ICAGENDA_FORM_ERROR_INVALID_PERIOD') . '</p><br>';
+		}
+	}
+	else
+	{
+		if (($this->item->startdate == $nodate) && ($this->item->enddate != $nodate))
+		{
+			$alert.= '<p>' . JText::_('COM_ICAGENDA_FORM_ERROR_NO_STARTDATE') . '</p><br>';
+		}
+		if (($this->item->enddate == $nodate) && ($this->item->startdate != $nodate))
+		{
+			$alert.= '<p>' . JText::_('COM_ICAGENDA_FORM_ERROR_NO_ENDDATE') . '</p><br>';
+		}
+		if (($this->item->enddate < $this->item->startdate)
+			&& (($this->item->next != '-3600') || ($this->item->next != $nodate)))
+		{
+			$alert.= '<p>' . JText::_('COM_ICAGENDA_FORM_ERROR_INVALID_PERIOD') . '</p><br>';
+		}
+	}
+	?>
+
+	<?php // ERROR ALERT ?>
+	<div id="form_errors" class="alert alert-danger" style="display:none">
+		<strong><?php echo JText::_('JGLOBAL_VALIDATION_FORM_FAILED'); ?></strong>
+		<div id="message_error">
+		</div>
+	</div>
+
+	<div class="alert alert-danger" id="error_dates" style="display:none">
+		<?php echo '<strong>' . JText::_('COM_ICAGENDA_FORM_WARNING') . '</strong><br />' . JText::_('COM_ICAGENDA_FORM_NO_DATES_ALERT'); ?>
+	</div>
+
+	<form action="<?php echo JRoute::_('index.php?option=com_icagenda&layout=edit&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="event-form" class="form-validate" enctype="multipart/form-data">
+		<div class="container">
+
+			<!-- iCheader top bar -->
+			<!--div class="iCheader-top">
+				<a href="#">
+					<strong>&laquo; Previous </strong>event
+				</a>
+				<span class="right">
+					<a href="#">
+						<strong>Next</strong> event <strong>&raquo;</strong>
+					</a>
+				</span>
+				<div class="clr"></div>
+			</div-->
+			<!--/ iCheader top bar -->
+
+			<!-- iCagenda Header -->
+			<?php
+			$new_event_value = empty($this->item->id) ? '1' : '0';
+			?>
+			<header>
+				<h1>
+					<?php echo '<input type="hidden" value="' . $new_event_value . '" name="new_event" />'; ?>
+					<?php echo empty($this->item->id) ? JText::_('COM_ICAGENDA_LEGEND_NEW_EVENT') : JText::sprintf('COM_ICAGENDA_LEGEND_EDIT_EVENT', $this->item->id); ?>&nbsp;<span>iCagenda</span>
+				</h1>
+				<h2>
+					<?php echo JText::_('COM_ICAGENDA_COMPONENT_DESC'); ?>
+					<!--nav class="iCheader-videos">
+						<span style="font-variant:small-caps">Tutorial Videos</span>
+						<a href="#">Add a event</a>
+						<a href="#">Video 2</a>
+						<a href="#">Video 3</a>
+					</nav-->
+				</h2>
+			</header>
+
+			<div>&nbsp;</div>
+
+			<!-- Alert Messages -->
+			<div>
+				<?php if ($messagealert) :?>
+				<div style="background: #990000; color: #FFFFFF; border-radius: 10px; border: 1px solid #D4D4D4; padding: 20px; margin-bottom:20px;">
+					<?php echo '<h2>' . JText::_('COM_ICAGENDA_FORM_WARNING') . '</h2>' . $messagealert; ?>
+				</div>
+				<?php endif; ?>
+				<?php if ($alert && ! $messagealert) : ?>
+				<div style="background: #FFFFFF; color: red; border-radius: 10px; border: 1px solid #D4D4D4; padding: 10px; margin-bottom:20px;">
+					<strong><?php echo $alert; ?></strong>
+				</div>
+				<?php endif; ?>
+			</div>
+
+			<!-- Begin Content -->
+			<div class="row-fluid">
+				<div class="span10 form-horizontal">
+
+					<!-- Open Panel Set -->
+					<?php echo JHtml::_($startPane, 'icTab', array('active' => 'event')); ?>
+
+						<!-- Panel Event -->
+						<?php echo JHtml::_($addPanel, $icPanEvent, $EventTag1, $EventTag2); ?>
+
+							<div class="icpanel iCleft">
+								<h1>
+									<?php echo empty($this->item->id) ? JText::_('COM_ICAGENDA_LEGEND_NEW_EVENT') : JText::sprintf('COM_ICAGENDA_LEGEND_EDIT_EVENT', $this->item->id); ?>
+								</h1>
+								<hr>
+								<div class="row-fluid">
+									<div class="span6 iCleft">
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('title'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('title'); ?>
+											</div>
+										</div>
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('catid'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('catid'); ?>
+											</div>
+										</div>
+									</div>
+									<?php if (version_compare(JVERSION, '3.0', 'ge')) : ?>
+									<div class="span6 iCleft">
+										<?php echo $this->form->renderField('image'); ?>
+										<div class="control-group">
+											<img src="../<?php echo $this->item->image; ?>" alt="" id="jform_image_preview" class="media-preview" style="float:right; max-width:100%; max-height:350px;">
+										</div>
+									</div>
+									<?php else : ?>
+									<div class="span6 iCleft">
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('image'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('image'); ?>
+											</div>
+										</div>
+										<div class="control-group">
+											<div>
+												<img src="../<?php echo $this->item->image; ?>" alt="" id="jform_image_preview" class="media-preview" style="float:right; max-width:100%; max-height:350px;">
+											</div>
+										</div>
+									</div>
+									<?php endif; ?>
+								</div>
+							</div>
+
+
+						<?php
+						if (version_compare(JVERSION, '3.0', 'ge'))
+						{
+							echo JHtml::_($endPanel);
+						}
+						?>
+
+						<!-- Panel Dates -->
+						<?php echo JHtml::_($addPanel, $icPanDates, $DatesTag1, $DatesTag2); ?>
+
+							<div class="icpanel iCleft">
+								<h1><?php echo JText::_('COM_ICAGENDA_LEGEND_DATES'); ?></h1>
+								<!--div class="row-fluid">
+									<div class="span12 iCleft">
+										<h3><?php echo JText::_('COM_ICAGENDA_LEGEND_SINGLE_DATES'); ?></h3>
+										<div class="control-group">
+											<?php echo $this->form->getInput('eventDates'); ?>
+										</div>
+									</div>
+								</div-->
+								<hr>
+								<div class="row-fluid">
+									<div class="span6 iCleft">
+										<h3><?php echo JText::_('COM_ICAGENDA_LEGEND_PERIOD_DATES'); ?></h3>
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('startdate'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('startdate'); ?>
+											</div>
+										</div>
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('enddate'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('enddate'); ?>
+											</div>
+										</div>
+										<!--div class="control-group">
+										</div-->
+									</div>
+									<div class="span6 iCleft">
+										<h3>&nbsp;</h3>
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('weekdays'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('weekdays'); ?>
+											</div>
+										</div>
+										<!--div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('weekdays_filter'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('weekdays_filter'); ?>
+											</div>
+										</div-->
+										<div class="control-group">
+											<div class="alert alert-info">
+												<h4><?php echo JText::_('COM_ICAGENDA_FORM_WEEK_DAYS_INFO_TITLE'); ?></h4>
+												<?php echo JText::_('COM_ICAGENDA_FORM_WEEK_DAYS_INFO_DESC'); ?>
+											</div>
+										</div>
+										<!--div class="control-group">
+										</div-->
+									</div>
+								</div>
+								<hr>
+								<div class="row-fluid">
+									<div class="span6 iCleft">
+										<h3><?php echo JText::_('COM_ICAGENDA_LEGEND_SINGLE_DATES'); ?></h3>
+										<div class="control-group">
+											<?php echo $this->form->getInput('dates'); ?>
+										</div>
+									</div>
+								</div>
+								<hr>
+								<div class="row-fluid">
+									<div class="span6 iCleft">
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('displaytime'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('displaytime'); ?>
+											</div>
+										</div>
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('next'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('next'); ?>
+											</div>
+										</div>
+									</div>
+								</div>
+								<hr>
+
+								<?php
+								echo '<fieldset style="margin:0">'
+									.JHtml::_('sliders.start', 'info-slider', array('useCookie'=>0, 'startOffset'=>-1, 'startTransition'=>1))
+									.JHtml::_('sliders.panel', JText::_('COM_ICAGENDA_DATES_HELP'), 'slide1')
+									.'<fieldset class="panelform" >'
+									.'<ul class="adminformlist" style="color:#555555;">'
+									.'<div>'. JText::_('COM_ICAGENDA_DATES_HELP_INTRO').'</div><br>'
+									.'<div style="text-transform:uppercase;"><b>'. JText::_('COM_ICAGENDA_LEGEND_SINGLE_DATES').'</b></div>'
+									.'<div><b>&#9658; '. JText::_('COM_ICAGENDA_DATES_HELP_LINE1').'</b></div>'
+									.'<div><i>'. JText::_('COM_ICAGENDA_DATES_HELP_EXAMPLE1').'</i></div><br>'
+									.'<div><b>&#9658; '. JText::_('COM_ICAGENDA_DATES_HELP_LINE2').'</b></div>'
+									.'<div><i>'. JText::_('COM_ICAGENDA_DATES_HELP_EXAMPLE2').'</i></div><br>'
+									.'<div style="text-transform:uppercase;"><b>'. JText::_('COM_ICAGENDA_LEGEND_PERIOD_DATES').'</b></div>'
+									.'<div><b>&#9658; '. JText::_('COM_ICAGENDA_DATES_HELP_LINE3').'</b></div>'
+									.'<div><i>'. JText::_('COM_ICAGENDA_DATES_HELP_EXAMPLE3').'</i></div><br>'
+									.'<div style="text-transform:uppercase;"><b>'. JText::_('COM_ICAGENDA_LEGEND_PERIOD_DATES').' & '. JText::_('COM_ICAGENDA_LEGEND_SINGLE_DATES').'</b></div>'
+									.'<div><b>&#9658; '. JText::_('COM_ICAGENDA_DATES_HELP_LINE4').'</b></div>'
+									.'<div><i>'. JText::_('COM_ICAGENDA_DATES_HELP_EXAMPLE4').'</i></div><br>'
+									.'<div><b>&#9658; '. JText::_('COM_ICAGENDA_DATES_HELP_LINE5').'</b></div>'
+									.'<div><i>'. JText::_('COM_ICAGENDA_DATES_HELP_EXAMPLE5').'</i></div><br>'
+									.'</ul>'
+									.'</fieldset>'
+									.JHtml::_('sliders.end')
+									.'<br />';
+								?>
+							</div>
+
+						<?php
+						if(version_compare(JVERSION, '3.0', 'ge'))
+						{
+							echo JHtml::_($endPanel);
+						}
+						?>
+
+						<!-- Panel Description -->
+						<?php echo JHtml::_($addPanel, $icPanDesc, $DescTag1, $DescTag2); ?>
+
+							<div class="icpanel iCleft">
+								<h1><?php echo JText::_('COM_ICAGENDA_LEGEND_DESC'); ?></h1>
+								<hr>
+								<div class="row-fluid">
+									<h3><?php echo JText::_('COM_ICAGENDA_FORM_EVENT_SHORT_DESCRIPTION_LBL'); ?></h3>
+									<div class="alert alert-info"><?php echo JText::_('COM_ICAGENDA_FORM_EVENT_SHORT_DESCRIPTION_DESC'); ?></div>
+									<?php echo $this->form->getInput('shortdesc'); ?>
+								</div>
+								<hr>
+								<div class="row-fluid">
+									<h3><?php echo JText::_('COM_ICAGENDA_FORM_DESC_EVENT_DESC'); ?></h3>
+									<?php echo $this->form->getInput('desc'); ?>
+								</div>
+								<hr>
+								<div class="row-fluid">
+									<h3><?php echo JText::_('COM_ICAGENDA_FORM_EVENT_METADESC_LBL'); ?></h3>
+									<div class="alert alert-info"><?php echo JText::_('COM_ICAGENDA_FORM_EVENT_METADESC_DESC'); ?></div>
+									<?php echo $this->form->getInput('metadesc'); ?>
+								</div>
+							</div>
+
+						<?php
+						if (version_compare(JVERSION, '3.0', 'ge'))
+						{
+							echo JHtml::_($endPanel);
+						}
+						?>
+
+						<!-- Panel Information -->
+						<?php echo JHtml::_($addPanel, $icPanInfos, $InfosTag1, $InfosTag2); ?>
+
+							<div class="icpanel iCleft">
+								<h1><?php echo JText::_('COM_ICAGENDA_LEGEND_INFORMATION'); ?></h1>
+								<hr>
+								<div class="row-fluid">
+									<div class="span6 iCleft">
+										<h3><?php echo JText::_('COM_ICAGENDA_LEGEND_VENUE'); ?></h3>
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('place'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('place'); ?>
+											</div>
+										</div>
+										<hr>
+										<h3><?php echo JText::_('COM_ICAGENDA_LEGEND_CONTACT'); ?></h3>
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('email'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('email'); ?>
+											</div>
+										</div>
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('phone'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('phone'); ?>
+											</div>
+										</div>
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('website'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('website'); ?>
+											</div>
+										</div>
+										<hr>
+										<h3><?php echo JText::_('COM_ICAGENDA_LEGEND_ALLEG'); ?></h3>
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('file'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('file'); ?>
+											</div>
+										</div>
+										<hr>
+									</div>
+									<div class="span6 iCleft">
+										<h3><?php echo JText::_('COM_ICAGENDA_LEGEND_FEATURES'); ?></h3>
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('features'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('features'); ?>
+											</div>
+										</div>
+										<hr>
+										<h3><?php echo JText::_('COM_ICAGENDA_CUSTOMFIELDS'); ?></h3>
+										<?php
+										// Load Custom fields - Event form (2)
+										echo icagendaCustomfields::loader(2);
+										?>
+									</div>
+								</div>
+							</div>
+
+						<?php
+						if (version_compare(JVERSION, '3.0', 'ge'))
+						{
+							echo JHtml::_($endPanel);
+						}
+						?>
+
+						<!-- Panel Google Maps -->
+						<?php echo JHtml::_($addPanel, $icPanGooglemap, $GooglemapTag1, $GooglemapTag2); ?>
+
+					<div class="icpanel iCleft" id="googlemap">
+						<h1><?php echo JText::_('COM_ICAGENDA_LEGEND_GOOGLE_MAPS'); ?></h1>
+						<hr>
+						<div class="row-fluid">
+							<?php if ( ! $maps_service) : ?>
+							<div class="span12">
+								<div class="icmap-box">
+									<div class="control-group">
+										<div class="control-label">
+											<?php echo $this->form->getLabel('address'); ?>
+										</div>
+										<div class="controls">
+											<?php echo $this->form->getInput('address'); ?>
+										</div>
+									</div>
+								</div>
+								<div class="alert alert-warning">
+									<?php echo JText::_('COM_ICAGENDA_MAPS_SERVICE_NOT_SET'); ?>
+								</div>
+								<script>
+									document.getElementById('jform_address').setAttribute('class', 'input-xxlarge');
+								</script>
+							</div>
+							<?php elseif ($maps_service == '2') : ?>
+							<div class="span12">
+								<div class="icmap-box">
+									<div class="control-group">
+										<div class="control-label">
+											<?php echo $this->form->getLabel('address'); ?>
+										</div>
+										<div class="controls">
+											<div class="input-append">
+												<?php echo $this->form->getInput('address'); ?>
+												<span class="btn btn-default" onclick="myFunction(document.getElementById('jform_address').value)"><?php echo JText::_('IC_CHECK'); ?></span>
+											</div>
+										</div>
+									</div>
+								</div>
+								<div id="embed_map">
+									<?php if ($this->item->address) : ?>
+										<?php echo '<iframe width="100%" height="300" frameborder="0" style="border:0;" class="icagenda_map" src="https://www.google.com/maps/embed/v1/place?key=' . $iCparams->get('googlemaps_embed_key', '') . '&q=' . urlencode(strip_tags($this->item->address)) . '" allowfullscreen></iframe>'; ?>
+									<?php endif; ?>
+								</div>
+								<script>
+									document.getElementById('jform_address').setAttribute('class', 'input-xxlarge');
+									function myFunction(address) {
+										var embedKey = "<?php echo $iCparams->get('googlemaps_embed_key', ''); ?>";
+										if (address){ 
+											html = '<iframe width="100%" height="300" frameborder="0" style="border:0;" class="icagenda_map" src="https://www.google.com/maps/embed/v1/place?key=' + embedKey + '&q=' + encodeURI(address) + '" allowfullscreen></iframe>';
+										} else {
+											html = '<div class="alert alert-warning"><?php echo addslashes(JText::_("COM_ICAGENDA_MAPS_FILL_IN_ADDRESS_ALERT")); ?></div>';
+										}
+										document.getElementById('embed_map').innerHTML = html;
+									}
+								</script>
+							</div>
+							<?php elseif ($maps_service == '3') : ?>
+							<div class="span6 iCleft">
+
+								<h3><?php echo JText::_('COM_ICAGENDA_GOOGLE_MAPS_SUBTITLE_LBL'); ?></h3>
+								<div>
+									<?php echo JText::_('COM_ICAGENDA_GOOGLE_MAPS_NOTE1'); ?>
+									<br/>
+									<?php echo JText::_('COM_ICAGENDA_GOOGLE_MAPS_NOTE2'); ?><br/>
+								</div>
+								<!--div class='clearfix'-->
+								<div class="icmap-box">
+									<div class="control-group">
+										<div class="control-label">
+											<?php echo $this->form->getLabel('address'); ?>
+										</div>
+										<div class="controls">
+											<?php echo $this->form->getInput('address'); ?>
+										</div>
+									</div>
+									<div class="icmap-field">
+										<?php echo $this->form->getInput('city'); ?>
+									</div>
+									<div class="icmap-field">
+										<?php echo $this->form->getInput('country'); ?>
+									</div>
+									<div class="icmap-field">
+										<?php echo $this->form->getInput('lat'); ?>
+									</div>
+									<div class="icmap-field">
+										<?php echo $this->form->getInput('lng'); ?>
+									</div>
+									<!--label>District: </label> <input id="administrative_area_level_2" disabled=disabled> <br/>
+									<label>State/Province: </label> <input id="administrative_area_level_1" disabled=disabled> <br/-->
+									<!--label>route: </label> <input id="route"> <br/>
+									<label>Postal Code: </label> <input id="postal_code" disabled=disabled> <br/>
+									<label>type: </label> <input id="type" disabled=disabled> <br/-->
+								</div>
+							</div>
+							<div class="span6 iCleft">
+								<div class="map-wrapper">
+									<h3>Map</h3>
+									<label id="geo_label" for="reverseGeocode"><?php echo JText::_('COM_ICAGENDA_GOOGLE_MAPS_REVERSE'); ?></label>
+									<select id="reverseGeocode">
+										<option value="false" selected><?php echo JText::_('JNO'); ?></option>
+										<option value="true"><?php echo JText::_('JYES'); ?></option>
+									</select><br/>
+
+									<div id="map"></div>
+									<div id="legend"><?php echo JText::_('COM_ICAGENDA_GOOGLE_MAPS_LEGEND'); ?></div>
+								</div>
+							</div>
+
+							<!--div class='input-positioned'>
+								<label>Callback: </label>
+								<textarea id='callback_result' rows="15"></textarea>
+							</div-->
+							<?php endif; ?>
+						</div>
+					</div>
+
+				<?php
+				if (version_compare(JVERSION, '3.0', 'ge'))
+				{
+					echo JHtml::_($endPanel);
+				}
+				?>
+
+				<?php
+				echo JHtml::_($addPanel, $icPanRegistrations, $RegistrationsTag1, $RegistrationsTag2);
+				?>
+				<div class="icpanel iCleft">
+					<h1><?php echo JText::_('COM_ICAGENDA_REGISTRATIONS_LABEL'); ?></h1>
+					<hr>
+					<div class="row-fluid">
+					<?php foreach ($params as $name => $fieldSet) : ?>
+						<?php if ( ! in_array($name, array('frontend', 'options', 'publishing'))) : ?>
+							<?php if (isset($fieldSet->description) && trim($fieldSet->description)) : ?>
+								<p class="tip"><?php echo $this->escape(JText::_($fieldSet->description));?></p>
+							<?php endif; ?>
+							<div class="span6 iCleft">
+								<h3><?php echo $this->escape(JText::_($fieldSet->label)); ?></h3>
+								<?php foreach ($this->form->getFieldset($name) as $field) : ?>
+									<div class="control-group">
+										<div class="control-label">
+											<?php echo $field->label; ?>
+										</div>
+										<div class="controls">
+											<?php
+											$language = JFactory::getLanguage();
+											$language->load('com_icagenda', JPATH_SITE, 'en-GB', true);
+											$language->load('com_icagenda', JPATH_SITE, null, true);
+
+											if (($field->name == 'jform[params][statutReg]') && ($field->value == '2'))
+											{
+												echo '<select name="jform[params][statutReg]">';
+												echo '<option value="">' . JText::_('JGLOBAL_USE_GLOBAL') . '</option>';
+												echo '<option value="0" selected>' . JText::_('JOFF') . '</option>';
+												echo '<option value="1">' . JText::_('JON') . '</option>';
+												echo '</select>';
+											}
+											elseif ($field->name == 'jform[params][maxRlistGlobal]')
+											{
+												 if ($field->value == '1')
+												 {
+													echo '<select name="jform[params][maxRlistGlobal]">';
+													echo '<option value="" selected>' . JText::_('JGLOBAL_USE_GLOBAL') . '</option>';
+													echo '<option value="2">' . JText::_('COM_ICAGENDA_LBL_CUSTOM_VALUE') . '</option>';
+													echo '</select>';
+												}
+												 elseif ($field->value == '0')
+												 {
+													echo '<select name="jform[params][maxRlistGlobal]">';
+													echo '<option value="">' . JText::_('JGLOBAL_USE_GLOBAL') . '</option>';
+													echo '<option value="2" selected>' . JText::_('COM_ICAGENDA_LBL_CUSTOM_VALUE') . '</option>';
+													echo '</select>';
+												}
+												else
+												{
+													echo $field->input;
+												}
+											}
+											else
+											{
+												echo $field->input;
+											}
+											?>
+										</div>
+									</div>
+								<?php endforeach; ?>
+							</div>
+						<?php endif; ?>
+					<?php endforeach; ?>
+					</div>
+				</div>
+
+
+				<?php
+				if (version_compare(JVERSION, '3.0', 'ge'))
+				{
+					echo JHtml::_($endPanel);
+				}
+				?>
+
+				<?php
+				echo JHtml::_($addPanel, $icPanOptions, $OptionsTag1, $OptionsTag2);
+				?>
+				<div class="icpanel iCleft">
+					<h1><?php echo JText::_('JOPTIONS'); ?></h1>
+					<hr>
+					<div class="row-fluid">
+					<?php foreach ($params as $name => $fieldSet) : ?>
+						<?php if ($name == 'options') : ?>
+							<?php if (isset($fieldSet->description) && trim($fieldSet->description)) : ?>
+								<p class="tip"><?php echo $this->escape(JText::_($fieldSet->description));?></p>
+							<?php endif; ?>
+							<div class="span6 iCleft">
+								<h3><?php echo $this->escape(JText::_($fieldSet->label)); ?></h3>
+								<?php foreach ($this->form->getFieldset($name) as $field) : ?>
+									<div class="control-group">
+										<div class="control-label">
+											<?php echo $field->label; ?>
+										</div>
+										<div class="controls">
+											<?php
+											$language = JFactory::getLanguage();
+											$language->load('com_icagenda', JPATH_SITE, 'en-GB', true);
+											$language->load('com_icagenda', JPATH_SITE, null, true);
+											echo $field->input;
+											?>
+										</div>
+									</div>
+								<?php endforeach; ?>
+							</div>
+						<?php endif; ?>
+					<?php endforeach; ?>
+					</div>
+				</div>
+
+
+				<?php
+				if (version_compare(JVERSION, '3.0', 'ge'))
+				{
+					echo JHtml::_($endPanel);
+				}
+				?>
+
+				<?php
+				echo JHtml::_($addPanel, $icPanPublishing, $PublishingTag1, $PublishingTag2);
+				?>
+				<div class="icpanel iCleft">
+					<h1><?php echo JText::_('JGLOBAL_FIELDSET_PUBLISHING'); ?></h1>
+					<hr>
+					<div class="row-fluid">
+						<?php foreach ($params as $name => $fieldSet) : ?>
+							<?php if ($name == 'publishing') : ?>
+								<?php if (isset($fieldSet->description) && trim($fieldSet->description)) : ?>
+									<p class="tip"><?php echo $this->escape(JText::_($fieldSet->description));?></p>
+								<?php endif; ?>
+								<div class="iCleft">
+									<h3><?php echo $this->escape(JText::_($fieldSet->label)); ?></h3>
+									<?php foreach ($this->form->getFieldset($name) as $field) : ?>
+										<?php echo $field->renderField(); ?>
+									<?php endforeach; ?>
+								</div>
+							<?php endif; ?>
+						<?php endforeach; ?>
+					</div>
+					<div class="row-fluid">
+						<div class="span6 iCleft">
+							<div class="control-group">
+								<div class="control-label">
+									<?php echo $this->form->getLabel('alias'); ?>
+								</div>
+								<div class="controls">
+									<?php echo $this->form->getInput('alias'); ?>
+								</div>
+							</div>
+							<div class="control-group">
+								<div class="control-label">
+									<?php echo $this->form->getLabel('id'); ?>
+								</div>
+								<div class="controls">
+									<?php echo $this->form->getInput('id'); ?>
+								</div>
+							</div>
+							<div class="control-group">
+								<div class="control-label">
+									<?php echo $this->form->getLabel('created'); ?>
+								</div>
+								<div class="controls">
+									<?php echo $this->form->getInput('created'); ?>
+								</div>
+							</div>
+							<div class="control-group">
+								<div class="control-label">
+									<?php echo $this->form->getLabel('created_by'); ?>
+								</div>
+								<div class="controls">
+									<?php echo $this->form->getInput('created_by'); ?>
+								</div>
+							</div>
+							<div class="control-group">
+								<div class="control-label">
+									<?php echo $this->form->getLabel('created_by_alias'); ?>
+								</div>
+								<div class="controls">
+									<?php echo $this->form->getInput('created_by_alias'); ?>
+								</div>
+							</div>
+							<div class="control-group">
+								<div class="control-label">
+									<?php echo $this->form->getLabel('modified'); ?>
+								</div>
+								<div class="controls">
+									<?php echo $this->form->getInput('modified'); ?>
+								</div>
+							</div>
+							<div class="control-group">
+								<div class="control-label">
+									<?php echo $this->form->getLabel('modified_by'); ?>
+								</div>
+								<div class="controls">
+									<?php echo $this->form->getInput('modified_by'); ?>
+								</div>
+							</div>
+							<div class="control-group">
+								<div class="control-label">
+									<?php echo $this->form->getLabel('checked_out'); ?>
+								</div>
+								<div class="controls">
+									<?php echo $this->form->getInput('checked_out'); ?>
+								</div>
+							</div>
+							<div class="control-group">
+								<div class="control-label">
+									<?php echo $this->form->getLabel('checked_out_time'); ?>
+								</div>
+								<div class="controls">
+									<?php echo $this->form->getInput('checked_out_time'); ?>
+								</div>
+							</div>
+							<?php if (!empty($this->item->site_itemid)) : ?>
+							<h2><?php echo $this->escape(JText::_('COM_ICAGENDA_FORM_FRONTEND_OPTIONS'));?></h2>
+							<hr>
+							<div class="control-group">
+								<div class="control-label">
+									<?php echo $this->form->getLabel('site_itemid'); ?>
+								</div>
+								<div class="controls">
+									<?php echo $this->form->getInput('site_itemid'); ?>
+								</div>
+							</div>
+							<div class="control-group">
+								<div class="control-label">
+									<?php echo $this->form->getLabel('username'); ?>
+								</div>
+								<div class="controls">
+									<?php echo $this->form->getInput('username'); ?>
+								</div>
+							</div>
+							<?php endif; ?>
+							<!--
+							<?php foreach ($params as $name => $fieldSet) : ?>
+								<?php if ($name == 'publishing') : ?>
+									<?php foreach ($this->form->getFieldset($name) as $field) : ?>
+										<?php if (($field->name == 'jform[params][start_publishing]')
+													&& ($field->value != '') && ($field->value != '0')) : ?>
+											<?php if (isset($fieldSet->label) && trim($fieldSet->label)) : ?>
+												<h2><?php echo $this->escape(JText::_($fieldSet->label));?></h2>
+												<hr>
+											<?php endif; ?>
+											<div class="control-group">
+												<div class="control-label">
+													<?php echo $field->label; ?>
+												</div>
+												<div class="controls">
+													<?php echo $field->input; ?>
+												</div>
+											</div>
+										<?php endif; ?>
+									<?php endforeach; ?>
+								<?php endif; ?>
+							<?php endforeach; ?>
+							-->
+						</div>
+					</div>
+				</div>
+
+
+
+				<?php echo JHtml::_($endPanel); ?>
+
+				<?php echo JHtml::_($endPane, 'icTab'); ?>
+			</div>
+
+		<!-- Begin Sidebar -->
+			<div class="span2 iCleft">
+			<h4><?php echo JText::_('COM_ICAGENDA_TITLE_SIDEBAR_DETAILS'); ?></h4>
+			<hr>
+				<div class="control-group">
+					<div class="control-label">
+						<?php echo $this->form->getLabel('state'); ?>
+					</div>
+					<div class="controls">
+						<?php echo $this->form->getInput('state'); ?>
+					</div>
+				</div>
+				<div class="control-group">
+					<div class="control-label">
+						<?php echo $this->form->getLabel('approval'); ?>
+					</div>
+					<div class="controls">
+						<?php echo $this->form->getInput('approval'); ?>
+					</div>
+				</div>
+				<div class="control-group">
+					<div class="control-label">
+						<?php echo $this->form->getLabel('access'); ?>
+					</div>
+					<div class="controls">
+						<?php echo $this->form->getInput('access'); ?>
+					</div>
+				</div>
+				<div class="control-group">
+					<div class="control-label">
+						<?php echo $this->form->getLabel('language'); ?>
+					</div>
+					<div class="controls">
+						<?php echo $this->form->getInput('language'); ?>
+					</div>
+				</div>
+				<div class="control-group">
+					<div class="control-label">
+						<?php echo $this->form->getLabel('hits'); ?>
+					</div>
+					<div class="controls">
+						<?php echo $this->form->getInput('hits'); ?>
+					</div>
+				</div>
+
+
+			</div>
+		<!-- End Sidebar -->
+		</div>
+
+		<div class="clr"></div>
+		</div>
+		<?php
+		if ($messagealert)
+		{
+			$this->item->state=='0';
+		}
+		?>
+		<div>
+			<input type="hidden" name="task" value="" />
+			<?php echo JHtml::_('form.token'); ?>
+		</div>
+	</form>
+
+	<?php // Set AM/PM and first day of the week options for datetime picker ?>
+	<?php
+		$ampm     = ($iCparams->get('timeformat', 1) == 2) ? 'true' : '';
+		$firstDay = $iCparams->get('firstday_week_global', 1);
+	?>
+	<script type="text/javascript">
+		jQuery(function($){
+			$("#startdate").datetimepicker({
+				ampm: '<?php echo $ampm; ?>',	
+				dateFormat: 'yy-mm-dd',
+				firstDay: '<?php echo $firstDay; ?>',
+				hourGrid: 4,
+				minuteGrid: 10
+			});
+			$("#enddate").datetimepicker({
+				ampm: '<?php echo $ampm; ?>',	
+				dateFormat: 'yy-mm-dd',
+				firstDay: '<?php echo $firstDay; ?>',
+				hourGrid: 4,
+				minuteGrid: 10
+			});
+			$(".ic-date-input").datetimepicker({
+				ampm: '<?php echo $ampm; ?>',	
+				dateFormat: 'yy-mm-dd',
+				firstDay: '<?php echo $firstDay; ?>',
+				hourGrid: 4,
+				minuteGrid: 10
+			});
+			$('#add').live('click', function(e){
+				$(".ic-date-input").datetimepicker({
+					ampm: '<?php echo $ampm; ?>',	
+					dateFormat: 'yy-mm-dd',
+					firstDay: '<?php echo $firstDay; ?>',
+					hourGrid: 4,
+					minuteGrid: 10
+				});
+			});
+		});
+	</script>
+
+	<?php // Maps service ?>
+	<?php if ($maps_service == '3') : ?>
+	<script type="text/javascript">
+		//<![CDATA[
+		var iCmapDisplay = '<?php echo $iCmapDisplay; ?>';
+
+		jQuery(function($) {
+			// Tabs
+			if (iCmapDisplay=='1') {
+				$iCgvar='a[href="#googlemap"]';
+				$iCmapShow='shown';
+			}
+			if (iCmapDisplay=='3') {
+				$iCgvar='.googlemap';
+				$iCmapShow='click';
+			}
+			// Slides
+			if (iCmapDisplay=='2') {
+				$iCgvar='#googlemap';
+				$iCmapShow='shown';
+			}
+
+			$(''+$iCgvar+'').on(''+$iCmapShow+'', function() {   // When tab is displayed...
+//			$('.googlemap').on('click', function (e) {
+
+				var addresspicker = $( "#addresspicker" ).addresspicker();
+				var addresspickerMap = $( '#jform_address' ).addresspicker({
+					regionBias: "fr",
+					updateCallback: showCallback,
+					mapOptions: {
+						zoom: <?php echo $zoom; ?>,
+						center: new google.maps.LatLng(<?php echo $coords; ?>),
+						scrollwheel: false,
+						mapTypeId: google.maps.MapTypeId.<?php echo $mapTypeId; ?>,
+						streetViewControl: false
+					},
+					elements: {
+						map: "#map",
+						lat: "#lat",
+						lng: "#lng",
+						street_number: '#street_number',
+						route: '#route',
+						locality: '#locality',
+						administrative_area_level_2: '#administrative_area_level_2',
+						administrative_area_level_1: '#administrative_area_level_1',
+						country: '#country',
+						postal_code: '#postal_code',
+						type: '#type',
+					}
+				});
+
+				var gmarker = addresspickerMap.addresspicker( "marker");
+				gmarker.setVisible(true);
+				addresspickerMap.addresspicker( "updatePosition");
+
+				$('#reverseGeocode').change(function(){
+					$("#jform_address").addresspicker("option", "reverseGeocode", ($(this).val() === 'true'));
+				});
+
+				function showCallback(geocodeResult, parsedGeocodeResult){
+					$('#callback_result').text(JSON.stringify(parsedGeocodeResult, null, 4));
+				}
+			});
+		});
+		//]]>
+	</script>
+	<?php endif; ?>
+
+	<?php
+	// Script validation for Event Edit form (2)
+	$iCheckForm = icagendaForm::submit(2);
+	$document->addScriptDeclaration($iCheckForm);
+
+	// CSS files which could be overridden into your site template. (eg. /templates/my_template/css/com_icagenda/icagenda-back.css)
+	JHtml::stylesheet( 'com_icagenda/icagenda.css', false, true );
+	JHtml::stylesheet( 'com_icagenda/jquery-ui-1.8.17.custom.css', false, true );
+
+	$ic_style = 'div.tip img.media-preview {display:none}';
+	$document->addStyleDeclaration($ic_style);
+
+	// Joomla 2.5
+	if (version_compare(JVERSION, '3.0', 'lt'))
+	{
+		JHtml::stylesheet('com_icagenda/template.j25.css', false, true);
+		JHtml::stylesheet('com_icagenda/icagenda-back.j25.css', false, true);
+
+		JHtml::_('behavior.framework');
+
+		// load jQuery, if not loaded before (NEW VERSION IN 1.2.6)
+		$scripts = array_keys($document->_scripts);
+		$scriptFound = false;
+		$scriptuiFound = false;
+		$mapsgooglescriptFound = false;
+		for ($i = 0; $i < count($scripts); $i++)
+		{
+			if (stripos($scripts[$i], 'jquery.min.js') !== false)
+			{
+				$scriptFound = true;
+			}
+			// load jQuery, if not loaded before as jquery - added in 1.2.7
+			if (stripos($scripts[$i], 'jquery.js') !== false)
+			{
+				$scriptFound = true;
+			}
+			if (stripos($scripts[$i], 'jquery-ui.min.js') !== false)
+			{
+				$scriptuiFound = true;
+			}
+			if (stripos($scripts[$i], 'maps.google') !== false)
+			{
+				$mapsgooglescriptFound = true;
+			}
+		}
+
+		// jQuery Library Loader
+		if (!$scriptFound)
+		{
+			// load jQuery, if not loaded before
+			if (!$app->get('jquery'))
+			{
+				$app->set('jquery', true);
+				// add jQuery
+				$document->addScript('https://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js');
+				$document->addScript( JURI::root( true ) . '/media/com_icagenda/js/jquery.noconflict.js' );
+			}
+		}
+
+		if (!$scriptuiFound)
+		{
+			$document->addScript('https://ajax.googleapis.com/ajax/libs/jqueryui/1.9.2/jquery-ui.min.js');
+		}
+
+		$document->addScript( JURI::root( true ) . '/media/com_icagenda/js/template.js' );
+	}
+	else
+	{
+		JHtml::_('bootstrap.framework');
+		JHtml::_('jquery.framework');
+
+		// Change jQuery UI version from 1.9.2 to 1.8.23 to prevent a conflict in tooltip that appeared since Joomla 3.1.4
+//		$document->addScript('https://ajax.googleapis.com/ajax/libs/jqueryui/1.9.2/jquery-ui.min.js');
+		$document->addScript('https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.23/jquery-ui.min.js');
+//		JHtml::_('jquery.ui', array('core', 'sortable'));
+	}
+
+	if ($maps_service == '3')
+	{
+		// Google Maps Javascript API V3
+		icagendaGooglemaps::loadGMapScripts('edit');
+	}
+
+	/**
+	 * Script files which could be overridden into your site template.
+	 * (eg. /templates/my_template/js/com_icagenda/FILE_NAME.js)
+	 */
+	JHtml::script( 'com_icagenda/timepicker.js', false, true );
+	JHtml::script( 'com_icagenda/icdates.js', false, true );
+	JHtml::script( 'com_icagenda/icform.js', false, true );
+}
+else
+{
+	if (defined('IC_LIBRARY')) $app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'warning');
+	$app->redirect(htmlspecialchars_decode('index.php?option=com_icagenda&view=icagenda'));
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/event/tmpl/index.html b/deployed/icagenda/administrator/components/com_icagenda/views/event/tmpl/index.html
new file mode 100644
index 00000000..42682b47
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/event/tmpl/index.html
@@ -0,0 +1 @@
+<html><body></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/event/view.html.php b/deployed/icagenda/administrator/components/com_icagenda/views/event/view.html.php
new file mode 100644
index 00000000..fc8f6c1b
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/event/view.html.php
@@ -0,0 +1,159 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-30
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * View class Admin - Edit an Event - iCagenda
+ */
+class iCagendaViewEvent extends JViewLegacy
+{
+	protected $state;
+	protected $item;
+	protected $form;
+
+	/**
+	 * Display the view
+	 *
+	 * @since   1.0
+	 */
+	public function display($tpl = null)
+	{
+		// Initialiase variables.
+		$this->state = $this->get('State');
+		$this->item  = $this->get('Item');
+		$this->form  = $this->get('Form');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+
+			return false;
+		}
+
+		$icagenda_categories = class_exists('icagendaCategories') ? icagendaCategories::getList('1') : false;
+
+		if ($icagenda_categories)
+		{
+			$this->addToolbar();
+		}
+		else
+		{
+			$app = JFactory::getApplication();
+
+			$app->enqueueMessage(JText::_('COM_ICAGENDA_ALERT_NO_CATEGORY_PUBLISHED')
+								. '<br /><br /><a class="btn btn-success" href="index.php?option=com_icagenda&view=category&layout=edit" >'
+								. JText::_('COM_ICAGENDA_LEGEND_NEW_CATEGORY') . '</a>'
+								. ' <a class="btn btn-inverse btn-mini" href="index.php?option=com_icagenda&view=categories" >'
+								. JText::_('ICCATEGORIES')
+								. '</a>', 'warning');
+			$app->redirect(htmlspecialchars_decode('index.php?option=com_icagenda&view=events'));
+		}
+
+		parent::display($tpl);
+
+		icagendaForm::loadDateTimePickerJSLanguage();
+
+		JHtml::stylesheet( 'com_icagenda/icagenda.css', false, true );
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @since   1.0
+	 */
+	protected function addToolbar()
+	{
+		$app      = JFactory::getApplication();
+		$document = JFactory::getDocument();
+		$jinput   = $app->input;
+
+		$jinput->set('hidemainmenu', true);
+
+		$user       = JFactory::getUser();
+		$userId     = $user->get('id');
+		$isNew      = ($this->item->id == 0);
+		$checkedOut = ! ($this->item->checked_out == 0 || $this->item->checked_out == $userId);
+		$canDo      = iCagendaHelper::getActions();
+
+		// Set Title
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			JToolBarHelper::title($isNew    ? 'iCagenda - ' . JText::_('COM_ICAGENDA_LEGEND_NEW_EVENT')
+											: 'iCagenda - ' . JText::_('COM_ICAGENDA_LEGEND_EDIT_EVENT'),
+											'event');
+		}
+		else
+		{
+			JToolBarHelper::title($isNew    ? 'iCagenda <span style="font-size:14px;">- ' . JText::_('COM_ICAGENDA_LEGEND_NEW_EVENT') . '</span>'
+											: 'iCagenda <span style="font-size:14px;">- ' . JText::_('COM_ICAGENDA_LEGEND_EDIT_EVENT') . '</span>',
+											$isNew ? 'new' : 'pencil-2');
+		}
+
+		$icTitle = $isNew ? JText::_('COM_ICAGENDA_LEGEND_NEW_EVENT') : JText::_('COM_ICAGENDA_LEGEND_EDIT_EVENT');
+
+		$sitename = $app->getCfg('sitename');
+		$title    = $sitename . ' - ' . JText::_('JADMINISTRATION') . ' - iCagenda: ' . $icTitle;
+
+		$document->setTitle($title);
+
+		// Build the actions for new and existing records.
+		if ($isNew)
+		{
+			// For new records, check the create permission.
+			if ($canDo->get('core.create'))
+			{
+				JToolBarHelper::apply('event.apply', 'JTOOLBAR_APPLY');
+				JToolBarHelper::save('event.save', 'JTOOLBAR_SAVE');
+				JToolBarHelper::custom('event.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+			}
+
+			JToolBarHelper::cancel('event.cancel', 'JTOOLBAR_CANCEL');
+		}
+		else
+		{
+			// Can't save the record if it's checked out.
+			if ( ! $checkedOut)
+			{
+				// Since it's an existing record, check the edit permission, or fall back to edit own if the owner.
+				if ($canDo->get('core.edit') || ($canDo->get('core.edit.own') && $this->item->created_by == $userId))
+				{
+					// We can save the new record
+					JToolBarHelper::apply('event.apply', 'JTOOLBAR_APPLY');
+					JToolBarHelper::save('event.save', 'JTOOLBAR_SAVE');
+
+					// We can save this record, but check the create permission to see
+					// if we can return to make a new one.
+					if ($canDo->get('core.create'))
+					{
+						JToolBarHelper::custom('event.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+					}
+				}
+			}
+
+			// If checked out, we can still save
+			if ($canDo->get('core.create'))
+			{
+				JToolBarHelper::custom('event.save2copy', 'save-copy.png', 'save-copy_f2.png', 'JTOOLBAR_SAVE_AS_COPY', false);
+			}
+
+			JToolBarHelper::cancel('event.cancel', 'JTOOLBAR_CLOSE');
+		}
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/events/index.html b/deployed/icagenda/administrator/components/com_icagenda/views/events/index.html
new file mode 100644
index 00000000..42682b47
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/events/index.html
@@ -0,0 +1 @@
+<html><body></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/events/tmpl/default.php b/deployed/icagenda/administrator/components/com_icagenda/views/events/tmpl/default.php
new file mode 100644
index 00000000..aef8462e
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/events/tmpl/default.php
@@ -0,0 +1,724 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.12 2020-03-25
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.modal');
+JHtml::_('behavior.multiselect');
+
+$app       = JFactory::getApplication();
+$user      = JFactory::getUser();
+$userId    = $user->get('id');
+$listOrder = $this->state->get('list.ordering');
+$listDirn  = $this->state->get('list.direction');
+$canOrder  = $user->authorise('core.edit.state', 'com_icagenda');
+$saveOrder = $listOrder == 'e.ordering';
+
+// Switch Joomla 2.5 / 3.x
+if (version_compare(JVERSION, '3.0', 'lt'))
+{
+	JHtml::_('behavior.tooltip');
+}
+else
+{
+	// Include the component HTML helpers.
+	JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+	JHtml::_('bootstrap.tooltip');
+	JHtml::_('formbehavior.chosen', 'select');
+	JHtml::_('dropdown.init');
+
+	$archived = $this->state->get('filter.published') == 2 ? true : false;
+	$trashed  = $this->state->get('filter.published') == -2 ? true : false;
+
+	if ($saveOrder)
+	{
+		$saveOrderingUrl = 'index.php?option=com_icagenda&task=events.saveOrderAjax&tmpl=component';
+		JHtml::_('sortablelist.sortable', 'eventsList', 'adminForm', strtolower($listDirn), $saveOrderingUrl);
+	}
+}
+
+// Check if GD is enabled
+if (extension_loaded('gd') && function_exists('gd_info'))
+{
+	$thumb_generator = $this->params->get('thumb_generator', 1);
+//	echo "It looks like GD is installed";
+}
+else
+{
+	$thumb_generator = 0;
+
+//	throw new Exception(JText::_('COM_ICAGENDA_PHP_ERROR_GD'), 101);
+	$app->enqueueMessage(JText::_('COM_ICAGENDA_PHP_ERROR_GD'), 'warning');
+}
+
+// Check if fopen is allowed
+$fopen  = true;
+$result = ini_get('allow_url_fopen');
+
+if (empty($result))
+{
+	$fopen = false;
+
+//	throw new Exception(JText::_('COM_ICAGENDA_PHP_ERROR_FOPEN'), 101);
+	$app->enqueueMessage(JText::_('COM_ICAGENDA_PHP_ERROR_FOPEN'), 'warning');
+}
+
+// 3.3.3
+$sortFields = array();
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_icagenda&view=events'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty($this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif;?>
+
+	<!-- Filters Joomla 2.5 (DEPRECATED iCagenda 3.7.x and after) -->
+	<?php if (version_compare(JVERSION, '3.0', 'lt')) : ?>
+
+		<fieldset id="filter-bar">
+			<div class="filter-search fltlft">
+				<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></label>
+				<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('Search'); ?>" />
+				<button type="submit"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+				<button type="button" onclick="document.id('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
+			</div>
+			<div class="filter-select fltrt">
+				<select name="filter_published" class="inputbox" onchange="this.form.submit()">
+					<option value=""><?php echo JText::_('COM_ICAGENDA_SELECT_STATE');?></option>
+					<?php echo JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), "value", "text", $this->state->get('filter.state'), true);?>
+				</select>
+
+				<select name="filter_category" class="inputbox" onchange="this.form.submit()">
+					<option value=""><?php echo JText::_('COM_ICAGENDA_SELECT_CATEGORY');?></option>
+					<?php echo JHtml::_('select.options', $this->categories, 'value', 'text', $this->state->get('filter.category'));?>
+				</select>
+
+				<select name="filter_upcoming" class="inputbox" onchange="this.form.submit()">
+					<option value=""><?php echo JText::_('COM_ICAGENDA_SELECT_DATES');?></option>
+					<?php echo JHtml::_('select.options', $this->upcoming, 'value', 'text', $this->state->get('filter.upcoming'));?>
+				</select>
+
+				<select name="filter_site_itemid" class="inputbox" onchange="this.form.submit()">
+					<option value=""><?php echo JText::_('COM_ICAGENDA_SELECT_SITE_ITEMID');?></option>
+					<?php echo JHtml::_('select.options', $this->itemids, 'value', 'text', $this->state->get('filter.site_itemid'));?>
+				</select>
+			</div>
+		</fieldset>
+		<div class="clr"> </div>
+
+	<!-- Search Tools Joomla 3 -->
+	<?php else : ?>
+
+		<div id="filter-bar" class="btn-toolbar">
+			<div class="filter-search btn-group pull-left">
+				<label for="filter_search" class="element-invisible"><?php echo JText::_('COM_ICAGENDA_FILTER_SEARCH_EVENTS_DESC'); ?></label>
+				<input type="text" name="filter_search" placeholder="<?php echo JText::_('COM_ICAGENDA_FILTER_SEARCH_EVENTS_DESC'); ?>" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('COM_ICAGENDA_FILTER_SEARCH_EVENTS_DESC'); ?>" />
+			</div>
+			<div class="btn-group pull-left">
+				<button class="btn tip hasTooltip" type="submit" title="<?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?>"><i class="icon-search"></i></button>
+				<button class="btn tip hasTooltip" type="button" onclick="document.id('filter_search').value='';this.form.submit();" title="<?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?>"><i class="icon-remove"></i></button>
+			</div>
+			<div class="btn-group pull-right hidden-phone">
+				<label for="limit" class="element-invisible"><?php echo JText::_('JFIELD_PLG_SEARCH_SEARCHLIMIT_DESC'); ?></label>
+				<?php echo $this->pagination->getLimitBox(); ?>
+			</div>
+		</div>
+		<div class="clearfix"> </div>
+
+	<?php endif;?>
+
+	<?php if (empty($this->items)) : ?>
+		<div class="alert alert-no-items">
+			<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+		</div>
+	<?php else : ?>
+		<table class="table table-striped" id="eventsList">
+			<!-- START HEAD -->
+			<thead>
+				<tr>
+
+				<?php if(version_compare(JVERSION, '3.0', 'ge')) : ?>
+					<!-- Ordering HEADER Joomla 3.x -->
+					<th width="1%" class="nowrap center hidden-phone">
+						<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'e.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+					</th>
+				<?php endif; ?>
+
+					<!-- CheckBox HEADER -->
+					<th width="1%" class="hidden-phone">
+						<input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
+					</th>
+
+					<!-- Status HEADER -->
+					<th width="1%" style="min-width:55px" class="nowrap center">
+						<?php echo JHtml::_('grid.sort', 'JSTATUS', 'e.state', $listDirn, $listOrder); ?>
+					</th>
+
+					<!-- Approval HEADER -->
+					<th width="1%" style="min-width:55px" class="nowrap center">
+						<?php echo JHtml::_('grid.sort', 'COM_ICAGENDA_EVENTS_APPROVAL', 'e.approval', $listDirn, $listOrder); ?>
+					</th>
+
+					<!-- Image HEADER -->
+					<th width="130px" class="nowrap center hidden-phone">
+						<?php echo JHtml::_('grid.sort', 'COM_ICAGENDA_EVENTS_IMAGE', 'e.image', $listDirn, $listOrder); ?>
+					</th>
+
+					<!-- Title HEADER -->
+					<th>
+						<?php echo JHtml::_('grid.sort', 'COM_ICAGENDA_EVENTS_TITLE', 'e.title', $listDirn, $listOrder); ?> |
+						<?php echo JHtml::_('grid.sort', 'COM_ICAGENDA_TITLE_CATEGORY', 'category', $listDirn, $listOrder); ?>
+						<?php //echo JHtml::_('grid.sort', 'COM_ICAGENDA_FORM_FRONTEND_SUBMIT_ITEMID_LBL', 'e.site_itemid', $listDirn, $listOrder); ?>
+					</th>
+
+					<!-- Image HEADER -->
+					<th width="15%" class="nowrap hidden-phone">
+						<?php echo JHtml::_('grid.sort',  'COM_ICAGENDA_EVENTS_NEXT', 'e.next', $listDirn, $listOrder); ?>
+					</th>
+
+				<?php if(version_compare(JVERSION, '3.0', 'lt')) : ?>
+					<!-- Ordering HEADER Joomla 2.5 -->
+					<?php if (isset($this->items[0]->ordering)) { ?>
+					<th width="10%">
+						<?php echo JHtml::_('grid.sort',  'JGRID_HEADING_ORDERING', 'e.ordering', $listDirn, $listOrder); ?>
+						<?php if ($canOrder && $saveOrder) :?>
+							<?php echo JHtml::_('grid.order',  $this->items, 'filesave.png', 'events.saveorder'); ?>
+						<?php endif; ?>
+					</th>
+					<?php } ?>
+				<?php endif; ?>
+
+					<!-- Access HEADER -->
+					<th width="10%" class="nowrap hidden-phone">
+						<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ACCESS', 'access', $listDirn, $listOrder); ?>
+					</th>
+
+					<!-- Author HEADER -->
+					<th width="10%" class="nowrap hidden-phone">
+						<?php echo JHtml::_('grid.sort',  'JAUTHOR', 'author_name', $listDirn, $listOrder); ?>
+					</th>
+
+					<!-- Language HEADER -->
+					<th width="5%" class="nowrap hidden-phone">
+						<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_LANGUAGE', 'language', $listDirn, $listOrder); ?>
+					</th>
+
+					<!-- Hits HEADER -->
+					<th width="1%" class="nowrap hidden-phone">
+						<?php echo JHtml::_('grid.sort', 'JGLOBAL_HITS', 'e.hits', $listDirn, $listOrder); ?>
+					</th>
+
+					<!-- ID HEADER -->
+					<th width="1%" class="nowrap hidden-phone">
+						<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ID', 'e.id', $listDirn, $listOrder); ?>
+					</th>
+
+				</tr>
+			</thead>
+			<!-- END HEAD -->
+
+			<!-- START FOOT -->
+			<tfoot>
+				<tr>
+					<td colspan="12">
+						<?php echo $this->pagination->getListFooter(); ?>
+					</td>
+				</tr>
+			</tfoot>
+			<!-- END FOOT -->
+
+			<!-- START BODY -->
+			<tbody valign="top">
+			<?php foreach ($this->items as $i => $item) : ?>
+				<?php
+				$ordering	= ($listOrder == 'e.ordering');
+				$canCreate	= $user->authorise('core.create', 'com_icagenda');
+				$canEdit	= $user->authorise('core.edit', 'com_icagenda');
+				$canCheckin	= $user->authorise('core.manage', 'com_icagenda') || $item->checked_out == $userId || $item->checked_out == 0;
+				$canChange	= $user->authorise('core.edit.state', 'com_icagenda') && $canCheckin;
+				$canEditOwn	= $user->authorise('core.edit.own', 'com_icagenda') && $item->created_by == $userId;
+//				$canEditOwn = $user->authorise('core.edit.own', 'com_icagenda.events.'.$item->id) && $item->created_by == $userId;
+
+				// Get Access Names
+				$db = JFactory::getDBO();
+				$db->setQuery(
+					'SELECT `title`' .
+					' FROM `#__viewlevels`' .
+					' WHERE `id` = '. (int) $item->access
+				);
+				$access_title = $db->loadObject()->title;
+
+				// Get Today and Next Date (Y-m-d)
+				$eventTimeZone	= null;
+				$today			= JHtml::date('now', 'Y-m-d');
+				$nextdate		= JHtml::date($item->next, 'Y-m-d', $eventTimeZone);
+				$isDate			= iCDate::isDate($item->next);
+				?>
+				<tr class="row<?php echo $i % 2; ?>" sortable-group-id="<?php echo $item->catid?>">
+
+					<!-- Ordering Joomla 3.x -->
+				<?php if(version_compare(JVERSION, '3.0', 'ge')) : ?>
+					<td class="order nowrap center hidden-phone">
+					<?php if ($canChange) :
+						$disableClassName = '';
+						$disabledLabel	  = '';
+
+						if ( ! $saveOrder) :
+							$disabledLabel    = JText::_('JORDERINGDISABLED');
+							$disableClassName = 'inactive tip-top';
+						endif; ?>
+						<span class="sortable-handler hasTooltip <?php echo $disableClassName; ?>" title="<?php echo $disabledLabel; ?>">
+							<i class="icon-menu"></i>
+						</span>
+						<input type="text" style="display:none" name="order[]" size="5" value="<?php echo $item->ordering; ?>" class="width-20 text-area-order " />
+					<?php else : ?>
+						<span class="sortable-handler inactive" >
+							<i class="icon-menu"></i>
+						</span>
+					<?php endif; ?>
+					</td>
+				<?php endif; ?>
+
+					<!-- CheckBox Joomla -->
+					<td class="center hidden-phone">
+						<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+					</td>
+
+					<!-- Status Joomla -->
+				<?php if (isset($this->items[0]->state)) : ?>
+					<td class="center">
+						<?php
+						$eventIsCancelled = icagendaEvent::cancelledButton($item->id);
+
+						if ($eventIsCancelled)
+						{
+							echo $eventIsCancelled;
+						}
+
+						// Control of dates if valid
+						elseif ( ! $isDate)
+						{
+							echo '<br/><i class="icon-warning"></i><br/>';
+							echo '<span style="color:red;"><strong>' . JText::_('COM_ICAGENDA_NO_VALID_DATE') . '</strong></span>';
+							if ($item->state == '1')
+							{
+								//$state = 0;
+								$db		= Jfactory::getDbo();
+								$query	= $db->getQuery(true);
+								$query->clear();
+								$query->update(' #__icagenda_events ');
+								$query->set(' state = 0 ' );
+								$query->where(' id = ' . (int) $item->id );
+								$db->setQuery((string)$query);
+								$db->query($query);
+ 							}
+						}
+						else
+						{
+							echo JHtml::_('jgrid.published', $item->state, $i, 'events.', $canChange, 'cb');
+						}
+						?>
+					</td>
+					<td class="center">
+						<?php
+						require_once JPATH_COMPONENT .'/helpers/html/events.php';
+						$approved = empty( $item->approval ) ? 0 : 1;
+						echo JHtml::_('jgrid.state', JHtmlEvents::approveEvents(), $approved, $i, 'events.', (boolean) $approved);
+						?>
+						<?php
+						//require_once JPATH_COMPONENT .'/helpers/approved.php';
+						//echo JHtml::_('approved.approved', $item->approval, $i, 'events.'); ?>
+						<?php //echo JHtml::_('approved.approved', $item->approval, $i); ?>
+						<?php //echo icHtmlHelper::approveEvent($item->approval, $i, 'events', $canChange, 'cb'); ?>
+					</td>
+				<?php endif; ?>
+
+					<!-- Image Joomla -->
+					<td class="small hidden-phone">
+						<div style="background:#F4F4F4; padding:5px; width:120px; text-align:center; overflow:hidden;">
+							<?php
+							// Set if run iCthumb
+							if (($item->image) && ($thumb_generator == 1))
+							{
+								// Get media path
+								$params_media = JComponentHelper::getParams('com_media');
+								$image_path = $params_media->get('image_path', 'images');
+
+								// Paths to thumbs folder
+								$thumbsPath 			= $image_path.'/icagenda/thumbs';
+
+								// Large Size Options
+								$l_thumbOptions		= $this->params->get('thumb_large');
+								$l_width			= is_numeric($l_thumbOptions[0]) ? $l_thumbOptions[0] : '900';
+								$l_height			= is_numeric($l_thumbOptions[1]) ? $l_thumbOptions[1] : '600';
+								$l_quality			= is_numeric($l_thumbOptions[2]) ? $l_thumbOptions[2] : '100';
+								$l_crop				= ! empty($l_thumbOptions[3]) ? true : false;
+
+								// Medium Size Options
+								$m_thumbOptions		= $this->params->get('thumb_medium');
+								$m_width			= is_numeric($m_thumbOptions[0]) ? $l_thumbOptions[0] : '300';
+								$m_height			= is_numeric($m_thumbOptions[1]) ? $l_thumbOptions[1] : '300';
+								$m_quality			= is_numeric($m_thumbOptions[2]) ? $l_thumbOptions[2] : '100';
+								$m_crop				= ! empty($m_thumbOptions[3]) ? true : false;
+
+								// Small Size Options
+								$s_thumbOptions		= $this->params->get('thumb_small');
+								$s_width			= is_numeric($s_thumbOptions[0]) ? $s_thumbOptions[0] : '100';
+								$s_height			= is_numeric($s_thumbOptions[1]) ? $s_thumbOptions[1] : '100';
+								$s_quality			= is_numeric($s_thumbOptions[2]) ? $s_thumbOptions[2] : '100';
+								$s_crop				= ! empty($s_thumbOptions[3]) ? true : false;
+
+								// XSmall Size Options
+								$xs_thumbOptions	= $this->params->get('thumb_xsmall');
+								$xs_width			= is_numeric($xs_thumbOptions[0]) ? $xs_thumbOptions[0] : '48';
+								$xs_height			= is_numeric($xs_thumbOptions[1]) ? $xs_thumbOptions[1] : '48';
+								$xs_quality			= is_numeric($xs_thumbOptions[2]) ? $xs_thumbOptions[2] : '80';
+								$xs_crop			= ! empty($xs_thumbOptions[3]) ? true : false;
+
+								// Generate large thumb if not exist
+								iCThumbGet::thumbnail($item->image, $thumbsPath, 'themes',
+									$l_width, $l_height, $l_quality, $l_crop, 'ic_large', null, true);
+
+								// Generate medium thumb if not exist
+								iCThumbGet::thumbnail($item->image, $thumbsPath, 'themes',
+									$m_width, $m_height, $m_quality, $m_crop, 'ic_medium');
+
+								// Generate small thumb if not exist
+								iCThumbGet::thumbnail($item->image, $thumbsPath, 'themes',
+									$s_width, $s_height, $s_quality, $s_crop, 'ic_small');
+
+								// Generate x-small thumb if not exist
+								iCThumbGet::thumbnail($item->image, $thumbsPath, 'themes',
+									$xs_width, $xs_height, $xs_quality, $xs_crop, 'ic_xsmall');
+
+								// Sub-folder Destination ($thumbsPath / 'subfolder' /)
+								$subFolder = 'system';
+
+								// Display thumbnail in admin events list
+								echo iCThumbGet::thumbnailImgTagLinkModal($item->image, $thumbsPath, $subFolder, '120', '100', '100', false);
+							}
+							elseif ($item->image
+								&& $thumb_generator == 0)
+							{
+								if (filter_var($item->image, FILTER_VALIDATE_URL))
+								{
+									echo '<a href="' . $item->image . '" class="modal">';
+									echo '<img src="' . $item->image . '" alt="" /></a>';
+								}
+								else
+								{
+									echo '<a href="../' . $item->image . '" class="modal">';
+									echo '<img src="../' . $item->image . '" alt="" /></a>';
+								}
+							}
+							else
+							{
+								echo '<img style="max-width:120px; max-height:100px;" src="../media/com_icagenda/images/nophoto.jpg" alt="" />';
+							}
+							// END iCthumb
+							?>
+						</div>
+					</td>
+
+					<!-- Title & Category -->
+					<td class="has-context">
+						<div class="pull-left">
+							<?php if ($item->checked_out) : ?>
+								<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'events.', $canCheckin); ?>
+							<?php endif; ?>
+							<?php if ($item->language == '*'):?>
+								<?php $language = JText::alt('JALL', 'language'); ?>
+							<?php else:?>
+								<?php $language = $item->language ? $this->escape($item->language) : JText::_('JUNDEFINED'); ?>
+							<?php endif;?>
+							<?php if ($canEdit || $canEditOwn) : ?>
+								<a href="<?php echo JRoute::_('index.php?option=com_icagenda&task=event.edit&id=' . $item->id); ?>" title="<?php echo JText::_('JACTION_EDIT'); ?>">
+									<?php echo $this->escape($item->title); ?></a>
+							<?php else : ?>
+								<span title="<?php echo JText::sprintf('JFIELD_ALIAS_LABEL', $this->escape($item->alias)); ?>"><?php echo $this->escape($item->title); ?></span>
+							<?php endif; ?>
+							<div class="small">
+								<?php echo JText::_('JCATEGORY') . ": " . $this->escape($item->category); ?>
+							</div>
+							<?php if (($item->place) OR ($item->city) OR ($item->country)) : ?>
+							<p>
+								<?php if ($item->place) : ?>
+								<div class="small iC-italic-grey">
+									<?php echo JText::_('COM_ICAGENDA_TITLE_LOCATION') . ": " . $this->escape($item->place); ?>
+								</div>
+								<?php endif; ?>
+								<?php if ($item->city) : ?>
+								<div class="small iC-italic-grey">
+									<?php echo JText::_('COM_ICAGENDA_FORM_LBL_EVENT_CITY') . ": " . $this->escape($item->city); ?>
+								</div>
+								<?php endif; ?>
+								<?php if ($item->country) : ?>
+								<div class="small iC-italic-grey">
+									<?php echo JText::_('COM_ICAGENDA_FORM_LBL_EVENT_COUNTRY') . ": " . $this->escape($item->country); ?>
+								</div>
+							</p>
+							<?php endif; ?>
+							<?php endif; ?>
+							<?php if (!empty($item->site_itemid)) : ?>
+							<a class="hasTooltip" href="<?php echo JURI::root() . 'index.php?option=com_icagenda&view=submit&Itemid=' . $item->site_itemid; ?>" title="<?php echo JText::_('COM_ICAGENDA_FORM_FRONTEND_SUBMIT_ITEMID_DESC'); ?>" target="_blank">
+								<div class="btn btn-primary btn-mini">
+									<?php echo JText::_('COM_ICAGENDA_FORM_FRONTEND_SUBMIT_ITEMID_LBL') . ": " . $this->escape($item->site_itemid); ?>
+								</div>
+							</a>
+							<?php endif; ?>
+						</div>
+
+					<?php if(version_compare(JVERSION, '3.0', 'ge')) : ?>
+
+						<!-- DropDown Edit Joomla 3 -->
+						<div class="pull-left">
+							<?php
+							if ($canChange || $canEditOwn)
+							{
+								// Create dropdown items
+								JHtml::_('dropdown.edit', $item->id, 'event.');
+								JHtml::_('dropdown.divider');
+
+								if ($item->state) :
+									JHtml::_('dropdown.unpublish', 'cb' . $i, 'events.');
+								else :
+									JHtml::_('dropdown.publish', 'cb' . $i, 'events.');
+								endif;
+
+//								if ($item->featured) :
+//									JHtml::_('dropdown.unfeatured', 'cb' . $i, 'events.');
+//								else :
+//									JHtml::_('dropdown.featured', 'cb' . $i, 'events.');
+//								endif;
+
+								JHtml::_('dropdown.divider');
+
+								if ($archived) :
+									JHtml::_('dropdown.unarchive', 'cb' . $i, 'events.');
+								else :
+									JHtml::_('dropdown.archive', 'cb' . $i, 'events.');
+								endif;
+
+								if ($item->checked_out) :
+									JHtml::_('dropdown.checkin', 'cb' . $i, 'events.');
+								endif;
+
+								if ($trashed) :
+									JHtml::_('dropdown.untrash', 'cb' . $i, 'events.');
+								else :
+									JHtml::_('dropdown.trash', 'cb' . $i, 'events.');
+								endif;
+
+								// Render dropdown list
+								echo JHtml::_('dropdown.render');
+							}
+							?>
+						</div>
+
+					<?php endif; ?>
+
+					</td>
+
+					<!-- Dates -->
+					<td class="small hidden-phone">
+						<?php
+						$date_format_global	= $this->params->get('date_format_global', 'Y - m - d');
+						$separator			= $this->params->get('date_separator', ' ');
+						$eventDate			= iCGlobalize::dateFormat($item->next, $date_format_global, $separator);
+						$eventTime			= $item->displaytime ? ' - ' . JHtml::date($item->next, 'H:i', null) : '';
+						$eventDate			= $eventDate ? $eventDate : date('Y-m-d', strtotime($item->next));
+						$dateshow			= $eventDate . $eventTime;
+
+						// Upcoming Next Date
+						if (iCDate::isDate($item->next))
+						{
+							if ($nextdate > $today)
+							{
+								echo '<div class="ic-nextdate ic-upcoming">';
+								echo JText::_('COM_ICAGENDA_EVENTS_NEXT_FUTUR') . '<br />';
+								echo '<center>' . $dateshow . '</center>';
+								echo '</div>';
+							}
+							// Next Date is today
+							elseif ($nextdate == $today)
+							{
+								echo '<div class="ic-nextdate ic-today">';
+								echo JText::_('COM_ICAGENDA_EVENTS_NEXT_TODAY') . '<br />';
+								echo '<center>' . $dateshow . '</center>';
+								echo '</div>';
+							}
+							elseif ($nextdate < $today)
+							{
+								echo '<div class="ic-nextdate ic-past">';
+								echo JText::_('COM_ICAGENDA_EVENTS_NEXT_PAST') . '<br />';
+								echo '<center>' . $dateshow . '</center>';
+								echo '</div>';
+							}
+						}
+						else
+						{
+							echo '<div class="ic-nextdate ic-no-date">';
+							echo JText::_('COM_ICAGENDA_EVENTS_NEXT_ALERT');
+							echo '</div>';
+						}
+						?>
+					</td>
+
+
+				<?php if(version_compare(JVERSION, '3.0', 'lt')) : ?>
+
+					<!-- Ordering Joomla 2.5 -->
+				<?php if (isset($this->items[0]->ordering)) : ?>
+					<td class="order">
+						<?php if ($canChange) : ?>
+							<?php if ($saveOrder) :?>
+								<?php if ($listDirn == 'asc') : ?>
+									<span><?php echo $this->pagination->orderUpIcon($i, true, 'events.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+									<span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, true, 'events.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+								<?php elseif ($listDirn == 'desc') : ?>
+									<span><?php echo $this->pagination->orderUpIcon($i, true, 'events.orderdown', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+									<span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, true, 'events.orderup', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+								<?php endif; ?>
+							<?php endif; ?>
+							<?php $disabled = $saveOrder ?  '' : 'disabled="disabled"'; ?>
+							<input type="text" name="order[]" size="5" value="<?php echo $item->ordering;?>" <?php echo $disabled ?> class="text-area-order" />
+						<?php else : ?>
+							<?php echo $item->ordering; ?>
+						<?php endif; ?>
+					</td>
+				<?php endif; ?>
+
+				<?php endif; ?>
+
+					<!-- Access -->
+					<td class="small hidden-phone">
+						<?php echo $this->escape($access_title); ?>
+					</td>
+
+					<!-- Username -->
+					<td class="small hidden-phone">
+						<?php
+						if ($item->username == '' && ! $item->created_by)
+						{
+							$undefined = '<i>' . JText::_('JUNDEFINED') . '</i>';
+							echo $undefined;
+						}
+						elseif ( ! $item->created_by || ! $item->author_name)
+						{
+							echo $this->escape($item->username);
+						}
+						else
+						{
+							echo $this->escape($item->author_name);
+							echo ' [' . $this->escape($item->author_username) . ']';
+						}
+						?>
+						<?php //echo JText::_('JGLOBAL_USERNAME').': '.$this->escape($username); ?>
+						<?php if ($item->created_by_alias) : ?>
+						<p class="smallsub">
+							<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->created_by_alias)); ?>
+						</p>
+						<?php endif; ?>
+					</td>
+
+					<!-- Language -->
+					<td class="small hidden-phone">
+						<?php if ($item->language == '*'):?>
+							<?php echo JText::alt('JALL', 'language'); ?>
+						<?php else:?>
+							<?php echo $item->language ? $this->escape($item->language) : JText::_('JUNDEFINED'); ?>
+						<?php endif; ?>
+					</td>
+
+					<!-- Hits -->
+					<td class="hidden-phone">
+						<?php echo (int) $item->hits; ?>
+					</td>
+
+					<!-- ID -->
+					<?php if (isset($this->items[0]->id)) : ?>
+					<td class="center hidden-phone">
+						<?php echo (int) $item->id; ?>
+					</td>
+					<?php endif; ?>
+
+				</tr>
+			<?php endforeach;
+
+			// Old Joomla versions asset_id issue. (all Joomla 2.5.x versions, and Joomla 3 NOT updated!)
+			$asset_issue = version_compare(JVERSION, '3.0', 'lt') ? true : false;
+
+			if ($asset_issue)
+			{
+				$ia = '0';
+				unset($msg);
+				unset($type);
+				$msg = $type = $front_submit = '';
+				$edittx = '<b>' . JText::_( 'JACTION_EDIT' ) . '</b>';
+				$savetx = '<b>' . JText::_( 'JSAVE' ) . '</b>';
+
+				foreach ($this->items as $i => $item)
+				{
+					if (($item->asset_id == '0') && ($item->state == '-2'))
+					{
+						$ia = $ia+1;
+						$front_submit = '1';
+					}
+				}
+
+				if ($front_submit == 1 && $ia == 1)
+				{
+					$app->enqueueMessage(JText::sprintf( 'COM_ICAGENDA_TRASH_FRONTEND_SUBMITTED_1', $edittx, $savetx ), 'notice');
+				}
+				elseif ($front_submit == 1 && $ia > 1)
+				{
+					$app->enqueueMessage(JText::sprintf( 'COM_ICAGENDA_TRASH_FRONTEND_SUBMITTED', $edittx, $savetx ), 'notice');
+				}
+
+				foreach ($this->items as $i => $item)
+				{
+					if ($item->asset_id == '0' && $item->state == '-2')
+					{
+						$editLink = 'index.php?option=com_icagenda&task=event.edit&id=' . $item->id;
+						$msg      = '- ' . $item->title . ' [' . $item->id . '] : <a href="' . $editLink . '"><b>' . JText::_('JACTION_EDIT') . '</b></a>';
+						$type     = JText::_('JGLOBAL_LIST').' :';
+					}
+					if ( ! empty($msg))
+					{
+						$app->enqueueMessage($msg, $type);
+					}
+				}
+			}
+			?>
+			</tbody>
+			<!-- END BODY -->
+
+		</table>
+	<?php endif; ?>
+
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+		<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/events/tmpl/index.html b/deployed/icagenda/administrator/components/com_icagenda/views/events/tmpl/index.html
new file mode 100644
index 00000000..b3e16a26
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/events/tmpl/index.html
@@ -0,0 +1,5 @@
+<html><body>
+
+<img src="thumb.php?src=nophoto.jpg&x=50&y=50&f=0">
+
+</body></html>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/events/view.html.php b/deployed/icagenda/administrator/components/com_icagenda/views/events/view.html.php
new file mode 100644
index 00000000..4b7824fe
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/events/view.html.php
@@ -0,0 +1,271 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-30
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * View class Admin - List of Events - iCagenda.
+ */
+class iCagendaViewEvents extends JViewLegacy
+{
+	protected $params;
+	protected $state;
+	protected $items;
+	protected $pagination;
+	protected $categories;
+	protected $upcoming;
+
+	/**
+	 * Display the view
+	 */
+	public function display($tpl = null)
+	{
+		$app = JFactory::getApplication();
+
+		// Joomla 2.5
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			jimport('joomla.environment.request');
+
+			JHtml::stylesheet('com_icagenda/icagenda-back.j25.css', false, true);
+		}
+
+		$this->params     = JComponentHelper::getParams('com_icagenda');
+		$this->state      = $this->get('State');
+		$this->items      = $this->get('Items');
+		$this->pagination = $this->get('Pagination');
+
+		$this->categories = $this->get('Categories');
+		$this->upcoming   = $this->get('Upcoming');
+		$this->itemids    = $this->get('MenuItemID');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+
+			return false;
+		}
+
+		$icagenda_categories = class_exists('icagendaCategories') ? icagendaCategories::getList('1') : false;
+
+		if ( ! $icagenda_categories)
+		{
+			$app->enqueueMessage( JText::_('COM_ICAGENDA_ALERT_NO_CATEGORY_PUBLISHED')
+								. '<br /><br /><a class="btn btn-success" href="index.php?option=com_icagenda&view=category&layout=edit" >'
+								. JText::_('COM_ICAGENDA_LEGEND_NEW_CATEGORY') . '</a>'
+								. ' <a class="btn btn-inverse btn-mini" href="index.php?option=com_icagenda&view=categories" >'
+								. JText::_('ICCATEGORIES')
+								. '</a>', 'warning' );
+		}
+
+		// We don't need toolbar in the modal window.
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->addToolbar();
+
+			if (version_compare(JVERSION, '3.0', 'ge'))
+			{
+				$this->sidebar = JHtmlSidebar::render();
+			}
+		}
+
+		$canDo = iCagendaHelper::getActions();
+
+		if (defined('IC_LIBRARY')
+			&& $canDo->get('icagenda.access.events'))
+		{
+			parent::display($tpl);
+		}
+		else
+		{
+			if (defined('IC_LIBRARY')) $app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'warning');
+			$app->redirect(htmlspecialchars_decode('index.php?option=com_icagenda&view=icagenda'));
+		}
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @since	1.6
+	 */
+	protected function addToolbar()
+	{
+		require_once JPATH_COMPONENT . '/helpers/icagenda.php';
+
+		$app      = JFactory::getApplication();
+		$document = JFactory::getDocument();
+
+		$state  = $this->get('State');
+		$user   = JFactory::getUser();
+		$userId = $user->get('id');
+		$canDo  = iCagendaHelper::getActions();
+
+		$icagenda_categories = class_exists('icagendaCategories') ? icagendaCategories::getList() : false;
+
+		// Set Title
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			JToolBarHelper::title('iCagenda - ' . JText::_('COM_ICAGENDA_TITLE_EVENTS'), 'events.png');
+		}
+		else
+		{
+			JToolBarHelper::title('iCagenda <span style="font-size:14px;">- ' . JText::_('COM_ICAGENDA_TITLE_EVENTS') . '</span>', 'calendar');
+		}
+
+		$icTitle = JText::_('COM_ICAGENDA_TITLE_EVENTS');
+
+		$sitename = $app->getCfg('sitename');
+		$title    = $app->getCfg('sitename') . ' - ' . JText::_('JADMINISTRATION') . ' - iCagenda: ' . $icTitle;
+
+		$document->setTitle($title);
+
+		//Check if the form exists before showing the add/edit buttons
+		$formPath = JPATH_COMPONENT_ADMINISTRATOR . '/views/event';
+
+		if (file_exists($formPath)
+			&& $icagenda_categories
+			)
+		{
+			if ($canDo->get('core.create'))
+			{
+				JToolBarHelper::addNew('event.add','JTOOLBAR_NEW');
+			}
+
+			if ($canDo->get('core.edit') || $canDo->get('core.edit.own'))
+			{
+				JToolBarHelper::editList('event.edit');
+			}
+
+		}
+
+		if ($canDo->get('core.edit.state')
+			&& $icagenda_categories
+			)
+		{
+			if (isset($this->items[0]->state))
+			{
+				JToolBarHelper::divider();
+				JToolBarHelper::custom('events.publish', 'publish.png', 'publish_f2.png','JTOOLBAR_PUBLISH', true);
+				JToolBarHelper::custom('events.unpublish', 'unpublish.png', 'unpublish_f2.png', 'JTOOLBAR_UNPUBLISH', true);
+			}
+			else
+			{
+				// If this component does not use state then show a direct delete button as we can not trash
+				JToolBarHelper::deleteList('', 'events.delete','JTOOLBAR_DELETE');
+			}
+
+			if (isset($this->items[0]->state))
+			{
+				JToolBarHelper::divider();
+				JToolBarHelper::archiveList('events.archive','JTOOLBAR_ARCHIVE');
+			}
+
+			if (isset($this->items[0]->checked_out))
+			{
+				JToolBarHelper::custom('events.checkin', 'checkin.png', 'checkin_f2.png', 'JTOOLBAR_CHECKIN', true);
+			}
+		}
+
+		// Show trash and delete for components that uses the state field
+		if (isset($this->items[0]->state)
+			&& $icagenda_categories
+			)
+		{
+			if ($state->get('filter.state') == -2 && $canDo->get('core.delete'))
+			{
+				JToolBarHelper::deleteList('', 'events.delete','JTOOLBAR_EMPTY_TRASH');
+				JToolBarHelper::divider();
+			}
+			elseif ($canDo->get('core.edit.state'))
+			{
+				JToolBarHelper::trash('events.trash','JTOOLBAR_TRASH');
+				JToolBarHelper::divider();
+			}
+		}
+
+		if ($canDo->get('core.admin'))
+		{
+			JToolBarHelper::preferences('com_icagenda');
+		}
+
+		if (version_compare(JVERSION, '3.0', 'ge'))
+		{
+			JHtmlSidebar::setAction('index.php?option=com_icagenda&view=events');
+
+			JHtmlSidebar::addFilter(
+				JText::_('COM_ICAGENDA_SELECT_STATE'),
+				'filter_published',
+				JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.state'), true)
+			);
+			JHtmlSidebar::addFilter(
+				'- ' . JText::_('COM_ICAGENDA_EVENTS_APPROVAL') . ' -',
+				'filter_approval',
+				JHtml::_('select.options', $this->get('approvalOptions'), 'value', 'text', $this->state->get('filter.approval'), true)
+			);
+			JHtmlSidebar::addFilter(
+				JText::_('COM_ICAGENDA_SELECT_CATEGORY'),
+				'filter_category',
+				JHtml::_('select.options', $this->get('Categories'), 'value', 'text', $this->state->get('filter.category'), true)
+			);
+			JHtmlSidebar::addFilter(
+				JText::_('COM_ICAGENDA_SELECT_DATES'),
+				'filter_upcoming',
+				JHtml::_('select.options', $this->get('Upcoming'), 'value', 'text', $this->state->get('filter.upcoming'), true)
+			);
+			JHtmlSidebar::addFilter(
+				JText::_('COM_ICAGENDA_SELECT_SITE_ITEMID'),
+				'filter_site_itemid',
+				JHtml::_('select.options', $this->get('MenuItemID'), 'value', 'text', $this->state->get('filter.site_itemid'), true)
+			);
+		}
+	}
+
+	/**
+	 * Method to save the submitted ordering values for records via AJAX.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public function saveOrderAjax()
+	{
+		// Get the input
+		$jinput = JFactory::getApplication()->input;
+		$pks    = $jinput->post->get('cid', array(), 'array');
+		$order  = $jinput->post->get('order', array(), 'array');
+
+		// Sanitize the input
+		JArrayHelper::toInteger($pks);
+		JArrayHelper::toInteger($order);
+
+		// Get the model
+		$model = $this->getModel();
+
+		// Save the ordering
+		$return = $model->saveorder($pks, $order);
+
+		if ($return)
+		{
+			echo "1";
+		}
+
+		// Close the application
+		JFactory::getApplication()->close();
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/feature/index.html b/deployed/icagenda/administrator/components/com_icagenda/views/feature/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/feature/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/feature/tmpl/edit.php b/deployed/icagenda/administrator/components/com_icagenda/views/feature/tmpl/edit.php
new file mode 100644
index 00000000..14529ed2
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/feature/tmpl/edit.php
@@ -0,0 +1,372 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      doorknob & Cyril Rezé
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.5.6 2015-05-06
+ * @since       3.4.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+JHtml::_('behavior.tooltip');
+JHtml::_('behavior.formvalidation');
+
+$app = JFactory::getApplication();
+$document = JFactory::getDocument();
+
+// Access Administration Features check.
+if (JFactory::getUser()->authorise('icagenda.access.features', 'com_icagenda'))
+{
+	$bootstrapType		= '1';
+	$PanelOne_Tag		= 'feature';
+	$PanelOne_Title		= JText::_('COM_ICAGENDA_TITLE_FEATURE', true);
+	$PanelTwo_Tag		= 'desc';
+	$PanelTwo_Title		= JText::_('COM_ICAGENDA_LEGEND_DESC', true);
+	$PublishingTag		= 'publishing';
+	$PublishingTitle	= JText::_('JGLOBAL_FIELDSET_PUBLISHING', true);
+
+	// Joomla 2.5
+	if (version_compare(JVERSION, '3.0', 'lt'))
+	{
+		jimport( 'joomla.html.html.tabs' );
+
+		$iCmapDisplay		= '3';
+
+		$icPanOne			= JText::_('COM_ICAGENDA_TITLE_EVENT');
+		$icPanTwo			= JText::_('COM_ICAGENDA_LEGEND_DESC');
+		$icPanPublishing	= JText::_('JGLOBAL_FIELDSET_PUBLISHING');
+		$startPane			= 'tabs.start';
+		$addPanel			= 'tabs.panel';
+		$endPanel			= 'tabs.end';
+		$endPane			= 'tabs.end';
+		$PanelOne_Tag1		= $PanelOne_Tag;
+		$PanelOne_Tag2		= $PanelOne_Title;
+		$PanelTwo_Tag1		= $PanelTwo_Tag;
+		$PanelTwo_Tag2		= $PanelTwo_Title;
+		$PublishingTag1		= $PublishingTag;
+		$PublishingTag2		= $PublishingTitle;
+	}
+
+	// Joomla 3
+	else
+	{
+		JHtml::_('formbehavior.chosen', 'select');
+		jimport('joomla.html.html.bootstrap');
+
+		$icPanOne			= 'icTab';
+		$icPanTwo			= 'icTab';
+		$icPanPublishing	= 'icTab';
+
+		if ($bootstrapType == '1')
+		{
+			$iCmapDisplay	= '1';
+			$startPane		= 'bootstrap.startTabSet';
+			$addPanel		= 'bootstrap.addTab';
+			$endPanel		= 'bootstrap.endTab';
+			$endPane		= 'bootstrap.endTabSet';
+			$PanelOne_Tag1	= $PanelOne_Tag;
+			$PanelOne_Tag2	= $PanelOne_Title;
+			$PanelTwo_Tag1	= $PanelTwo_Tag;
+			$PanelTwo_Tag2	= $PanelTwo_Title;
+			$PublishingTag1	= $PublishingTag;
+			$PublishingTag2	= $PublishingTitle;
+		}
+		if ($bootstrapType == '2')
+		{
+			$iCmapDisplay	= '2';
+			$startPane		= 'bootstrap.startAccordion';
+			$addPanel		= 'bootstrap.addSlide';
+			$endPanel		= 'bootstrap.endSlide';
+			$endPane		= 'bootstrap.endAccordion';
+			$PanelOne_Tag1	= $PanelOne_Title;
+			$PanelOne_Tag2	= $PanelOne_Tag;
+			$PanelTwo_Tag1	= $PanelTwo_Title;
+			$PanelTwo_Tag2	= $PanelTwo_Tag;
+			$PublishingTag1	= $PublishingTitle;
+			$PublishingTag2	= $PublishingTag;
+		}
+	}
+	?>
+
+	<script type="text/javascript">
+		Joomla.submitbutton = function(task)
+		{
+			if (task == 'feature.cancel' || document.formvalidator.isValid(document.id('feature-form'))) {
+				Joomla.submitform(task, document.getElementById('feature-form'));
+			}
+			else {
+				alert('<?php echo $this->escape(JText::_('JGLOBAL_VALIDATION_FORM_FAILED'));?>');
+			}
+		}
+	</script>
+
+	<form action="<?php echo JRoute::_('index.php?option=com_icagenda&layout=edit&id='.(int) $this->item->id); ?>" method="post" name="adminForm" id="feature-form" class="form-validate">
+		<div class="container">
+			<?php // iCagenda Header ?>
+			<header>
+				<h1>
+					<?php echo empty($this->item->id) ? JText::_('COM_ICAGENDA_LEGEND_NEW_FEATURE') : JText::sprintf('COM_ICAGENDA_LEGEND_EDIT_FEATURE', $this->item->id); ?>&nbsp;<span>iCagenda</span>
+				</h1>
+				<h2>
+					<?php echo JText::_('COM_ICAGENDA_COMPONENT_DESC'); ?>
+				</h2>
+			</header>
+			<div>&nbsp;</div>
+
+			<?php // Begin Content ?>
+			<div class="row-fluid">
+				<div class="span10 form-horizontal">
+
+					<?php // Open Panel Set ?>
+					<?php echo JHtml::_($startPane, 'icTab', array('active' => 'feature')); ?>
+
+						<?php // Panel Feature ?>
+						<?php echo JHtml::_($addPanel, $icPanOne, $PanelOne_Tag1, $PanelOne_Tag2); ?>
+
+							<div class="icpanel iCleft">
+								<h1>
+									<?php echo empty($this->item->id) ? JText::_('COM_ICAGENDA_LEGEND_NEW_FEATURE') : JText::sprintf('COM_ICAGENDA_LEGEND_EDIT_FEATURE', $this->item->id); ?>
+								</h1>
+								<hr>
+								<div class="row-fluid">
+									<div class="span12 iCleft">
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('title'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('title'); ?>
+											</div>
+										</div>
+									</div>
+								</div>
+								<div class="row-fluid">
+									<div class="span12 iCleft">
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('icon'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('icon'); ?>
+											</div>
+										</div>
+									</div>
+								</div>
+								<div class="row-fluid">
+									<div class="span12 iCleft">
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('new_icon'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('new_icon'); ?>
+											</div>
+										</div>
+									</div>
+								</div>
+								<div class="row-fluid">
+									<div class="span12 iCleft">
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('icon_alt'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('icon_alt'); ?>
+											</div>
+										</div>
+									</div>
+								</div>
+								<div class="row-fluid">
+									<div class="span12 iCleft">
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('show_filter'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('show_filter'); ?>
+											</div>
+										</div>
+									</div>
+								</div>
+							</div>
+
+							<?php // End Panel Feature ?>
+							<?php if(version_compare(JVERSION, '3.0', 'ge')) echo JHtml::_($endPanel); ?>
+
+
+							<?php // Panel Description ?>
+							<?php //echo JHtml::_($addPanel, $icPanTwo, $PanelTwo_Tag1, $PanelTwo_Tag2); ?>
+
+								<!--div class="icpanel iCleft">
+								<h1>
+								<?php //echo JText::_('COM_ICAGENDA_FORM_FEATURE_DESCRIPTION_LABEL'); ?>
+								</h1>
+								<hr>
+								<div class="row-fluid">
+									<div class="span12 iCleft">
+										<h3>
+											<?php //echo JText::_('COM_ICAGENDA_FORM_FEATURE_DESCRIPTION_DESC'); ?>
+										</h3>
+										<?php //echo $this->form->getInput('desc'); ?>
+									</div>
+								</div>
+							</div-->
+
+						<?php // End Panel Description ?>
+						<?php //if(version_compare(JVERSION, '3.0', 'ge')) echo JHtml::_($endPanel); ?>
+
+
+						<?php // Panel Publishing ?>
+						<?php echo JHtml::_($addPanel, $icPanPublishing, $PublishingTag1, $PublishingTag2); ?>
+
+							<div class="icpanel iCleft">
+								<h1>
+									<?php echo JText::_('JGLOBAL_FIELDSET_PUBLISHING'); ?>
+								</h1>
+								<hr>
+								<div class="row-fluid">
+									<div class="span6 iCleft">
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('alias'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('alias'); ?>
+											</div>
+										</div>
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('id'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('id'); ?>
+											</div>
+										</div>
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('checked_out'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('checked_out'); ?>
+											</div>
+										</div>
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('checked_out_time'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('checked_out_time'); ?>
+											</div>
+										</div>
+									</div>
+								</div>
+							</div>
+
+						<?php // End Panel Publishing ?>
+						<?php echo JHtml::_($endPanel); ?>
+
+					<?php // End Panel Set ?>
+					<?php echo JHtml::_($endPane, 'icTab'); ?>
+
+				</div>
+
+
+				<?php // Begin Sidebar ?>
+				<div class="span2 iCleft">
+
+					<h4>
+						<?php echo JText::_('COM_ICAGENDA_TITLE_SIDEBAR_DETAILS'); ?>
+					</h4>
+					<hr>
+					<div class="control-group">
+						<div class="control-label">
+							<?php echo $this->form->getLabel('state'); ?>
+						</div>
+						<div class="controls">
+							<?php echo $this->form->getInput('state'); ?>
+						</div>
+					</div>
+
+				<?php // End Sidebar ?>
+				</div>
+
+				<div class="clr"></div>
+			</div>
+		</div>
+		<input type="hidden" name="task" value="" />
+		<?php echo JHtml::_('form.token'); ?>
+		<div class="clr"></div>
+	</form>
+
+	<?php
+	// Joomla 2.5
+	if (version_compare(JVERSION, '3.0', 'lt'))
+	{
+		JHtml::stylesheet('com_icagenda/template.j25.css', false, true);
+		JHtml::stylesheet('com_icagenda/icagenda-back.j25.css', false, true);
+
+		JHtml::_('behavior.framework');
+
+		// load jQuery, if not loaded before
+		$scripts = array_keys($document->_scripts);
+		$scriptFound = false;
+		$scriptuiFound = false;
+
+		for ($i = 0; $i < count($scripts); $i++)
+		{
+			if (stripos($scripts[$i], 'jquery.min.js') !== false)
+			{
+				$scriptFound = true;
+			}
+			if (stripos($scripts[$i], 'jquery.js') !== false)
+			{
+				$scriptFound = true;
+			}
+			if (stripos($scripts[$i], 'jquery-ui.min.js') !== false)
+			{
+				$scriptuiFound = true;
+			}
+		}
+
+		// jQuery Library Loader
+		if (!$scriptFound)
+		{
+			// load jQuery, if not loaded before
+			if (!$app->get('jquery'))
+			{
+				$app->set('jquery', true);
+				// add jQuery
+				$document->addScript('https://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js');
+				$document->addScript( JURI::root( true ) . '/media/com_icagenda/js/jquery.noconflict.js' );
+			}
+		}
+
+		if (!$scriptuiFound)
+		{
+			$document->addScript('https://ajax.googleapis.com/ajax/libs/jqueryui/1.9.2/jquery-ui.min.js');
+		}
+
+		$document->addScript( JURI::root( true ) . '/media/com_icagenda/js/template.js' );
+	}
+	else
+	{
+		JHtml::_('bootstrap.framework');
+		JHtml::_('jquery.framework');
+	}
+
+	}
+else
+{
+	$app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'warning');
+	$app->redirect(htmlspecialchars_decode('index.php?option=com_icagenda&view=icagenda'));
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/feature/tmpl/index.html b/deployed/icagenda/administrator/components/com_icagenda/views/feature/tmpl/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/feature/tmpl/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/feature/view.html.php b/deployed/icagenda/administrator/components/com_icagenda/views/feature/view.html.php
new file mode 100644
index 00000000..0c116799
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/feature/view.html.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-30
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.4.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * View class Admin - Edit a Feature - iCagenda
+ */
+class iCagendaViewFeature extends JViewLegacy
+{
+	protected $state;
+	protected $item;
+	protected $form;
+
+	/**
+	 * Display the view
+	 */
+	public function display($tpl = null)
+	{
+		$this->state = $this->get('State');
+		$this->item  = $this->get('Item');
+		$this->form  = $this->get('Form');
+
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+
+			return false;
+		}
+
+		$this->addToolbar();
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 */
+	protected function addToolbar()
+	{
+		$app      = JFactory::getApplication();
+		$document = JFactory::getDocument();
+		$jinput   = $app->input;
+
+		$jinput->set('hidemainmenu', true);
+
+		$user  = JFactory::getUser();
+		$isNew = ($this->item->id == 0);
+
+		if (isset($this->item->checked_out))
+		{
+			$checkedOut	= ! ($this->item->checked_out == 0 || $this->item->checked_out == $user->get('id'));
+		}
+		else
+		{
+			$checkedOut = false;
+		}
+
+		$canDo = iCagendaHelper::getActions();
+
+		// Set Title
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			JToolBarHelper::title($isNew ? 'iCagenda - ' . JText::_('COM_ICAGENDA_LEGEND_NEW_FEATURE') : 'iCagenda - ' . JText::_('COM_ICAGENDA_LEGEND_EDIT_FEATURE'), 'feature.png');
+		}
+		else
+		{
+			JToolBarHelper::title($isNew ? 'iCagenda <span style="font-size:14px;">- ' . JText::_('COM_ICAGENDA_LEGEND_NEW_FEATURE') . '</span>'  : 'iCagenda <span style="font-size:14px;">- ' . JText::_('COM_ICAGENDA_LEGEND_EDIT_FEATURE') . '</span>' , $isNew ? 'new' : 'pencil-2');
+		}
+
+		$icTitle = $isNew ? JText::_('COM_ICAGENDA_LEGEND_NEW_FEATURE') : JText::_('COM_ICAGENDA_LEGEND_EDIT_FEATURE');
+
+		$sitename = $app->getCfg('sitename');
+		$title    = $app->getCfg('sitename') . ' - ' . JText::_('JADMINISTRATION') . ' - iCagenda: ' . $icTitle;
+
+		$document->setTitle($title);
+
+		// If not checked out, can save the item.
+		if ( ! $checkedOut && ($canDo->get('core.edit')||($canDo->get('core.create'))))
+		{
+			JToolBarHelper::apply('feature.apply', 'JTOOLBAR_APPLY');
+			JToolBarHelper::save('feature.save', 'JTOOLBAR_SAVE');
+		}
+
+		if ( ! $checkedOut && ($canDo->get('core.create')))
+		{
+			JToolBarHelper::custom('feature.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+		}
+
+		// If an existing item, can save to a copy.
+		if ( ! $isNew && $canDo->get('core.create'))
+		{
+			JToolBarHelper::custom('feature.save2copy', 'save-copy.png', 'save-copy_f2.png', 'JTOOLBAR_SAVE_AS_COPY', false);
+		}
+
+		if (empty($this->item->id))
+		{
+			JToolBarHelper::cancel('feature.cancel', 'JTOOLBAR_CANCEL');
+		}
+		else
+		{
+			JToolBarHelper::cancel('feature.cancel', 'JTOOLBAR_CLOSE');
+		}
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/features/index.html b/deployed/icagenda/administrator/components/com_icagenda/views/features/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/features/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/features/tmpl/default.php b/deployed/icagenda/administrator/components/com_icagenda/views/features/tmpl/default.php
new file mode 100644
index 00000000..bb93a718
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/features/tmpl/default.php
@@ -0,0 +1,411 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      doorknob
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.4.0 2014-07-14
+ * @since       3.4.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+$app = JFactory::getApplication();
+
+// Access Administration Features check.
+if (JFactory::getUser()->authorise('icagenda.access.features', 'com_icagenda'))
+{
+	// Check Theme Packs Compatibility
+	if (class_exists('icagendaTheme')) icagendaTheme::checkThemePacks();
+
+	$user		= JFactory::getUser();
+	$userId		= $user->get('id');
+	$listOrder	= $this->escape($this->state->get('list.ordering'));
+	$listDirn	= $this->escape($this->state->get('list.direction'));
+	$canOrder	= $user->authorise('core.edit.state', 'com_icagenda');
+	$saveOrder	= $listOrder == 'a.ordering';
+
+	if(version_compare(JVERSION, '3.0', 'lt'))
+	{
+		JHtml::_('behavior.tooltip');
+		JHtml::_('script','system/multiselect.js',false,true);
+	}
+	else
+	{
+		// Include the component HTML helpers.
+		JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+		JHtml::_('bootstrap.tooltip');
+		JHtml::_('behavior.multiselect');
+		JHtml::_('formbehavior.chosen', 'select');
+		JHtml::_('dropdown.init');
+
+		$extension	= $this->escape($this->state->get('filter.extension'));
+
+		$archived	= $this->state->get('filter.published') == 2 ? true : false;
+		$trashed	= $this->state->get('filter.published') == -2 ? true : false;
+
+		if ($saveOrder)
+		{
+			$saveOrderingUrl = 'index.php?option=com_icagenda&task=features.saveOrderAjax&tmpl=component';
+			JHtml::_('sortablelist.sortable', 'featuresList', 'adminForm', strtolower($listDirn), $saveOrderingUrl, false, true);
+		}
+
+		$sortFields = array();
+		?>
+
+		<script type="text/javascript">
+		Joomla.orderTable = function()
+		{
+			table = document.getElementById("sortTable");
+			direction = document.getElementById("directionTable");
+			order = table.options[table.selectedIndex].value;
+
+			if (order != '<?php echo $listOrder; ?>')
+			{
+				dirn = 'asc';
+			}
+			else
+			{
+				dirn = direction.options[direction.selectedIndex].value;
+			}
+			Joomla.tableOrdering(order, dirn, '');
+		}
+		</script>
+	<?php
+	}
+
+	// Get media path
+	$params_media = JComponentHelper::getParams('com_media');
+	$image_path = $params_media->get('image_path', 'images');
+	?>
+
+	<form action="<?php echo JRoute::_('index.php?option=com_icagenda&view=features'); ?>" method="post" name="adminForm" id="adminForm">
+	<?php if (!empty( $this->sidebar)) : ?>
+		<div id="j-sidebar-container" class="span2">
+			<?php echo $this->sidebar; ?>
+		</div>
+		<div id="j-main-container" class="span10">
+	<?php else : ?>
+		<div id="j-main-container">
+	<?php endif;?>
+
+		<?php if(version_compare(JVERSION, '3.0', 'lt')) : ?>
+			<fieldset id="filter-bar">
+				<div class="filter-search fltlft">
+					<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></label>
+					<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('Search'); ?>" />
+					<button type="submit"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+					<button type="button" onclick="document.id('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
+				</div>
+				<div class="filter-select fltrt">
+					<select name="filter_published" class="inputbox" onchange="this.form.submit()">
+						<option value=""><?php echo JText::_('JOPTION_SELECT_PUBLISHED');?></option>
+						<?php echo JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), "value", "text", $this->state->get('filter.state'), true);?>
+					</select>
+				</div>
+			</fieldset>
+			<div class="clr"> </div>
+
+		<?php else : ?>
+
+			<div id="filter-bar" class="btn-toolbar">
+				<div class="filter-search btn-group pull-left">
+					<label for="filter_search" class="element-invisible"><?php echo JText::_('COM_ICAGENDA_FILTER_SEARCH_FEATURES_DESC'); ?></label>
+					<input type="text" name="filter_search" placeholder="<?php echo JText::_('COM_ICAGENDA_FILTER_SEARCH_FEATURES_DESC'); ?>" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('COM_ICAGENDA_FILTER_SEARCH_FEATURES_DESC'); ?>" />
+				</div>
+				<div class="btn-group pull-left hidden-phone">
+					<button class="btn tip hasTooltip" type="submit" title="<?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?>"><i class="icon-search"></i></button>
+					<button class="btn tip hasTooltip" type="button" onclick="document.id('filter_search').value='';this.form.submit();" title="<?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?>"><i class="icon-remove"></i></button>
+				</div>
+				<div class="btn-group pull-right hidden-phone">
+					<label for="limit" class="element-invisible"><?php echo JText::_('JFIELD_PLG_SEARCH_SEARCHLIMIT_DESC'); ?></label>
+					<?php echo $this->pagination->getLimitBox(); ?>
+				</div>
+			</div>
+			<div class="clearfix"> </div>
+
+		<?php endif;?>
+
+
+		<?php if(version_compare(JVERSION, '3.0', 'lt')) : ?>
+			<table class="adminlist">
+		<?php else : ?>
+			<table class="table table-striped" id="featuresList">
+		<?php endif; ?>
+
+				<thead>
+					<tr>
+
+					<?php // START Joomla 3.x ?>
+					<?php if(version_compare(JVERSION, '3.0', 'ge')) : ?>
+
+						<?php // Ordering HEADER Joomla 3.x ?>
+						<th width="1%" class="nowrap center hidden-phone">
+							<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+						</th>
+
+					<?php // END Joomla 3.x ?>
+					<?php endif; ?>
+
+						<?php // CheckBox HEADER ?>
+						<th width="1%" class="hidden-phone">
+							<input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
+						</th>
+
+						<?php // Status HEADER ?>
+						<th width="1%" style="min-width:55px" class="nowrap center">
+							<?php echo JHtml::_('grid.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
+						</th>
+
+						<?php // Title HEADER ?>
+						<th>
+							<?php echo JHtml::_('grid.sort', 'COM_ICAGENDA_FEATURES_TITLE', 'a.title', $listDirn, $listOrder); ?>
+						</th>
+
+						<?php // Icon HEADER ?>
+						<th width="30%" class="nowrap">
+							<?php echo JHtml::_('grid.sort', 'COM_ICAGENDA_FEATURES_ICON', 'a.icon', $listDirn, $listOrder); ?>
+						</th>
+
+						<?php // Icon ALT HEADER ?>
+						<th width="30%" class="nowrap">
+							<?php echo JHtml::_('grid.sort', 'COM_ICAGENDA_FORM_FEATURE_ICON_ALT_LABEL', 'a.icon_alt', $listDirn, $listOrder); ?>
+						</th>
+
+						<?php // Show Filter HEADER ?>
+						<th width="5%" class="center nowrap">
+							<?php echo JHtml::_('grid.sort', 'COM_ICAGENDA_FEATURES_SHOW_FILTER', 'a.show_filter', $listDirn, $listOrder); ?>
+						</th>
+
+					<?php // START Joomla 2.5 ?>
+					<?php if(version_compare(JVERSION, '3.0', 'lt')) : ?>
+
+						<?php // Ordering HEADER Joomla 2.5 ?>
+						<?php if (isset($this->items[0]->ordering)) { ?>
+						<th width="10%">
+							<?php echo JHtml::_('grid.sort',  'JGRID_HEADING_ORDERING', 'a.ordering', $listDirn, $listOrder); ?>
+							<?php if ($canOrder && $saveOrder) :?>
+								<?php echo JHtml::_('grid.order',  $this->items, 'filesave.png', 'features.saveorder'); ?>
+							<?php endif; ?>
+						</th>
+						<?php } ?>
+
+					<?php // END Joomla 2.5 ?>
+					<?php endif; ?>
+
+						<?php // ID HEADER ?>
+						<th width="1%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+						</th>
+					</tr>
+				</thead>
+
+				<?php // FOOTER ?>
+				<tfoot>
+					<tr>
+						<td colspan="10">
+							<?php echo $this->pagination->getListFooter(); ?>
+						</td>
+					</tr>
+				</tfoot>
+
+				<?php // BODY ?>
+				<tbody>
+
+					<?php foreach ($this->items as $i => $item) :
+						$ordering	= ($listOrder == 'a.ordering');
+						$canCreate	= $user->authorise('core.create',		'com_icagenda');
+						$canEdit	= $user->authorise('core.edit',			'com_icagenda');
+						$canCheckin	= $user->authorise('core.manage',		'com_icagenda');
+						$canChange	= $user->authorise('core.edit.state',	'com_icagenda');
+						$canEditOwn	= $user->authorise('core.edit.own',		'com_icagenda');
+						?>
+
+						<tr class="row<?php echo $i % 2; ?>">
+
+						<?php // START Joomla 3.x ?>
+						<?php if(version_compare(JVERSION, '3.0', 'ge')) : ?>
+
+							<?php // Ordering Joomla 3.x ?>
+							<td class="order nowrap center hidden-phone">
+								<?php if ($canChange) :
+									$disableClassName = '';
+									$disabledLabel	  = '';
+
+									if (!$saveOrder) :
+										$disabledLabel    = JText::_('JORDERINGDISABLED');
+										$disableClassName = 'inactive tip-top';
+									endif; ?>
+									<span class="sortable-handler hasTooltip <?php echo $disableClassName; ?>" title="<?php echo $disabledLabel; ?>">
+										<i class="icon-menu"></i>
+									</span>
+									<input type="text" style="display:none" name="order[]" size="5" value="<?php echo $item->ordering; ?>" class="width-20 text-area-order " />
+								<?php else : ?>
+									<span class="sortable-handler inactive" >
+										<i class="icon-menu"></i>
+									</span>
+								<?php endif; ?>
+							</td>
+
+						<?php // END Joomla 3.x ?>
+						<?php endif; ?>
+
+							<?php // CheckBox ?>
+							<td class="center hidden-phone">
+								<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+							</td>
+
+							<?php // Status ?>
+						<?php if (isset($this->items[0]->state)) { ?>
+							<td class="center">
+								<?php echo JHtml::_('jgrid.published', $item->state, $i, 'features.', $canChange, 'cb'); ?>
+							</td>
+						<?php } ?>
+
+							<?php // Title ?>
+							<td class="nowrap has-context">
+								<div class="pull-left">
+									<?php if ($item->checked_out) : ?>
+										<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'features.', $canCheckin); ?>
+									<?php endif; ?>
+									<?php //if ($item->language == '*'):?>
+										<?php //$language = JText::alt('JALL', 'language'); ?>
+									<?php //else:?>
+										<?php //$language = $item->language ? $this->escape($item->language) : JText::_('JUNDEFINED'); ?>
+									<?php //endif;?>
+									<?php if ($canEdit) : ?>
+										<a href="<?php echo JRoute::_('index.php?option=com_icagenda&task=feature.edit&id=' . $item->id); ?>" title="<?php echo JText::_('JACTION_EDIT'); ?>">
+											<?php echo $this->escape($item->title); ?></a>
+									<?php else : ?>
+										<span title="<?php echo JText::sprintf('JFIELD_ALIAS_LABEL', $this->escape($item->alias)); ?>"><?php echo $this->escape($item->title); ?></span>
+									<?php endif; ?>
+								</div>
+
+							<?php // START DropDown Edit Joomla 3.x ?>
+							<?php if(version_compare(JVERSION, '3.0', 'ge')) : ?>
+
+								<?php // Show Filter ?>
+								<div class="pull-left">
+									<?php
+									// Create dropdown items
+									JHtml::_('dropdown.edit', $item->id, 'feature.');
+									JHtml::_('dropdown.divider');
+									if ($item->state) :
+										JHtml::_('dropdown.unpublish', 'cb' . $i, 'features.');
+									else :
+										JHtml::_('dropdown.publish', 'cb' . $i, 'features.');
+									endif;
+
+									JHtml::_('dropdown.divider');
+
+									if ($archived) :
+										JHtml::_('dropdown.unarchive', 'cb' . $i, 'features.');
+									else :
+										JHtml::_('dropdown.archive', 'cb' . $i, 'features.');
+									endif;
+
+									if ($item->checked_out) :
+										JHtml::_('dropdown.checkin', 'cb' . $i, 'features.');
+									endif;
+
+									if ($trashed) :
+										JHtml::_('dropdown.untrash', 'cb' . $i, 'features.');
+									else :
+										JHtml::_('dropdown.trash', 'cb' . $i, 'features.');
+									endif;
+
+									// Render dropdown list
+									echo JHtml::_('dropdown.render');
+									?>
+								</div>
+
+							<?php // END DropDown Edit Joomla 3.x ?>
+							<?php endif; ?>
+							</td>
+
+							<?php // Icon ?>
+							<td>
+								<div>
+									<?php echo '<img src="../' . $image_path . '/icagenda/feature_icons/24_bit/' . $item->icon . '" alt="[' . $item->icon . ']" />'; ?>
+									<?php echo $item->icon == -1 ? JText::_('JOPTION_DO_NOT_USE') : $item->icon; ?>
+								</div>
+							</td>
+
+							<?php // Icon ALT Value ?>
+							<td>
+								<div>
+									<?php echo $this->escape($item->icon_alt) ?>
+								</div>
+							</td>
+
+							<?php // Show Filter ?>
+							<td class="center">
+								<div>
+									<i class="icon-<?php echo $item->show_filter ? 'publish' : 'unpublish';// Note:'publish/unpublish' preferred to 'checkmark/cancel' because of colour ?>"></i>
+								</div>
+							</td>
+
+						<?php // START Joomla 2.5 ?>
+						<?php if(version_compare(JVERSION, '3.0', 'lt')) : ?>
+
+							<?php // Ordering Joomla 2.5 ?>
+						<?php if (isset($this->items[0]->ordering)) { ?>
+							<td class="order">
+								<?php if ($canChange) : ?>
+									<?php if ($saveOrder) :?>
+										<?php if ($listDirn == 'asc') : ?>
+											<span><?php echo $this->pagination->orderUpIcon($i, true, 'features.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+											<span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, true, 'features.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+										<?php elseif ($listDirn == 'desc') : ?>
+											<span><?php echo $this->pagination->orderUpIcon($i, true, 'features.orderdown', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+											<span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, true, 'features.orderup', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+										<?php endif; ?>
+									<?php endif; ?>
+									<?php $disabled = $saveOrder ?  '' : 'disabled="disabled"'; ?>
+									<input type="text" name="order[]" size="5" value="<?php echo $item->ordering;?>" <?php echo $disabled ?> class="text-area-order" />
+								<?php else : ?>
+									<?php echo $item->ordering; ?>
+								<?php endif; ?>
+							</td>
+						<?php } ?>
+
+						<?php // END Joomla 2.5 ?>
+						<?php endif; ?>
+
+							<?php // ID ?>
+						<?php if (isset($this->items[0]->id)) { ?>
+							<td class="center hidden-phone">
+								<?php echo (int) $item->id; ?>
+							</td>
+						<?php } ?>
+
+						</tr>
+
+					<?php endforeach; ?>
+
+				</tbody>
+			</table>
+			<div>
+				<input type="hidden" name="task" value="" />
+				<input type="hidden" name="boxchecked" value="0" />
+				<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+				<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+				<?php echo JHtml::_('form.token'); ?>
+			</div>
+		</div>
+	</form>
+<?php
+}
+else
+{
+	$app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'warning');
+	$app->redirect(htmlspecialchars_decode('index.php?option=com_icagenda&view=icagenda'));
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/features/tmpl/index.html b/deployed/icagenda/administrator/components/com_icagenda/views/features/tmpl/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/features/tmpl/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/features/view.html.php b/deployed/icagenda/administrator/components/com_icagenda/views/features/view.html.php
new file mode 100644
index 00000000..a22f0605
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/features/view.html.php
@@ -0,0 +1,177 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-26
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.4.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * View class Admin - List of Features - iCagenda.
+ */
+class iCagendaViewFeatures extends JViewLegacy
+{
+	protected $items;
+	protected $pagination;
+	protected $state;
+
+	/**
+	 * Display the view
+	 *
+	 * @since   3.4.0
+	 */
+	public function display($tpl = null)
+	{
+		// Joomla 2.5
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			jimport('joomla.environment.request');
+
+			JHtml::stylesheet( 'com_icagenda/icagenda-back.j25.css', false, true );
+		}
+
+		$this->state      = $this->get('State');
+		$this->items      = $this->get('Items');
+		$this->pagination = $this->get('Pagination');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+
+			return false;
+		}
+
+		// We don't need toolbar in the modal window.
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->addToolbar();
+
+			if(version_compare(JVERSION, '3.0', 'ge'))
+			{
+				$this->sidebar = JHtmlSidebar::render();
+			}
+		}
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @since   3.4.0
+	 */
+	protected function addToolbar()
+	{
+		require_once JPATH_COMPONENT . '/helpers/icagenda.php';
+
+		$state  = $this->get('State');
+		$user   = JFactory::getUser();
+		$userId = $user->get('id');
+		$canDo  = iCagendaHelper::getActions();
+
+		// Set Title
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			JToolBarHelper::title('iCagenda - ' . JText::_('COM_ICAGENDA_TITLE_FEATURES'), 'features.png');
+		}
+		else
+		{
+			JToolBarHelper::title('iCagenda <span style="font-size:14px;">- ' . JText::_('COM_ICAGENDA_TITLE_FEATURES') . '</span>', 'folder');
+		}
+
+		$icTitle = JText::_('COM_ICAGENDA_TITLE_FEATURES');
+
+		$document = JFactory::getDocument();
+		$app      = JFactory::getApplication();
+		$sitename = $app->getCfg('sitename');
+		$title    = $app->getCfg('sitename') . ' - ' . JText::_('JADMINISTRATION') . ' - iCagenda: ' . $icTitle;
+
+		$document->setTitle($title);
+
+		// Check if the form exists before showing the add/edit buttons
+		$formPath = JPATH_COMPONENT_ADMINISTRATOR . '/views/feature';
+
+		if (file_exists($formPath))
+		{
+			if ($canDo->get('core.create'))
+			{
+				JToolBarHelper::addNew('feature.add','JTOOLBAR_NEW');
+			}
+
+			if ($canDo->get('core.edit'))
+			{
+				JToolBarHelper::editList('feature.edit','JTOOLBAR_EDIT');
+			}
+		}
+
+		if ($canDo->get('core.edit.state'))
+		{
+			if (isset($this->items[0]->state))
+			{
+				JToolBarHelper::divider();
+				JToolBarHelper::custom('features.publish', 'publish.png', 'publish_f2.png','JTOOLBAR_PUBLISH', true);
+				JToolBarHelper::custom('features.unpublish', 'unpublish.png', 'unpublish_f2.png', 'JTOOLBAR_UNPUBLISH', true);
+			}
+			else
+			{
+				// If this component does not use state then show a direct delete button as we can not trash
+				JToolBarHelper::deleteList('', 'features.delete','JTOOLBAR_DELETE');
+			}
+
+			if (isset($this->items[0]->state))
+			{
+				JToolBarHelper::divider();
+				JToolBarHelper::archiveList('features.archive','JTOOLBAR_ARCHIVE');
+			}
+
+			if (isset($this->items[0]->checked_out))
+			{
+				JToolBarHelper::custom('features.checkin', 'checkin.png', 'checkin_f2.png', 'JTOOLBAR_CHECKIN', true);
+			}
+		}
+
+		// Show trash and delete for components that uses the state field
+		if (isset($this->items[0]->state))
+		{
+			if ($state->get('filter.state') == -2 && $canDo->get('core.delete'))
+			{
+				JToolBarHelper::deleteList('', 'features.delete','JTOOLBAR_EMPTY_TRASH');
+				JToolBarHelper::divider();
+			}
+			elseif ($canDo->get('core.edit.state'))
+			{
+				JToolBarHelper::trash('features.trash','JTOOLBAR_TRASH');
+				JToolBarHelper::divider();
+			}
+		}
+
+		if ($canDo->get('core.admin'))
+		{
+			JToolBarHelper::preferences('com_icagenda');
+		}
+
+		if(version_compare(JVERSION, '3.0', 'ge'))
+		{
+			JHtmlSidebar::setAction('index.php?option=com_icagenda&view=features');
+
+			JHtmlSidebar::addFilter(
+				JText::_('JOPTION_SELECT_PUBLISHED'),
+				'filter_published',
+				JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.state'), true)
+			);
+		}
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/icagenda/index.html b/deployed/icagenda/administrator/components/com_icagenda/views/icagenda/index.html
new file mode 100644
index 00000000..42682b47
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/icagenda/index.html
@@ -0,0 +1 @@
+<html><body></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/icagenda/tmpl/color.php b/deployed/icagenda/administrator/components/com_icagenda/views/icagenda/tmpl/color.php
new file mode 100644
index 00000000..daadac75
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/icagenda/tmpl/color.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.3.8 2014-07-04
+ * @since       1.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+
+class iCagendaUpdateLogsColoriser
+{
+	public static function colorise($file, $onlyLast = false)
+	{
+		$ret = '';
+
+		$lines = @file($file);
+
+		if(empty($lines)) return $ret;
+
+		array_shift($lines);
+
+		foreach($lines as $line)
+		{
+			$line = trim($line);
+
+			if(empty($line)) continue;
+
+			$type = substr($line,0,1);
+
+			switch($type)
+			{
+				case '=':
+					continue;
+					break;
+
+				case ':':
+					$ret .= "\t".'<div style="font-size:8pt;">Legend'.$line."</div>\n";
+					break;
+
+				case '?':
+					$ret .= "<div class=\"ic-message-info\">".trim(substr($line,2))."</div>\n";
+					break;
+
+				case '!':
+					$ret .= "\t".'<li class="ic-bold ic-important"><div class="ic-box-16 ic-box-important">!</div>'
+							. htmlentities(trim(substr($line,2))) . "</li>\n";
+					break;
+
+				case '1':
+					$ret .= "\t".'<li class="ic-changelog-important-sub"><span></span> '.trim(substr($line,2))."</li>\n";
+					break;
+
+				case '+':
+					$ret .= "\t".'<li class="ic-added"><div class="ic-box-16 ic-box-added">+</div>'
+							. htmlentities(trim(substr($line,2))) . "</li>\n";
+					break;
+
+				case '-':
+					$ret .= "\t".'<li class="ic-removed"><div class="ic-box-16 ic-box-removed">-</div>'
+							. htmlentities(trim(substr($line,2))) . "</li>\n";
+					break;
+
+				case '~':
+					$ret .= "\t".'<li class="ic-changed"><div class="ic-box-16 ic-box-changed">~</div>'
+							. htmlentities(trim(substr($line,2))) . "</li>\n";
+					break;
+
+				case '#':
+					$ret .= "\t".'<li class="ic-fixed"><div class="ic-box-16 ic-box-fixed">#</div>'
+							. htmlentities(trim(substr($line,2))) . "</li>\n";
+					break;
+
+//				case 'H':
+//					$ret .= "\t".'<li class="ic-fixed"><div class="ic-box-16 ic-box-fixed">#</div><div class="ic-box ic-box-removed">HIGH</div> '
+//							. htmlentities(trim(substr($line,2))) . "</li>\n";
+//					break;
+
+				case '*':
+					$ret .= "\t".'<h4 class="ic-changelog">' . htmlentities(trim(substr($line,2))) . "</h4>\n";
+					break;
+
+				case '$':
+					$ret .= "</ul>";
+					$ret .= "<h3 class=\"ic-changelog-pro\">&nbsp;&nbsp;" . substr($line,2) . " <SUP>[ PRO Testing ]</SUP></h3>\n";
+					$ret .= "<ul class=\"ic-changelog\">\n";
+					break;
+
+				// End
+				case ';':
+					$ret .= "</ul>";
+					break;
+
+				default:
+
+					if(!empty($ret))
+					{
+						$ret .= "</ul>";
+						if($onlyLast) return $ret;
+					}
+
+					if(!$onlyLast) $ret .= "<h3 class=\"ic-changelog\">&nbsp;&nbsp;$line</h3>\n";
+
+					$ret .= "<ul class=\"ic-changelog\">\n";
+					break;
+			}
+		}
+
+		return $ret;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/icagenda/tmpl/default.php b/deployed/icagenda/administrator/components/com_icagenda/views/icagenda/tmpl/default.php
new file mode 100644
index 00000000..d84dffa7
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/icagenda/tmpl/default.php
@@ -0,0 +1,927 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.10 2019-08-29
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+// Check Theme Packs Compatibility (to be changed to a little note button with modal)
+//if (class_exists('icagendaTheme')) icagendaTheme::checkThemePacks();
+
+$user		= JFactory::getUser();
+$userId		= $user->get('id');
+
+$params		= JComponentHelper::getParams( 'com_icagenda' );
+$version	= $params->get('version');
+$icsys		= $params->get('icsys');
+$translator	= JText::_('COM_ICAGENDA_TRANSLATOR');
+
+if (version_compare(phpversion(), '5.3.10', '<'))
+{
+	$JoomlaRecommended = '5.4 +';
+
+	// Get Application
+	$app = JFactory::getApplication();
+
+	$icon_warning = (version_compare(JVERSION, '3.0', 'lt')) ? '' : '<span class="icon-warning"></span>';
+
+	$php_warning_msg = '<strong> ' . JText::sprintf('COM_ICAGENDA_YOUR_PHP_VERSION_IS', phpversion()) . '</strong><br />';
+	$php_warning_msg.= JText::sprintf('COM_ICAGENDA_PHP_VERSION_JOOMLA_RECOMMENDED', $JoomlaRecommended);
+	$php_warning_msg.= ' ( ' . JText::_('IC_READMORE') . ': ';
+	$php_warning_msg.= '<a href="http://www.joomla.org/technical-requirements.html"';
+	$php_warning_msg.= ' target="_blank">http://www.joomla.org/technical-requirements.html</a> )<br />';
+	$php_warning_msg.= JText::_('COM_ICAGENDA_PHP_VERSION_ICAGENDA_RECOMMENDATION');
+
+	$app->enqueueMessage( $icon_warning . $php_warning_msg, 'error' );
+}
+?>
+<div id="j-main-container">
+	<?php JHtml::_('behavior.modal'); ?>
+	<!-- Start Content -->
+	<div class="row-fluid icpanel">
+		<div class="span12">
+			<div class="row-fluid">
+				<div class="span6">
+					<div class="row-fluid">
+						<?php if ( $user->authorise('icagenda.access.categories', 'com_icagenda') ) : ?>
+						<div class="span6" style="text-align: center">
+							<table>
+								<tbody>
+									<tr>
+										<td colspan="2">
+											<h3><?php echo JText::_('COM_ICAGENDA_TITLE_CATEGORIES'); ?></h3>
+										</td>
+									</tr>
+									<tr>
+										<td>
+											<div class="icon right">
+												<a href="index.php?option=com_icagenda&view=categories">
+													<?php if ($user->authorise('icagenda.access.categories', 'com_icagenda')) : ?>
+														<img alt=""
+															src="../media/com_icagenda/images/all_cats-48.png">
+														<span class="iconText">
+															<?php echo JText::_( 'COM_ICAGENDA_PANEL_CATEGORY' ); ?>
+														</span>
+													<?php else : ?>
+														<img alt="<?php echo JText::_( 'JERROR_ALERTNOAUTHOR' ); ?>"
+															src="../media/com_icagenda/images/panel_denied/all_cats-48.png">
+														<span class="iconText denied">
+															<?php echo JText::_( 'COM_ICAGENDA_PANEL_CATEGORY' ); ?>
+														</span>
+													<?php endif; ?>
+												</a>
+											</div>
+										</td>
+										<td>
+											<div class="icon left">
+												<a href="index.php?option=com_icagenda&view=category&layout=edit">
+													<?php if ($user->authorise('icagenda.access.categories', 'com_icagenda')) : ?>
+														<img alt=""
+															src="../media/com_icagenda/images/new_cat-48.png">
+														<span class="iconText">
+															<?php echo JText::_( 'COM_ICAGENDA_PANEL_NEW_CATEGORY' ); ?>
+														</span>
+													<?php else : ?>
+														<img alt="<?php echo JText::_( 'JERROR_ALERTNOAUTHOR' ); ?>"
+															src="../media/com_icagenda/images/panel_denied/new_cat-48.png">
+														<span class="iconText denied">
+															<?php echo JText::_( 'COM_ICAGENDA_PANEL_NEW_CATEGORY' ); ?>
+														</span>
+													<?php endif; ?>
+												</a>
+											</div>
+										</td>
+									</tr>
+								</tbody>
+							</table>
+						</div>
+						<?php endif; ?>
+						<?php if ( $user->authorise('icagenda.access.events', 'com_icagenda') ) : ?>
+						<div class="span6" style="text-align: center">
+				    		<table>
+				    			<tbody>
+				    				<tr>
+				    					<td colspan="2">
+											<h3><?php echo JText::_('COM_ICAGENDA_TITLE_EVENTS'); ?></h3>
+										</td>
+									</tr>
+				    				<tr>
+	 				   					<td>
+											<div class="icon right">
+												<a href="index.php?option=com_icagenda&view=events">
+													<?php if ($user->authorise('icagenda.access.events', 'com_icagenda')) : ?>
+														<img alt=""
+															src="../media/com_icagenda/images/all_events-48.png">
+														<span class="iconText">
+															<?php echo JText::_( 'COM_ICAGENDA_PANEL_EVENTS' ); ?>
+														</span>
+													<?php else : ?>
+														<img alt="<?php echo JText::_( 'JERROR_ALERTNOAUTHOR' ); ?>"
+															src="../media/com_icagenda/images/panel_denied/all_events-48.png">
+														<span class="iconText denied">
+															<?php echo JText::_( 'COM_ICAGENDA_PANEL_EVENTS' ); ?>
+														</span>
+													<?php endif; ?>
+												</a>
+											</div>
+										</td>
+	 				   					<td>
+											<div class="icon left">
+												<a href="index.php?option=com_icagenda&view=event&layout=edit">
+													<?php if ($user->authorise('icagenda.access.events', 'com_icagenda')) : ?>
+														<img alt=""
+															src="../media/com_icagenda/images/new_event-48.png">
+														<span class="iconText">
+															<?php echo JText::_( 'COM_ICAGENDA_PANEL_NEW_EVENT' ); ?>
+														</span>
+													<?php else : ?>
+														<img alt="<?php echo JText::_( 'JERROR_ALERTNOAUTHOR' ); ?>"
+															src="../media/com_icagenda/images/panel_denied/new_event-48.png">
+														<span class="iconText denied">
+															<?php echo JText::_( 'COM_ICAGENDA_PANEL_NEW_EVENT' ); ?>
+														</span>
+													<?php endif; ?>
+												</a>
+											</div>
+										</td>
+									</tr>
+								</tbody>
+							</table>
+						</div>
+						<?php endif; ?>
+					</div>
+
+					<div class="row-fluid">
+						<?php if ( $user->authorise('icagenda.access.registrations', 'com_icagenda')
+								|| $user->authorise('icagenda.access.newsletter', 'com_icagenda') ) : ?>
+						<div class="span6" style="text-align: center">
+			    			<table>
+					    		<tbody>
+				    				<tr>
+				    					<td colspan="2">
+											<h3><?php echo JText::_('COM_ICAGENDA_TITLE_REGISTRATION'); ?></h3>
+										</td>
+									</tr>
+				    				<tr>
+	 				   					<td>
+											<div class="icon right">
+												<a href="index.php?option=com_icagenda&view=registrations">
+													<?php if ($user->authorise('icagenda.access.registrations', 'com_icagenda')) : ?>
+														<img alt=""
+															src="../media/com_icagenda/images/registration-48.png">
+														<span class="iconText">
+															<?php echo JText::_( 'COM_ICAGENDA_PANEL_REGISTRATION' ); ?>
+														</span>
+													<?php else : ?>
+														<img alt="<?php echo JText::_( 'JERROR_ALERTNOAUTHOR' ); ?>"
+															src="../media/com_icagenda/images/panel_denied/registration-48.png">
+														<span class="iconText denied">
+															<?php echo JText::_( 'COM_ICAGENDA_PANEL_REGISTRATION' ); ?>
+														</span>
+													<?php endif; ?>
+												</a>
+											</div>
+										</td>
+	 				   					<td>
+											<div class="icon left">
+												<a href="index.php?option=com_icagenda&view=mail&layout=edit">
+													<?php if ($user->authorise('icagenda.access.newsletter', 'com_icagenda')) : ?>
+														<img alt=""
+															src="../media/com_icagenda/images/newsletter-48.png">
+														<span class="iconText">
+															<?php echo JText::_( 'COM_ICAGENDA_PANEL_NEWSLETTER' ); ?>
+														</span>
+													<?php else : ?>
+														<img alt="<?php echo JText::_( 'JERROR_ALERTNOAUTHOR' ); ?>"
+															src="../media/com_icagenda/images/panel_denied/newsletter-48.png">
+														<span class="iconText denied">
+															<?php echo JText::_( 'COM_ICAGENDA_PANEL_NEWSLETTER' ); ?>
+														</span>
+													<?php endif; ?>
+												</a>
+											</div>
+										</td>
+									</tr>
+								</tbody>
+							</table>
+						</div>
+						<?php endif; ?>
+						<?php if ( $user->authorise('icagenda.access.customfields', 'com_icagenda')
+								|| $user->authorise('icagenda.access.features', 'com_icagenda') ) : ?>
+						<div class="span6" style="text-align: center">
+				    		<table>
+				    			<tbody>
+				    				<tr>
+				    					<td colspan="2">
+											<h3><?php echo JText::_('COM_ICAGENDA_ADDITIONALS_LABEL'); ?></h3>
+										</td>
+									</tr>
+				    				<tr>
+	 				   					<td>
+											<div class="icon right">
+												<a href="index.php?option=com_icagenda&view=customfields">
+													<?php if ($user->authorise('icagenda.access.customfields', 'com_icagenda')) : ?>
+														<img alt=""
+															src="../media/com_icagenda/images/customfields-48.png" />
+														<span class="iconText">
+															<?php echo JText::_( 'COM_ICAGENDA_PANEL_CUSTOMFIELDS' ); ?>
+														</span>
+													<?php else : ?>
+														<img alt="<?php echo JText::_( 'JERROR_ALERTNOAUTHOR' ); ?>"
+															src="../media/com_icagenda/images/panel_denied/customfields-48.png" />
+														<span class="iconText denied">
+															<?php echo JText::_( 'COM_ICAGENDA_PANEL_CUSTOMFIELDS' ); ?>
+														</span>
+													<?php endif; ?>
+												</a>
+											</div>
+										</td>
+	 				   					<td>
+											<div class="icon left">
+												<a href="index.php?option=com_icagenda&view=features">
+													<?php if ($user->authorise('icagenda.access.features', 'com_icagenda')) : ?>
+														<img alt=""
+															src="../media/com_icagenda/images/features-48.png">
+														<span class="iconText">
+															<?php echo JText::_( 'COM_ICAGENDA_PANEL_FEATURES' ); ?>
+														</span>
+													<?php else : ?>
+														<img alt="<?php echo JText::_( 'JERROR_ALERTNOAUTHOR' ); ?>"
+															src="../media/com_icagenda/images/panel_denied/features-48.png">
+														<span class="iconText denied">
+															<?php echo JText::_( 'COM_ICAGENDA_PANEL_FEATURES' ); ?>
+														</span>
+													<?php endif; ?>
+												</a>
+											</div>
+										</td>
+									</tr>
+								</tbody>
+							</table>
+						</div>
+						<?php endif; ?>
+					</div>
+
+					<div class="row-fluid">
+						<?php if ( $user->authorise('core.admin', 'com_icagenda')
+								|| $user->authorise('icagenda.access.themes', 'com_icagenda') ) : ?>
+						<div class="span6" style="text-align: center">
+			    			<table>
+					    		<tbody>
+				    				<tr>
+				    					<td colspan="2">
+											<h3><?php echo JText::_('COM_ICAGENDA_GLOBAL_PARAMS_LABEL'); ?></h3>
+										</td>
+									</tr>
+				    				<tr>
+	 				   					<td>
+											<div class="icon right">
+												<?php if(version_compare(JVERSION, '3.0', 'ge')) : ?>
+													<a href="index.php?option=com_config&view=component&component=com_icagenda&path=&return=<?php echo base64_encode(JURI::getInstance()->toString()) ?>">
+												<?php else : ?>
+													<a href="index.php?option=com_config&view=component&component=com_icagenda&path=&tmpl=component"
+														class="modal"
+														rel="{handler: 'iframe', size: {x: 870, y: 550}}">
+												<?php endif; ?>
+													<?php if ($user->authorise('core.admin', 'com_icagenda')) : ?>
+														<img alt=""
+															src="../media/com_icagenda/images/global_options-48.png">
+														<span class="iconText">
+															<?php echo JText::_( 'JTOOLBAR_OPTIONS' ); ?>
+														</span>
+													<?php else : ?>
+														<img alt="<?php echo JText::_( 'JERROR_ALERTNOAUTHOR' ); ?>"
+															src="../media/com_icagenda/images/panel_denied/global_options-48.png">
+														<span class="iconText denied">
+															<?php echo JText::_( 'JTOOLBAR_OPTIONS' ); ?>
+														</span>
+													<?php endif; ?>
+												</a>
+											</div>
+										</td>
+	 				   					<td>
+											<div class="icon left">
+												<a href="index.php?option=com_icagenda&view=themes">
+													<?php if ($user->authorise('icagenda.access.themes', 'com_icagenda')) : ?>
+														<img alt=""
+															src="../media/com_icagenda/images/themes-48.png">
+														<span class="iconText">
+															<?php echo JText::_( 'COM_ICAGENDA_PANEL_THEMES' ); ?>
+														</span>
+													<?php else : ?>
+														<img alt="<?php echo JText::_( 'JERROR_ALERTNOAUTHOR' ); ?>"
+															src="../media/com_icagenda/images/panel_denied/themes-48.png">
+														<span class="iconText denied">
+															<?php echo JText::_( 'COM_ICAGENDA_PANEL_THEMES' ); ?>
+														</span>
+													<?php endif; ?>
+												</a>
+											</div>
+										</td>
+									</tr>
+								</tbody>
+							</table>
+						</div>
+						<?php endif; ?>
+						<?php if ( $user->authorise('core.admin', 'com_icagenda') ) : ?>
+						<div class="span6" style="text-align: center">
+			    			<table>
+					    		<tbody>
+				    				<tr>
+				    					<td colspan="2">
+											<h3><?php echo JText::_('COM_ICAGENDA_PANEL_UPDATE_AND_INFOS'); ?></h3>
+										</td>
+									</tr>
+				    				<tr>
+	 				   					<td>
+											<div class="icon right">
+												<a href="index.php?option=com_icagenda&view=info">
+													<img src="../media/com_icagenda/images/info-48.png">
+													<span class="iconText"><?php echo JText::_( 'COM_ICAGENDA_INFO' ); ?></span>
+												</a>
+											</div>
+										</td>
+	 				   					<td class="left">
+											<?php echo LiveUpdate::getIcon(); ?>
+										</td>
+									</tr>
+								</tbody>
+							</table>
+						</div>
+						<?php endif; ?>
+					</div>
+
+					<?php if ($icsys == 'core') : ?>
+					<div class="row-fluid">
+
+						<div class="span12">
+							<div class="alert alert-block alert-info">
+							<?php if(version_compare(JVERSION, '3.0', 'ge')) : ?>
+								<button type="button" class="close" data-dismiss="alert">×</button>
+							<?php endif; ?>
+								<p>&nbsp;</p>
+								<div style="font-weight: bold; color: #555555;">
+									<p>
+										<?php echo JText::_('COM_ICAGENDA_PANEL_FREE_VERSION') ?><br/>
+										<?php echo JText::_('COM_ICAGENDA_PANEL_PRO_VERSION') ?>:
+										<?php echo JText::_('COM_ICAGENDA_PANEL_PRO_MODULE_IC_EVENT_LIST') ?>
+									</p>
+								</div>
+								<div style="display:none;">
+									<div id="loadDiv" style="background-color:#F4F4F4;">
+										<table style="width:600px; height:350px;" cellpadding="0" cellspacing="0">
+											<tbody>
+												<tr>
+													<td style="text-align: center; height:140px;" rowspan="1" colspan="3">
+														&nbsp;&nbsp;&nbsp;<img src="../media/com_icagenda/images/iconicagenda48.png" alt="" />
+													</td>
+												</tr>
+												<tr>
+													<td style="text-align: right; width: 280px; height:60px;">
+														<a class="btn" href="https://order.shareit.com/cart/add?vendorid=200184827&PRODUCT[300582128]=1&qpc=wl9cu" target="_blank" rel="noopener noreferrer">
+															<?php echo JText::_('COM_ICAGENDA_PURCHASE_1_YEAR'); ?>
+														</a>
+													</td>
+													<td style="width: 40px; height:60px;">
+													</td>
+													<td style="width: 280px; height:60px;">
+														<a class="btn" href="https://order.shareit.com/cart/add?vendorid=200184827&PRODUCT[300579672]=1&qpc=mvt1o" target="_blank" rel="noopener noreferrer">
+															<?php echo JText::_('COM_ICAGENDA_PURCHASE_UNLIMITED'); ?>
+														</a>
+													</td>
+												</tr>
+												<tr>
+													<td style="text-align: center; height:50px;" colspan="3">
+														<a href="https://icagenda.joomlic.com/#download" alt ="<?php echo JText::_('COM_ICAGENDA_INFO'); ?>" target="_blank" rel="noopener noreferrer"><?php echo JText::_('COM_ICAGENDA_VERSIONS_COMPARISON'); ?></a>
+													</td>
+												</tr>
+												<tr>
+													<td style="text-align: center;" rowspan="1" colspan="3">
+														<div>
+															<p>
+																<img src="../media/com_icagenda/images/payment/icon_cca.gif" alt="" border="0"/>
+																<img src="../media/com_icagenda/images/payment/icon_pal.gif" alt="" border="0"/>
+																<img src="../media/com_icagenda/images/payment/icon_wtr.gif" alt="" border="0"/>
+																<img src="../media/com_icagenda/images/payment/icon_chk.gif" alt="" border="0"/>
+															</p>
+														</div>
+														<div>
+															<img src="../media/com_icagenda/images/payment/shareit_ani.gif" alt="" border="0"/>
+														</div>
+													</td>
+												</tr>
+											</tbody>
+										</table>
+									</div>
+								</div>
+
+								<p>
+									&nbsp;
+								</p>
+								<div>
+									<p style="text-align: center;">
+										<a href="#loadDiv" class="modal" rel="{size: {x: 600, y: 350}}">
+											<input type="submit" class="btn" value="<?php echo JText::_( 'COM_ICAGENDA_PURCHASE' ); ?>" />
+										</a>
+										<!--a href="http://www.joomlic.com/extensions/icagenda" alt ="<?php echo JText::_( 'COM_ICAGENDA_INFO' ); ?>" target="_blank">
+											<?php echo JText::_( 'COM_ICAGENDA_INFO' ); ?>
+										</a-->
+									</p>
+									<p style="text-align: center; font-size:11px;">
+										<a href="http://icagenda.joomlic.com/#download" alt ="<?php echo JText::_( 'COM_ICAGENDA_INFO' ); ?>" target="_blank"><?php echo JText::_( 'COM_ICAGENDA_VERSIONS_COMPARISON' ); ?></a>
+									</p>
+								</div>
+
+							</div>
+
+						</div><!--end span12-->
+
+					</div><!--end row-->
+					<?php endif; ?>
+
+				</div><!--end span 6-->
+				<div class="span1">
+				</div><!--end span 1-->
+				<div class="span5">
+					<div class="span12">
+
+						<?php
+						$db = JFactory::getDbo();
+						$query	= $db->getQuery(true);
+						//$query->select('version AS icv, releasedate AS icd')->from('#__icagenda')->where('id = 1');
+						//$query->select('version AS icv, releasedate AS icd')->from('#__icagenda')->where('id = 2');
+						$query->select('version AS icv, releasedate AS icd, params AS icp')->from('#__icagenda')->where('id = 3');
+						$db->setQuery($query);
+						$result		= $db->loadObject();
+						$release	= $result->icv;
+						$date		= $result->icd;
+						$icp		= json_decode( $result->icp, true );
+
+						if ($icsys == 'pro')
+						{
+							$app = JFactory::getApplication();
+							$welcome_pro =  $app->input->get('welcome', '');
+
+							// Get Current URL
+							$thisURL = JURI::getInstance()->toString();
+
+							$return_cp = 'index.php?option=com_icagenda';
+
+							if ($welcome_pro == -1)
+							{
+								$this->saveDefault($welcome_pro, 'msg_procp', '-1');
+								$app->enqueueMessage(JText::_('COM_ICAGENDA_WELCOME_HIDE_SUCCESS'), 'message');
+								$app->redirect($return_cp);
+							}
+							elseif ($welcome_pro == 1)
+							{
+								$this->saveDefault($welcome_pro, 'msg_procp', '1');
+//								$app->enqueueMessage(JText::_('COM_ICAGENDA_WELCOME_SHOW_SUCCESS'), 'message');
+								$app->redirect($return_cp);
+							}
+
+							$options_link = version_compare(JVERSION, '3.0', 'ge')
+											? ' : <a href="index.php?option=com_config&view=component&component=com_icagenda&path=&return='
+												.  base64_encode(JURI::getInstance()->toString()) . '#pro">'
+												. JText::_('JTOOLBAR_OPTIONS') . '</a>'
+											: '.';
+							?>
+							<?php if ($icp['msg_procp'] == -1) : ?>
+								<a class="hasTooltip" href="<?php echo JRoute::_($thisURL.'&welcome=1') ?>" data-original-title="Clear" data-toggle="tooltip" title="<?php echo JText::_('COM_ICAGENDA_WELCOME_RELOAD_DESC') ?>">
+									<div class="btn btn-mini"><?php echo JText::_('COM_ICAGENDA_WELCOME_RELOAD'); ?></div>
+								</a>
+							<?php else : ?>
+							<?php
+			$app->enqueueMessage('<h2>' . JText::sprintf('COM_ICAGENDA_PRO_WELCOME', 'iCagenda PRO') . '</h2>'
+								. '<p>' . JText::sprintf('COM_ICAGENDA_PRO_WELCOME_PRO_ACCOUNT_INFO', 'iCagenda PRO', '<a href="http://pro.joomlic.com" target="_blank">pro.joomlic.com</a>') . '</p>'
+								. '<p>' . JText::sprintf('COM_ICAGENDA_PRO_WELCOME_PRO_NOTIFICATION_EMAILS', 'info(at)joomlic.com') . '</p>'
+								. '<p>' . JText::sprintf('COM_ICAGENDA_PRO_WELCOME_PRO_NOTIFICATION_EMAILS_FIRST', 'Pro JoomliC') . '<br />'
+								. JText::_('COM_ICAGENDA_PRO_WELCOME_PRO_NOTIFICATION_EMAILS_SECOND') . '<br />'
+								. JText::_('COM_ICAGENDA_PRO_WELCOME_PRO_CHECK_YOUR_EMAIL') . '</p>'
+								. '<p>' . JText::sprintf('COM_ICAGENDA_PRO_WELCOME_PRO_FIRST_LOGIN_1', '<a href="http://pro.joomlic.com" target="_blank">pro.joomlic.com</a>') . '<br />'
+								. JText::sprintf('COM_ICAGENDA_PRO_WELCOME_PRO_FIRST_LOGIN_2', '<a href="http://pro.joomlic.com" target="_blank">pro.joomlic.com</a>') . '<br />'
+								. JText::sprintf('COM_ICAGENDA_PRO_WELCOME_PRO_OPTIONS', $options_link) . '</p>'
+								. '<p>' . JText::sprintf('COM_ICAGENDA_PRO_WELCOME_PRO_ID_1', 'iCagenda PRO') . '</p>'
+								. '<p>' . JText::_('COM_ICAGENDA_PRO_WELCOME_CONTACT') . '<br />'
+								. JText::sprintf('COM_ICAGENDA_PRO_WELCOME_SUPPORT', '<a href="http://pro.joomlic.com/support" target="_blank">Pro Ticket System</a>') . '</p>'
+								. '<p><small><strong>' . JText::_('COM_ICAGENDA_PRO_WELCOME_NOTE') . '</strong></small></p>'
+								. '<div style="text-align:center">'
+								. '<a class="hasTooltip" href="' . JRoute::_($thisURL.'&welcome=-1') . '" data-original-title="Clear" data-toggle="tooltip" title="' . JText::_('COM_ICAGENDA_WELCOME_SHOW_SUCCESS_DESC') . '">'
+								. '<div class="btn btn-inverse btn-small">' . JText::_('IC_HIDE_THIS_MESSAGE') . '</div>'
+								. '</a>'
+								. '</div>'
+								, 'message');
+								?>
+							<?php endif; ?>
+						<?php } ?>
+
+						<div style="float:right; padding:0px 0px 0px 20px;">
+							<img src="../media/com_icagenda/images/logo_icagenda.png" alt="logo_icagenda" />
+						</div>
+						<div>
+							<h2 style="font-size:2em;">
+								<strong><span style="color: #cc0000;">iC</span><span style="color: #666666;">agenda<sup style="font-size:0.5em">&trade;</sup></span></strong><small><?php echo $version;?></small>
+							</h2>
+						</div>
+						<div>
+							<h4>
+								<?php echo JText::_('COM_ICAGENDA_COMPONENT_DESC') ?>
+							</h4>
+						</div>
+
+						<div class="small">
+							<?php echo JText::_('COM_ICAGENDA_FEATURES_BACKEND') ?><br />
+							<?php echo JText::_('COM_ICAGENDA_FEATURES_FRONTEND') ?>
+						</div>
+
+						<div>&nbsp;</div>
+
+						<div style="font-size:0.9em" class="blockbtn">
+							<?php echo JText::_('COM_ICAGENDA_PANEL_VERSION');?>:&nbsp;<b><?php echo $release ;?></b> | <?php echo JText::_('COM_ICAGENDA_PANEL_DATE');?>:&nbsp;<b><?php echo $date ;?></b>&nbsp;&nbsp;
+
+							<?php JHtml::_('behavior.modal'); ?>
+							<div style="display:none;">
+								<div id="icagenda-changelog">
+									<?php
+										require_once dirname(__FILE__).'/color.php';
+										echo iCagendaUpdateLogsColoriser::colorise(JPATH_COMPONENT_ADMINISTRATOR.'/CHANGELOG.php');
+									?>
+								</div>
+							</div>
+							<a href="#icagenda-changelog" class="btn modal"><?php echo JText::_('COM_ICAGENDA_PANEL_UPDATE_LOGS') ?></a>
+							<?php //  rel="{size: {x: 800, y: 350}}" ?>
+						</div>
+
+						<br/>
+						<?php
+							$urlposter = '../media/com_icagenda/images/video_poster_icagenda.jpg';
+						?>
+
+						<div>&nbsp;</div>
+						<div>&nbsp;</div>
+
+
+<?php
+// Statistics Charts
+$document = JFactory::getDocument();
+$document->addStyleDeclaration('
+	#canvas-holder {
+		width: 90%;
+		margin: 5%;
+	}
+	@media(min-width:768px) {
+		#canvas-holder {
+			width: 40%;
+			margin: 10px 5%;
+		}
+	}
+');
+
+$charts = array(
+			'categoryStats' => JText::sprintf('COM_ICAGENDA_STATS_TOP_CATEGORIES_LBL', '10') .
+								'<br /><small>' . JText::_('COM_ICAGENDA_STATS_BASED_ON_ALL_EVENTS_HITS') . '</small>',
+			'eventStats' => JText::sprintf('COM_ICAGENDA_STATS_TOP_EVENTS_LBL', '10') .
+								'<br /><small>' . JText::_('COM_ICAGENDA_STATS_ON_EVENT_HITS') . '</small>',
+		);
+
+$mbString = extension_loaded('mbstring');
+?>
+
+<div class="span12" style="background: #f5f5f5; border: 1px solid #f5f5f5; border-radius: 5px 5px 0 0; margin-left: 0;">
+
+<?php foreach ($charts as $chart => $title) : ?>
+	<div id="canvas-holder" class="span6">
+		<h3><?php echo $title; ?></h3>
+		<?php if ($this->eventHitsTotal) : ?>
+		<canvas id="<?php echo $chart; ?>_area" width="160" height="160"></canvas>
+		<?php else : ?>
+		<span><?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?></span>
+		<?php endif; ?>
+	</div>
+
+	<?php
+	$script = array();
+	$legend = array();
+
+	$script[]= 'var data = [';
+
+	foreach ($this->{$chart} AS $v)
+	{
+		$percent = $this->eventHitsTotal ? ($v->hits / $this->eventHitsTotal) : 0;
+
+		$script[]= '		{';
+		$script[]= ($chart == 'categoryStats')
+					? '			value: ' . round(( $percent * 100 ), 2) . ','
+					:  '			value: ' . $v->hits . ',';
+		$script[]= '			color: "' . $v->cat_color . '",';
+		$script[]= '			highlight: "#777777",';
+
+		$label_length	= $mbString ? mb_strlen($v->stats_label, 'UTF-8') : strlen($v->stats_label);
+		$label_cut		= $mbString ? mb_substr($v->stats_label, 0, 20, 'UTF-8') : substr($v->stats_label, 0, 20);
+
+		$stats_label 	= $label_cut;
+		$stats_label   .= ($label_length > 20) ? '...' : '';
+
+		$script[]= '			label: "' . addslashes($stats_label) . '"';
+		$script[]= '		},';
+
+		$legend_data = addslashes($v->cat_title) . '@@' . $v->cat_color;
+
+		if ( ! in_array($legend_data, $legend))
+		{
+			$legend[]= $legend_data;
+		}
+	}
+
+	sort($legend);
+
+	$script[]= '	];';
+
+	$script[]= 'var options = {';
+	$script[]= '	animationEasing : "easeInOutBack",';
+	$script[]= '	animationSteps : 60,';
+	$script[]= '	responsive : true,';
+	$script[]= '	segmentStrokeColor : "#f5f5f5",';
+	$script[]= ($chart == 'categoryStats')
+				? '	percentageInnerCutout : 0, tooltipTemplate: "<%if (label){%><%=label%> | <%}%><%= value %>%"'
+				: '	percentageInnerCutout : 50';
+	$script[]= '}';
+
+	$script[]= '	var ctx' . $chart . ' = document.getElementById("' . $chart . '_area").getContext("2d");';
+	$script[]= '	var myNewChart = new Chart(ctx' . $chart . ').Doughnut(data, options);';
+
+	if ($this->eventHitsTotal)
+	{
+		echo '<script>' . implode("\n", $script) . '</script>';
+	}
+	?>
+<?php endforeach; ?>
+
+
+</div>
+<?php // Stats Legend ?>
+<div class="span12" style="margin: 0; padding: 5px; border: 1px solid #f5f5f5; border-radius: 0 0 5px 5px;">
+	<?php foreach ($legend AS $v) : ?>
+	<?php
+	$ex_v = explode('@@', $v);
+	$cat_title = $ex_v[0];
+	$cat_color = $ex_v[1];
+	?>
+	<div style="float:left; font-size: 12px; line-height: 14px; font-weight: bold; color: #555;">
+		<div style="float:left; background: <?php echo $cat_color; ?>; width: 16px; height: 16px; border-radius: 8px;"></div>
+		<div style="float:left; margin: 0 10px 0 5px;"><?php echo $cat_title; ?></div>
+	</div>
+	<?php endforeach; ?>
+</div>
+
+						<div>&nbsp;</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+
+	<div class="row-fluid">
+		<div class="span12">
+			<div class="row-fluid">
+				<div class="span12">
+					<h3>42&nbsp;<?php echo JText::_('COM_ICAGENDA_PANEL_TRANSLATION_PACKS');?></h3>
+					<p>
+						<?php
+							if(version_compare(JVERSION, '3.0', 'lt')) {
+								$iCtag = '::';
+							} else {
+								$iCtag = '<br />';
+							}
+						?>
+						<span rel="tooltip" data-placement="right" class="editlinktip hasTip" title=" Afrikaans (South Africa)
+							<?php echo $iCtag;?><?php echo $translator;?>: Isileth " >
+							<img src="../media/mod_languages/images/af.gif" border="0" alt="Tooltip"/>
+						</span>
+						<span rel="tooltip" data-placement="right" class="editlinktip hasTip" title=" Arabic (Unitag)
+							<?php echo $iCtag;?><?php echo $translator;?>: haneen2013, fkinanah, Specialist " >
+							<img src="../media/mod_languages/images/ar.gif" border="0" alt="Tooltip"/>
+						</span>
+						<span rel="tooltip" data-placement="right" class="editlinktip hasTip" title=" Basque (Spain)
+							<?php echo $iCtag;?><?php echo $translator;?>: Bizkaitarra " >
+							<img src="../media/mod_languages/images/eu_es.gif" border="0" alt="Tooltip"/>
+						</span>
+						<span rel="tooltip" data-placement="right" class="editlinktip hasTip" title=" Bulgarian (Bulgaria)
+							<?php echo $iCtag;?><?php echo $translator;?>: bimbongr " >
+							<img src="../media/mod_languages/images/bg.gif" border="0" alt="Tooltip"/>
+						</span>
+						<span rel="tooltip" data-placement="right" class="editlinktip hasTip" title=" Catalan (Spain)
+							<?php echo $iCtag;?><?php echo $translator;?>: Mussool, EduardAymerich, Figuerolero " >
+							<img src="../media/mod_languages/images/ca.gif" border="0" alt="Tooltip"/>
+						</span>
+						<span rel="tooltip" data-placement="right" class="editlinktip hasTip" title=" Chinese (China)
+							<?php echo $iCtag;?><?php echo $translator;?>: Foxyman " >
+							<img src="../media/mod_languages/images/zh.gif" border="0" alt="Tooltip"/>
+						</span>
+						<span rel="tooltip" data-placement="right" class="editlinktip hasTip" title=" Chinese (Taiwan)
+							<?php echo $iCtag;?><?php echo $translator;?>: jedi, hkce, rowdytang " >
+							<img src="../media/mod_languages/images/tw.gif" border="0" alt="Tooltip"/>
+						</span>
+						<span rel="tooltip" data-placement="right" class="editlinktip hasTip" title=" Croatian (Croatia)
+							<?php echo $iCtag;?><?php echo $translator;?>: Davor Čolić (cdavor) " >
+							<img src="../media/mod_languages/images/hr.gif" border="0" alt="Tooltip"/>
+						</span>
+						<span rel="tooltip" data-placement="right" class="editlinktip hasTip" title=" Czech (Czech Republic)
+							<?php echo $iCtag;?><?php echo $translator;?>: Bongovo (bong) " >
+							<img src="../media/mod_languages/images/cz.gif" border="0" alt="Tooltip"/>
+						</span>
+						<span rel="tooltip" data-placement="right" class="editlinktip hasTip" title=" Danish (Denmark)
+							<?php echo $iCtag;?><?php echo $translator;?>: olewolf.dk, torbenspetersen, hvitnov, dannikrstnsn, AhmadHamid, poulfrom " >
+							<img src="../media/mod_languages/images/dk.gif" border="0" alt="Tooltip"/>
+						</span>
+						<span rel="tooltip" data-placement="right" class="editlinktip hasTip" title=" Dutch (Netherlands)
+							<?php echo $iCtag;?><?php echo $translator;?>: Molenwal1, AnneM, Walldorff, Mario Guagliardo, wfvdijk, robert.kleinpeter " >
+							<img src="../media/mod_languages/images/nl.gif" border="0" alt="Tooltip"/>
+						</span>
+						<span rel="tooltip" data-placement="right" class="editlinktip hasTip" title=" English (United Kingdom)
+							<?php echo $iCtag;?><?php echo $translator;?>: Lyr!C " >
+							<img src="../media/mod_languages/images/en.gif" border="0" alt="Tooltip"/>
+						</span>
+						<span rel="tooltip" data-placement="right" class="editlinktip hasTip" title=" English (United States)
+							<?php echo $iCtag;?><?php echo $translator;?>: Lyr!C " >
+							<img src="../media/mod_languages/images/us.gif" border="0" alt="Tooltip"/>
+						</span>
+						<span rel="tooltip" data-placement="right" class="editlinktip hasTip" title=" Esperanto
+							<?php echo $iCtag;?><?php echo $translator;?>: Amema, Anita_Dagmarsdotter " >
+							<img src="../media/mod_languages/images/eo.gif" border="0" alt="Tooltip"/>
+						</span>
+						<span rel="tooltip" data-placement="right" class="editlinktip hasTip" title=" Estonian (Estonia)
+							<?php echo $iCtag;?><?php echo $translator;?>: Reijo, Eraser " >
+							<img src="../media/mod_languages/images/et.gif" border="0" alt="Tooltip"/>
+						</span>
+						<span rel="tooltip" data-placement="right" class="editlinktip hasTip" title=" Finnish (Finland)
+							<?php echo $iCtag;?><?php echo $translator;?>: Kai Metsävainio (metska) " >
+							<img src="../media/mod_languages/images/fi.gif" border="0" alt="Tooltip"/>
+						</span>
+						<span rel="tooltip" data-placement="right" class="editlinktip hasTip" title=" French (France)
+							<?php echo $iCtag;?><?php echo $translator;?>: Lyr!C " >
+							<img src="../media/mod_languages/images/fr.gif" border="0" alt="Tooltip"/>
+						</span>
+						<span rel="tooltip" data-placement="right" class="editlinktip hasTip" title=" Galician (Spain)
+							<?php echo $iCtag;?><?php echo $translator;?>: XanVFR, Xnake " >
+							<img src="../media/mod_languages/images/gl.gif" border="0" alt="Tooltip"/>
+						</span>
+						<span rel="tooltip" data-placement="right" class="editlinktip hasTip" title=" German (Germany)
+							<?php echo $iCtag;?><?php echo $translator;?>: grisuu, mPino, bmbsbr, Wasilis, chuerner, cordi_allemand " >
+							<img src="../media/mod_languages/images/de.gif" border="0" alt="Tooltip"/>
+						</span>
+						<span rel="tooltip" data-placement="right" class="editlinktip hasTip" title=" Greek (Greece)
+							<?php echo $iCtag;?><?php echo $translator;?>: E.Gkana-D.Kontogeorgis (elinag), kost36, rinenweb, mbini " >
+							<img src="../media/mod_languages/images/el.gif" border="0" alt="Tooltip"/>
+						</span>
+						<span rel="tooltip" data-placement="right" class="editlinktip hasTip" title=" Hungarian (Hungary)
+							<?php echo $iCtag;?><?php echo $translator;?>: Halilaci, magicf, Cerbo, PKH, mester93 " >
+							<img src="../media/mod_languages/images/hu.gif" border="0" alt="Tooltip"/>
+						</span>
+						<span rel="tooltip" data-placement="right" class="editlinktip hasTip" title=" Italian (Italy)
+							<?php echo $iCtag;?><?php echo $translator;?>: Giuseppe Bosco (giusebos) " >
+							<img src="../media/mod_languages/images/it.gif" border="0" alt="Tooltip"/>
+						</span>
+						<span rel="tooltip" data-placement="right" class="editlinktip hasTip" title=" Japanese (Japan)
+							<?php echo $iCtag;?><?php echo $translator;?>: nagata " >
+							<img src="../media/mod_languages/images/ja.gif" border="0" alt="Tooltip"/>
+						</span>
+						<span rel="tooltip" data-placement="right" class="editlinktip hasTip" title=" Latvian (Latvia)
+							<?php echo $iCtag;?><?php echo $translator;?>: kredo9 " >
+							<img src="../media/mod_languages/images/lv.gif" border="0" alt="Tooltip"/>
+						</span>
+						<span rel="tooltip" data-placement="right" class="editlinktip hasTip" title=" Lithuanian (Lithuania)
+							<?php echo $iCtag;?><?php echo $translator;?>: ahxoohx " >
+							<img src="../media/mod_languages/images/lt.gif" border="0" alt="Tooltip"/>
+						</span>
+						<span rel="tooltip" data-placement="right" class="editlinktip hasTip" title=" Luxembourgish (Luxembourg)
+							<?php echo $iCtag;?><?php echo $translator;?>: Superjhemp " >
+							<img src="../media/mod_languages/images/icon-16-language.png" border="0" alt="Tooltip"/>
+						</span>
+						<span rel="tooltip" data-placement="right" class="editlinktip hasTip" title=" Macedonian (Macedonia)
+							<?php echo $iCtag;?><?php echo $translator;?>: Strumjan (Ilija Iliev) " >
+							<img src="../media/mod_languages/images/mk.gif" border="0" alt="Tooltip"/>
+						</span>
+						<span rel="tooltip" data-placement="right" class="editlinktip hasTip" title=" Norwegian Bokmål (Norway)
+							<?php echo $iCtag;?><?php echo $translator;?>: Rikard Tømte Reitan (rikrei) " >
+							<img src="../media/mod_languages/images/no.gif" border="0" alt="Tooltip"/>
+						</span>
+						<span rel="tooltip" data-placement="right" class="editlinktip hasTip" title=" Persian (Iran)
+							<?php echo $iCtag;?><?php echo $translator;?>: Arash Rezvani (al3n.nvy) " >
+							<img src="../media/mod_languages/images/fa_ir.gif" border="0" alt="Tooltip"/>
+						</span>
+						<span rel="tooltip" data-placement="right" class="editlinktip hasTip" title=" Polish (Poland)
+							<?php echo $iCtag;?><?php echo $translator;?>: mbsrz, KISweb, gienio22, traktor, niewidzialny " >
+							<img src="../media/mod_languages/images/pl.gif" border="0" alt="Tooltip"/>
+						</span>
+						<span rel="tooltip" data-placement="right" class="editlinktip hasTip" title=" Portuguese (Brazil)
+							<?php echo $iCtag;?><?php echo $translator;?>: Carosouza, alxaraujo " >
+							<img src="../media/mod_languages/images/pt_br.gif" border="0" alt="Tooltip"/>
+						</span>
+						<span rel="tooltip" data-placement="right" class="editlinktip hasTip" title=" Portuguese (Portugal)
+							<?php echo $iCtag;?><?php echo $translator;?>: LFGM, macedorl, horus68 " >
+							<img src="../media/mod_languages/images/pt.gif" border="0" alt="Tooltip"/>
+						</span>
+						<span rel="tooltip" data-placement="right" class="editlinktip hasTip" title=" Romanian (Romania)
+							<?php echo $iCtag;?><?php echo $translator;?>: hat, mester93 " >
+							<img src="../media/mod_languages/images/ro.gif" border="0" alt="Tooltip"/>
+						</span>
+						<span rel="tooltip" data-placement="right" class="editlinktip hasTip" title=" Russian (Russia)
+							<?php echo $iCtag;?><?php echo $translator;?>: nshash, MSV " >
+							<img src="../media/mod_languages/images/ru.gif" border="0" alt="Tooltip"/>
+						</span>
+						<span rel="tooltip" data-placement="right" class="editlinktip hasTip" title=" Serbian (latin)
+							<?php echo $iCtag;?><?php echo $translator;?>: Nenad Mihajlović (nenadm) " >
+							<img src="../media/mod_languages/images/sr.gif" border="0" alt="Tooltip"/>
+						</span>
+						<span rel="tooltip" data-placement="right" class="editlinktip hasTip" title=" Slovak (Slovakia)
+							<?php echo $iCtag;?><?php echo $translator;?>: ischindl, J.Ribarszki " >
+							<img src="../media/mod_languages/images/sk.gif" border="0" alt="Tooltip"/>
+						</span>
+						<span rel="tooltip" data-placement="right" class="editlinktip hasTip" title=" Slovenian (Slovenia)
+							<?php echo $iCtag;?><?php echo $translator;?>: erbi (Ervin Bizjak) " >
+							<img src="../media/mod_languages/images/sl.gif" border="0" alt="Tooltip"/>
+						</span>
+						<span rel="tooltip" data-placement="right" class="editlinktip hasTip" title=" Spanish (Spain)
+							<?php echo $iCtag;?><?php echo $translator;?>: elerizo, mPino, albertodg, adolf64, Goncatín, claugardia, sterroso " >
+							<img src="../media/mod_languages/images/es.gif" border="0" alt="Tooltip"/>
+						</span>
+						<span rel="tooltip" data-placement="right" class="editlinktip hasTip" title=" Swedish (Sweden)
+							<?php echo $iCtag;?><?php echo $translator;?>: Rickard Norberg (metska), Amema, osignell, kricke " >
+							<img src="../media/mod_languages/images/sv.gif" border="0" alt="Tooltip"/>
+						</span>
+						<span rel="tooltip" data-placement="right" class="editlinktip hasTip" title=" Thai (Thailand)
+							<?php echo $iCtag;?><?php echo $translator;?>: nightlight, rattanachai.ha " >
+							<img src="../media/mod_languages/images/th.gif" border="0" alt="Tooltip"/>
+						</span>
+						<span rel="tooltip" data-placement="right" class="editlinktip hasTip" title=" Turkish (Turkey)
+							<?php echo $iCtag;?><?php echo $translator;?>: harikalarkutusu, farukzeynep, kemalokmen " >
+							<img src="../media/mod_languages/images/tr.gif" border="0" alt="Tooltip"/>
+						</span>
+						<span rel="tooltip" data-placement="right" class="editlinktip hasTip" title=" Ukrainian (Ukraine)
+							<?php echo $iCtag;?><?php echo $translator;?>: Vlad Shuh (slv54) " >
+							<img src="../media/mod_languages/images/uk.gif" border="0" alt="Tooltip"/>
+						</span>
+					</p>
+				</div>
+			</div>
+		</div>
+	</div>
+
+	<div class="row-fluid">
+		<div class="span12">
+			<table style="width: 100%; border: 0px;">
+				<tbody>
+					<tr>
+						<td>
+							<a href="http://icagenda.joomlic.com/resources/translations" target="_blank" class="btn">
+								<?php echo JText::_('COM_ICAGENDA_PANEL_TRANSLATION_PACKS_DONWLOAD');?>
+							</a>
+						</td>
+						<td style="text-align:right; vertical-align: bottom;">
+							<a href='http://www.joomlic.com/forum/icagenda'  target="_blank" class="btn">
+								<?php echo JText::_('COM_ICAGENDA_PANEL_HELP_FORUM'); ?>
+							</a>
+						</td>
+					</tr>
+				</tbody>
+			</table>
+		</div>
+	</div>
+
+	<hr>
+
+	<div class="row-fluid">
+		<div class="span12">
+			<div class="row-fluid">
+				<div class="span9">
+					Copyright ©2012-<?php echo date("Y"); ?> joomlic.com -&nbsp;
+					<?php echo JText::_('COM_ICAGENDA_PANEL_COPYRIGHT');?>&nbsp;<a href="http://extensions.joomla.org/extensions/calendars-a-events/events/events-management/22013" target="_blank">Joomla! Extensions Directory</a>.
+					<br />
+					<br />
+				</div>
+				<div class="span3" style="text-align: right">
+					<a href='http://www.joomlic.com' target='_blank'>
+						<img src="../media/com_icagenda/images/logo_joomlic.png" alt="" border="0"/>
+					</a>
+					<br />
+					<i><b><?php echo JText::_('COM_ICAGENDA_PANEL_SITE_VISIT');?>&nbsp;<a href='http://www.joomlic.com' target='_blank'>www.joomlic.com</a></b></i>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/icagenda/tmpl/index.html b/deployed/icagenda/administrator/components/com_icagenda/views/icagenda/tmpl/index.html
new file mode 100644
index 00000000..42682b47
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/icagenda/tmpl/index.html
@@ -0,0 +1 @@
+<html><body></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/icagenda/view.html.php b/deployed/icagenda/administrator/components/com_icagenda/views/icagenda/view.html.php
new file mode 100644
index 00000000..c4e1df08
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/icagenda/view.html.php
@@ -0,0 +1,168 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-30
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+jimport('joomla.filesystem.path');
+
+// Access check.
+if (JFactory::getUser()->authorise('core.admin', 'com_icagenda'))
+{
+	JToolBarHelper::preferences('com_icagenda');
+}
+
+/**
+ * View class for a list of iCagenda.
+ */
+class iCagendaViewicagenda extends JViewLegacy
+{
+	/**
+	 * Display the view
+	 */
+	public function display($tpl = null)
+	{
+		$document = JFactory::getDocument();
+
+		$this->categoryStats  = $this->get('CategoryStats');
+		$this->eventStats     = $this->get('EventStats');
+		$this->eventHitsTotal = $this->get('EventHitsTotal');
+
+		// Joomla 2.5
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			JHtml::stylesheet('com_icagenda/template.j25.css', false, true);
+			JHtml::stylesheet('com_icagenda/icagenda-back.j25.css', false, true);
+
+			JHTML::_('behavior.tooltip');
+			JHTML::_('behavior.modal');
+
+			$document->addScript(JURI::root( true ) . '/media/com_icagenda/js/template.js');
+
+			jimport('joomla.filesystem.path');
+		}
+		// Joomla 3
+		else
+		{
+ 			JHtml::_('behavior.modal');
+		}
+
+		// Add Charts.js
+		$document->addScript( JURI::root( true ) . '/media/com_icagenda/js/Chart.min.js' );
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+
+			return false;
+		}
+
+		$this->addToolbar();
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 */
+	protected function addToolbar()
+	{
+		require_once JPATH_COMPONENT . '/helpers/icagenda.php';
+
+		$app      = JFactory::getApplication();
+		$document = JFactory::getDocument();
+
+		$state = $this->get('State');
+		$canDo = iCagendaHelper::getActions($state->get('filter.category_id'));
+
+		//JToolBarHelper::title(JText::_('COM_ICAGENDA_TITLE_ICAGENDA_IMAGE'));
+		// Set Title
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			JToolBarHelper::title(JText::_('COM_ICAGENDA_TITLE_ICAGENDA_IMAGE'));
+		}
+		else
+		{
+			$logo_icagenda_url = '../media/com_icagenda/images/iconicagenda36.png';
+
+			if (file_exists($logo_icagenda_url))
+			{
+				$logo_icagenda = '<img src="' . $logo_icagenda_url . '" height="36px" alt="iCagenda" />';
+			}
+			else
+			{
+				$logo_icagenda = 'iCagenda :: ' . JText::_('COM_ICAGENDA_TITLE_ICAGENDA') . '';
+			}
+
+			JToolBarHelper::title($logo_icagenda, 'icagenda');
+		}
+
+		$icTitle = JText::_('COM_ICAGENDA_TITLE_ICAGENDA');
+
+		$sitename = $app->getCfg('sitename');
+		$title    = $app->getCfg('sitename') . ' - ' . JText::_('JADMINISTRATION') . ' - iCagenda: ' . $icTitle;
+
+		$document->setTitle($title);
+	}
+
+	/**
+	 * Save iCagenda Params
+	 *
+	 * Update Database
+	 *
+	 * @since   3.3.8
+	 */
+	public function saveDefault($var, $name, $value)
+	{
+		if ($var)
+		{
+			$params[$name] = $value;
+
+			$this->updateParams( $params );
+		}
+	}
+
+	/**
+	 * Update iCagenda Params
+	 *
+	 * Update Database
+	 *
+	 * @since   3.3.8
+	 */
+	protected function updateParams($params_array)
+	{
+		// Read the existing component value(s)
+		$db = JFactory::getDbo();
+		$db->setQuery('SELECT params FROM #__icagenda WHERE id = "3"');
+
+		$params = json_decode( $db->loadResult(), true );
+
+		// Add the new variable(s) to the existing one(s)
+		foreach ( $params_array as $name => $value )
+		{
+			$params[ (string) $name ] = $value;
+		}
+
+		// Store the combined new and existing values back as a JSON string
+		$paramsString = json_encode( $params );
+
+		$db->setQuery('UPDATE #__icagenda SET params = ' .
+		$db->quote( $paramsString ) . ' WHERE id = "3"' );
+		$db->query();
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/index.html b/deployed/icagenda/administrator/components/com_icagenda/views/index.html
new file mode 100644
index 00000000..42682b47
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/index.html
@@ -0,0 +1 @@
+<html><body></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/info/index.html b/deployed/icagenda/administrator/components/com_icagenda/views/info/index.html
new file mode 100644
index 00000000..42682b47
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/info/index.html
@@ -0,0 +1 @@
+<html><body></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/info/tmpl/default.php b/deployed/icagenda/administrator/components/com_icagenda/views/info/tmpl/default.php
new file mode 100644
index 00000000..7823e4f3
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/info/tmpl/default.php
@@ -0,0 +1,247 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.6.0 2016-07-26
+ * @since       2.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+$user		= JFactory::getUser();
+$userId		= $user->get('id');
+
+$db			= JFactory::getDbo();
+$query		= $db->getQuery(true);
+$query->select('version AS icv, releasedate AS icd')->from('#__icagenda')->where('id = 3');
+$db->setQuery($query);
+$result		= $db->loadObject();
+$version	= $result->icv;
+$date		= $result->icd;
+?>
+
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif;?>
+		<!-- Begin Content -->
+		<div class="row-fluid">
+			<div class="span12">
+				<div class="row-fluid">
+					<div class="span6">
+						<div class="icpanel" style="background-color:#FFFFFF; border: 1px solid #D4D4D4; padding:10px; border-radius: 10px;">
+							<h2 style="font-size:2em; color: Gray; text-align: center">
+								<?php echo JText::_('COM_ICAGENDA_PANEL_CONTRIBUTORS');?>
+							</h2>
+							<div>&nbsp;</div>
+							<p style="margin:10px 30px; text-align:center; color: grey;">
+								<i>&ldquo; <?php echo JText::_('COM_ICAGENDA_PANEL_THANKS_TEXT'); ?> &rdquo;</i>
+							</p>
+							<p class="small" style="margin:20px 0px; text-align:justify; color: DimGray;">
+								Ervin Bizjak, Bong, Giuseppe Bosco, Carosouza, Davor Čolić, doorknob, Reinhard Ekker, elirezo, jedi, jowe3, JonxDuo, KISweb, kredo9, macedorl, Kai Metsävainio, mussool, NicoDeluxe, Rickard Norberg, Andrzej Opejda, Régis, Tom-Henning, Rikard Tømte Reitan, Vlad Shuh, Leland Vandervort, Wilfred van Dijk, Roland van Wanrooy, David White ...
+							</p>
+							<h3><?php echo JText::_('COM_ICAGENDA_PANEL_TRANSLATION');?></h3>
+							<div style="margin-left: 20px; padding:0px; color: DimGray;">
+	<img src='../media/mod_languages/images/af.gif' alt="af-ZA" class='iCflag' /> &nbsp;<b>Afrikaans (South Africa) :</b> Isileth <br />
+	<img src='../media/mod_languages/images/ar.gif' alt="ar-AA" class='iCflag' /> &nbsp;<b>Arabic (Unitag) :</b> haneen2013, fkinanah, Specialist <br />
+	<img src='../media/mod_languages/images/eu_es.gif' alt="eu-ES" class='iCflag' /> &nbsp;<b>Basque (Spain) :</b> Bizkaitarra <br />
+	<img src='../media/mod_languages/images/bg.gif' alt="bg-BG" class='iCflag' /> &nbsp;<b>Bulgarian (Bulgaria) :</b> bimbongr <br />
+	<img src='../media/mod_languages/images/ca.gif' alt="ca-ES" class='iCflag' /> &nbsp;<b>Catalan (Spain) :</b> Mussool, EduardAymerich, Figuerolero <br />
+	<img src='../media/mod_languages/images/zh.gif' alt="zh-CN" class='iCflag' /> &nbsp;<b>Chinese (China) :</b> Foxyman <br />
+	<img src='../media/mod_languages/images/tw.gif' alt="zh-TW" class='iCflag' /> &nbsp;<b>Chinese (Taiwan) :</b> jedi, hkce, rowdytang <br />
+	<img src='../media/mod_languages/images/hr.gif' alt="hr-HR" class='iCflag' /> &nbsp;<b>Croatian (Croatia) :</b> Davor Čolić (cdavor) <br />
+	<img src='../media/mod_languages/images/cz.gif' alt="cz-CZ" class='iCflag' /> &nbsp;<b>Czech (Czech Republic) :</b> Bongovo (bong) <br />
+	<img src='../media/mod_languages/images/dk.gif' alt="dk-DK" class='iCflag' /> &nbsp;<b>Danish (Denmark) :</b> olewolf.dk, torbenspetersen, hvitnov, dannikrstnsn, AhmadHamid, poulfrom <br />
+	<img src='../media/mod_languages/images/nl.gif' alt="nl-NL" class='iCflag' /> &nbsp;<b>Dutch (Netherlands) :</b> Molenwal1, AnneM, Walldorff, Mario Guagliardo, wfvdijk, robert.kleinpeter <br />
+	<img src='../media/mod_languages/images/en.gif' alt="en-GB" class='iCflag' /> &nbsp;<b>English (United Kingdom) :</b> Lyr!C <br />
+	<img src='../media/mod_languages/images/us.gif' alt="en-US" class='iCflag' /> &nbsp;<b>English (United States) :</b> Lyr!C <br />
+	<img src='../media/mod_languages/images/eo.gif' alt="eo" class='iCflag' /> &nbsp;<b>Esperanto :</b> Amema, Anita_Dagmarsdotter <br />
+	<img src='../media/mod_languages/images/et.gif' alt="et-EE" class='iCflag' /> &nbsp;<b>Estonian (Estonia) :</b> Reijo, Eraser <br />
+	<img src='../media/mod_languages/images/fi.gif' alt="fi-FI" class='iCflag' /> &nbsp;<b>Finnish (Finland) :</b> Kai Metsävainio (metska)<br />
+	<img src='../media/mod_languages/images/fr.gif' alt="fr-FR" class='iCflag' /> &nbsp;<b>French (France) :</b> Lyr!C <br />
+	<img src='../media/mod_languages/images/gl.gif' alt="gl-ES" class='iCflag' /> &nbsp;<b>Galician (Spain) :</b> XanVFR, Xnake <br />
+	<img src='../media/mod_languages/images/de.gif' alt="de-DE" class='iCflag' /> &nbsp;<b>German (Germany) :</b> grisuu, mPino, bmbsbr, Wasilis, chuerner, cordi_allemand <br />
+	<img src='../media/mod_languages/images/el.gif' alt="el-GR" class='iCflag' /> &nbsp;<b>Greek (Greece) :</b> E.Gkana-D.Kontogeorgis (elinag), kost36, rinenweb, mbini <br />
+	<img src='../media/mod_languages/images/hu.gif' alt="hu-HU" class='iCflag' /> &nbsp;<b>Hungarian (Hungary) :</b> Halilaci, magicf, Cerbo, PKH, mester93 <br />
+	<img src='../media/mod_languages/images/it.gif' alt="it-IT" class='iCflag' /> &nbsp;<b>Italian (Italy) :</b> Giuseppe Bosco (giusebos) <br />
+	<img src='../media/mod_languages/images/ja.gif' alt="ja-JP" class='iCflag' /> &nbsp;<b>Japanese (Japan) :</b> nagata <br />
+	<img src='../media/mod_languages/images/lv.gif' alt="lv-LV" class='iCflag' /> &nbsp;<b>Latvian (Latvia) :</b> kredo9 <br />
+	<img src='../media/mod_languages/images/lt.gif' alt="lt-LT" class='iCflag' /> &nbsp;<b>Lithuanian (Lithuania) :</b> ahxoohx <br />
+	<img src='../media/mod_languages/images/icon-16-language.png' alt="lb-LU" class='iCflag' /> &nbsp;<b>Luxembourgish (Luxembourg) :</b> Superjhemp <br />
+	<img src='../media/mod_languages/images/mk.gif' alt="mk-MK" class='iCflag' /> &nbsp;<b>Macedonian (Macedonia) :</b> Strumjan (Ilija Iliev) <br />
+	<img src='../media/mod_languages/images/no.gif' alt="nb-NO" class='iCflag' /> &nbsp;<b>Norwegian Bokmål (Norway) :</b> Rikard Tømte Reitan (Rikrei) <br />
+	<img src='../media/mod_languages/images/fa_ir.gif' alt="fa-IR" class='iCflag' /> &nbsp;<b>Persian (Iran) :</b> Arash Rezvani (al3n.nvy) <br />
+	<img src='../media/mod_languages/images/pl.gif' alt="pl-PL" class='iCflag' /> &nbsp;<b>Polish (Poland) :</b> mbsrz, KISweb, gienio22, traktor, niewidzialny <br />
+	<img src='../media/mod_languages/images/pt_br.gif' alt="pt-BR" class='iCflag' /> &nbsp;<b>Portuguese (Brazil) :</b> Carosouza, alxaraujo <br />
+	<img src='../media/mod_languages/images/pt.gif' alt="pt-PT" class='iCflag' /> &nbsp;<b>Portuguese (Portugal) :</b> LFGM, macedorl, horus68 <br />
+	<img src='../media/mod_languages/images/ro.gif' alt="ro-RO" class='iCflag' /> &nbsp;<b>Romanian (Romania) :</b> hat, mester93 <br />
+	<img src='../media/mod_languages/images/ru.gif' alt="ru-RU" class='iCflag' /> &nbsp;<b>Russian (Russia) :</b> nshash, MSV <br />
+	<img src='../media/mod_languages/images/sr.gif' alt="sr-YU" class='iCflag' /> &nbsp;<b>Serbian (latin) :</b> Nenad Mihajlović (nenadm) <br />
+	<img src='../media/mod_languages/images/sk.gif' alt="sk-SK" class='iCflag' /> &nbsp;<b>Slovak (Slovakia) :</b> ischindl, J.Ribarszki <br />
+	<img src='../media/mod_languages/images/sl.gif' alt="sl-SI" class='iCflag' /> &nbsp;<b>Slovenian (Slovenia) :</b> erbi (Ervin Bizjak) <br />
+	<img src='../media/mod_languages/images/es.gif' alt="es-ES" class='iCflag' /> &nbsp;<b>Spanish (Spain) :</b> elerizo, mPino, albertodg, adolf64, Goncatín, claugardia, sterroso <br />
+	<img src='../media/mod_languages/images/sv.gif' alt="sv-SE" class='iCflag' /> &nbsp;<b>Swedish (Sweden) :</b> Rickard Norberg (metska), Amema, osignell, kricke <br />
+	<img src='../media/mod_languages/images/th.gif' alt="th-TH" class='iCflag' /> &nbsp;<b>Thai (Thailand) :</b> nightlight, rattanachai.ha <br />
+	<img src='../media/mod_languages/images/tr.gif' alt="tr-TR" class='iCflag' /> &nbsp;<b>Turkish (Turkey) :</b> harikalarkutusu, farukzeynep, kemalokmen <br />
+	<img src='../media/mod_languages/images/uk.gif' alt="uk" class='iCflag' /> &nbsp;<b>Ukrainian (Ukraine) :</b> Vlad Shuh (slv54) <br />
+							</div>
+							<br />
+						</div>
+					</div>
+					<div class="span1">
+					</div>
+					<div class="span5">
+						<div style="float:right; padding:0px 0px 0px 20px;">
+							<img src="../media/com_icagenda/images/logo_icagenda.png" alt="logo_icagenda" />
+						</div>
+						<div>
+							<h2 style="font-size:2em;">
+								<b style="color:#cc0000;">iC</b><b style="color: #666666;">agenda<sup style="font-size:0.6em">&trade;</sup></b>&nbsp;<b style="font-size:0.5em;"></b>
+							</h2>
+						</div>
+						<div>
+							<h4>
+								<?php echo JText::_('COM_ICAGENDA_INFORMATION') ?>
+							</h4>
+						</div>
+						<div>&nbsp;</div>
+						<div>&nbsp;</div>
+						<div>&nbsp;</div>
+						<div>&nbsp;</div>
+						<div>&nbsp;</div>
+						<div>&nbsp;</div>
+
+						<h3><?php echo JText::_('iCagenda Team');?></h3>
+						<p>
+							<strong><?php echo JText::_('COM_ICAGENDA_PANEL_LEAD_DEVELOPER');?></strong><br />
+							Cyril Rezé (Lyr!C) | <a href="http://www.joomlic.com" target="_blank">www.joomlic.com</a>
+						</p>
+						<p>
+							<strong><?php echo JText::_('COM_ICAGENDA_PANEL_TEAM_1');?></strong><br>
+							Giuseppe Bosco (giusebos) | <a href="http://www.newideasproject.com/" target="_blank">www.newideasproject.com</a>
+						</p>
+						<p>
+							<strong><?php echo JText::_('COM_ICAGENDA_PANEL_TEAM_CODE_CONTRIBUTORS');?></strong>
+							<div class="span12">
+							Doorknob :
+								<ul>
+									<small>
+									<li>Features</li>
+									<li>Responsive Screen Threshold Widths (media css)</li>
+									<li>jQuery.highlightToday.js (module calendar)</li>
+									</small>
+								</ul>
+							</div>
+							<div class="span12">
+							Tom-Henning (MaW) :
+								<ul>
+									<small>
+									<li>iCalcreator integration (Add to iCal/Outlook)</li>
+									</small>
+								</ul>
+							</div>
+						</p>
+						<h3><?php echo JText::_('COM_ICAGENDA_VERSION');?></h3>
+						<p>
+							<?php echo $version ;?>
+						</p>
+						<h3><?php echo JText::_('COM_ICAGENDA_COPYRIGHT');?></h3>
+						<p>
+							© 2012 - <?php echo date("Y"); ?> Cyril Rezé / Jooml!C<br/>
+							<a href="http://www.joomlic.com" target="_blank">www.Jooml!C.com</a>
+						</p>
+						<h3><?php echo JText::_('COM_ICAGENDA_LICENSE');?></h3>
+						<p>
+							<a href="http://www.gnu.org/licenses/gpl.html" target="_blank">GPLv3 or later</a>
+						</p>
+						<hr>
+						<h3><?php echo JText::_('COM_ICAGENDA_LIBRARIES');?></h3>
+						<p>
+							<strong>Akeeba Live Update (ARS)</strong><br/>
+							© Nicholas K. Dionysopoulos | <a href="https://www.akeebabackup.com" target="_blank">www.akeebabackup.com</a><br/>
+							<small>Licensed under <a href="http://www.gnu.org/copyleft/lesser.html" target="_blank">GNU LGPLv3</a> or later.</small><br/>
+						</p>
+						<p>
+							<strong>Timepicker jQuery addon</strong><br/>
+							© Trent Richardson | <a href="http://trentrichardson.com" target="_blank">trentrichardson.com</a><br/>
+							<small>Project licensed under the <a href="http://trentrichardson.com/Impromptu/MIT-LICENSE.txt" target="_blank">MIT</a> or <a href="http://trentrichardson.com/Impromptu/GPL-LICENSE.txt" target="_blank">GPL</a> licenses.</small><br/>
+						</p>
+						<p>
+							<strong>TipTip jQuery plugin</strong><br/>
+							© Drew Wilson | <a href="http://www.drewwilson.com" target="_blank">www.drewwilson.com</a><br/>
+							<small>Dual licensed under the <a href="http://www.opensource.org/licenses/mit-license.php" target="_blank">MIT</a> and <a href="http://www.gnu.org/licenses/gpl.html" target="_blank">GPL</a> licenses.</small><br/>
+						</p>
+						<p>
+							<strong>Google Maps™</strong><br/>
+							© Google Inc. | <a href="https://developers.google.com/maps/terms" target="_blank">Google Maps/Google Earth APIs Terms of Service</a><br/>
+							<small>Google™ and Google Maps™ are registered trademarks of Google Inc.</small><br/>
+						</p>
+						<p>
+							<strong>and of course... Joomla!</strong><br/>
+							<a href="http://www.joomla.org" target="_blank">www.joomla.org</a><br/>
+						</p>
+
+					</div>
+				</div>
+			</div>
+		</div>
+
+		<div class="row-fluid">
+			<div class="span12">
+				<tbody>
+					<table style="border: 0px;">
+						<tr>
+							<td>
+								<a href="http://icagenda.joomlic.com/resources/translations" target="_blank" class="btn">
+									<?php echo JText::_('COM_ICAGENDA_PANEL_TRANSLATION_PACKS_DONWLOAD');?>
+								</a>
+							</td>
+							<td>
+								<a href='http://www.joomlic.com/forum/icagenda'  target="_blank" class="btn">
+									<?php echo JText::_('COM_ICAGENDA_PANEL_HELP_FORUM'); ?>
+								</a>
+							</td>
+						</tr>
+					</table>
+				</tbody>
+			</div>
+		</div>
+	</div>
+
+	<!-- footer -->
+	<div>
+		<div class="row-fluid">
+			<div class="span12">
+				<hr>
+				<div class="row-fluid">
+					<div class="span9">
+						Copyright ©2012-<?php echo date("Y"); ?> joomlic.com -&nbsp;
+						<?php echo JText::_('COM_ICAGENDA_PANEL_COPYRIGHT');?>&nbsp;<a href="http://extensions.joomla.org/extensions/calendars-a-events/events/events-management/22013" target="_blank">Joomla! Extensions Directory</a>.
+						<br />
+						<br />
+					</div>
+					<div class="span3" style="text-align: right">
+						<a href='http://www.joomlic.com' target='_blank'>
+							<img src="../media/com_icagenda/images/logo_joomlic.png" alt="JoomliC" border="0"/>
+						</a>
+						<br />
+						<i><b><?php echo JText::_('COM_ICAGENDA_PANEL_SITE_VISIT');?>&nbsp;<a href='http://www.joomlic.com' target='_blank'>www.joomlic.com</a></b></i>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/info/tmpl/index.html b/deployed/icagenda/administrator/components/com_icagenda/views/info/tmpl/index.html
new file mode 100644
index 00000000..42682b47
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/info/tmpl/index.html
@@ -0,0 +1 @@
+<html><body></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/info/view.html.php b/deployed/icagenda/administrator/components/com_icagenda/views/info/view.html.php
new file mode 100644
index 00000000..5b3684cc
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/info/view.html.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-30
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.2.6
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+jimport('joomla.filesystem.path');
+
+// Access check.
+if (JFactory::getUser()->authorise('core.admin', 'com_icagenda'))
+{
+	JToolBarHelper::preferences('com_icagenda');
+}
+
+/**
+ * View class for a list of iCagenda.
+ */
+class iCagendaViewinfo extends JViewLegacy
+{
+	/**
+	 * Display the view
+	 */
+	public function display($tpl = null)
+	{
+		// Joomla 2.5
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			JHtml::stylesheet('com_icagenda/template.j25.css', false, true);
+
+			JHtml::_('behavior.tooltip');
+		}
+
+		JHtml::_('behavior.modal');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+
+			return false;
+		}
+
+		// We don't need toolbar in the modal window.
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->addToolbar();
+
+			if (version_compare(JVERSION, '3.0', 'ge'))
+			{
+				$this->sidebar = JHtmlSidebar::render();
+			}
+		}
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @since	1.6
+	 */
+	protected function addToolbar()
+	{
+		require_once JPATH_COMPONENT . '/helpers/icagenda.php';
+
+		$app      = JFactory::getApplication();
+		$document = JFactory::getDocument();
+
+		$state = $this->get('State');
+
+		// Set Title
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			JToolBarHelper::title(JText::_('COM_ICAGENDA_TITLE_ICAGENDA_IMAGE'));
+		}
+		else
+		{
+			JToolBarHelper::title('iCagenda <span style="font-size:14px;">- ' . JText::_('COM_ICAGENDA_INFO') . '</span>', 'info-2');
+		}
+
+		$icTitle = JText::_('COM_ICAGENDA_INFO');
+
+		$sitename = $app->getCfg('sitename');
+		$title    = $app->getCfg('sitename') . ' - ' . JText::_('JADMINISTRATION') . ' - iCagenda: ' . $icTitle;
+
+		$document->setTitle($title);
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/mail/index.html b/deployed/icagenda/administrator/components/com_icagenda/views/mail/index.html
new file mode 100644
index 00000000..42682b47
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/mail/index.html
@@ -0,0 +1 @@
+<html><body></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/mail/tmpl/edit.php b/deployed/icagenda/administrator/components/com_icagenda/views/mail/tmpl/edit.php
new file mode 100644
index 00000000..6eda528a
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/mail/tmpl/edit.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.5.9 2015-07-30
+ * @since       1.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+JHtml::_('behavior.tooltip');
+JHtml::_('behavior.keepalive');
+JHtml::_('behavior.formvalidation');
+
+if (version_compare(JVERSION, '3.0', 'ge'))
+{
+	JHtml::_('formbehavior.chosen', 'select');
+}
+
+$app = JFactory::getApplication();
+
+//$session		= JFactory::getSession();
+//$ic_newsletter	= $session->get('ic_newsletter', array());
+
+$script = "\t" . 'Joomla.submitbutton = function(pressbutton) {' . "\n";
+$script .= "\t\t" . 'var form = document.adminForm;' . "\n";
+$script .= "\t\t" . 'if (pressbutton == \'mail.cancel\') {' . "\n";
+$script .= "\t\t\t" . 'Joomla.submitform(pressbutton);' . "\n";
+$script .= "\t\t\t" . 'return;' . "\n";
+$script .= "\t\t" . '}' . "\n";
+$script .= "\t\t" . '// do field validation' . "\n";
+$script .= "\t\t" . 'if (form.jform_subject.value == ""){' . "\n";
+$script .= "\t\t\t" . 'alert("' . JText::_('COM_ICAGENDA_NEWSLETTER_NO_OBJ_ALERT', true) . '");' . "\n";
+$script .= "\t\t" . '} else if (getSelectedValue(\'adminForm\',\'jform[eventid]\') == ""){' . "\n";
+$script .= "\t\t\t" . 'alert("' . JText::_('COM_ICAGENDA_NEWSLETTER_NO_EVENT_SELECTED', true) . '");' . "\n";
+$script .= "\t\t" . '} else if (getSelectedValue(\'adminForm\',\'jform[date]\') == ""){' . "\n";
+$script .= "\t\t\t" . 'alert("' . JText::_('COM_ICAGENDA_NEWSLETTER_NO_DATE_SELECTED', true) . '");' . "\n";
+//$script .= "\t\t" . '} else if (form.jform_message.value == ""){' . "\n";
+//$script .= "\t\t\t" . 'alert("' . JText::_('COM_ICAGENDA_NEWSLETTER_NO_BODY_ALERT', true) . '");' . "\n";
+$script .= "\t\t" . '} else {' . "\n";
+$script .= "\t\t\t" . 'Joomla.submitform(pressbutton);' . "\n";
+$script .= "\t\t" . '}' . "\n";
+$script .= "\t\t" . '}' . "\n";
+
+//JFactory::getDocument()->addScriptDeclaration($script);
+
+// Access Administration Newsletter check.
+if (JFactory::getUser()->authorise('icagenda.access.newsletter', 'com_icagenda'))
+{
+	?>
+	<!--script type="text/javascript">
+		Joomla.submitbutton = function(task)
+		{
+			if (task == 'event.cancel' || document.formvalidator.isValid(document.id('event-form'))) {
+				Joomla.submitform(task, document.getElementById('event-form'));
+			}
+			else {
+				alert('<?php echo $this->escape(JText::_('JGLOBAL_VALIDATION_FORM_FAILED'));?>');
+			}
+		}
+	</script-->
+
+	<form action="<?php echo JRoute::_('index.php?option=com_icagenda&view=mail&layout=edit') ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+		<div class="container">
+			<!-- iCagenda Header -->
+			<header>
+				<h1>
+					<?php echo JText::_('COM_ICAGENDA_TITLE_MAIL'); ?>&nbsp;<span>iCagenda</span>
+				</h1>
+				<h2>
+					<?php echo JText::_('COM_ICAGENDA_COMPONENT_DESC'); ?>
+					<!--nav class="iCheader-videos">
+						<span style="font-variant:small-caps">Tutorial Videos</span>
+						<a href="#">Video</a>
+					</nav-->
+				</h2>
+			</header>
+
+			<div>&nbsp;</div>
+
+			<!-- Begin Content -->
+			<h4><?php echo JText::_('COM_ICAGENDA_FORM_LBL_NEWSLETTER_LIST'); ?></h4>
+			<div class="row-fluid">
+				<div class="span12">
+					<div class="span4 iCleft">
+						<div class="control-group">
+							<?php echo $this->form->getLabel('eventid'); ?>
+							<div class="controls">
+								<?php echo $this->form->getInput('eventid'); ?>
+							</div>
+						</div>
+					</div>
+					<div class="span4 iCleft">
+						<div class="control-group">
+							<?php echo $this->form->getLabel('date'); ?>
+							<div class="controls">
+								<?php echo $this->form->getInput('date'); ?>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+			<hr>
+			<h4><?php echo JText::_('COM_ICAGENDA_TITLE_NEWSLETTER'); ?></h4>
+			<div class="row-fluid">
+				<div class="span12">
+					<div class="control-group">
+						<?php echo $this->form->getLabel('subject'); ?>
+						<div class="controls">
+							<?php echo $this->form->getInput('subject'); ?>
+						</div>
+					</div>
+					<div class="control-group">
+						<?php echo $this->form->getLabel('message'); ?>
+						<div class="controls">
+							<?php echo $this->form->getInput('message'); ?>
+						</div>
+					</div>
+				</div>
+			</div>
+			<input type="hidden" name="option" value="com_icagenda" />
+			<input type="hidden" name="task" value="" />
+			<?php echo JHtml::_('form.token'); ?>
+		</div>
+		<div class="clr"></div>
+	</form>
+	<?php
+}
+else
+{
+	$app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'warning');
+	$app->redirect(htmlspecialchars_decode('index.php?option=com_icagenda&view=icagenda'));
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/mail/tmpl/index.html b/deployed/icagenda/administrator/components/com_icagenda/views/mail/tmpl/index.html
new file mode 100644
index 00000000..42682b47
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/mail/tmpl/index.html
@@ -0,0 +1 @@
+<html><body></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/mail/view.html.php b/deployed/icagenda/administrator/components/com_icagenda/views/mail/view.html.php
new file mode 100644
index 00000000..10ef0f22
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/mail/view.html.php
@@ -0,0 +1,138 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-30
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       2.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * View class Admin - Mail Newsletter - iCagenda
+ */
+class iCagendaViewMail extends JViewLegacy
+{
+	protected $data;
+
+	protected $state;
+
+	protected $item;
+
+	protected $form;
+
+	/**
+	 * Display the view
+	 */
+	public function display($tpl = null)
+	{
+		// Joomla 2.5
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			jimport( 'joomla.environment.request' );
+
+			JHtml::stylesheet('com_icagenda/template.j25.css', false, true);
+			JHtml::stylesheet('com_icagenda/icagenda-back.j25.css', false, true);
+
+			JHtml::_('behavior.mootools');
+
+			$app      = JFactory::getApplication();
+			$document = JFactory::getDocument();
+
+			// load jQuery, if not loaded before
+			$scripts = array_keys($document->_scripts);
+			$scriptFound = false;
+
+			for ($i = 0; $i < count($scripts); $i++)
+			{
+				if (stripos($scripts[$i], 'jquery.min.js') !== false
+					|| stripos($scripts[$i], 'jquery.js') !== false)
+				{
+					$scriptFound = true;
+				}
+			}
+
+			// jQuery Library Loader
+			if (!$scriptFound)
+			{
+				// load jQuery, if not loaded before
+				if (!$app->get('jquery'))
+				{
+					$app->set('jquery', true);
+
+					// Add jQuery Library
+					$document->addScript('https://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js');
+					JHtml::script('com_icagenda/jquery.noconflict.js', false, true);
+				}
+			}
+		}
+
+		$this->form = $this->get('Form');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+
+			return false;
+		}
+
+		$this->addToolbar();
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 */
+	protected function addToolbar()
+	{
+		$app      = JFactory::getApplication();
+		$document = JFactory::getDocument();
+		$jinput   = $app->input;
+
+		$jinput->set('hidemainmenu', true);
+
+		$user = JFactory::getUser();
+
+		$canDo = iCagendaHelper::getActions();
+
+		// Set Title
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			JToolBarHelper::title(JText::_('COM_ICAGENDA_TITLE_MAIL'), 'mail.png');
+		}
+		else
+		{
+			JToolBarHelper::title('iCagenda <span style="font-size:14px;">- ' . JText::_('COM_ICAGENDA_TITLE_MAIL') . '</span>', 'mail');
+		}
+
+		$icTitle = JText::_('COM_ICAGENDA_TITLE_MAIL');
+
+		$sitename = $app->getCfg('sitename');
+		$title    = $app->getCfg('sitename') . ' - ' . JText::_('JADMINISTRATION') . ' - iCagenda: ' . $icTitle;
+
+		$document->setTitle($title);
+
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			JToolBarHelper::custom('mail.send', 'forward.png', 'forward.png', 'ICAGENDA_JTOOLBAR_SEND', false);
+		}
+		else
+		{
+			JToolbarHelper::custom('mail.send', 'envelope.png', 'send_f2.png', 'ICAGENDA_JTOOLBAR_SEND', false);
+		}
+
+		JToolBarHelper::cancel('mail.cancel', 'JTOOLBAR_CLOSE');
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/registration/index.html b/deployed/icagenda/administrator/components/com_icagenda/views/registration/index.html
new file mode 100644
index 00000000..42682b47
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/registration/index.html
@@ -0,0 +1 @@
+<html><body></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/registration/tmpl/edit.php b/deployed/icagenda/administrator/components/com_icagenda/views/registration/tmpl/edit.php
new file mode 100644
index 00000000..0b88ae80
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/registration/tmpl/edit.php
@@ -0,0 +1,463 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.6.5 2016-11-14
+ * @since       3.3.3
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+JHtml::_('behavior.tooltip');
+JHtml::_('behavior.keepalive');
+JHtml::_('behavior.formvalidation');
+
+$app = JFactory::getApplication();
+
+// Access Administration Categories check.
+if (JFactory::getUser()->authorise('icagenda.access.registrations', 'com_icagenda'))
+{
+	$document			= JFactory::getDocument();
+	$bootstrapType		= '1';
+	$RegistrationTag	= 'Registration';
+	$RegistrationTitle	= JText::_('COM_ICAGENDA_REGISTRATION_INFORMATION', true);
+	$DescTag			= 'desc';
+	$DescTitle			= JText::_('COM_ICAGENDA_REGISTRATION_NOTES_DISPLAY_LABEL', true);
+	$PublishingTag		= 'publishing';
+	$PublishingTitle	= JText::_('JGLOBAL_FIELDSET_PUBLISHING', true);
+
+	// Joomla 2.5
+	if (version_compare(JVERSION, '3.0', 'lt'))
+	{
+		jimport( 'joomla.html.html.tabs' );
+
+		$iCmapDisplay		= '3';
+
+		$icPanRegistration	= JText::_('COM_ICAGENDA_TITLE_REGISTRATION');
+		$icPanDesc			= JText::_('COM_ICAGENDA_REGISTRATION_NOTES_DISPLAY_LABEL');
+		$icPanPublishing	= JText::_('JGLOBAL_FIELDSET_PUBLISHING');
+		$startPane			= 'tabs.start';
+		$addPanel			= 'tabs.panel';
+		$endPanel			= 'tabs.end';
+		$endPane			= 'tabs.end';
+		$RegistrationTag1	= $RegistrationTag;
+		$RegistrationTag2	= $RegistrationTitle;
+		$DescTag1			= $DescTag;
+		$DescTag2			= $DescTitle;
+		$PublishingTag1		= $PublishingTag;
+		$PublishingTag2		= $PublishingTitle;
+	}
+
+	// Joomla 3
+	else
+	{
+		JHtml::_('formbehavior.chosen', 'select');
+		jimport('joomla.html.html.bootstrap');
+
+		$icPanRegistration	= 'icTab';
+		$icPanDesc			= 'icTab';
+		$icPanPublishing	= 'icTab';
+
+		if ($bootstrapType == '1')
+		{
+			$iCmapDisplay		= '1';
+			$startPane			= 'bootstrap.startTabSet';
+			$addPanel			= 'bootstrap.addTab';
+			$endPanel			= 'bootstrap.endTab';
+			$endPane			= 'bootstrap.endTabSet';
+			$RegistrationTag1	= $RegistrationTag;
+			$RegistrationTag2	= $RegistrationTitle;
+			$DescTag1			= $DescTag;
+			$DescTag2			= $DescTitle;
+			$PublishingTag1		= $PublishingTag;
+			$PublishingTag2		= $PublishingTitle;
+		}
+		if ($bootstrapType == '2')
+		{
+			$iCmapDisplay		= '2';
+			$startPane			= 'bootstrap.startAccordion';
+			$addPanel			= 'bootstrap.addSlide';
+			$endPanel			= 'bootstrap.endSlide';
+			$endPane			= 'bootstrap.endAccordion';
+			$RegistrationTag1	= $RegistrationTitle;
+			$RegistrationTag2	= $RegistrationTag;
+			$DescTag1			= $DescTitle;
+			$DescTag2			= $DescTag;
+			$PublishingTag1		= $PublishingTitle;
+			$PublishingTag2		= $PublishingTag;
+		}
+	}
+	?>
+
+	<?php // ERROR ALERT ?>
+	<div id="form_errors" class="alert alert-danger" style="display:none">
+		<strong><?php echo JText::_('JGLOBAL_VALIDATION_FORM_FAILED'); ?></strong>
+		<div id="message_error">
+		</div>
+	</div>
+
+	<form action="<?php echo JRoute::_('index.php?option=com_icagenda&layout=edit&id='.(int) $this->item->id); ?>" method="post" name="adminForm" id="registration-form" class="form-validate" enctype="multipart/form-data">
+		<div class="container">
+
+			<!-- iCagenda Header -->
+			<header>
+				<h1>
+					<?php echo empty($this->item->id) ? JText::_('COM_ICAGENDA_LEGEND_NEW_REGISTRATION') : JText::sprintf('COM_ICAGENDA_LEGEND_EDIT_REGISTRATION', $this->item->id); ?>&nbsp;<span>iCagenda</span>
+				</h1>
+				<h2>
+					<?php echo JText::_('COM_ICAGENDA_COMPONENT_DESC'); ?>
+				</h2>
+			</header>
+
+			<div>&nbsp;</div>
+
+			<!-- Begin Content -->
+			<div class="row-fluid">
+				<div class="span10 form-horizontal">
+
+					<!-- Open Panel Set -->
+					<?php echo JHtml::_($startPane, 'icTab', array('active' => 'Registration')); ?>
+
+						<!-- Panel Event -->
+						<?php echo JHtml::_($addPanel, $icPanRegistration, $RegistrationTag1, $RegistrationTag2); ?>
+
+							<div class="icpanel iCleft">
+								<h1>
+									<?php echo empty($this->item->id) ? JText::_('COM_ICAGENDA_LEGEND_NEW_REGISTRATION') : JText::sprintf('COM_ICAGENDA_LEGEND_EDIT_REGISTRATION', $this->item->id); ?>
+								</h1>
+								<hr>
+								<div class="row-fluid">
+									<div class="span6 iCleft">
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('userid'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('userid'); ?>
+											</div>
+										</div>
+										<div class="control-group" id="userid_msg" style="display: none">
+											<div class="control-label">
+											</div>
+											<div class="controls" id="fill_user_info_msg">
+											</div>
+										</div>
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('name'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('name'); ?>
+											</div>
+										</div>
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('email'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('email'); ?>
+											</div>
+										</div>
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('phone'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('phone'); ?>
+											</div>
+										</div>
+										<h3><?php echo JText::_('COM_ICAGENDA_CUSTOMFIELDS'); ?></h3>
+										<?php
+										// Load Custom fields - Registration form (1)
+										$customForm		= icagendaEvent::getCustomfieldGroups($this->item->eventid);
+//										$customFields	= icagendaCustomfields::getCustomFields(1, $customForm);
+										echo icagendaCustomfields::loader(1, $customForm);
+										?>
+									</div>
+									<div class="span6 iCleft">
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('eventid'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('eventid'); ?>
+											</div>
+										</div>
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('date'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('date'); ?>
+											</div>
+										</div>
+										<?php //if ($this->item->period) : ?>
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('period'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('period'); ?>
+											</div>
+										</div>
+										<?php //endif; ?>
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('people'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('people'); ?>
+											</div>
+										</div>
+										<input id="jform_data_people" type="hidden" name="jform[data_people]" value="<?php echo $this->item->people; ?>" />
+									</div>
+								</div>
+							</div>
+
+
+						<?php
+						if(version_compare(JVERSION, '3.0', 'ge')) {
+							echo JHtml::_($endPanel);
+						}
+						?>
+
+
+						<!-- Panel Description -->
+						<?php echo JHtml::_($addPanel, $icPanDesc, $DescTag1, $DescTag2); ?>
+
+							<div class="icpanel iCleft">
+								<h1><?php echo JText::_('COM_ICAGENDA_REGISTRATION_NOTES_DISPLAY_LABEL'); ?></h1>
+								<hr>
+								<div class="row-fluid">
+									<div class="span12 iCleft">
+										<!--h3><?php echo JText::_('COM_ICAGENDA_FORM_DESC_REGISTRATION_DESC'); ?></h3-->
+										<?php echo $this->form->getInput('notes'); ?>
+									</div>
+								</div>
+							</div>
+
+
+						<?php
+						if(version_compare(JVERSION, '3.0', 'ge')) {
+							echo JHtml::_($endPanel);
+						}
+						?>
+
+						<?php
+						echo JHtml::_($addPanel, $icPanPublishing, $PublishingTag1, $PublishingTag2);
+						?>
+							<div class="icpanel iCleft">
+								<h1><?php echo JText::_('JGLOBAL_FIELDSET_PUBLISHING'); ?></h1>
+								<hr>
+								<div class="row-fluid">
+									<div class="span6 iCleft">
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('id'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('id'); ?>
+											</div>
+										</div>
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('created'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('created'); ?>
+											</div>
+										</div>
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('created_by'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('created_by'); ?>
+											</div>
+										</div>
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('modified'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('modified'); ?>
+											</div>
+										</div>
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('modified_by'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('modified_by'); ?>
+											</div>
+										</div>
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('checked_out'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('checked_out'); ?>
+											</div>
+										</div>
+										<div class="control-group">
+											<div class="control-label">
+												<?php echo $this->form->getLabel('checked_out_time'); ?>
+											</div>
+											<div class="controls">
+												<?php echo $this->form->getInput('checked_out_time'); ?>
+											</div>
+										</div>
+									</div>
+								</div>
+							</div>
+
+						<?php echo JHtml::_($endPanel); ?>
+
+					<?php echo JHtml::_($endPane, 'icTab'); ?>
+				</div>
+
+				<!-- Begin Sidebar -->
+				<div class="span2 iCleft">
+					<h4><?php echo JText::_('COM_ICAGENDA_TITLE_SIDEBAR_DETAILS'); ?></h4>
+					<hr>
+					<div class="control-group">
+						<div class="control-label">
+							<?php echo $this->form->getLabel('state'); ?>
+						</div>
+						<div class="controls">
+							<?php echo $this->form->getInput('state'); ?>
+						</div>
+					</div>
+				</div>
+				<!-- End Sidebar -->
+
+			</div>
+			<div class="clr"></div>
+		</div>
+
+		<input type="hidden" name="task" value="" />
+		<?php echo JHtml::_('form.token'); ?>
+	</form>
+
+<?php
+	// Build the select user update script.
+	$script = array();
+	$script[] = '	function setUserID() {';
+
+	if (JComponentHelper::getParams('com_icagenda')->get('autofilluser', 1) == 1)
+	{
+		$script[] = '		jQuery(document).ready(function($){';
+		$script[] = '			var userid = $("#jform_userid_id").val();';
+		$script[] = '			$.ajax({url: "index.php?option=com_icagenda&task=registration.registrationName&userid="+userid,';
+		$script[] = '				success: function(output) {';
+		$script[] = '					userInfo = output.split(",");';
+
+		if ( ! $this->item->name && ! $this->item->email)
+		{
+			$script[] = '					$("#jform_name").val(userInfo[0]);';
+			$script[] = '					$("#jform_email").val(userInfo[1]);';
+		}
+		else
+		{
+			$script[] = '					$("#userid_msg").show();';
+			$script[] = '					$("#fill_user_info_msg").html("<div class=\"alert alert-info alert-small\"><p>' . JText::_("COM_ICAGENDA_REGISTRATION_UPDATE_NAME_AND_EMAIL_ALERT") . '</p><div id=\"update-info\" class=\"btn btn-success\">' . JText::_("JYES") . '</div> <div id=\"no-update-info\" class=\"btn btn-danger\">' . JText::_("JNO") . '</div></div>");';
+    		$script[] = '					$("#update-info").on("click",function(){';
+			$script[] = '						$("#jform_name").val(userInfo[0]);';
+			$script[] = '						$("#jform_email").val(userInfo[1]);';
+			$script[] = '						$("#fill_user_info_msg").html("<div class=\"alert alert-success alert-small\"><p>' . JText::_("COM_ICAGENDA_REGISTRATION_UPDATE_NAME_AND_EMAIL_SUCCESS") . '</p></div>");';
+			$script[] = '						$("#userid_msg").delay(700).fadeOut(300);';
+			$script[] = '					});';
+			$script[] = '					$("#no-update-info").on("click",function(){';
+			$script[] = '						$("#userid_msg").fadeOut(300);';
+			$script[] = '					});';
+		}
+
+		$script[] = '				},';
+		$script[] = '				error: function (xhr, ajaxOptions, thrownError) {';
+		$script[] = '					alert(xhr.status + " "+ thrownError);';
+		$script[] = '				}';
+		$script[] = '			});';
+		$script[] = '		});';
+	}
+	else
+	{
+		$script[] = '		console.log("iCagenda info: Auto-fill Name and Email disabled");';
+	}
+
+	$script[] = '	}';
+
+	// Add the script to the document head.
+	JFactory::getDocument()->addScriptDeclaration(implode("\n", $script));
+
+	// Script validation for Registration form (1)
+	$iCheckForm = icagendaForm::submit(1);
+	$document->addScriptDeclaration($iCheckForm);
+
+	// Joomla 2.5
+	if (version_compare(JVERSION, '3.0', 'lt'))
+	{
+		JHtml::stylesheet('com_icagenda/template.j25.css', false, true);
+		JHtml::stylesheet('com_icagenda/icagenda-back.j25.css', false, true);
+
+		// load jQuery, if not loaded before (NEW VERSION IN 1.2.6)
+		$scripts = array_keys($document->_scripts);
+		$scriptFound = false;
+		$scriptuiFound = false;
+		$mapsgooglescriptFound = false;
+		for ($i = 0; $i < count($scripts); $i++)
+		{
+			if (stripos($scripts[$i], 'jquery.min.js') !== false)
+			{
+				$scriptFound = true;
+			}
+			// load jQuery, if not loaded before as jquery - added in 1.2.7
+			if (stripos($scripts[$i], 'jquery.js') !== false)
+			{
+				$scriptFound = true;
+			}
+			if (stripos($scripts[$i], 'jquery-ui.min.js') !== false)
+			{
+				$scriptuiFound = true;
+			}
+			if (stripos($scripts[$i], 'maps.google') !== false)
+			{
+				$mapsgooglescriptFound = true;
+			}
+		}
+
+		// jQuery Library Loader
+		if (!$scriptFound)
+		{
+			// load jQuery, if not loaded before
+			if (!JFactory::getApplication()->get('jquery'))
+			{
+				JFactory::getApplication()->set('jquery', true);
+				// add jQuery
+				$document->addScript('https://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js');
+				$document->addScript( JURI::root( true ) . '/media/com_icagenda/js/jquery.noconflict.js' );
+			}
+		}
+
+		if (!$scriptuiFound)
+		{
+			$document->addScript('https://ajax.googleapis.com/ajax/libs/jqueryui/1.9.2/jquery-ui.min.js');
+		}
+
+		$document->addScript( JURI::root( true ) . '/media/com_icagenda/js/template.js' );
+	}
+}
+else
+{
+	$app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'warning');
+	$app->redirect(htmlspecialchars_decode('index.php?option=com_icagenda&view=icagenda'));
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/registration/tmpl/index.html b/deployed/icagenda/administrator/components/com_icagenda/views/registration/tmpl/index.html
new file mode 100644
index 00000000..42682b47
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/registration/tmpl/index.html
@@ -0,0 +1 @@
+<html><body></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/registration/view.html.php b/deployed/icagenda/administrator/components/com_icagenda/views/registration/view.html.php
new file mode 100644
index 00000000..8b439013
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/registration/view.html.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-30
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.3.3
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * View class Admin - Registration Edit - iCagenda
+ */
+class iCagendaViewRegistration extends JViewLegacy
+{
+	protected $state;
+	protected $item;
+	protected $form;
+
+	/**
+	 * Display the view
+	 */
+	public function display($tpl = null)
+	{
+		// Initialiase variables.
+		$this->state = $this->get('State');
+		$this->item  = $this->get('Item');
+		$this->form  = $this->get('Form');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+
+			return false;
+		}
+
+		$this->addToolbar();
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 */
+	protected function addToolbar()
+	{
+		$app      = JFactory::getApplication();
+		$document = JFactory::getDocument();
+		$jinput   = $app->input;
+
+		$jinput->set('hidemainmenu', true);
+
+		$user  = JFactory::getUser();
+		$isNew = ($this->item->id == 0);
+
+		if (isset($this->item->checked_out))
+		{
+			$checkedOut = ! ($this->item->checked_out == 0 || $this->item->checked_out == $user->get('id'));
+		}
+		else
+		{
+		$checkedOut = false;
+		}
+
+		$canDo = iCagendaHelper::getActions();
+
+		// Set Title
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			JToolBarHelper::title($isNew ? 'iCagenda - ' . JText::_('COM_ICAGENDA_LEGEND_NEW_REGISTRATION') : 'iCagenda - ' . JText::_('COM_ICAGENDA_LEGEND_EDIT_REGISTRATION'), 'registration.png');
+		}
+		else
+		{
+			JToolBarHelper::title($isNew ? 'iCagenda <span style="font-size:14px;">- ' . JText::_('COM_ICAGENDA_LEGEND_NEW_REGISTRATION') . '</span>'  : 'iCagenda <span style="font-size:14px;">- ' . JText::_('COM_ICAGENDA_LEGEND_EDIT_REGISTRATION') . '</span>' , $isNew ? 'new' : 'pencil-2');
+		}
+
+		$icTitle = $isNew ? JText::_('COM_ICAGENDA_LEGEND_NEW_REGISTRATION') : JText::_('COM_ICAGENDA_LEGEND_EDIT_REGISTRATION');
+
+		$sitename = $app->getCfg('sitename');
+		$title    = $app->getCfg('sitename') . ' - ' . JText::_('JADMINISTRATION') . ' - iCagenda: ' . $icTitle;
+
+		$document->setTitle($title);
+
+		// If not checked out, can save the item.
+		if ( ! $checkedOut && ($canDo->get('core.edit') || $canDo->get('core.edit.own') || $canDo->get('core.create')))
+		{
+			JToolBarHelper::apply('registration.apply', 'JTOOLBAR_APPLY');
+			JToolBarHelper::save('registration.save', 'JTOOLBAR_SAVE');
+		}
+
+		if ( ! $checkedOut && ($canDo->get('core.create')))
+		{
+			JToolBarHelper::custom('registration.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+		}
+
+		// If an existing item, can save to a copy.
+		if ( ! $isNew && $canDo->get('core.create'))
+		{
+			JToolBarHelper::custom('registration.save2copy', 'save-copy.png', 'save-copy_f2.png', 'JTOOLBAR_SAVE_AS_COPY', false);
+		}
+
+		if (empty($this->item->id))
+		{
+			JToolBarHelper::cancel('registration.cancel', 'JTOOLBAR_CANCEL');
+		}
+		else
+		{
+			JToolBarHelper::cancel('registration.cancel', 'JTOOLBAR_CLOSE');
+		}
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/registrations/index.html b/deployed/icagenda/administrator/components/com_icagenda/views/registrations/index.html
new file mode 100644
index 00000000..42682b47
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/registrations/index.html
@@ -0,0 +1 @@
+<html><body></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/registrations/tmpl/default.php b/deployed/icagenda/administrator/components/com_icagenda/views/registrations/tmpl/default.php
new file mode 100644
index 00000000..a9d01463
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/registrations/tmpl/default.php
@@ -0,0 +1,617 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.12 2020-03-03
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       2.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.modal');
+JHtml::_('behavior.multiselect');
+
+$app = JFactory::getApplication();
+
+// Access Administration Registrations check.
+if (JFactory::getUser()->authorise('icagenda.access.registrations', 'com_icagenda'))
+{
+	$user			= JFactory::getUser();
+	$userId			= $user->get('id');
+	$listOrder		= $this->state->get('list.ordering');
+	$listDirn		= $this->state->get('list.direction');
+	$canOrder		= $user->authorise('core.edit.state', 'com_icagenda');
+	$saveOrder		= $listOrder == 'a.ordering';
+	$dateFormat		= $this->params->get('date_format_global', 'Y - m - d');
+	$dateSeparator	= $this->params->get('date_separator', ' ');
+	$timeFormat		= ($this->params->get('timeformat', '1') == 1) ? 'H:i' : 'h:i A';
+
+	if (version_compare(JVERSION, '3.0', 'lt'))
+	{
+		JHtml::_('behavior.tooltip');
+	}
+	else
+	{
+		// Include the component HTML helpers.
+		JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+		JHtml::_('bootstrap.tooltip');
+		JHtml::_('formbehavior.chosen', 'select');
+		JHtml::_('dropdown.init');
+
+//		$archived	= $this->state->get('filter.published') == 2 ? true : false;
+//		$trashed	= $this->state->get('filter.published') == -2 ? true : false;
+
+		if ($saveOrder)
+		{
+	    	$saveOrderingUrl = 'index.php?option=com_icagenda&task=registrations.saveOrderAjax&tmpl=component';
+	    	JHtml::_('sortablelist.sortable', 'registrationsList', 'adminForm', strtolower($listDirn), $saveOrderingUrl);
+		}
+	}
+
+	?>
+
+	<form action="<?php echo JRoute::_('index.php?option=com_icagenda&view=registrations'); ?>" method="post" name="adminForm" id="adminForm">
+	<?php if (!empty( $this->sidebar)) : ?>
+		<div id="j-sidebar-container" class="span2">
+			<?php echo $this->sidebar; ?>
+		</div>
+		<div id="j-main-container" class="span10">
+	<?php else : ?>
+		<div id="j-main-container">
+	<?php endif;?>
+
+		<?php if(version_compare(JVERSION, '3.0', 'lt')) : ?>
+			<fieldset id="filter-bar">
+				<div class="filter-search fltlft">
+					<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></label>
+					<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('Search'); ?>" />
+					<button type="submit"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+					<button type="button" onclick="document.id('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
+				</div>
+				<div class="filter-select fltrt">
+
+					<select name="filter_published" class="inputbox" onchange="this.form.submit()">
+						<option value=""><?php echo JText::_('JOPTION_SELECT_PUBLISHED'); ?></option>
+						<?php echo JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), "value", "text", $this->state->get('filter.state'), true);?>
+					</select>
+
+					<select name="filter_categories" class="inputbox" onchange="this.form.submit()">
+						<option value=""><?php echo JText::_('COM_ICAGENDA_REGISTRATIONS_SELECT_CATEGORY'); ?></option>
+						<?php echo JHtml::_('select.options', $this->categories, 'value', 'text', $this->state->get('filter.categories'));?>
+					</select>
+
+					<select name="filter_events" class="inputbox" onchange="this.form.submit()">
+						<option value=""><?php echo JText::_('COM_ICAGENDA_REGISTRATIONS_SELECT_EVENT'); ?></option>
+						<?php echo JHtml::_('select.options', $this->events, 'value', 'text', $this->state->get('filter.events'));?>
+					</select>
+
+					<select name="filter_dates" class="inputbox" onchange="this.form.submit()">
+						<option value=""><?php echo JText::_('COM_ICAGENDA_REGISTRATIONS_SELECT_DATE'); ?></option>
+						<?php echo JHtml::_('select.options', $this->dates, 'value', 'text', $this->state->get('filter.dates'));?>
+					</select>
+
+				</div>
+			</fieldset>
+			<div class="clr"> </div>
+
+		<?php else : ?>
+
+			<div class="alert alert-info">
+				<span class="icon-lamp"></span><strong><?php echo JText::_('IC_TIPS'); ?></strong><br /><?php echo JText::_('COM_ICAGENDA_REGISTRATIONS_TIPS'); ?>
+			</div>
+			<div id="filter-bar" class="btn-toolbar">
+				<div class="filter-search btn-group pull-left">
+					<label for="filter_search" class="element-invisible"><?php echo JText::_('JSEARCH_FILTER'); ?></label>
+					<input class="tip hasTooltip" type="text" name="filter_search" placeholder="<?php echo JText::_('JSEARCH_FILTER'); ?>" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('JSEARCH_FILTER'); ?>" />
+				</div>
+				<div class="btn-group pull-left">
+					<button class="btn tip hasTooltip" type="submit" title="<?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?>"><i class="icon-search"></i></button>
+					<button class="btn tip hasTooltip" type="button" onclick="document.id('filter_search').value='';this.form.submit();" title="<?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?>"><i class="icon-remove"></i></button>
+				</div>
+				<div class="btn-group pull-right hidden-phone">
+					<label for="limit" class="element-invisible"><?php echo JText::_('JFIELD_PLG_SEARCH_SEARCHLIMIT_DESC'); ?></label>
+					<?php echo $this->pagination->getLimitBox(); ?>
+				</div>
+			</div>
+			<div class="alert">
+				<?php echo JText::_('COM_ICAGENDA_REGISTRATIONS_FILTER_SEARCH_DESC'); ?>
+			</div>
+			<div class="clearfix"> </div>
+
+		<?php endif;?>
+
+
+		<?php if(version_compare(JVERSION, '3.0', 'lt')) : ?>
+			<table class="adminlist">
+		<?php else : ?>
+			<table class="table table-striped" id="registrationsList">
+		<?php endif; ?>
+
+				<thead>
+					<tr>
+						<?php // *** Ordering HEADER (Joomla 3.x) *** ?>
+						<?php if(version_compare(JVERSION, '3.0', 'ge')) : ?>
+ 						<th width="1%" class="nowrap center hidden-phone">
+							<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+						</th>
+						<?php endif; ?>
+
+						<?php // *** CheckBox HEADER *** ?>
+						<th width="1%" class="hidden-phone">
+							<input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
+						</th>
+
+						<?php // *** Status HEADER *** ?>
+						<th width="1%" style="min-width:55px" class="nowrap center hidden-phone">
+							<?php echo JHtml::_('grid.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
+						</th>
+
+						<?php // *** User HEADER *** ?>
+						<th>
+							<?php echo JText::_('COM_ICAGENDA_REGISTRATION_INFORMATION'); ?><span class="hidden-phone">:</span><span class="visible-phone"></span>
+							<?php echo JHtml::_('grid.sort',  'IC_NAME', 'name', $listDirn, $listOrder); ?>&nbsp;|
+							<?php echo JHtml::_('grid.sort',  'COM_ICAGENDA_REGISTRATION_USER_ID', 'userid', $listDirn, $listOrder); ?>&nbsp;|
+							<?php echo JHtml::_('grid.sort',  'COM_ICAGENDA_REGISTRATION_EMAIL', 'email', $listDirn, $listOrder); ?>&nbsp;|
+							<?php echo JHtml::_('grid.sort',  'COM_ICAGENDA_REGISTRATION_PHONE', 'phone', $listDirn, $listOrder); ?>&nbsp;|
+							<?php //echo JText::_('COM_ICAGENDA_REGISTRATION_LABEL'); ?><!--span class="hidden-phone">:</span><span class="visible-phone"></span-->
+							<?php echo JHtml::_('grid.sort',  'COM_ICAGENDA_REGISTRATION_NUMBER_PLACES', 'a.people', $listDirn, $listOrder); ?>&nbsp;-
+							<?php echo JHtml::_('grid.sort',  'COM_ICAGENDA_REGISTRATION_EVENTID', 'event', $listDirn, $listOrder); ?>&nbsp;|
+							<?php echo JHtml::_('grid.sort',  'ICDATE', 'a.date', $listDirn, $listOrder); ?>&nbsp;|
+							<?php echo JHtml::_('grid.sort',  'JGLOBAL_FIELD_CREATED_BY_LABEL', 'evt_created_by', $listDirn, $listOrder); ?>
+						</th>
+
+						<?php // *** ID HEADER *** ?>
+						<th width="1%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+						</th>
+
+					</tr>
+				</thead>
+				<tfoot>
+					<tr>
+						<td colspan="5">
+							<?php echo $this->pagination->getListFooter(); ?>
+						</td>
+					</tr>
+				</tfoot>
+				<tbody valign="top">
+				<?php foreach ($this->items as $i => $item) :
+					$ordering		= ($listOrder == 'a.ordering');
+					$canCreate		= $user->authorise('core.create', 'com_icagenda');
+					$canEdit		= $user->authorise('core.edit', 'com_icagenda');
+					$canCheckin		= $user->authorise('core.manage', 'com_icagenda') || $item->checked_out == $userId || $item->checked_out == 0;
+					$canChange		= $user->authorise('core.edit.state', 'com_icagenda') && $canCheckin;
+					$canEditOwn		= $user->authorise('core.edit.own', 'com_icagenda') && $item->userid == $userId;
+
+					// Get participant privacy consents
+					$user_actions = isset($item->user_action) ? explode(',', $item->user_action) : array();
+
+					// Get Gravatar consent
+					if (in_array('consent_gravatar', $user_actions))
+					{
+						$avatar             = md5(strtolower(trim($item->email)));
+						$participant_avatar = '<img alt="' . $item->name . '"  src="https://www.gravatar.com/avatar/' . $avatar . '?s=36&d=mm"/><br /><span class="small iC-italic-grey"><small>Gravatar</small></span>';
+					}
+					else
+					{
+						$participant_avatar = '<div style="display: block; height:36px; width: 36px; font-size: 36px; background: #fff;"><span class="iCicon-avatar ic-avatar"></span></div>';
+					}
+
+					// Get Username and name
+					$data_name     = ($item->userid) ? $item->fullname : $item->name;
+					$data_username = ($item->userid) ? $item->username : false;
+
+					// Load Custom fields DATA
+					$customfields	= icagendaCustomfields::getListNotEmpty($item->id, 1);
+					?>
+					<tr class="row<?php echo $i % 2; ?>">
+
+						<?php // START J3 CODE ?>
+						<?php if(version_compare(JVERSION, '3.0', 'ge')) : ?>
+
+						<?php // *** Ordering (Joomla 3.x) *** ?>
+						<td class="order nowrap center hidden-phone">
+						<?php if ($canChange) :
+							$disableClassName = '';
+							$disabledLabel	  = '';
+
+							if (!$saveOrder) :
+								$disabledLabel    = JText::_('JORDERINGDISABLED');
+								$disableClassName = 'inactive tip-top';
+							endif; ?>
+							<span class="sortable-handler hasTooltip <?php echo $disableClassName; ?>" title="<?php echo $disabledLabel; ?>">
+								<i class="icon-menu"></i>
+							</span>
+							<input type="text" style="display:none" name="order[]" size="5" value="<?php echo $item->ordering; ?>" class="width-20 text-area-order " />
+						<?php else : ?>
+							<span class="sortable-handler inactive" >
+								<i class="icon-menu"></i>
+							</span>
+						<?php endif; ?>
+						</td>
+
+						<?php // END J3 CODE ?>
+						<?php endif; ?>
+
+						<?php // *** CheckBox *** ?>
+						<td class="center hidden-phone">
+							<?php //if ( $item->evt_state == 1) : ?>
+								<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+							<?php //else : ?>
+								<?php //echo ''; ?>
+							<?php //endif; ?>
+						</td>
+
+ 						<?php // *** Status *** ?>
+				    	<td class="center hidden-phone">
+               				<?php if (isset($this->items[0]->state)) : ?>
+					    		<?php echo JHtml::_('jgrid.published', $item->state, $i, 'registrations.', $canChange, 'cb'); ?>
+                			<?php endif; ?>
+				    	</td>
+
+ 						<?php // *** User Information *** ?>
+						<td class="has-context">
+							<div class="pull-left hidden-phone" style="margin-right:10px;">
+								<?php echo $participant_avatar; ?>
+							</div>
+							<div class="pull-left" style="width:45%">
+								<?php if ($item->checked_out) : ?>
+									<?php echo JHtml::_('jgrid.checkedout', $i, $item->username, $item->checked_out_time, 'registrations.', $canCheckin); ?>
+								<?php endif; ?>
+								<?php //if ($item->language == '*'):?>
+									<?php //$language = JText::alt('JALL', 'language'); ?>
+								<?php //else:?>
+									<?php //$language = $item->language ? $this->escape($item->language) : JText::_('JUNDEFINED'); ?>
+								<?php //endif;?>
+								<?php //if ($canEdit || $canEditOwn) : ?>
+								<!--a href="<?php //echo JRoute::_('index.php?option=com_icagenda&task=registration.edit&id=' . $item->id); ?>" title="<?php //echo JText::_('JACTION_EDIT'); ?>"-->
+
+
+								<?php if ($data_name) : ?>
+									<p class="smallsub">
+										<?php echo JText::_('IC_NAME') . ': '; ?>
+										<?php //if ($canEdit && $item->evt_state == 1) : ?>
+										<?php if ($canEdit || $canEditOwn) : ?>
+											<a href="<?php echo JRoute::_('index.php?option=com_icagenda&task=registration.edit&id=' . $item->id); ?>" title="<?php echo JText::_('JACTION_EDIT'); ?>">
+												<?php echo '<strong>' . $this->escape($item->name). '</strong>'; ?>
+											</a>
+										<?php else : ?>
+												<?php echo '<strong>' . $this->escape($item->name). '</strong>'; ?>
+										<?php endif; ?>
+										<?php // Name Visibility Consent. ?>
+										<?php if (in_array('consent_name_public', $user_actions)) : ?>
+											<br />
+											<span class="badge badge-success">
+												<?php echo JText::_('COM_ICAGENDA_PRIVACY_PARTICIPANT_NAME_VISIBILITY_LABEL'); ?>: <?php echo JText::_('COM_ICAGENDA_PRIVACY_PUBLIC'); ?>
+											</span>
+										<?php elseif (in_array('consent_name_users', $user_actions)) : ?>
+											<br />
+											<span class="badge badge-info">
+												<?php echo JText::_('COM_ICAGENDA_PRIVACY_PARTICIPANT_NAME_VISIBILITY_LABEL'); ?>: <?php echo JText::_('COM_ICAGENDA_PRIVACY_USERS'); ?>
+											</span>
+										<?php //elseif ( ! empty($user_actions)) : ?>
+											<!--span class="badge"><?php //echo JText::_('COM_ICAGENDA_PRIVACY_ORGANISER'); ?></span-->
+										<?php endif; ?>
+									</p>
+									<?php if ($data_username) : ?>
+										<?php echo '<strong>' . $this->escape($data_username) . '</strong>'; ?>
+										<?php echo '<small>[' . $this->escape($data_name) . ']</small>'; ?>
+									<?php endif; ?>
+
+									<!--/a-->
+									<?php //else : ?>
+										<!--span title="<?php //echo JText::sprintf('JFIELD_ALIAS_LABEL', $this->escape($item->alias)); ?>"--><?php //echo $this->escape($item->name); ?><!--/span-->
+									<?php //endif; ?>
+									<?php if ($item->userid != '0') : ?>
+										<p class="smallsub">
+											<?php echo JText::_('COM_ICAGENDA_REGISTRATION_USER_ID') . ": " . $this->escape($item->userid); ?>
+										</p>
+									<?php else:?>
+										<p class="smallsub">
+											<?php echo JText::_('COM_ICAGENDA_REGISTRATION_NO_USER_ID'); ?>
+										</p>
+									<?php endif; ?>
+									<?php if (($item->email) OR ($item->phone)) : ?>
+										<!--div class="small" style="height:5px; border-bottom: solid 1px #D4D4D4">
+										</div-->
+										<p>
+										<?php if ($item->email) : ?>
+											<div class="small iC-italic-grey">
+												<?php echo JText::_('COM_ICAGENDA_REGISTRATION_EMAIL') . ": <b>" . $this->escape($item->email) . "</b>"; ?>
+											</div>
+										<?php endif; ?>
+										<?php if ($item->phone) : ?>
+											<div class="small iC-italic-grey">
+												<?php echo JText::_('COM_ICAGENDA_REGISTRATION_PHONE') . ": <b>" . $this->escape($item->phone) . "</b>"; ?>
+											</div>
+										<?php endif; ?>
+										</p>
+									<?php endif; ?>
+								<?php endif; ?>
+
+								<?php if ($item->notes) : ?>
+									<br />
+									<a href="#loadDiv<?php echo $item->id; ?>" class="modal" rel="{size: {x: 600, y: 350}}">
+										<input type="submit" class="btn" value="<?php echo JText::_( 'COM_ICAGENDA_REGISTRATION_NOTES_DISPLAY_LABEL' ); ?>" />
+									</a>
+									<div style="display:none;">
+										<div id="loadDiv<?php echo $item->id; ?>">
+											<?php echo "<h3>".JText::_('COM_ICAGENDA_REGISTRATION_NOTES_DISPLAY_LABEL') . ": </h3><hr>" . nl2br(html_entity_decode($item->notes)); ?>
+										</div>
+									</div>
+								<?php endif; ?>
+
+ 								<?php // Custom Fields ?>
+ 								<?php if ($customfields) : ?>
+									<?php foreach ($customfields AS $customfield) : ?>
+										<?php $cf_value = isset($customfield->cf_value) ? $customfield->cf_value : JText::_('IC_NOT_SPECIFIED'); ?>
+										<div class="small iC-italic-grey">
+											<?php echo JText::_($customfield->cf_title) . ': <strong>' . JText::_($cf_value) . '</strong>'; ?>
+										</div>
+									<?php endforeach; ?>
+								<?php endif; ?>
+
+								<p class="smallsub">
+									<?php if (in_array('consent_organiser', $user_actions)) : ?>
+										<span class="badge">&#10003; <?php echo JText::_('COM_ICAGENDA_REGISTRATION_CONSENT_ORGANISER_LABEL'); ?></span>
+									<?php endif; ?>
+									<?php if (in_array('consent_terms', $user_actions)) : ?>
+										<span class="badge">&#10003; <?php echo JText::_('COM_ICAGENDA_REGISTRATION_TERMS_LABEL'); ?></span>
+									<?php endif; ?>
+								</p>
+
+
+							</div>
+							<div class="pull-right visible-phone" style="margin-right:5%;">
+								<?php echo $participant_avatar; ?>
+							</div>
+							<div class="pull-left" style="width:50%">
+								<?php if ( $item->evt_state != 1) : ?>
+									<div class="small">
+										<div style="font-weight:bold; background:#c30000; color:#FFFFFF; padding: 2px 5px; border-radius: 5px;">
+											<?php echo JText::_( 'COM_ICAGENDA_REGISTRATION_EVENT_NOT_PUBLISHED' ); ?>
+										</div>
+									</div>
+								<?php endif; ?>
+								<div class="small">
+									<?php echo JText::_('ICEVENT'); ?>
+								</div>
+								<div class="small iC-italic-grey">
+									<?php echo JText::_('ICTITLE') . ': <strong>' . $this->escape($item->event) . '</strong>'; ?>
+								</div>
+								<div class="small iC-italic-grey">
+									<?php if (( ! $item->date && $item->period == 0) || ($item->period == 1)) : ?>
+										<?php echo JText::_('ICDATES') . ': '; ?>
+									<?php else : ?>
+										<?php echo JText::_('ICDATE') . ': '; ?>
+									<?php endif; ?>
+									<strong>
+									<?php if ( ! $item->date && $item->period == 0) : ?>
+										<?php // echo JText::_( 'COM_ICAGENDA_ADMIN_REGISTRATION_FOR_ALL_PERIOD' ); ?>
+										<?php if (iCDate::isDate($item->startdate)) : ?>
+											<?php $period = iCGlobalize::dateFormat($item->startdate, $dateFormat, $dateSeparator); ?>
+											<?php if ($item->displaytime) : ?>
+												<?php $period.= ' - ' . date($timeFormat, strtotime($item->startdate)); ?>
+											<?php endif; ?>
+										<?php else : ?>
+											<?php $period = $item->startdate; ?>
+										<?php endif; ?>
+										<?php if ($item->enddate) $period.= ' > '; ?>
+										<?php if (iCDate::isDate($item->enddate)) : ?>
+											<?php $period.= iCGlobalize::dateFormat($item->enddate, $dateFormat, $dateSeparator); ?>
+											<?php if ($item->displaytime) : ?>
+												<?php $period.= ' - ' . date($timeFormat, strtotime($item->enddate)); ?>
+											<?php endif; ?>
+										<?php else : ?>
+											<?php $period.= $item->enddate; ?>
+										<?php endif; ?>
+										<?php echo $period; ?>
+									<?php elseif ( ! $item->date && $item->period == 1) : ?>
+										<?php echo JText::_( 'COM_ICAGENDA_ADMIN_REGISTRATION_FOR_ALL_DATES' ); ?>
+									<?php else : ?>
+										<?php if (iCDate::isDate($item->date)) : ?>
+											<?php echo iCGlobalize::dateFormat($item->date, $dateFormat, $dateSeparator); ?>
+											<?php if ($item->displaytime) : ?>
+												<?php echo ' - ' . date($timeFormat, strtotime($item->date)); ?>
+											<?php endif; ?>
+										<?php else : ?>
+											<?php echo $item->date; ?>
+										<?php endif; ?>
+									<?php endif; ?>
+									</strong>
+								</div>
+								<?php if ($item->evt_created_by) :
+									// Get Author Name
+									$db = JFactory::getDBO();
+									$db->setQuery(
+										'SELECT name' .
+										' FROM #__users' .
+										' WHERE id = '. (int) $item->evt_created_by
+									);
+									$authorname = $db->loadObject()->name;
+ 								?>
+								<div class="small iC-italic-grey">
+									<?php echo JText::_('JGLOBAL_FIELD_CREATED_BY_LABEL') . ': <strong>' . $this->escape($authorname) . '</strong>'; ?>
+								</div>
+								<?php endif; ?>
+								<p>
+								<div class="small">
+									<?php echo JText::_('ICINFORMATION'); ?>
+								</div>
+								<div class="small iC-italic-grey">
+									<?php echo JText::_('COM_ICAGENDA_REGISTRATION_NUMBER_PLACES') . ': <strong>' . $item->people . '</strong>'; ?>
+								</div>
+								</p>
+
+								<?php
+									$reg_label =  array(
+										'-2' => 'warning',
+										'0'  => 'important',
+										'1'  => 'default',
+										'2'  => 'info',
+										'3'  => 'success',
+									);
+									$reg_status =  array(
+										'-2' => 'Failed',
+										'0'  => 'Cancelled',
+										'1'  => '...',
+										'2'  => 'Pending',
+										'3'  => 'Completed',
+									);
+								?>
+								<?php $reg_params = json_decode($item->params); ?>
+								<?php $eventParams = json_decode($item->eventParams); ?>
+								<?php if ($reg_params) : ?>
+									<div class="">
+										<strong><?php echo JText::_('PayPal Payment'); ?></strong>
+									</div>
+									<div>
+										<span class="">
+											Registration Status:
+										</span>
+										<span class="label label-<?php echo $reg_label[$item->status]; ?>">
+											<?php echo $reg_status[$item->status]; ?>
+										</span>
+									</div>
+									<div>
+										<span class="">
+											Payment ID:
+										</span>
+										<span class="label label-default">
+											<?php echo $reg_params->paymentID; ?>
+										</span>
+									</div>
+									<div>
+										<span class="">
+											Payment:
+										</span>
+										<span class="label label-info">
+											<?php echo $reg_params->total . ' ' . $reg_params->currency; ?>
+										</span>
+									</div>
+								<?php elseif ((isset($eventParams->registration_payment) && $eventParams->registration_payment == 1)
+									|| (isset($eventParams->registration_payment) && $eventParams->registration_payment == '' && JComponentHelper::getParams('com_icagenda')->get('registration_payment', ''))) : ?>
+									<div class="small">
+										<strong><?php echo JText::_('PayPal Payment'); ?></strong>
+									</div>
+									<div>
+										<span class="">
+											Registration Status:
+										</span>
+										<span class="label label-<?php echo $reg_label[$item->status]; ?>">
+											<?php echo $reg_status[$item->status]; ?>
+										</span>
+									</div>
+								<?php endif; ?>
+
+							</div>
+						</td>
+
+						<?php // *** ID *** ?>
+						<td class="center hidden-phone">
+							<?php if (isset($this->items[0]->id)) : ?>
+								<?php echo (int) $item->id; ?>
+							<?php endif; ?>
+						</td>
+
+					</tr>
+				<?php endforeach; ?>
+
+			<?php
+			// Old Joomla versions asset_id issue. (all Joomla 2.5.x versions, and Joomla 3 NOT updated!)
+			$asset_issue = version_compare(JVERSION, '3.0', 'lt') ? true : false;
+
+			if ($asset_issue)
+			{
+				$ia = '0';
+				unset($msg);
+				unset($type);
+				$msg = $type = $front_submit = '';
+				$edittx = '<b>' . JText::_( 'JACTION_EDIT' ) . '</b>';
+				$savetx = '<b>' . JText::_( 'JSAVE' ) . '</b>';
+
+				foreach ($this->items as $i => $item)
+				{
+					if (($item->asset_id == '0') && ($item->state == '-2'))
+					{
+						$ia = $ia+1;
+						$front_submit = '1';
+					}
+				}
+
+				if ($front_submit == 1 && $ia == 1)
+				{
+					$app->enqueueMessage(JText::sprintf( 'COM_ICAGENDA_TRASH_FRONTEND_REGISTRATION_1', $edittx, $savetx ), 'notice');
+				}
+				elseif ($front_submit == 1 && $ia > 1)
+				{
+					$app->enqueueMessage(JText::sprintf( 'COM_ICAGENDA_TRASH_FRONTEND_REGISTRATION', $edittx, $savetx ), 'notice');
+				}
+
+				foreach ($this->items as $i => $item)
+				{
+					if ($item->asset_id == '0' && $item->state == '-2')
+					{
+						$editLink = 'index.php?option=com_icagenda&task=registration.edit&id=' . $item->id;
+						$msg	= '- ' . $item->name . ' [' . $item->id . '] : <a href="' . $editLink . '"><b>'.JText::_( 'JACTION_EDIT' ).'</b></a>';
+						$type	= JText::_( 'JGLOBAL_LIST' ).' :';
+					}
+					if ( ! empty($msg))
+					{
+						$app->enqueueMessage($msg, $type);
+					}
+				}
+			}
+			?>
+
+				</tbody>
+			</table>
+
+			<?php if (version_compare(JVERSION, '3.0', 'ge')) : ?>
+			<?php // Load the export form ?>
+			<?php echo JHtml::_(
+				'bootstrap.renderModal',
+				'downloadModal',
+				array(
+					'title'       => JText::_('JTOOLBAR_EXPORT'),
+					'url'         => JRoute::_('index.php?option=com_icagenda&amp;view=download&amp;tmpl=component'),
+					'height'      => '900px',
+					'width'       => '300px',
+					'bodyHeight'  => '70',
+					'modalWidth'  => '40',
+					'footer'      => '<a class="btn" data-dismiss="modal" type="button"'
+							. ' onclick="jQuery(\'#downloadModal iframe\').contents().find(\'#closeBtn\').click();">'
+							. JText::_('COM_ICAGENDA_CANCEL') . '</a>'
+							. '<button class="btn btn-success" type="button"'
+							. ' onclick="jQuery(\'#downloadModal iframe\').contents().find(\'#exportBtn\').click();">'
+							. JText::_('COM_ICAGENDA_REGISTRATIONS_EXPORT') . '</button>',
+				)
+			); ?>
+			<?php endif; ?>
+
+			<div>
+				<input type="hidden" name="task" value="" />
+				<input type="hidden" name="boxchecked" value="0" />
+				<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+				<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+				<?php echo JHtml::_('form.token'); ?>
+			</div>
+		</div>
+	</form>
+	<?php
+}
+else
+{
+	$app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'warning');
+	$app->redirect(htmlspecialchars_decode('index.php?option=com_icagenda&view=icagenda'));
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/registrations/tmpl/index.html b/deployed/icagenda/administrator/components/com_icagenda/views/registrations/tmpl/index.html
new file mode 100644
index 00000000..42682b47
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/registrations/tmpl/index.html
@@ -0,0 +1 @@
+<html><body></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/registrations/view.html.php b/deployed/icagenda/administrator/components/com_icagenda/views/registrations/view.html.php
new file mode 100644
index 00000000..08bce582
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/registrations/view.html.php
@@ -0,0 +1,221 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.7 2019-01-06
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       2.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * View class Admin - List of Registrations - iCagenda
+ */
+class iCagendaViewRegistrations extends JViewLegacy
+{
+	protected $params;
+	protected $state;
+	protected $items;
+	protected $pagination;
+	protected $events;
+	protected $dates;
+
+	/**
+	 * Display the view
+	 */
+	public function display($tpl = null)
+	{
+		// Joomla 2.5
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			jimport( 'joomla.environment.request' );
+
+			JHtml::stylesheet('com_icagenda/template.j25.css', false, true);
+			JHtml::stylesheet('com_icagenda/icagenda-back.j25.css', false, true);
+		}
+
+		$this->params     = JComponentHelper::getParams('com_icagenda');
+		$this->state      = $this->get('State');
+		$this->items      = $this->get('Items');
+		$this->pagination = $this->get('Pagination');
+		$this->events     = $this->get('Events');
+		$this->dates      = $this->get('Dates');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+
+			return false;
+		}
+
+		// We don't need toolbar in the modal window.
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->addToolbar();
+
+			if (version_compare(JVERSION, '3.0', 'ge'))
+			{
+				$this->sidebar = JHtmlSidebar::render();
+			}
+		}
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 */
+	protected function addToolbar()
+	{
+		require_once JPATH_COMPONENT . '/helpers/icagenda.php';
+
+		$app      = JFactory::getApplication();
+		$document = JFactory::getDocument();
+
+		$state = $this->get('State');
+		$canDo = iCagendaHelper::getActions();
+
+		// Set Title
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			JToolBarHelper::title('iCagenda - ' . JText::_('COM_ICAGENDA_TITLE_REGISTRATION'), 'registration.png');
+		}
+		else
+		{
+			JToolBarHelper::title('iCagenda <span style="font-size:14px;">- ' . JText::_('COM_ICAGENDA_TITLE_REGISTRATION') . '</span>', 'users');
+		}
+
+		$icTitle = JText::_('COM_ICAGENDA_TITLE_REGISTRATION');
+
+		$sitename = $app->getCfg('sitename');
+		$title    = $app->getCfg('sitename') . ' - ' . JText::_('JADMINISTRATION') . ' - iCagenda: ' . $icTitle;
+
+		$document->setTitle($title);
+
+		//Check if the form exists before showing the add/edit buttons
+		$formPath = JPATH_COMPONENT_ADMINISTRATOR . '/views/registration';
+
+		if (file_exists($formPath))
+		{
+			$bar = JToolBar::getInstance('toolbar');
+
+			// Add Export Button to the ToolBar
+			if (version_compare(JVERSION, '3.7.0', 'lt'))
+			{
+				// Joomla 2.5
+				$bar->appendButton('Popup', 'export', 'JTOOLBAR_EXPORT', 'index.php?option=com_icagenda&amp;view=download&amp;tmpl=component', 600, 300);
+
+				JToolBarHelper::divider();
+			}
+			else
+			{
+				// Instantiate a new JLayoutFile instance and render the export button
+				$layout = new JLayoutFile('joomla.toolbar.modal');
+
+				$dhtml  = $layout->render(
+					array(
+						'selector' => 'downloadModal',
+						'icon'     => 'download',
+						'text'     => JText::_('JTOOLBAR_EXPORT'),
+					)
+				);
+
+				$bar->appendButton('Custom', $dhtml, 'download');
+			}
+
+			if ($canDo->get('core.create'))
+			{
+				JToolBarHelper::addNew('registration.add', 'JTOOLBAR_NEW');
+			}
+
+			if ($canDo->get('core.edit') || $canDo->get('core.edit.own'))
+			{
+				JToolBarHelper::editList('registration.edit', 'JTOOLBAR_EDIT');
+			}
+
+		}
+
+		if ($canDo->get('core.edit.state'))
+		{
+			if (isset($this->items[0]->state))
+			{
+//				JToolBarHelper::divider();
+				JToolBarHelper::custom('registrations.publish', 'publish.png', 'publish_f2.png','JTOOLBAR_PUBLISH', true);
+				JToolBarHelper::custom('registrations.unpublish', 'unpublish.png', 'unpublish_f2.png', 'JTOOLBAR_UNPUBLISH', true);
+			}
+			else
+			{
+				// If this component does not use state then show a direct delete button as we can not trash
+				JToolBarHelper::deleteList('', 'registrations.delete', 'JTOOLBAR_DELETE');
+			}
+
+			if (isset($this->items[0]->state))
+			{
+				JToolBarHelper::divider();
+				JToolBarHelper::archiveList('registrations.archive', 'JTOOLBAR_ARCHIVE');
+			}
+
+			if (isset($this->items[0]->checked_out))
+			{
+				JToolBarHelper::custom('registrations.checkin', 'checkin.png', 'checkin_f2.png', 'JTOOLBAR_CHECKIN', true);
+			}
+		}
+
+		// Show trash and delete for components that uses the state field
+		if (isset($this->items[0]->state))
+		{
+			if ($state->get('filter.state') == -2 && $canDo->get('core.delete'))
+			{
+				JToolBarHelper::deleteList('', 'registrations.delete', 'JTOOLBAR_EMPTY_TRASH');
+				JToolBarHelper::divider();
+			}
+			elseif ($canDo->get('core.edit.state'))
+			{
+				JToolBarHelper::trash('registrations.trash', 'JTOOLBAR_TRASH');
+				JToolBarHelper::divider();
+			}
+		}
+
+		if ($canDo->get('core.admin'))
+		{
+			JToolBarHelper::preferences('com_icagenda');
+		}
+
+		if (version_compare(JVERSION, '3.0', 'ge'))
+		{
+			JHtmlSidebar::setAction('index.php?option=com_icagenda&view=registrations');
+
+			JHtmlSidebar::addFilter(
+				JText::_('COM_ICAGENDA_REGISTRATIONS_SELECT_STATUS'),
+				'filter_published',
+				JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.state', '1'), true)
+			);
+			JHtmlSidebar::addFilter(
+				JText::_('COM_ICAGENDA_REGISTRATIONS_SELECT_CATEGORY'),
+				'filter_categories',
+				JHtml::_('select.options', $this->get('Categories'), 'value', 'text', $this->state->get('filter.categories'), true)
+			);
+			JHtmlSidebar::addFilter(
+				JText::_('COM_ICAGENDA_REGISTRATIONS_SELECT_EVENT'),
+				'filter_events',
+				JHtml::_('select.options', $this->get('Events'), 'value', 'text', $this->state->get('filter.events'), true)
+			);
+			JHtmlSidebar::addFilter(
+				JText::_('COM_ICAGENDA_REGISTRATIONS_SELECT_DATE'),
+				'filter_dates',
+				JHtml::_('select.options', $this->get('Dates'), 'value', 'text', $this->state->get('filter.dates'), true)
+			);
+		}
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/registrations/view.raw.php b/deployed/icagenda/administrator/components/com_icagenda/views/registrations/view.raw.php
new file mode 100644
index 00000000..d40c3462
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/registrations/view.raw.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.13 2018-03-28
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.5.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * View class for a list of registrations.
+ *
+ * @since	3.5.0
+ */
+class icagendaViewRegistrations extends JViewLegacy
+{
+	/**
+	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
+	 */
+	public function display($tpl = null)
+	{
+		$basename		= $this->get('BaseName');
+		$filetype		= $this->get('FileType');
+		$mimetype		= $this->get('MimeType');
+		$content		= $this->get('Content');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		$document = JFactory::getDocument();
+		$document->setMimeEncoding($mimetype);
+
+		// Joomla 3
+		if (version_compare(JVERSION, '3.0', 'ge'))
+		{
+			JFactory::getApplication()
+				->setHeader(
+					'Content-disposition',
+					'attachment; filename="' . $basename . '.' . $filetype . '"; creation-date="' . JFactory::getDate()->toRFC822() . '"',
+					true
+				);
+		}
+		// Joomla 2.5
+		else
+		{
+			JResponse::setHeader('Content-disposition', 'attachment; filename="' . $basename . '.' . $filetype . '"; creation-date="' . JFactory::getDate()->toRFC822() . '"', true);
+		}
+
+		echo $content;
+	}
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/themes/index.html b/deployed/icagenda/administrator/components/com_icagenda/views/themes/index.html
new file mode 100644
index 00000000..42682b47
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/themes/index.html
@@ -0,0 +1 @@
+<html><body></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/themes/tmpl/default.php b/deployed/icagenda/administrator/components/com_icagenda/views/themes/tmpl/default.php
new file mode 100644
index 00000000..2fbeb993
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/themes/tmpl/default.php
@@ -0,0 +1,319 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-26
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       2.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+jimport( 'joomla.filesystem.path' );
+
+JHtml::_('behavior.framework');
+JHtml::_('behavior.modal');
+
+$app      = JFactory::getApplication();
+$document = JFactory::getDocument();
+
+// Access Administration Registrations check.
+if (JFactory::getUser()->authorise('icagenda.access.themes', 'com_icagenda'))
+{
+	// Check Theme Packs Compatibility
+	if (class_exists('icagendaTheme')) icagendaTheme::checkThemePacks();
+
+	$user    = JFactory::getUser();
+	$userId  = $user->get('id');
+
+	$params  = JComponentHelper::getParams( 'com_icagenda' );
+	$version = $params->get('version');
+	?>
+
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif;?>
+
+		<!-- Begin Content -->
+		<div class="row-fluid">
+			<div class="span12">
+				<div class="span6">
+					<div style="background-color:#FFFFFF; border: 1px solid #D4D4D4; padding:30px; border-radius: 10px;">
+						<form enctype="multipart/form-data" action="index.php" method="post" name="adminForm" id="themes-form" class="form-validate">
+							<?php
+							if (isset($this->require_ftp)) {
+							echo iCagendaFileUpload::renderFTPaccess();
+							}
+							?>
+							<div class="control-group">
+								<label for="install_package"><b><?php echo JText::_( 'COM_ICAGENDA_UPLOAD_THEME_PACKAGE_FILE' ); ?></b></label>
+								<div class="controls">
+									<input type="file" id="sfile-upload" class="input" name="Filedata" />
+									<button onclick="submitbutton()" class="btn btn-primary" id="upload-submit">
+	<?php if(version_compare(JVERSION, '3.0', 'lt')) : ?>
+										<?php echo JText::_( 'COM_ICAGENDA_UPLOAD_AND_INSTALL' ); ?>
+	<?php else : ?>
+										<i class="icon-upload icon-white"></i> <?php echo JText::_( 'COM_ICAGENDA_UPLOAD_AND_INSTALL' ); ?>
+	<?php endif; ?>
+									</button>
+								</div>
+							</div>
+							<input type="hidden" name="type" value="" />
+							<input type="hidden" name="option" value="com_icagenda" />
+							<input type="hidden" name="task" value="themes.themeinstall" />
+							<?php echo JHTML::_( 'form.token' ); ?>
+						</form>
+					</div>
+				</div>
+				<div class="span1">
+				</div>
+				<div class="span5">
+					<div style="float:right; padding:0px 0px 0px 20px;">
+						<img src="../media/com_icagenda/images/logo_icagenda.png" alt="logo_icagenda" />
+					</div>
+					<div>
+						<h2 style="font-size:2em;">
+							<strong><span style="color: #cc0000;">iC</span><span style="color: #666666;">agenda<sup style="font-size:0.5em">&trade;</sup></span></strong><small><?php echo $version;?></small>
+						</h2>
+					</div>
+					<div>
+						<h4>
+							<?php echo JText::_('COM_ICAGENDA_THEME_MANAGER') ?> v1
+						</h4>
+					</div>
+					<br/>
+				</div>
+			</div>
+		</div>
+		<div class="clearfix"> </div>
+
+		<div class="row-fluid">
+			<h2><?php echo JText::_('COM_ICAGENDA_THEMES_LIST_TITLE'); ?></h2>
+			<div class="span12 small" style="margin-left: 0px">
+				<?php
+
+				$url    = JPATH_SITE . '/components/com_icagenda/themes/packs';
+				$urlxml = JPATH_SITE . '/components/com_icagenda/themes/';
+
+				$nb_themes = 0;
+
+				function url_exists($url) {
+					$a_url = parse_url($url);
+					if (!isset($a_url['port'])) $a_url['port'] = 80;
+					$errno = 0;
+					$errstr = '';
+					$timeout = 30;
+					if(isset($a_url['host']) && $a_url['host']!=gethostbyname($a_url['host'])){
+						$fid = fsockopen($a_url['host'], $a_url['port'], $errno, $errstr, $timeout);
+						if (!$fid) return false;
+						$page = isset($a_url['path']) ?$a_url['path']:'';
+						$page .= isset($a_url['query'])?'?'.$a_url['query']:'';
+						fputs($fid, 'HEAD '.$page.' HTTP/1.0'."\r\n".'Host: '.$a_url['host']."\r\n\r\n");
+						$head = fread($fid, 4096);
+						fclose($fid);
+						return preg_match('#^HTTP/.*\s+[200|302]+\s#i', $head);
+					} else {
+						return false;
+					}
+				}
+
+				if($dossier = opendir($url)) {
+					while(false !== ($pack = readdir($dossier))) {
+						if($pack != '.' && $pack != '..' && $pack != 'index.php' && $pack != 'index.html' && $pack != '.DS_Store' && $pack!='.thumbs') {
+							$nb_themes++; // On incrémente le compteur de 1
+							$xml = '.xml';
+							$themeurl = $urlxml.$pack.$xml;
+
+							$dom = new DomDocument;
+							$dom->load($themeurl);
+
+							$getthemeUpdate = $dom->getElementsByTagName('themeUpdate');
+							foreach ($getthemeUpdate AS $themeUpdate)
+							$themeUpdate = $themeUpdate->firstChild->nodeValue;
+							$urltheme = $themeUpdate.'/'.$pack.'/update.xml';
+							$unknown = JText::_('COM_ICAGENDA_THEME_UNKNOWN');
+
+							// Test si fichier de mise à jour
+							$urlex = $urltheme;
+
+							if (url_exists($urlex))
+							{
+								// Récupération données fichier distant de MàJ
+								$update = new DomDocument;
+								$update->load($urltheme);
+
+								$getUpdateversion = $update->getElementsByTagName('version');
+								$getUpdatedownload = $update->getElementsByTagName('download');
+								foreach ($getUpdateversion AS $Updatevers)
+								foreach ($getUpdatedownload AS $download)
+								$updateVersion = $Updatevers->firstChild->nodeValue;
+								$updateDownload = $download->firstChild->nodeValue;
+							}
+							else
+							{
+								$updateVersion = $unknown;
+								$updateDownload = '#';
+							}
+
+
+//							$getUpdatestatus = $dom->getElementsByTagName('status');
+
+							// Récupération données fichier manifest install
+							$getthemename = $dom->getElementsByTagName('name');
+							$getversion = $dom->getElementsByTagName('version');
+							$getcreationDate = $dom->getElementsByTagName('creationDate');
+							$getauthor = $dom->getElementsByTagName('author');
+							$getauthorEmail = $dom->getElementsByTagName('authorEmail');
+							$getauthorWebsite = $dom->getElementsByTagName('authorWebsite');
+							$getauthorUrl = $dom->getElementsByTagName('authorUrl');
+							$getdescription = $dom->getElementsByTagName('description');
+
+							// Conversion des données
+							foreach ($getthemename AS $name)
+//							foreach ($getUpdatestatus AS $status)
+							foreach ($getversion AS $version)
+							foreach ($getcreationDate AS $creationDate)
+							foreach ($getauthor AS $author)
+							foreach ($getauthorEmail AS $authorEmail)
+							foreach ($getauthorWebsite AS $authorWebsite)
+							foreach ($getauthorUrl AS $authorUrl)
+							foreach ($getdescription AS $description)
+
+							$authorWebsitetest = $authorWebsite->firstChild->nodeValue;
+
+							// Affichage fiches Themes
+							echo '<div class="span3" style="padding: 10px; margin:10px 20px 10px 0px; background: #D9D9D9; border-radius:10px;">';
+
+								// Affichage Titre et Nom
+								echo '<div style="text-align:center"><h4>' . $name->firstChild->nodeValue . ' <br><small>[&nbsp;<span style="color:grey">' . $pack . '</span>&nbsp;]</small></h4></div>';
+
+								//Image Theme
+								$urlimg		= '../components/com_icagenda/themes/packs';
+								$thumb		= $urlimg.'/'.$pack.'/images/'.$pack.'_thumbnail.png';
+								$preview	= $urlimg.'/'.$pack.'/images/'.$pack.'_preview.png';
+								if (file_exists($thumb))
+								{
+									$img	= '<img width=280px height=160px src="'.$thumb.'" alt="">';
+									if (file_exists($preview))
+									{
+										$imgtheme	= '<div style="text-align:center; max-width=280px"><a href="'.$preview.'" class="modal" title="'.JText::_('COM_ICAGENDA_CLICK_TO_ENLARGE').'">'.$img.'</a></div>';
+									}
+								} else {
+									$imgtheme ='<div style="text-align:center; max-width=280px">'.JText::_('COM_ICAGENDA_THEME_NO_PREVIEW').'</div>';
+								}
+
+								echo $imgtheme;
+
+								// Affichage Description
+								echo '<p><div style="text-align:justify;"><i>' . $description->firstChild->nodeValue . '</i></div>';
+
+								// Affichage Auteur
+								echo '<div>'.JText::_('COM_ICAGENDA_THEME_AUTHOR').' : <a href="mailto:'.$authorEmail->firstChild->nodeValue.'">' . $author->firstChild->nodeValue . '</a></div>';
+
+								// Affichage Site Auteur
+								$authorWebsite = $authorWebsite->firstChild->nodeValue;
+								if ($authorWebsite != NULL) {
+									echo '<div>'.JText::_('COM_ICAGENDA_THEME_AUTHOR_WEBSITE').' : <a href="'.$authorUrl->firstChild->nodeValue.'" target="_blank">' . $authorWebsite . '</a></div>';
+								}
+
+								// Affichage Version installée
+								echo '<div>'.JText::_('COM_ICAGENDA_THEME_INSTALLED_VERSION').' : ' . $version->firstChild->nodeValue . '</div>';
+
+								// Affichage Dernière version publiée
+								if (($updateVersion > $version->firstChild->nodeValue) && ($updateVersion != $unknown)) {
+									echo '<div>'.JText::_('COM_ICAGENDA_THEME_LATEST_VERSION').' : ' . $updateVersion . '</div></p>';
+								}
+
+								echo '<p></p><div style="display:block; margin-left:auto; margin-right: auto;">';
+
+									if (($updateVersion > $version->firstChild->nodeValue) && ($updateVersion != $unknown)) {
+										echo '<a href="'.$updateDownload.'" target="_blank"><div class="btn_update">'.JText::_('COM_ICAGENDA_THEME_UPDATE').' ' . $updateVersion . ' !</div></a>';
+									} elseif ($updateVersion == $unknown) {
+										echo '<div style="text-align:center; background:#333333; padding:5px; border-radius:5px; color:#FFFFFF;">'.JText::_('COM_ICAGENDA_THEME_AUTHOR_CONTACT').'</div>';
+									} else {
+										echo '<div style="text-align:center; background:#FFFFFF; padding:5px; border-radius:5px;">'.JText::_('COM_ICAGENDA_THEME_LATEST').'</div>';
+									}
+
+								echo '</div>';
+							echo '</div>';
+							} // On ferme le if (qui permet de ne pas afficher index.php, etc.)
+
+						} // On termine la boucle
+
+						echo '<div style="clear: both;"></div>';
+
+						echo '<div>&nbsp;</div>';
+
+						echo '<div>' . JText::_('COM_ICAGENDA_THEME_NB_THEMES_1') . '<strong> ' . $nb_themes . ' </strong>' . JText::_('COM_ICAGENDA_THEME_NB_THEMES_2') .'</div>';
+						echo '<div>&nbsp;</div>';
+
+						closedir($dossier);
+
+						} else {
+							echo 'ERROR: Folder not opened!';
+						}
+						?>
+
+			</div>
+
+			<div class="span12" style="margin-left: 0px">
+				<div class="span6">
+					<div>
+						<a href="http://icagenda.joomlic.com/resources/translations" target="_blank" class="btn"><?php echo JText::_('COM_ICAGENDA_PANEL_TRANSLATION_PACKS_DONWLOAD');?></a>
+						<a href='http://www.joomlic.com/forum/icagenda'  target="_blank" class="btn"><?php echo JText::_('COM_ICAGENDA_PANEL_HELP_FORUM'); ?></a>
+					</div>
+				</div>
+				<div class="span6">
+				</div>
+			</div>
+		</div>
+		<div class="clearfix"> </div>
+	</div>
+
+
+	<div class="row-fluid">
+		<div class="span12">
+		<hr>
+			<div class="span9">
+				Copyright ©2012-<?php echo date("Y"); ?> joomlic.com -&nbsp;
+				<?php echo JText::_('COM_ICAGENDA_PANEL_COPYRIGHT');?>&nbsp;<a href="http://extensions.joomla.org/extensions/calendars-a-events/events/events-management/22013" target="_blank">Joomla! Extensions Directory</a>.
+				<br />
+				<br />
+			</div>
+			<div class="span3" style="text-align: right">
+				<a href='http://www.joomlic.com' target='_blank'><img src="../media/com_icagenda/images/logo_joomlic.png" alt="JoomliC" border="0"/></a>
+				<br />
+				<i><b><?php echo JText::_('COM_ICAGENDA_PANEL_SITE_VISIT');?>&nbsp;<a href='http://www.joomlic.com' target='_blank'>www.joomlic.com</a></b></i>
+			</div>
+		</div>
+	</div>
+
+	<div class="clearfix"> </div>
+
+	<?php
+	// Joomla 2.5 CSS
+	if (version_compare(JVERSION, '3.0', 'lt'))
+	{
+		JHtml::stylesheet('com_icagenda/template.j25.css', false, true);
+		JHtml::stylesheet('com_icagenda/icagenda-back.j25.css', false, true);
+	}
+}
+else
+{
+	$app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'warning');
+	$app->redirect(htmlspecialchars_decode('index.php?option=com_icagenda&view=icagenda'));
+}
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/themes/tmpl/index.html b/deployed/icagenda/administrator/components/com_icagenda/views/themes/tmpl/index.html
new file mode 100644
index 00000000..42682b47
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/themes/tmpl/index.html
@@ -0,0 +1 @@
+<html><body></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/administrator/components/com_icagenda/views/themes/view.html.php b/deployed/icagenda/administrator/components/com_icagenda/views/themes/view.html.php
new file mode 100644
index 00000000..a12917a4
--- /dev/null
+++ b/deployed/icagenda/administrator/components/com_icagenda/views/themes/view.html.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-30
+ *
+ * @package     iCagenda.Admin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+// Access check.
+if (JFactory::getUser()->authorise('core.admin', 'com_icagenda'))
+{
+	JToolBarHelper::preferences('com_icagenda');
+}
+
+/**
+ * View class Admin - Theme Manager - iCagenda
+ */
+class iCagendaViewthemes extends JViewLegacy
+{
+	/**
+	 * Display the view
+	 */
+	public function display($tpl = null)
+	{
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+
+			return false;
+		}
+
+		// We don't need toolbar in the modal window.
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->addToolbar();
+
+			if (version_compare(JVERSION, '3.0', 'ge'))
+			{
+				$this->sidebar = JHtmlSidebar::render();
+			}
+		}
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 */
+	protected function addToolbar()
+	{
+		require_once JPATH_COMPONENT . '/helpers/icagenda.php';
+
+		$app      = JFactory::getApplication();
+		$document = JFactory::getDocument();
+
+		$state = $this->get('State');
+
+		// Set Title
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			JToolBarHelper::title('iCagenda - ' . JText::_('COM_ICAGENDA_THEME_MANAGER'), 'themes.png');
+		}
+		else
+		{
+			JToolBarHelper::title('iCagenda <span style="font-size:14px;">- ' . JText::_('COM_ICAGENDA_THEME_MANAGER') . '</span>', 'palette');
+		}
+
+		$icTitle = JText::_('COM_ICAGENDA_THEME_MANAGER');
+
+		$sitename = $app->getCfg('sitename');
+		$title    = $app->getCfg('sitename') . ' - ' . JText::_('JADMINISTRATION') . ' - iCagenda: ' . $icTitle;
+
+		$document->setTitle($title);
+	}
+}
diff --git a/deployed/icagenda/components/com_icagenda/add/elements/icevent_vars.php b/deployed/icagenda/components/com_icagenda/add/elements/icevent_vars.php
new file mode 100644
index 00000000..da6119aa
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/add/elements/icevent_vars.php
@@ -0,0 +1,403 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.15 2020-05-18
+ *
+ * @package     iCagenda.Site
+ * @subpackage  Add/elements
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2020 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.6.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die();
+
+/**
+ * Event view
+ * Defines variables for use with Theme Packs
+*/
+
+$EVENT_TITLE					= icagendaRender::titleToFormat($item->title);
+$EVENT_META_AS_SHORTDESC		= iCFilterOutput::fullCleanHTML($item->metadesc);
+$EVENT_SHORT_DESCRIPTION		= JHtml::_('content.prepare', $item->shortdesc, $this->params, 'com_icagenda.event');
+$EVENT_DESCRIPTION				= JHtml::_('content.prepare', $item->desc, $this->params, 'com_icagenda.event');
+$AUTO_SHORT_DESCRIPTION			= icagendaEvents::shortDescription($item->desc); // Function to be renamed
+$EVENT_SHARING					= icagendaAddthis::sharing($item);
+
+$CUSTOM_FIELDS					= icagendaEvent::getCustomFields($item->id);
+$EVENT_INFO						= icagendaEvent::infoDetails($item, $CUSTOM_FIELDS);
+$EVENT_INFOS					= $EVENT_INFO; // TODO: changed official Theme Packs (Do not remove for B/C)
+
+$EVENT_EMAIL_CLOAKING			= $item->email ? icagendaRender::emailTag($item->email) : '';
+$EVENT_WEBSITE_LINK				= icagendaRender::websiteTag($item->website);
+$GOOGLEMAPS_COORDINATES			= icagendaGooglemaps::display($item);
+$EVENT_MAP						= icagendaGooglemaps::map($item);
+$EVENT_SINGLE_DATES				= icagendaEvent::displayListSingleDates($item);
+$EVENT_PERIOD					= icagendaEvent::displayPeriodDates($item);
+$EVENT_ATTACHEMENTS_TAG			= icagendaRender::fileTag($item->file);
+$EVENT_IMAGE_TAG				= $item->image ? icagendaThumb::sizeLarge($item->image, 'imgTag', true) : '';
+
+$EVENT_URL						= icagendaEvent::url($item->id, $item->alias);
+
+// Data from database
+$CATEGORY_TITLE			= $item->cat_title;
+$CATEGORY_COLOR			= $item->cat_color;
+$EVENT_ATTACHEMENTS		= $item->file;
+$EVENT_EMAIL			= $item->email;
+$EVENT_IMAGE			= $item->image; // TODO: Check old icmodel function if needed...
+$EVENT_NEXT				= $item->next;
+$EVENT_PHONE			= $item->phone;
+$EVENT_WEBSITE			= $item->website;
+
+
+/**
+ *	Feature Icons
+ */
+$FEATURES_ICONSIZE_LIST		= $this->params->get('features_icon_size_list');
+$FEATURES_ICONSIZE_EVENT	= $this->params->get('features_icon_size_event');
+$SHOW_ICON_TITLE			= $this->params->get('show_icon_title');
+// Get media path
+$params_media = JComponentHelper::getParams('com_media');
+$image_path = $params_media->get('image_path', 'images');
+$FEATURES_ICONROOT_LIST		= JUri::root() . $image_path . '/icagenda/feature_icons/' . $FEATURES_ICONSIZE_LIST . '/';
+$FEATURES_ICONROOT_EVENT	= JUri::root() . $image_path . '/icagenda/feature_icons/' . $FEATURES_ICONSIZE_EVENT . '/';
+$FEATURES_ICONS				= array();
+
+if (isset($item->features) && is_array($item->features)
+	&& (!empty($FEATURES_ICONSIZE_LIST) || !empty($FEATURES_ICONSIZE_EVENT)))
+{
+	foreach ($item->features as $feature)
+	{
+		$FEATURES_ICONS[] = array('icon' => $feature->icon, 'icon_alt' => $feature->icon_alt);
+	}
+}
+
+
+/**
+ *	Event Image and Thumbnails
+ */
+$IMAGE_LARGE_HTML	= ($EVENT_IMAGE && icagendaClass::isLoaded('icagendaThumb'))
+					? icagendaThumb::sizeLarge($item->image, 'imgTag', true)
+					: '';
+
+
+/**
+ *	Description, Meta-description and Intro Text
+ */
+$EVENT_DESC				= ($item->desc || $item->shortdesc) ? true : false;
+$EVENT_META				= $EVENT_META_AS_SHORTDESC;
+
+$desc_display_event = $this->params->get('desc_display_event', '');
+
+// Full description
+if ($desc_display_event == '1')
+{
+	$EVENT_SHORTDESC	= false;
+	$EVENT_DESCRIPTION	= $EVENT_DESCRIPTION ? $EVENT_DESCRIPTION : false;
+}
+
+// Short description
+elseif ($desc_display_event == '2')
+{
+	$EVENT_SHORTDESC	= $EVENT_SHORT_DESCRIPTION ? $EVENT_SHORT_DESCRIPTION : false;
+	$EVENT_DESCRIPTION	= false;
+}
+
+// Short and full descriptions
+elseif ($desc_display_event == '3')
+{
+	$EVENT_SHORTDESC	= $EVENT_SHORT_DESCRIPTION ? $EVENT_SHORT_DESCRIPTION : false;
+	$EVENT_DESCRIPTION	= $EVENT_DESCRIPTION ? $EVENT_DESCRIPTION : false;
+}
+
+// Hide
+elseif ($desc_display_event == '0')
+{
+	$EVENT_SHORTDESC	= false;
+	$EVENT_DESC			= false;
+	$EVENT_DESCRIPTION	= false;
+}
+
+// Auto (First Full Description, if does not exist, will use Short Description if not empty)
+else
+{
+	$EVENT_SHORTDESC	= false;
+	$EVENT_DESCRIPTION	= $EVENT_DESCRIPTION ? $EVENT_DESCRIPTION : $EVENT_SHORT_DESCRIPTION;
+}
+
+
+/**
+ *	Event Address
+ */
+$EVENT_VENUE			= $this->params->get('venue_display_global') ? $item->place : false;
+$EVENT_CITY				= $this->params->get('city_display_global') ? $item->city : false;
+$EVENT_COUNTRY			= $this->params->get('country_display_global') ? $item->country : false;
+
+if ($item->address)
+{
+	// Create an array to separate all strings between comma in individual parts
+	$EVENT_STREET		= $item->address;
+	$ADDRESS_EX			= explode(',', $EVENT_STREET);
+
+	$country_to_check	= ($EVENT_COUNTRY == 'United States') ? 'USA' : $EVENT_COUNTRY;
+	$country_removed	= false;
+	$city_removed		= false;
+
+	$streetAndCity = $street = '';
+
+	$i = 0;
+	$count_ADDRESS_EX = count($ADDRESS_EX);
+
+	for ($i; $i < $count_ADDRESS_EX; $i++)
+	{
+		// Remove the country from the full address
+		if ($EVENT_COUNTRY && ! $country_removed
+			&& strpos($EVENT_STREET, $country_to_check) !== false)
+		{
+			$country_removed	= true;
+
+			// Remove country
+			$EVENT_STREET		= substr( $EVENT_STREET, 0, strripos( $EVENT_STREET, ',' ) );
+			$streetAndCity		= $EVENT_STREET;
+		}
+		elseif ($EVENT_CITY && ! $city_removed
+			&& strpos($EVENT_STREET, $EVENT_CITY) !== false)
+		{
+			$city_removed		= true;
+
+			// Remove last value, until city is not found in the string
+			$EVENT_STREET		= substr( $EVENT_STREET, 0, strripos( $EVENT_STREET, ',' ) );
+			$street				= $EVENT_STREET;
+
+			if (str_replace($street, '', $streetAndCity) != $EVENT_CITY)
+			{
+				$EVENT_CITY_POSTALCODE = str_replace($street, '', $streetAndCity);
+				$EVENT_CITY_POSTALCODE = str_replace(', ', '', $EVENT_CITY_POSTALCODE);
+			}
+		}
+	}
+
+	$EVENT_CITY_POSTALCODE = isset($EVENT_CITY_POSTALCODE) ? $EVENT_CITY_POSTALCODE : $EVENT_CITY;
+
+
+	// Generate EVENT_ADDRESS Html tag
+	$EVENT_ADDRESS = $EVENT_STREET ? $EVENT_STREET . '<br />' : '';
+
+	if ($EVENT_CITY_POSTALCODE && $EVENT_COUNTRY)
+	{
+		$EVENT_ADDRESS.= $EVENT_CITY_POSTALCODE . ', ' . $EVENT_COUNTRY . '<br />';
+	}
+	elseif ( ! $EVENT_COUNTRY && $EVENT_CITY_POSTALCODE)
+	{
+		$EVENT_ADDRESS.= $EVENT_CITY_POSTALCODE . '<br />';
+	}
+	elseif ( ! $EVENT_CITY_POSTALCODE && $EVENT_COUNTRY)
+	{
+		$EVENT_ADDRESS.= $EVENT_COUNTRY . '<br />';
+	}
+}
+else
+{
+	$EVENT_ADDRESS = false;
+}
+
+
+/**
+ *	Set Date from session
+ */
+$app        = JFactory::getApplication();
+$session    = JFactory::getSession();
+
+$input      = $app->input;
+$view       = $input->get('view');
+
+if ($view == 'event')
+{
+	$get_date   = $input->get('date', '');
+	$event_date = $session->get('event_date', '');
+
+	if  ( ! $get_date
+		&& ! $event_date)
+	{
+		$get_date = date('Y-m-d-H-i', strtotime(icagendaEvent::getNextDate($item)));
+	}
+	elseif ( ! $get_date
+		&& $event_date)
+	{
+		$get_date = date('Y-m-d-H-i', strtotime($event_date));
+	}
+	elseif ( ! $get_date
+		&& iCDate::isDate($item->startdate)
+		&& iCDate::isDate($item->enddate)
+		)
+	{
+		$get_date = date('Y-m-d-H-i', strtotime($item->startdate));
+		$session->set('event_date', '');
+	}
+//	elseif ( ! $get_date
+//		&& ! $event_date)
+//	{
+//		$get_date = date('Y-m-d-H-i', strtotime($item->next));
+//	}
+}
+else
+{
+	$session_date = $session->get('session_date', '');
+	$get_date     = date('Y-m-d-H-i', strtotime($session_date));
+}
+
+if ($get_date)
+{
+	$ex = explode('-', $get_date);
+
+	if (count($ex) == 5)
+	{
+		$dateday = $ex['0'].'-'.$ex['1'].'-'.$ex['2'].' '.$ex['3'].':'.$ex['4'];
+	}
+	else
+	{
+		$dateday = '';
+	}
+}
+
+$TEXT_FOR_NEXTDATE				= icagendaEvent::dateText($item);
+
+$timeformat		= $this->params->get('timeformat');
+$timedisplay	= $item->displaytime;
+
+if ($get_date)
+{
+//	$item->registered = icagendaRegistration::getRegisteredTotal($item->id, date('Y-m-d H:i:s', strtotime($dateday)), $item->params->get('typeReg', '1'));
+	$EVENT_NEXTDATE  = icagendaEvent::nextDate($dateday, $item);
+
+	$EVENT_THIS_DATE = icagendaRender::dateToFormat($dateday);
+
+	$weekdays_array = $item->weekdays ? explode (',', $item->weekdays) : '';
+	$weekdays       = $weekdays_array ? count($weekdays_array) : '';
+
+	$period_array	= unserialize($item->period);
+	$period_array	= is_array($period_array) ? $period_array : array();
+
+	// @TODO: create 'Date' and 'Dates' translation strings.
+	// Full period (no weekdays selected)
+	if ( ! $weekdays
+		&& in_array($dateday, $period_array)
+		)
+	{
+		$EVENT_VIEW_DATE_TEXT	= JTEXT::_('COM_ICAGENDA_EVENT_DATE'); // See @TODO
+	}
+
+	// Single date
+	else
+	{
+		$EVENT_VIEW_DATE_TEXT	= JTEXT::_('COM_ICAGENDA_EVENT_DATE'); // See @TODO
+	}
+
+	$EVENT_VIEW_DATE		= $EVENT_NEXTDATE;
+}
+
+// If multiple dates and Display all dates OFF: Use Next date
+else
+{
+	$EVENT_NEXTDATE         = icagendaEvent::nextDate($item->next, $item);
+
+	$EVENT_VIEW_DATE_TEXT	= $TEXT_FOR_NEXTDATE;
+	$EVENT_VIEW_DATE		= $EVENT_NEXTDATE;
+
+	$item->registered       = icagendaRegistration::getRegisteredTotal($item->id, $item->next, $item->params->get('typeReg', '1'));
+
+	$session->set('event_date', $item->next);
+}
+
+
+/**
+ *	Registration info
+ */
+$maxNbTickets	= $item->params->get('maxReg', '1000000'); // TODO: check all functions using max nb of tickets, and replace by empty for unlimited
+$statutReg		= $item->params->get('statutReg', '');
+
+// TEST $item->listTicketsAvailable = icagendaRegistration::getListTicketsAvailable($item->id, $item->params->get('typeReg', '1'), $maxNbTickets);
+
+// Set Registration button + registered people info
+if ($input->get('tmpl') != 'component'
+	&& $input->get('print') != 1
+	&& ! $item->params->get('event_cancelled')
+	)
+{
+	$EVENT_REGISTRATION = icagendaRegistration::reg($item);
+}
+else
+{
+	$EVENT_REGISTRATION = '';
+}
+
+// Set Event information on tickets available/bookable
+if ($maxNbTickets != '1000000'
+	&& $statutReg == '1')
+{
+	$SEATS_AVAILABLE	= ($maxNbTickets - $item->registered);
+
+	if ($SEATS_AVAILABLE === 0)
+	{
+		$SEATS_AVAILABLE	= JText::_('COM_ICAGENDA_REGISTRATION_DATE_NO_TICKETS_LEFT');
+	}
+
+	$MAX_NB_OF_SEATS	= $maxNbTickets;
+}
+
+// No limit for nb of tickets available
+else
+{
+	$SEATS_AVAILABLE		= false;
+	$MAX_NB_OF_SEATS		= false;
+}
+
+// Set Participants list
+$PARTICIPANTS_DISPLAY   = icagendaRegistrationParticipants::listDisplay($item);
+$PARTICIPANTS_HEADER    = icagendaRegistrationParticipants::listTitle($item);
+$EVENT_PARTICIPANTS     = icagendaRegistrationParticipants::registeredUsers($item);
+
+
+// DEPRECATED (old theme packs)
+if ( ! in_array($this->template, array('default', 'ic_rounded')))
+{
+	$item->coordinate				= $GOOGLEMAPS_COORDINATES;
+	$item->datelistUl				= $EVENT_SINGLE_DATES;
+	$item->dateText					= $TEXT_FOR_NEXTDATE;
+	$item->emailLink				= $EVENT_EMAIL_CLOAKING;
+	$item->fileTag					= $EVENT_ATTACHEMENTS_TAG;
+	$item->imageTag					= $EVENT_IMAGE_TAG;
+	$item->infoDetails				= $EVENT_INFO;
+	$item->loadEventCustomFields	= $CUSTOM_FIELDS;
+	$item->map						= $EVENT_MAP;
+	$item->nextDate					= $EVENT_NEXTDATE;
+	$item->participantList			= $PARTICIPANTS_DISPLAY;
+	$item->participantListTitle		= $PARTICIPANTS_HEADER;
+	$item->periodDates				= $EVENT_PERIOD;
+	$item->reg						= $EVENT_REGISTRATION;
+	$item->registeredUsers			= $EVENT_PARTICIPANTS;
+	$item->share_event				= $EVENT_SHARING;
+	$item->websiteLink				= $EVENT_WEBSITE_LINK;
+	$item->periodDisplay			= ($EVENT_SINGLE_DATES || $EVENT_PERIOD) ? true : false;
+	$item->description				= $EVENT_DESCRIPTION;
+
+	// B/C Theme Packs (to be checked, and added if needed)
+	$item->place_name				= $item->place;
+	$item->startdatetime			= $item->startdate;
+	$item->enddatetime				= $item->enddate;
+
+	$item->startDate				= icagendaRender::dateToFormat($item->startdate);
+	$item->endDate					= icagendaRender::dateToFormat($item->enddate);
+
+	$item->startTime				= icagendaRender::dateToTime($item->startdate);
+	$item->endTime					= icagendaRender::dateToTime($item->enddate);
+
+	$EVENT_INFOS					= $EVENT_INFO; // DEPRECATED (Not removed for B/C)
+}
diff --git a/deployed/icagenda/components/com_icagenda/add/elements/iclist_vars.php b/deployed/icagenda/components/com_icagenda/add/elements/iclist_vars.php
new file mode 100644
index 00000000..516255b7
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/add/elements/iclist_vars.php
@@ -0,0 +1,245 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.13 2017-10-20
+ *
+ * @package     iCagenda.Site
+ * @subpackage  Add.elements
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.6.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+
+/**
+ *------------------------------------------------------------------------------
+ *	iCagenda Set Var for Theme Packs - List
+ *------------------------------------------------------------------------------
+*/
+
+$EVENT_TITLE					= $item->titleFormat;
+$EVENT_TITLEBAR					= $item->titlebar;
+$EVENT_META_AS_SHORTDESC		= $item->metaAsShortDesc;
+$EVENT_SHORT_DESCRIPTION		= $item->shortDescription;
+$EVENT_DESCRIPTION				= $item->description;
+$AUTO_SHORT_DESCRIPTION			= $item->descShort;
+$CATEGORY_FONTCOLOR				= $item->fontColor;
+
+$app			= JFactory::getApplication();
+$isSef			= $app->getCfg('sef');
+
+$datesDisplay	= $this->params->get('datesDisplay', 1);
+
+$eventTimeZone	= null;
+$weekdays       = ($item->weekdays || $item->weekdays == '0') ? true : false;
+
+$this_date		= JHtml::date($evt, 'Y-m-d H:i', $eventTimeZone);
+$date_today		= JHtml::date('now', 'Y-m-d');
+$period			= unserialize($item->period);
+$period			= is_array($period) ? $period : array();
+$is_in_period	= (in_array($this_date, $period)) ? true : false;
+
+if ($is_in_period
+	&& $item->weekdays == ''
+	&& strtotime($item->startdate) <= strtotime($date_today)
+	&& strtotime($item->enddate) >= strtotime($date_today)
+	)
+{
+	$ongoing = true;
+}
+else
+{
+	$ongoing = false;
+}
+
+// Day in Date Box (list of events)
+$EVENT_DAY			= $this->params->get('day_display_global', 1)
+					? icagendaEvents::day($evt, $item)
+					: false;
+
+// Month in Date Box (list of events)
+$EVENT_MONTH		= $this->params->get('month_display_global', 1)
+					? icagendaEvents::dateBox($this_date, $this->params->get('event_month_format', 'monthshort'), $ongoing)
+					: false;
+
+if ($this->template == 'default'
+	&& $this->params->get('event_month_format') == 'month')
+{
+	$style = '.ic-month {'
+			. '  font-size: 12px;'
+			. '}'; 
+	JFactory::getDocument()->addStyleDeclaration($style);
+}
+
+// @deprecated since 3.6.0 (EVENT_MONTHSHORT kept for B/C)
+$EVENT_MONTHSHORT	= $this->params->get('month_display_global', 1) ? icagendaEvents::dateBox($this_date, 'monthshort', $ongoing) : false;
+
+// Year in Date Box (list of events)
+$EVENT_YEAR			= $this->params->get('year_display_global', 1)
+					? icagendaEvents::dateBox($evt, 'year', $ongoing)
+					: false;
+
+// Time in Date Box (list of events)
+$EVENT_TIME			= ($this->params->get('time_display_global', 0) && $item->displaytime == 1)
+					? icagendaEvents::dateToTimeFormat($evt)
+					: false;
+
+// Load Event Data
+$EVENT_DATE			= icagendaEvent::nextDate($evt, $item);
+$EVENT_SET_DATE		= icagendaEvent::urlDateVar($evt);
+$READ_MORE			= ($this->params->get('shortdesc_display_global', '') == '' && ! $item->shortdesc)
+					? icagendaEvent::readMore($item->url, $item->desc, '[&#46;&#46;&#46;]')
+					: false;
+
+// URL to event details view (list of events)
+//if ($datesDisplay == 1)
+//{
+	$date_var		= ($isSef == '1') ? '?date=' : '&amp;date=';
+	$set_url_date	= $date_var . $EVENT_SET_DATE;
+	$date_url		= ( ! $weekdays && in_array($this_date, $period))
+					? ''
+					: $date_var . $EVENT_SET_DATE;
+
+	$EVENT_URL = $item->url . $date_url;
+//}
+//else
+//{
+//	$EVENT_URL = $item->url;
+//}
+
+/**
+ *	Event Dates
+ */
+$EVENT_NEXT				= $item->next;
+
+/**
+ *	Feature Icons
+ */
+$FEATURES_ICONSIZE_LIST		= $this->params->get('features_icon_size_list');
+$FEATURES_ICONSIZE_EVENT	= $this->params->get('features_icon_size_event');
+$SHOW_ICON_TITLE			= $this->params->get('show_icon_title');
+// Get media path
+$params_media = JComponentHelper::getParams('com_media');
+$image_path = $params_media->get('image_path', 'images');
+$FEATURES_ICONROOT_LIST		= JUri::root() . $image_path . '/icagenda/feature_icons/' . $FEATURES_ICONSIZE_LIST . '/';
+$FEATURES_ICONROOT_EVENT	= JUri::root() . $image_path . '/icagenda/feature_icons/' . $FEATURES_ICONSIZE_EVENT . '/';
+$FEATURES_ICONS				= array();
+
+if (isset($item->features) && is_array($item->features)
+	&& (!empty($FEATURES_ICONSIZE_LIST) || !empty($FEATURES_ICONSIZE_EVENT)))
+{
+	foreach ($item->features as $feature)
+	{
+		$FEATURES_ICONS[] = array('icon' => $feature->icon, 'icon_alt' => $feature->icon_alt);
+	}
+}
+
+
+/**
+ *	Event Image and Thumbnails
+ */
+$EVENT_IMAGE	= $item->image;
+
+$IMAGE_MEDIUM	= ($EVENT_IMAGE && icagendaClass::isLoaded('icagendaThumb'))
+				? icagendaThumb::sizeMedium($item->image)
+				: '';
+
+
+/**
+ *	Events List - Intro Text (TO DO: MIGRATE TO UTILITIES)
+ */
+$EVENT_DESC = ($item->desc || $item->shortdesc) ? true : false;
+
+$shortdesc_display_global = $this->params->get('shortdesc_display_global', '');
+$Filtering_ShortDesc_Global = JComponentHelper::getParams('com_icagenda')->get('Filtering_ShortDesc_Global', '');
+
+if ($shortdesc_display_global == '1') // short desc
+{
+	$EVENT_DESCSHORT	= $item->shortdesc ? $item->shortdesc : false;
+
+	if ($EVENT_DESCSHORT)
+	{
+		$EVENT_DESCSHORT	= empty($Filtering_ShortDesc_Global) ? '<i>' . $EVENT_DESCSHORT . '</i>' : $EVENT_DESCSHORT;
+	}
+}
+elseif ($shortdesc_display_global == '2') // Auto-Introtext
+{
+	$EVENT_DESCSHORT	= $AUTO_SHORT_DESCRIPTION ? $AUTO_SHORT_DESCRIPTION : false;
+}
+elseif ($shortdesc_display_global == '0') // Hide
+{
+	$EVENT_DESCSHORT	= false;
+}
+else // Auto (First Short Description, if does not exist, Auto-generated short description from the full description. And if does not exist, will use meta description if not empty)
+{
+	$shortDescription = $item->shortdesc ? $item->shortdesc : $AUTO_SHORT_DESCRIPTION;
+
+	$metaAsShortDesc = $EVENT_META_AS_SHORTDESC;
+
+	if ($metaAsShortDesc)
+	{
+		$metaAsShortDesc	= empty($Filtering_ShortDesc_Global) ? '<i>' . $metaAsShortDesc . '</i>' : $metaAsShortDesc;
+	}
+
+	$EVENT_DESCSHORT	= $shortDescription ? $shortDescription : $metaAsShortDesc;
+}
+
+$EVENT_INTRO_TEXT = $EVENT_DESCSHORT; // New var name since 3.4.0
+
+
+
+$EVENT_VENUE			= $this->params->get('venue_display_global', 1) ? $item->place : false;
+$EVENT_POSTAL_CODE		= $this->params->get('city_display_global', 1) ? $item->city : false;
+$EVENT_CITY				= $this->params->get('city_display_global', 1) ? $item->city : false;
+$EVENT_COUNTRY			= $this->params->get('country_display_global', 1) ? $item->country : false;
+
+$CATEGORY_TITLE			= $item->cat_title;
+$CATEGORY_COLOR			= $item->cat_color;
+
+
+/**
+ *	Add Event Info from plugins (if exists)
+ */
+$onListAddEventInfo = $this->dispatcher->trigger('onListAddEventInfo', array('com_icagenda.list', &$item, &$this->params));
+
+$IC_LIST_ADD_EVENT_INFO = '';
+
+foreach ($onListAddEventInfo as $added_info)
+{
+	$IC_LIST_ADD_EVENT_INFO.= '<div class="ic-list-add-event-info">' . $added_info . '</div>';
+}
+
+
+
+// B/C Theme Packs (to be checked, and added if needed)
+if ( ! in_array($this->template, array('default', 'ic_rounded')))
+{
+	$item->place_name				= $item->place;
+	$item->startdatetime			= $item->startdate;
+	$item->enddatetime				= $item->enddate;
+
+	$item->startDate				= icagendaRender::dateToFormat($item->startdate);
+	$item->endDate					= icagendaRender::dateToFormat($item->enddate);
+
+	$item->startTime				= icagendaRender::dateToTime($item->startdate);
+	$item->endTime					= icagendaRender::dateToTime($item->enddate);
+
+	$item->day						= $EVENT_DAY;
+	$item->monthShort				= $EVENT_MONTHSHORT;
+	$item->year						= $EVENT_YEAR;
+	$item->evenTime					= $EVENT_TIME;
+
+	$this->atlist					= '';
+
+	// To be checked
+	$CUSTOM_FIELDS				= icagendaEventData::loadEventCustomFields($item->id);
+}
diff --git a/deployed/icagenda/components/com_icagenda/add/elements/index.html b/deployed/icagenda/components/com_icagenda/add/elements/index.html
new file mode 100644
index 00000000..fa6d84e8
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/add/elements/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/components/com_icagenda/add/index.html b/deployed/icagenda/components/com_icagenda/add/index.html
new file mode 100644
index 00000000..fa6d84e8
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/add/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/components/com_icagenda/controller.php b/deployed/icagenda/components/com_icagenda/controller.php
new file mode 100644
index 00000000..c412e6f7
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/controller.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-30
+ *
+ * @package     iCagenda.Site
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+require_once(JPATH_COMPONENT_SITE . '/helpers/iCicons.class.php');
+
+/**
+ * Controller class for iCagenda.
+ */
+class iCagendaController extends JControllerLegacy
+{
+	public function display($cachable = false, $urlparams = false)
+	{
+		$paramsC  = JComponentHelper::getParams('com_icagenda');
+		$cache    = $paramsC->get('enable_cache', 0);
+		$cachable = false;
+
+		if ($cache == 1)
+		{
+			$cachable = true;
+		}
+
+		$document = JFactory::getDocument();
+
+		$safeurlparams = array(
+			'catid'  => 'INT',
+			'id'     => 'INT',
+			'date'   => 'STRING',
+			'page'   => 'INT',
+			'year'   => 'INT',
+			'month'  => 'INT',
+			'return' => 'BASE64',
+			'print'  => 'BOOLEAN',
+			'lang'   => 'CMD',
+			'Itemid' => 'INT',
+		);
+
+		parent::display($cachable, $safeurlparams);
+
+		return $this;
+	}
+}
diff --git a/deployed/icagenda/components/com_icagenda/controllers/index.html b/deployed/icagenda/components/com_icagenda/controllers/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/controllers/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/components/com_icagenda/controllers/registration.php b/deployed/icagenda/components/com_icagenda/controllers/registration.php
new file mode 100644
index 00000000..e2f86fa6
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/controllers/registration.php
@@ -0,0 +1,342 @@
+<?php
+
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-05-04
+ *
+ * @package     iCagenda.Site
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.6.0
+ *----------------------------------------------------------------------------
+ */
+
+defined('_JEXEC') or die;
+
+require_once JPATH_COMPONENT . '/controller.php';
+
+/**
+ * Registration controller class for Users.
+ *
+ * @since   3.6.0
+ */
+class iCagendaControllerRegistration extends iCagendaController
+{
+	/**
+	 * Method to register a user.
+	 *
+	 * @return  boolean  True on success, false on failure.
+	 *
+	 * @since   3.6.0
+	 */
+
+	public function registerWithoutForm()
+	{
+		require_once(JPATH_BASE . '/common_cadline_libraries/crm_users.class.php');
+
+		$data = JRequest::get($_POST);
+
+		$event 				= new stdClass();
+		$event->evt_id 		= $data['evt_id'];
+		$event->date 		= $data['startDate'];
+		$event->endDate 	= $data['endDate'];
+		$event->zone 		= $data['zone'];
+		$event->cntry 		= $data['country'];
+		$event->userName	= $data['name'];
+		$event->userEmail 	= $data['email'];
+		$event->rerun 		= $data['rerun'];
+		$events 			= new Event($event);
+
+		if ($event->evt_id == '108')
+			$data['req_url'] = 'https://www.archlinexp.com/update-day-25-november';
+		else
+			$data['req_url'] = 'https://www.archlinexp.com/events';
+
+		if ($data['g-recaptcha-response'] == '') {
+			$this->setMessage('<h1>Please complete the captcha</h1>', 'danger');
+			$this->setRedirect(JRoute::_($data['req_url'], false));
+			return;
+		}
+
+		if ($data['country'] == '') {
+			$this->setMessage('<h1>Please choose a country</h1>', 'danger');
+			$this->setRedirect(JRoute::_($data['req_url'], false));
+			return;
+		}
+
+		if (!icagendaRegistration::validEmail($data['email'])) {
+			$this->setMessage(JText::_('COM_ICAGENDA_REGISTRATION_EMAIL_NOT_VALID'), 'danger');
+			$this->setRedirect(JRoute::_($data['req_url'], false));
+			return;
+		}
+
+		if ($events->registration()) {
+			$this->setMessage('Thank you for taking time to register. <br/>
+				An email with further details has been sent to the email address you provided. <br/>
+				We hope you will enjoy the presentations.');
+		}
+		$this->setRedirect(JRoute::_($data['req_url'], false));
+	}
+
+	public function registerToAlLive()
+	{
+		require_once(JPATH_BASE . '/common_cadline_libraries/crm_users.class.php');
+
+		$data = JRequest::get($_POST);
+
+		$event->userName	= $data['name'];
+		$event->userEmail	= $data['email'];
+		$event->cntry		= $data['country'];
+		$events 			= new Event($event);
+
+		$data['req_url'] = 'https://www.archlinexp.com/win-al-live';
+
+		if ($data['g-recaptcha-response'] == '') {
+			$this->setMessage('<h1>Please complete the captcha</h1>', 'danger');
+			$this->setRedirect(JRoute::_($data['req_url'], false));
+			return;
+		}
+
+		if ($data['country'] == '') {
+			$this->setMessage('<h1>Please choose a country</h1>', 'danger');
+			$this->setRedirect(JRoute::_($data['req_url'], false));
+			return;
+		}
+
+		if (!icagendaRegistration::validEmail($data['email'])) {
+			$this->setMessage(JText::_('COM_ICAGENDA_REGISTRATION_EMAIL_NOT_VALID'), 'danger');
+			$this->setRedirect(JRoute::_($data['req_url'], false));
+			return;
+		}
+
+		/*if ($events->registerToWinLIVE()) {
+			$this->setMessage('Thank you for taking time to register. <br/>
+				An email with further details has been sent to the email address you provided. <br/>
+				We hope you will enjoy the presentations.');
+		}*/
+
+		$this->setMessage('Thank you for taking time to register. <br/>
+			An email with further details has been sent to the email address you provided. <br/>
+			We hope you will enjoy the presentations.');
+
+		$this->setRedirect(JRoute::_($data['req_url'], false));
+	}
+
+	public function register()
+	{
+		// Check for request forgeries.
+		//		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		// If registration is disabled - Redirect to login page.
+		//		if (JComponentHelper::getParams('com_users')->get('allowUserRegistration') == 0)
+		//		{
+		//			$this->setRedirect(JRoute::_('index.php?option=com_users&view=login', false));
+
+		//			return false;
+		//		}
+
+		$app    = JFactory::getApplication();
+		$jinput = $app->input;
+
+		$id = $jinput->getInt('eventID');
+
+		$model = $this->getModel('Registration');
+
+		// Get the user data.
+		$requestData = $jinput->post->get('jform', array(), 'array');
+
+		// Validate the posted data.
+		$form = $model->getForm();
+
+		if (!$form) {
+			throw new Exception($model->getError(), 500);
+
+			return false;
+		}
+
+		$data = $model->validate($form, $requestData);
+
+		// Check for validation errors.
+		if ($data === false) {
+			// Get the validation messages.
+			$errors = $model->getErrors();
+
+			// Push up to five validation messages out to the user.
+			for ($i = 0, $n = count($errors); $i < $n && $i < 5; $i++) {
+				if ($errors[$i] instanceof Exception) {
+					$app->enqueueMessage($errors[$i]->getMessage(), 'warning');
+				} else {
+					$app->enqueueMessage($errors[$i], 'warning');
+				}
+			}
+
+			// Save the data in the session.
+			$app->setUserState('com_icagenda.registration.data', $requestData);
+
+			// Redirect back to the registration screen.
+			$this->setRedirect(JRoute::_('index.php?option=com_icagenda&view=registration&id=' . $id, false));
+
+			return false;
+		}
+
+		// Set data to user State
+		//		$app->setUserState('com_icagenda.registration.data', $requestData);
+
+		// Attempt to save the data.
+		$return = $model->register($data);
+
+		// Check for errors.
+		if ($return === false) {
+			// Save the data in the session.
+			$app->setUserState('com_icagenda.registration.data', $data);
+
+			// Redirect back to the edit screen.
+			$this->setMessage($model->getError(), 'warning');
+			$this->setRedirect(JRoute::_('index.php?option=com_icagenda&view=registration&id=' . $id, false));
+
+			return false;
+		}
+
+		// Flush the data from the session.
+		$app->setUserState('com_icagenda.registration.data', null);
+
+		// Redirect to the complete layout.
+		if ($return === 'complete') {
+			$this->setMessage(JText::_('COM_ICAGENDA_REGISTRATION_COMPLETE_SUCCESS'));
+			$this->setRedirect(JRoute::_('index.php?option=com_icagenda&view=registration&layout=complete&id=' . $id, false));
+		}
+
+		// Redirect to the actions layout.
+		elseif ($return) {
+			// Save the data in the session.
+			$app->setUserState('com_icagenda.registration.regdata', $data);
+			$app->setUserState('com_icagenda.registration.actions', $return);
+
+			$this->setRedirect(JRoute::_('index.php?option=com_icagenda&view=registration&layout=actions&id=' . $id, false));
+		} else {
+			// Save the data in the session.
+			$app->setUserState('com_icagenda.registration.data', $data);
+
+			// Redirect back to the registration form.
+			$this->setMessage($model->getError(), 'warning');
+			$this->setRedirect(JRoute::_('index.php?option=com_icagenda&view=registration&id=' . $id, false));
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to complete actions.
+	 *
+	 * @return  boolean  True on success, false on failure.
+	 *
+	 * @since   3.6.13
+	 */
+	public function actions()
+	{
+		$app    = JFactory::getApplication();
+		$jinput = $app->input;
+
+		$id       = $jinput->getInt('eventID');
+		$action   = $jinput->get('action', '');
+		$data     = $jinput->get('data', null);
+		$complete = $jinput->get('complete', '');
+
+		$regid    = $app->getUserState('com_icagenda.registration.regid', '');
+		$regData  = $app->getUserState('com_icagenda.registration.regdata', null);
+
+		// Get registration ID
+		$regData['id'] = $regid;
+
+		$app->setUserState('com_icagenda.actions.data', $data);
+
+		$model = $this->getModel('Registration');
+
+		// Attempt to validate the action.
+		$return = $model->actions($action, $data, $regData);
+
+		if ($complete && $return) {
+			$this->setMessage(JText::_('COM_ICAGENDA_REGISTRATION_COMPLETE_SUCCESS'));
+			$this->setRedirect(JRoute::_('index.php?option=com_icagenda&view=registration&layout=complete&id=' . $id, false));
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to cancel one registration.
+	 *
+	 * @return  boolean  True on success, false on failure.
+	 *
+	 * @since   3.6.13
+	 */
+	public function cancel()
+	{
+		$app    = JFactory::getApplication();
+		$jinput = $app->input;
+		$user   = JFactory::getUser();
+
+		$dates_cancelled = $jinput->get('dates_cancelled');
+		$event_id        = $jinput->getInt('eventID');
+		$user_id         = $user->get('id');
+
+		if (empty($dates_cancelled)) {
+			$this->setMessage(JText::_('COM_ICAGENDA_REGISTRATION_CANCEL_SELECT_DATES'), 'error');
+			$this->setRedirect(JRoute::_('index.php?option=com_icagenda&view=registration&layout=cancel&id=' . $event_id, false));
+		}
+
+		$model = $this->getModel('Registration');
+
+		// Attempt to cancel date(s) registration.
+		$return = $model->cancel($dates_cancelled, $user_id);
+
+		if ($return === false) {
+			$this->setMessage(JText::_('JERROR_LAYOUT_PAGE_NOT_FOUND'), 'warning');
+			$this->setRedirect(JRoute::_('index.php?option=com_icagenda&view=event&id=' . $event_id, false));
+
+			return false;
+		} elseif ($return && $dates_cancelled && $user_id) {
+			JArrayHelper::toInteger($dates_cancelled);
+			$dates_cancelled = implode(',', $dates_cancelled);
+			$this->setMessage(JText::_('COM_ICAGENDA_REGISTRATION_CANCEL_SUCCESS'), 'message');
+			$this->setRedirect(JRoute::_('index.php?option=com_icagenda&view=registration&layout=cancel&id=' . $event_id . '&dates_cancelled=' . $dates_cancelled, false));
+		} else {
+			$this->setMessage(JText::_('JERROR_LAYOUT_PAGE_NOT_FOUND'), 'warning');
+			$this->setRedirect(JRoute::_('index.php?option=com_icagenda&view=event&id=' . $event_id, false));
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Return Ajax to get total of registered people for one event and one date
+	 *
+	 * @since   3.6.5
+	 */
+	public function ticketsBookable()
+	{
+		$jinput = JFactory::getApplication()->input;
+
+		$eventID = $jinput->get('eventID', '');
+
+		$regDate = $jinput->get('regDate', '');
+		$regDate = str_replace('space', ' ', $regDate);
+		$regDate = str_replace('_', ':', $regDate);
+
+		$typeReg = $jinput->get('typeReg', '');
+		$maxReg  = $jinput->get('maxReg', '');
+		$tickets = $jinput->get('tickets', '');
+
+		icagendaAjax::getTicketsBookable($eventID, $regDate, $typeReg, $maxReg, $tickets);
+	}
+}
diff --git a/deployed/icagenda/components/com_icagenda/helpers/iCicons.class.php b/deployed/icagenda/components/com_icagenda/helpers/iCicons.class.php
new file mode 100644
index 00000000..a6dbfd91
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/helpers/iCicons.class.php
@@ -0,0 +1,177 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.3 2018-07-27
+ *
+ * @package     iCagenda.Site
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.2.9
+ * @todo        Migrate to Library (iC Library or Utilities ?)
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+
+class iCicons
+{
+	/**
+	 * Shows the button corresponding to the action.
+	 *
+	 * @param   $type  of action
+	 * @param   $link  to be handled
+	 * @return  $html  string
+	 */
+	public static function showIcon($type, $link = '', $vcal = '', $gcal = '', $wcal = '', $ycal = '')
+	{
+		// loading Global Options
+		$iC_global = JComponentHelper::getParams('com_icagenda');
+
+		// Component Options
+		$iconAddToCal_options = $iC_global->get('iconAddToCal_options', '');
+		$iconAddToCal_size    = $iC_global->get('iconAddToCal_size', '16');
+
+		$html = array();
+
+		switch ( strtolower($type) )
+		{
+			case 'printpreview':
+
+				$html[]= '<a class="iCtip" href="' . $link . '" onclick="window.open(this.href,\'win2\',\'status=no,toolbar=no,scrollbars=yes,titlebar=no,menubar=no,resizable=yes,width=640,height=480,directories=no,location=no\'); return false;" title="' . JText::_('JGLOBAL_PRINT') . '" rel="nofollow">';
+
+				// Joomla 3.x / 2.5 SWITCH
+				if (version_compare(JVERSION, '3.0', 'ge'))
+				{
+					$html[]= '<span class="iCicon iCicon-print"></span>';
+				}
+				else
+				{
+					$html[]= JHtml::_('image', 'system/printButton.png', JText::_('JGLOBAL_PRINT'), null, true);
+				}
+
+				$html[]= '</a>';
+
+				break;
+
+			case 'print':
+
+				$html[]= '<a href="#" onclick="window.print();return false;" title="' . JText::_('JGLOBAL_PRINT') . '" rel="nofollow">';
+
+				// Joomla 3.x / 2.5 SWITCH
+				if (version_compare(JVERSION, '3.0', 'ge'))
+				{
+					$html[]= '<span class="iCicon iCicon-print"></span>&#160;' . JText::_('JGLOBAL_PRINT') . '&#160;';
+				}
+				else
+				{
+					$html[]= JHtml::_('image', 'system/printButton.png', JText::_('JGLOBAL_PRINT'), null, true).'&#160;' . JText::_('JGLOBAL_PRINT') . '&#160;';
+				}
+
+				$html[]= '</a>';
+
+				break;
+
+			case 'vcal':
+
+				if (is_array($iconAddToCal_options))
+				{
+					$addtocal = '';
+					$addtocal.= '<div class="ic-tip-title">' . JText::_('COM_ICAGENDA_ADD_TO_CALL_LABEL') . '</div>';
+
+					// Google Calendar - link
+					if (in_array('1', $iconAddToCal_options))
+					{
+						$addtocal.= '<div class="ic-tip-link">';
+						$addtocal.= '<a href="' . $gcal . '" class="ic-title-cal-tip" rel="nofollow" target="_blank">';
+						$addtocal.= JHtml::_('image', 'media/com_icagenda/images/cal/google_cal-'.$iconAddToCal_size.'.png', JText::_('COM_ICAGENDA_GCALENDAR_LABEL'), array());
+						$addtocal.= '&#160;' . JText::_('COM_ICAGENDA_GCALENDAR_LABEL') . '&#160;';
+						$addtocal.= '</a>';
+						$addtocal.= '</div>';
+					}
+
+					// iCal Calendar - ics
+					if (in_array('2', $iconAddToCal_options))
+					{
+						$addtocal.= '<div class="ic-tip-link">';
+						$addtocal.= '<a href="' . $vcal . '" class="ic-title-cal-tip" rel="nofollow" target="_blank">';
+						$addtocal.= JHtml::_('image', 'media/com_icagenda/images/cal/apple_ical-'.$iconAddToCal_size.'.png', JText::_('COM_ICAGENDA_VCAL_ICAL_LABEL'), array());
+						$addtocal.= '&#160;' . JText::_('COM_ICAGENDA_VCAL_ICAL_LABEL') . '&#160;';
+						$addtocal.= '</a>';
+						$addtocal.= '</div>';
+					}
+
+					// Outlook Calendar - ics
+					if (in_array('3', $iconAddToCal_options))
+					{
+						$addtocal.= '<div class="ic-tip-link">';
+						$addtocal.= '<a href="' . $vcal . '" class="ic-title-cal-tip" rel="nofollow" target="_blank">';
+						$addtocal.= JHtml::_('image', 'media/com_icagenda/images/cal/outlook_cal-'.$iconAddToCal_size.'.png', JText::_('COM_ICAGENDA_OUTLOOK_LABEL'), array());
+						$addtocal.= '&#160;' . JText::_('COM_ICAGENDA_OUTLOOK_LABEL') . '&#160;';
+						$addtocal.= '</a>';
+						$addtocal.= '</div>';
+					}
+
+					// Windows Live Calendar - link
+					if (in_array('4', $iconAddToCal_options))
+					{
+						$addtocal.= '<div class="ic-tip-link">';
+						$addtocal.= '<a href="' . $wcal . '" class="ic-title-cal-tip" rel="nofollow" target="_blank">';
+						$addtocal.= JHtml::_('image', 'media/com_icagenda/images/cal/windows-live_cal-'.$iconAddToCal_size.'.png', JText::_('COM_ICAGENDA_LIVE_CALENDAR_LABEL'), array());
+						$addtocal.= '&#160;' . JText::_('COM_ICAGENDA_LIVE_CALENDAR_LABEL') . '&#160;';
+						$addtocal.= '</a>';
+						$addtocal.= '</div>';
+					}
+
+					// Yahoo Calendar - link
+					if (in_array('5', $iconAddToCal_options))
+					{
+						$addtocal.= '<div class="ic-tip-link">';
+						$addtocal.= '<a href="' . $ycal . '" class="ic-title-cal-tip" rel="nofollow" target="_blank">';
+						$addtocal.= JHtml::_('image', 'media/com_icagenda/images/cal/yahoo_cal-'.$iconAddToCal_size.'.png', JText::_('COM_ICAGENDA_YAHOO_CALENDAR_LABEL'), array());
+						$addtocal.= '&#160;' . JText::_('COM_ICAGENDA_YAHOO_CALENDAR_LABEL') . '&#160;';
+						$addtocal.= '</a>';
+						$addtocal.= '</div>';
+					}
+
+					$return_atc = htmlspecialchars($addtocal);
+
+					$html[]= '<a class="ic-addtocal" style="cursor: pointer;" title="' . $return_atc . '" rel="nofollow">'; // @todo: remove style, and replace <a> by <button>
+
+					// Joomla 3.x / 2.5 SWITCH
+					if(version_compare(JVERSION, '3.0', 'ge'))
+					{
+						$html[]= '<span class="iCicon iCicon-calendar"></span>';
+					}
+					else
+					{
+						$html[]= JHtml::_('image', 'system/calendar.png', JText::_('COM_ICAGENDA_ADD_TO_CALL_LABEL'), null, true);
+					}
+
+					$html[]= '</a>';
+
+					break;
+				}
+
+			default:
+		}
+
+		return implode("\n", $html);
+	}
+
+	/**
+	 * Removes variable from URL
+	 * @param $url to change
+	 * @param $varname to remove from string
+	 */
+	public static function removeqsvar($url, $varname)
+	{
+		return preg_replace('/([?&])'.$varname.'=[^&]+(&|$)/','$1',$url);
+	}
+}
diff --git a/deployed/icagenda/components/com_icagenda/helpers/index.html b/deployed/icagenda/components/com_icagenda/helpers/index.html
new file mode 100644
index 00000000..fa6d84e8
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/helpers/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/components/com_icagenda/icagenda.php b/deployed/icagenda/components/com_icagenda/icagenda.php
new file mode 100644
index 00000000..6aaa5990
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/icagenda.php
@@ -0,0 +1,150 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.7 2019-01-06
+ *
+ * @package     iCagenda.Site
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+// Get Application
+$app = JFactory::getApplication();
+
+// Check Errors: iC Library & iCagenda Utilities
+$UTILITIES_DIR = is_dir(JPATH_ADMINISTRATOR . '/components/com_icagenda/utilities');
+
+if ( ( ! $UTILITIES_DIR)
+	|| ( ! class_exists('iCLibrary')) )
+{
+	$alert_message = JText::_('ICAGENDA_CAN_NOT_LOAD').'<br />';
+	$alert_message.= '<ul>';
+	if ( ! class_exists('iCLibrary')) $alert_message.= '<li>' . JText::_('IC_LIBRARY_NOT_LOADED') . '</li>';
+	if ( ! $UTILITIES_DIR) $alert_message.= '<li>' . JText::_('ICAGENDA_A_FOLDER_IS_MISSING') . '</li>';
+	$alert_message.= '</ul>';
+	if ( ! $UTILITIES_DIR) $alert_message.= JText::_('ICAGENDA_IS_NOT_CORRECTLY_INSTALLED') . ' ';
+	if ( ! $UTILITIES_DIR) $alert_message.= JText::_('ICAGENDA_INSTALL_AGAIN') . '<br />';
+	if ( ! $UTILITIES_DIR) $alert_message.= JText::_('IC_ALTERNATIVELY') . ':<br /><ul>';
+	if ($UTILITIES_DIR) $alert_message.= JText::_('IC_PLEASE') . ', ';
+	if ( ! class_exists('iCLibrary'))
+	{
+		if ( ! $UTILITIES_DIR) $alert_message.= '<li>';
+		$alert_message.= JText::_('IC_LIBRARY_CHECK_PLUGIN_AND_LIBRARY');
+		if ( ! $UTILITIES_DIR) $alert_message.= '</li>';
+	}
+	if ( ! $UTILITIES_DIR)
+	{
+		$alert_message.= '<li>' . JText::Sprintf('ICAGENDA_UTILITIES_FIX_MANUAL'
+						, '<strong>admin/utilities</strong>'
+						, '<strong>administrator/components/com_icagenda/</strong>');
+		$alert_message.= '</li></ul>';
+	}
+
+	// Get the message queue
+	$messages = $app->getMessageQueue();
+
+	$display_alert_message = false;
+
+	// If we have messages
+	if (is_array($messages) && count($messages))
+	{
+		// Check each message for the one we want
+		foreach ($messages as $key => $value)
+		{
+			if ($value['message'] == $alert_message)
+			{
+				$display_alert_message = true;
+			}
+		}
+	}
+
+	if ( ! $display_alert_message)
+	{
+		$app->enqueueMessage($alert_message, 'error');
+	}
+
+	return false;
+}
+
+$time_loading = JComponentHelper::getParams('com_icagenda')->get('time_loading', '');
+
+if ($time_loading)
+{
+	$starttime = iCLibrary::getMicrotime();
+}
+
+// Load Utilities
+JLoader::registerPrefix('icagenda', JPATH_ADMINISTRATOR . '/components/com_icagenda/utilities');
+
+// Set JInput
+$jinput = $app->input;
+
+// Redirect old layouts of the view 'list' to new separated views for event details and registration (since 3.6.0)
+$layout = $jinput->get('layout', '');
+$id     = $jinput->get('id', '');
+$Itemid = $jinput->get('Itemid', '');
+
+if (in_array($layout, array('event', 'registration')))
+{
+	$new_event_url = 'index.php?option=com_icagenda&view=' . $layout . '&id=' . $id . '&Itemid=' . $Itemid;
+	$app->redirect((string) $new_event_url, 301);
+}
+
+// Test if translation is missing, set to en-GB by default
+$language = JFactory::getLanguage();
+$language->load('com_icagenda', JPATH_SITE, 'en-GB', true);
+$language->load('com_icagenda', JPATH_SITE, null, true);
+
+// Load Vector iCicons Font
+JHtml::stylesheet('media/com_icagenda/icicons/style.css');
+
+// CSS files which could be overridden into your site template. (eg. /templates/my_template/css/com_icagenda/icagenda-front.css)
+JHtml::stylesheet('com_icagenda/icagenda-front.css', false, true);
+JHtml::stylesheet('com_icagenda/tipTip.css', false, true);
+
+// Set iCtip
+$iCtip   = array();
+$iCtip[] = '	jQuery(document).ready(function(){';
+$iCtip[] = '		jQuery(".iCtip").tipTip({maxWidth: "200", defaultPosition: "top", edgeOffset: 1});';
+$iCtip[] = '	});';
+
+// Add the script to the document head.
+JFactory::getDocument()->addScriptDeclaration(implode("\n", $iCtip));
+
+// Perform the Requested task
+$controller = JControllerLegacy::getInstance('iCagenda');
+$controller->execute(JFactory::getApplication()->input->get('task', 'display'));
+
+// Redirect if set by the controller
+$controller->redirect();
+
+// Time to create content
+if ($time_loading)
+{
+	$endtime = iCLibrary::getMicrotime();
+
+	echo '<center style="font-size:8px;">Time to create content: ' . round($endtime-$starttime, 3) . ' seconds</center>';
+}
diff --git a/deployed/icagenda/components/com_icagenda/images/btn_google_signin_light_normal_web.png b/deployed/icagenda/components/com_icagenda/images/btn_google_signin_light_normal_web.png
new file mode 100644
index 00000000..29ab5110
Binary files /dev/null and b/deployed/icagenda/components/com_icagenda/images/btn_google_signin_light_normal_web.png differ
diff --git a/deployed/icagenda/components/com_icagenda/index.html b/deployed/icagenda/components/com_icagenda/index.html
new file mode 100644
index 00000000..fa6d84e8
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/components/com_icagenda/layouts/joomla/form/field/file.php b/deployed/icagenda/components/com_icagenda/layouts/joomla/form/field/file.php
new file mode 100644
index 00000000..f3a14a2b
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/layouts/joomla/form/field/file.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *------------------------------------------------------------------------------
+ * @package     iCagenda.Site
+ * @subpackage  Layout
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        https://www.joomlic.com
+ *
+ * @version     3.6.12 2017-07-25
+ * @since       3.6.9
+ *------------------------------------------------------------------------------
+*/
+
+defined('JPATH_BASE') or die;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * -----------------
+ * @var   string   $autocomplete    Autocomplete attribute for the field.
+ * @var   boolean  $autofocus       Is autofocus enabled?
+ * @var   string   $class           Classes for the input.
+ * @var   string   $description     Description of the field.
+ * @var   boolean  $disabled        Is this field disabled?
+ * @var   string   $group           Group the field belongs to. <fields> section in form XML.
+ * @var   boolean  $hidden          Is this field hidden in the form?
+ * @var   string   $hint            Placeholder for the field.
+ * @var   string   $id              DOM id of the field.
+ * @var   string   $label           Label of the field.
+ * @var   string   $labelclass      Classes to apply to the label.
+ * @var   boolean  $multiple        Does this field support multiple values?
+ * @var   string   $name            Name of the input field.
+ * @var   string   $onchange        Onchange attribute for the field.
+ * @var   string   $onclick         Onclick attribute for the field.
+ * @var   string   $pattern         Pattern (Reg Ex) of value of the form field.
+ * @var   boolean  $readonly        Is this field read only?
+ * @var   boolean  $repeat          Allows extensions to duplicate elements.
+ * @var   boolean  $required        Is this field required?
+ * @var   integer  $size            Size attribute of the input.
+ * @var   boolean  $spellcheck      Spellcheck state for the form field.
+ * @var   string   $validate        Validation rules to apply.
+ * @var   string   $value           Value attribute of the field.
+ * @var   array    $checkedOptions  Options that will be set as checked.
+ * @var   boolean  $hasValue        Has this field a value assigned?
+ * @var   array    $options         Options available for this field.
+ * @var   array    $inputType       Options available for this field.
+ * @var   array    $spellcheck      Options available for this field.
+ * @var   string   $accept          File types that are accepted.
+ */
+
+// Including fallback code for HTML5 non supported browsers.
+JHtml::_('jquery.framework');
+JHtml::_('script', 'system/html5fallback.js', array('version' => 'auto', 'relative' => true));
+
+?>
+<input type="file"
+	name="<?php echo $name; ?>"
+	id="<?php echo $id; ?>"
+	<?php echo !empty($size) ? ' size="' . $size . '"' : ''; ?>
+	<?php echo !empty($accept) ? ' accept="' . $accept . '"' : ''; ?>
+	<?php echo !empty($class) ? ' class="' . $class . '"' : ''; ?>
+	<?php echo !empty($multiple) ? ' multiple' : ''; ?>
+	<?php echo $disabled ? ' disabled' : ''; ?>
+	<?php echo $autofocus ? ' autofocus' : ''; ?>
+	<?php echo !empty($onchange) ? ' onchange="' . $onchange . '"' : ''; ?>
+	<?php echo $required ? ' required aria-required="true"' : ''; ?> />
diff --git a/deployed/icagenda/components/com_icagenda/models/event.php b/deployed/icagenda/components/com_icagenda/models/event.php
new file mode 100644
index 00000000..bf1b2f9c
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/models/event.php
@@ -0,0 +1,325 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.3 2018-07-27
+ *
+ * @package     iCagenda.Site
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.6.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+if (version_compare(JVERSION, '3.4', 'lt'))
+{
+	jimport('joomla.application.component.modelitem');
+	jimport('joomla.registry.registry');
+}
+
+use Joomla\Registry\Registry;
+
+/**
+ * iCagenda Component Event Model
+ *
+ */
+class iCagendaModelEvent extends JModelItem
+{
+	/**
+	 * Model context string.
+	 *
+	 * @var     string
+	 */
+	protected $_context = 'com_icagenda.event';
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.6.0
+	 */
+	protected function populateState()
+	{
+		$app    = JFactory::getApplication('site');
+		$jinput = $app->input;
+
+		// Load state from the request.
+		$pk = $jinput->getInt('id');
+		$this->setState('event.id', $pk);
+
+		$offset = $jinput->getUInt('limitstart');
+		$this->setState('list.offset', $offset);
+
+		// Load the parameters.
+		$params = $app->getParams();
+		$this->setState('params', $params);
+
+		// TODO: Tune these values based on other permissions.
+		$user = JFactory::getUser();
+
+		if ( ! $user->authorise('core.edit.state', 'com_icagenda') && ! $user->authorise('core.edit', 'com_icagenda'))
+		{
+			$this->setState('filter.published', 1);
+			$this->setState('filter.archived', 2);
+		}
+
+		$this->setState('filter.language', JLanguageMultilang::isEnabled());
+	}
+
+	/**
+	 * Method to get event data.
+	 *
+	 * @param   integer  $pk  The id of the event.
+	 *
+	 * @return  mixed  Menu item data object on success, false on failure.
+	 *
+	 * @since   3.6.0
+	 */
+	public function getItem($pk = null)
+	{
+		$app    = JFactory::getApplication();
+		$jinput = $app->input;
+		$user   = JFactory::getUser();
+
+		$pk = ( ! empty($pk)) ? $pk : (int) $this->getState('event.id');
+
+		if ($this->_item === null)
+		{
+			$this->_item = array();
+		}
+
+		if ( ! isset($this->_item[$pk]))
+		{
+			try
+			{
+				$db    = $this->getDbo();
+				$query = $db->getQuery(true)
+					->select(
+						$this->getState(
+							'item.select', 'e.*, ' .
+							'e.name AS contact_name, e.email AS contact_email'
+						)
+					);
+				$query->from('#__icagenda_events AS e');
+				$query->where('e.state = 1');
+
+				// Join over the category
+				$query->select('c.id AS cat_id, c.title AS cat_title, c.color AS cat_color, c.desc AS cat_desc')
+					->join('LEFT', '#__icagenda_category AS c ON c.id = e.catid')
+					->where('c.state = 1');
+
+				// Filter by language
+				if ($this->getState('filter.language'))
+				{
+					$query->where('e.language in (' . $db->quote(JFactory::getLanguage()->getTag()) . ',' . $db->quote('*') . ')');
+				}
+
+				$query->where('e.id = ' . (int) $pk);
+
+				// Features - Extract the number of displayable icons per event
+				$query->select('feat.count AS features');
+				$sub_query = $db->getQuery(true);
+				$sub_query->select('fx.event_id, COUNT(*) AS count');
+				$sub_query->from('#__icagenda_feature_xref AS fx');
+				$sub_query->innerJoin("#__icagenda_feature AS f ON fx.feature_id = f.id AND f.state = 1 AND f.icon <> '-1'");
+				$sub_query->group('fx.event_id');
+				$query->leftJoin('(' . (string) $sub_query . ') AS feat ON e.id = feat.event_id');
+
+				// Registrations - Get total of registered people
+				$evtParams = icagendaEvent::getParams((int) $pk);
+
+				$typeReg = $evtParams->get('typeReg', 1);
+
+				$query->select($db->qn('r.count', 'registered'));
+				$sub_query = $db->getQuery(true)
+							->select(array(
+									$db->qn('r.eventid'),
+									'sum(' . $db->qn('r.people') . ') AS count',
+								))
+							->from($db->qn('#__icagenda_registration', 'r'))
+							->where($db->qn('r.state') . ' = 1');
+
+				// Get var event date alias if set or var 'event_date' set to session in event details view
+				$session = JFactory::getSession();
+
+				$date_value = $jinput->get('date', '');
+
+				$event_id = $session->get('event_id', '');
+
+				if ($event_id !== $pk)
+				{
+					$session->set('event_id', (int) $pk);
+					$session->set('event_date', icagendaEvent::convertDateAliasToSQLDatetime($date_value));
+					$session->set('session_date', icagendaEvent::convertDateAliasToSQLDatetime($date_value));
+				}
+				elseif ($date_value)
+				{
+					$session->set('event_date', icagendaEvent::convertDateAliasToSQLDatetime($date_value));
+					$session->set('session_date', icagendaEvent::convertDateAliasToSQLDatetime($date_value));
+				}
+
+				if ( ! $event_id) $session->set('event_id', (int) $pk);
+
+				$event_date = $session->get('event_date', '');
+				$get_date   = $jinput->get('date', ($event_date ? date('Y-m-d-H-i', strtotime($event_date)) : ''));
+
+				// Convert to SQL datetime if set, or return empty.
+				$dateday = icagendaEvent::convertDateAliasToSQLDatetime($get_date);
+
+				// Redirect and remove date var, if not correctly set
+				if ($get_date
+					&& ! $dateday)
+				{
+					$event_url = JUri::getInstance()->toString();
+					$cleanurl  = preg_replace('/&date=[^&]*/', '', $event_url);
+					$cleanurl  = preg_replace('/\?date=[^\?]*/', '', $cleanurl);
+
+					$app->redirect($cleanurl);
+
+					return false;
+				}
+
+				// Registration type: by single date/period (1)
+				if ($dateday && $typeReg == 1)
+				{
+//					$sub_query->where('r.date = ' . $db->q($dateday)); // This is the good logic if correctly set
+					$sub_query->where('(r.date = ' . $db->q($dateday) . ' OR (r.date = "" AND r.period = 1))');
+				}
+				elseif ( ! $dateday && $typeReg == 1)
+				{
+//					$sub_query->where('r.date = "" AND r.period = 0'); // This is the good logic if correctly set
+					$sub_query->where('r.date = ""');
+				}
+
+				$sub_query->group('r.eventid');
+				$query->leftJoin('(' . (string) $sub_query . ') AS r ON e.id = r.eventid');
+
+				// Filter by published state.
+//				$published = $this->getState('filter.published');
+//				$archived = $this->getState('filter.archived');
+
+//				if (is_numeric($published))
+//				{
+//					$query->where('(a.state = ' . (int) $published . ' OR a.state =' . (int) $archived . ')');
+//				}
+
+				// Filter by language
+				if ($this->getState('filter.language'))
+				{
+					$query->where('e.language in (' . $db->q(JFactory::getLanguage()->getTag()) . ',' . $db->q('*') . ')');
+				}
+
+				$db->setQuery($query);
+
+				$data = $db->loadObject();
+
+				if (empty($data))
+				{
+					throw new \Exception(\JText::_('COM_ICAGENDA_ERROR_EVENT_NOT_FOUND'), 404);
+				}
+
+				// iCagenda event view variables
+				$data->backArrow      = icagendaEvent::backArrow($data);
+				$data->map            = icagendaGooglemaps::map($data);
+				$data->managerToolBar = icagendaManager::toolBar($data);
+//				$data->totalRegistered = icagendaRegistration::totalRegistered($data); // @deprecated 3.6.5 and @removed 3.7.0 (not used)
+
+				// Add to Cal
+				$data->googleCalendar      = icagendaAddtocal::googleCalendar($data);
+				$data->windowsliveCalendar = icagendaAddtocal::windowsliveCalendar($data);
+				$data->yahooCalendar       = icagendaAddtocal::yahooCalendar($data);
+
+				// Extract the feature details, if needed
+				if (is_null($data->features))
+				{
+					$data->features = array();
+				}
+				else
+				{
+					$db = $this->getDbo();
+					$query = $db->getQuery(true);
+					$query->select('DISTINCT f.icon, f.icon_alt');
+					$query->from('#__icagenda_feature_xref AS fx');
+					$query->innerJoin("#__icagenda_feature AS f ON fx.feature_id=f.id AND f.state=1 AND f.icon<>'-1'");
+					$query->where('fx.event_id=' . $data->id);
+					$query->order('f.ordering DESC'); // Order descending because the icons are floated right
+					$db->setQuery($query);
+					$data->features = $db->loadObjectList();
+				}
+
+				// Convert parameter fields to objects.
+				$registry = (version_compare(JVERSION, '3.4', 'lt')) ? new JRegistry : new Registry;
+				$registry->loadString($data->params);
+
+				// Merge Event params to app params
+				$data->params = clone $this->getState('params');
+				$data->params->merge($registry);
+
+				$this->_item[$pk] = $data;
+			}
+			catch (Exception $e)
+			{
+				if ($e->getCode() == 404)
+				{
+					// Need to go thru the error handler to allow Redirect to work.
+					throw new \Exception($e->getMessage(), 404);
+				}
+				else
+				{
+					$this->setError($e);
+					$this->_item[$pk] = false;
+				}
+			}
+		}
+
+		return $this->_item[$pk];
+	}
+
+	/**
+	 * Increment the hit counter for the event.
+	 *
+	 * @param   integer  $pk  Optional primary key of the event to increment.
+	 *
+	 * @return  boolean  True if successful; false otherwise and internal error set.
+	 *
+	 * @since   3.6.0
+	 */
+	public function hit($pk = 0)
+	{
+		$jinput = JFactory::getApplication()->input;
+
+		$hitcount = $jinput->getInt('hitcount', 1);
+
+		if ($hitcount)
+		{
+			// Initialise variables.
+			$pk = ( ! empty($pk)) ? $pk : (int) $this->getState('event.id');
+			$db = $this->getDbo();
+
+			$db->setQuery(
+					'UPDATE #__icagenda_events' .
+					' SET hits = hits + 1' .
+					' WHERE id = ' . (int) $pk
+			);
+
+			if ( ! $db->query())
+			{
+				$this->setError($db->getErrorMsg());
+
+				return false;
+			}
+		}
+
+		return true;
+	}
+}
diff --git a/deployed/icagenda/components/com_icagenda/models/events.php b/deployed/icagenda/components/com_icagenda/models/events.php
new file mode 100644
index 00000000..08cf17f6
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/models/events.php
@@ -0,0 +1,313 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-26
+ *
+ * @package     iCagenda.Site
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.4.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+jimport('joomla.application.component.modellist');
+
+/**
+ * This models supports retrieving lists of events.
+ */
+class iCagendaModelEvents extends JModelList
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param	array		An optional associative array of configuration settings.
+	 * @see		JController
+	 * @since	3.4.0
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'id', 'e.id',
+				'ordering', 'e.ordering',
+				'state', 'e.state',
+				'access', 'e.access', 'access_level',
+				'approval', 'e.approval',
+				'created', 'e.created',
+				'title', 'e.title',
+				'username', 'e.username',
+				'email', 'e.email',
+				'category', 'e.category',
+				'cat_color', 'e.catcolor',
+				'image', 'e.image',
+				'file', 'e.file',
+				'next', 'e.next',
+				'place', 'e.place',
+				'city', 'e.city',
+				'country', 'e.country',
+				'desc', 'e.desc',
+				'language', 'e.language',
+				'location', 'e.location',
+				'category_id',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 * NOT IN USE CURRENTLY
+	 */
+	protected function populateState($ordering = null, $direction = null)
+	{
+		// Initialise variables.
+		$app = JFactory::getApplication();
+
+		// Load the filter search.
+		$search = $app->getUserStateFromRequest($this->context.'.filter.search', 'filter_search');
+		$this->setState('filter.search', $search);
+
+		// Load the filter state.
+		$published = $app->getUserStateFromRequest($this->context.'.filter.state', 'filter_published', '', 'string');
+		$this->setState('filter.state', $published);
+
+		// Load the filter access.
+		$access = $app->getUserStateFromRequest($this->context.'.filter.access', 'filter_access', '', 'string');
+		$this->setState('filter.access', $access);
+
+		// Load the filter language.
+		$language = $app->getUserStateFromRequest($this->context.'.filter.language', 'filter_language', '', 'string');
+		$this->setState('filter.language', $language);
+
+		// Filter (dropdown) category
+		$category = $this->getUserStateFromRequest($this->context.'.filter.category', 'filter_category');
+//		$category = $app->input->get('filter_category');
+		$this->setState('filter.category', $category);
+
+		// Filter (dropdown) year
+		$year = $this->getUserStateFromRequest($this->context.'.filter.year', 'filter_year', '', 'string');
+		$this->setState('filter.year', $year);
+
+		// Filter categoryId
+		$categoryId = $this->getUserStateFromRequest($this->context . '.filter.category_id', 'filter_category_id');
+		$this->setState('filter.category_id', $categoryId);
+
+		// Filter (dropdown) upcoming
+		$upcoming = $this->getUserStateFromRequest($this->context.'.filter.upcoming', 'filter_upcoming', '', 'string');
+		$this->setState('filter.upcoming', $upcoming);
+
+		// Load the parameters.
+		$params = $app->getParams();
+		$this->setState('params', $params);
+
+		// List state information.
+		parent::populateState('e.id', 'desc');
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param	string		$id	A prefix for the store id.
+	 * @return	string		A store id.
+	 * @since	3.4.0
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id .= ':' . $this->getState('filter.search');
+		$id .= ':' . $this->getState('filter.access');
+		$id .= ':' . $this->getState('filter.state');
+		$id .= ':' . $this->getState('filter.access');
+		$id .= ':' . $this->getState('filter.language');
+		$id .= ':' . $this->getState('filter.category');
+		$id .= ':' . $this->getState('filter.year');
+//		$id .= ':' . $this->getState('filter.category_id.include');
+		$id .= ':' . serialize($this->getState('filter.category_id'));
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Build an SQL query to load the list data.
+	 *
+	 * @return	JDatabaseQuery
+	 * @since	3.4.0
+	 */
+	protected function getListQuery()
+	{
+		// Get the current user for authorisation checks
+		$user	= JFactory::getUser();
+
+		// Create a new query object.
+		$db		= $this->getDbo();
+		$query	= $db->getQuery(true);
+
+		// Select the required fields from the table.
+		$query->select(
+			$this->getState(
+				'list.select',
+				'e.*'
+			)
+		);
+		$query->from($db->qn('#__icagenda_events') . ' AS e');
+
+		// Join over the asset groups.
+//		$query->select('ag.title AS access_level')
+//			->join('LEFT', '#__viewlevels AS ag ON ag.id = e.access');
+
+		// Join the category
+		$query->select('c.id AS cat_id, c.title AS cat_title, c.color AS cat_color, c.desc AS cat_desc,
+						c.title AS category, c.color AS catcolor');
+		$query->join('LEFT', '#__icagenda_category AS c ON c.id = e.catid');
+		$query->where('c.state = 1');
+
+		// Features - extract the number of displayable icons per event
+		$query->select('feat.count AS features');
+		$sub_query = $db->getQuery(true);
+		$sub_query->select('fx.event_id, COUNT(*) AS count');
+		$sub_query->from('#__icagenda_feature_xref AS fx');
+		$sub_query->innerJoin("#__icagenda_feature AS f ON fx.feature_id=f.id AND f.state=1 AND f.icon<>'-1'");
+		$sub_query->group('fx.event_id');
+		$query->leftJoin('(' . (string) $sub_query . ') AS feat ON e.id=feat.event_id');
+
+		// Join Total of registrations
+//		$query->select('r.count AS registered');
+//		$sub_query = $db->getQuery(true);
+//		$sub_query->select('r.state, r.date, r.eventid, sum(r.people) AS count');
+//		$sub_query->from('#__icagenda_registration AS r');
+//		$sub_query->where('r.state > 0');
+//		$sub_query->group('r.date, r.eventid');
+//		$query->leftJoin('(' . (string) $sub_query . ') AS r ON ((e.next = r.date OR r.date = "") AND e.id = r.eventid)');
+
+		// Join over the users for the author.
+//		$query->select('ua.name AS author_name, ua.username AS author_username')
+//			->join('LEFT', '#__users AS ua ON ua.id = e.created_by');
+
+		// Get Module Params
+		$mod_params = $this->getState('filter.mod_params');
+
+		// Filter by features
+//		$query->where(icagendaEventsData::getFeaturesFilter($mod_params));
+
+		// Filter by published state
+		$published = $this->getState('filter.state');
+
+		if (is_numeric($published))
+		{
+			$query->where('e.state = '.(int) $published);
+		}
+		elseif ($published === '')
+		{
+			$query->where('(e.state IN (0, 1))');
+		}
+
+		$userGroups = $user->getAuthorisedGroups();
+
+		$groupid	= JComponentHelper::getParams('com_icagenda')->get('approvalGroups', array("8"));
+		$groupid	= is_array($groupid) ? $groupid : array($groupid);
+
+		// Test if user login have Approval Rights
+		if ( ! array_intersect($userGroups, $groupid)
+			&& ! in_array('8', $userGroups))
+		{
+			$query->where('e.approval <> 1');
+		}
+		else
+		{
+			$query->where('e.approval < 2');
+		}
+
+		// Filter by access level.
+		$access = $this->getState('filter.access');
+
+		if ( ! empty($access)
+			&& ! in_array('8', $userGroups))
+		{
+			$access_levels = implode(',', $user->getAuthorisedViewLevels());
+
+			$query->where('e.access IN (' . $access_levels . ')');
+//				->where('c.access IN (' . $access_levels . ')'); // To be added later, when access integrated to category
+		}
+
+		// Filter by language
+		if ($this->getState('filter.language'))
+		{
+			$query->where('e.language in (' . $db->q(JFactory::getLanguage()->getTag()) . ',' . $db->q('*') . ')');
+		}
+
+
+		// Get list of All dates
+		$all_dates_with_id	= icagendaEventsData::getAllDates(
+								$this->getState('filter.upcoming', '0'),
+								$this->getState('filter.all_dates'),
+								$this->getState('list.direction'),
+								$this->getState('filter.category_id', 'all'),
+								$mod_params
+							);
+
+		$dpp_array = $dpp_dates = array();
+
+		foreach ($all_dates_with_id AS $dpp)
+		{
+			$dpp_alldates_array	= explode('_', $dpp);
+			$dpp_date			= $dpp_alldates_array['0'];
+			$dpp_id				= $dpp_alldates_array['1'];
+			$dpp_dates[]		= $dpp_date;
+			$dpp_array[]		= $dpp_id;
+		}
+
+		$list_id = implode(',', $dpp_array);
+
+		if (count($dpp_array))
+		{
+			$query->where('e.id IN (' . $list_id . ')');
+		}
+		else
+		{
+			return false;
+		}
+
+		// Add the list ordering clause.
+		$query->order($this->getState('list.ordering', 'e.next') . ' ' . $this->getState('list.direction', 'ASC'));
+
+		return $query;
+	}
+
+	/**
+	 * Method to get an array of data items.
+	 *
+	 * @return  mixed  An array of data items on success, false on failure.
+	 *
+	 * @since   12.2
+	 */
+	public function getItems()
+	{
+		if ($items = parent::getItems())
+		{
+			//Do any procesing on fields here if needed
+//			foreach ($items AS $item)
+//			{
+//				$item->loadEventCustomFields	= icagendaEventData::loadEventCustomFields($item->id);
+//				$item->registeredUsers			= icagendaRegistrationParticipants::registeredUsers($item);
+//			}
+		}
+
+		return $items;
+	}
+}
diff --git a/deployed/icagenda/components/com_icagenda/models/fields/categories.php b/deployed/icagenda/components/com_icagenda/models/fields/categories.php
new file mode 100644
index 00000000..e65699a0
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/models/fields/categories.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-05-01
+ *
+ * @package     iCagenda.Site
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.6.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+jimport('joomla.html.html');
+jimport('joomla.form.formfield');
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Category frontend search filter.
+ */
+class JFormFieldCategories extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var     string
+	 * @since   3.6.0
+	 */
+	protected $type = 'categories';
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return  array   The field option objects.
+	 * @since   3.6.0
+	 */
+	public function getOptions()
+	{
+		$app            = JFactory::getApplication();
+		$params         = $app->getParams();
+
+		$filters_mode   = ($app->getMenu()->getActive()->params->get('search_filters') == 1)
+						? $params->get('filters_mode', 1)
+						: JComponentHelper::getParams('com_icagenda')->get('filters_mode', 1);
+
+		// Initialize variables.
+		$options = array();
+
+		$db    = JFactory::getDbo();
+		$query = $db->getQuery(true);
+
+		$query->select('id AS catid, title AS cattitle');
+		$query->from('#__icagenda_category AS c');
+		$query->where('state = 1');
+
+		// Search in menu filtered list
+		if ($filters_mode == 1)
+		{
+			$mcatid = $params->get('mcatid', '');
+			JArrayHelper::toInteger($mcatid);
+			$list_catid = implode(',', $mcatid);
+
+			if ($mcatid
+				&& count($mcatid) > 0
+				&& ! in_array('0', $mcatid))
+			{
+				$query->where('c.id IN (' . $list_catid . ')');
+			}
+		}
+
+		$query->order('c.title');
+
+		// Get the options.
+		$db->setQuery($query);
+
+		$options = $db->loadObjectList();
+
+		// Check for a database error.
+		if ($db->getErrorNum())
+		{
+			throw new Exception($db->getErrorMsg(), 500);
+		}
+
+		return $options;
+	}
+}
diff --git a/deployed/icagenda/components/com_icagenda/models/fields/index.html b/deployed/icagenda/components/com_icagenda/models/fields/index.html
new file mode 100644
index 00000000..fa6d84e8
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/models/fields/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/components/com_icagenda/models/fields/month.php b/deployed/icagenda/components/com_icagenda/models/fields/month.php
new file mode 100644
index 00000000..a6980014
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/models/fields/month.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version 	3.6.0 2016-07-08
+ * @since       3.6.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('JPATH_BASE') or die;
+
+jimport('joomla.html.html');
+jimport('joomla.form.formfield');
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Month frontend search filter.
+ */
+class JFormFieldMonth extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var		string
+	 * @since	3.6.0
+	 */
+	protected $type = 'month';
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return	array	The field option objects.
+	 * @since	3.6.0
+	 */
+	public function getOptions()
+	{
+		// Initialize variables.
+		$options = array(
+					'1' => JText::_('JANUARY'),
+					'2' => JText::_('FEBRUARY'),
+					'3' => JText::_('MARCH'),
+					'4' => JText::_('APRIL'),
+					'5' => JText::_('MAY'),
+					'6' => JText::_('JUNE'),
+					'7' => JText::_('JULY'),
+					'8' => JText::_('AUGUST'),
+					'9' => JText::_('SEPTEMBER'),
+					'10' => JText::_('OCTOBER'),
+					'11' => JText::_('NOVEMBER'),
+					'12' => JText::_('DECEMBER'),
+					);
+
+		return $options;
+	}
+}
diff --git a/deployed/icagenda/components/com_icagenda/models/fields/year.php b/deployed/icagenda/components/com_icagenda/models/fields/year.php
new file mode 100644
index 00000000..886836f8
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/models/fields/year.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.13 2018-04-04
+ *
+ * @package     iCagenda.Site
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.6.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+jimport('joomla.html.html');
+jimport('joomla.form.formfield');
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Year frontend search filter.
+ */
+class JFormFieldYear extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var		string
+	 * @since	3.6.0
+	 */
+	protected $type = 'year';
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return	array	The field option objects.
+	 * @since	3.6.0
+	 */
+	public function getOptions()
+	{
+		$params = JFactory::getApplication()->getParams();
+
+		$session = JFactory::getSession();
+
+		$app            = JFactory::getApplication();
+		$params         = $app->getParams();
+
+		$filters_mode   = ($app->getMenu()->getActive()->params->get('search_filters') == 1)
+						? $params->get('filters_mode', 1)
+						: JComponentHelper::getParams('com_icagenda')->get('filters_mode', 1);
+
+		$session_options = $session->get('filter_year_options');
+
+		$filters_mode_session = $session->get('filters_mode_session');
+
+		if ($session_options && $filters_mode == $filters_mode_session)
+		{
+			rsort($session_options);
+
+			return $session_options;
+		}
+
+		// Initialize variables.
+		$options = array();
+
+		$filterTime = ($filters_mode == 1)
+					? $params->get('time', 0)
+					: '0';
+
+		$dates = icagendaEventsData::getAllDates($filterTime);
+
+		if (count($dates) < 1)
+		{
+			$year = $app->input->get('filter_year', '');
+
+			if ($year)
+			{
+				$year_option = new stdClass;
+				$year_option->value = $year;
+				$year_option->label = $year;
+
+				if ( ! in_array($year_option, $options))
+				{
+					$options[] = $year_option;
+				}
+			}
+		}
+		else
+		{
+			foreach ($dates AS $date)
+			{
+				$year       = substr($date, 0, 4);
+				$year		= ((int) $year > 0)
+							? $year
+							: '';
+
+				if ($year)
+				{
+					$year_option = new stdClass;
+					$year_option->value = $year;
+					$year_option->label = $year;
+
+					if ( ! in_array($year_option, $options))
+					{
+						$options[] = $year_option;
+					}
+				}
+			}
+		}
+
+		rsort($options);
+
+		$session->set('filter_year_options', $options);
+		$session->set('filters_mode_session', $filters_mode);
+
+		return $options;
+	}
+}
diff --git a/deployed/icagenda/components/com_icagenda/models/forms/index.html b/deployed/icagenda/components/com_icagenda/models/forms/index.html
new file mode 100644
index 00000000..fa6d84e8
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/models/forms/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/components/com_icagenda/models/forms/registration.xml b/deployed/icagenda/components/com_icagenda/models/forms/registration.xml
new file mode 100644
index 00000000..527872f3
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/models/forms/registration.xml
@@ -0,0 +1,344 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+
+	<!-- Core & Custom Fields -->
+	<fieldset
+		name="default"
+		label=""
+		addfieldpath="/administrator/components/com_icagenda/models/fields"
+		>
+
+		<field
+			name="uid"
+			type="hidden"
+			label="ICAGENDA_REGISTRATION_FORM_USERID"
+			description="ICAGENDA_REGISTRATION_FORM_USERID_DESC"
+		/>
+
+		<field
+			name="name"
+			type="text"
+			label="ICAGENDA_REGISTRATION_FORM_NAME"
+			description="ICAGENDA_REGISTRATION_FORM_NAME_DESC"
+			size="30"
+			filter="username"
+			required="true"
+		/>
+
+		<field
+			name="email"
+			type="email"
+			label="ICAGENDA_REGISTRATION_FORM_EMAIL"
+			description="ICAGENDA_REGISTRATION_FORM_EMAIL_DESC"
+			size="30"
+			field="id"
+			filter="string"
+			validate="email"
+		/>
+
+		<field
+			name="email2"
+			type="email"
+			label="IC_FORM_EMAIL_CONFIRM_LBL"
+			size="30"
+			field="email"
+			filter="string"
+			message="COM_ICAGENDA_FORM_VALIDATE_FIELD_EMAIL2_MESSAGE"
+			validate="equals"
+			hint="IC_FORM_EMAIL_CONFIRM_HINT"
+		/>
+
+		<field
+			name="phone"
+			type="tel"
+			label="ICAGENDA_REGISTRATION_FORM_PHONE"
+			description="ICAGENDA_REGISTRATION_FORM_PHONE_DESC"
+			size="30"
+		/>
+
+		<field
+			name="date"
+			type="icagenda.registrationdates"
+			label="ICAGENDA_REGISTRATION_FORM_DATE"
+			description="ICAGENDA_REGISTRATION_FORM_DATE_DESC"
+		/>
+
+		<field
+			name="period"
+			type="hidden"
+		/>
+
+		<field
+			name="people"
+			type="icagenda.registrationpeople"
+			label="ICAGENDA_REGISTRATION_FORM_PEOPLE"
+			description="ICAGENDA_REGISTRATION_FORM_PEOPLE_DESC"
+		/>
+
+		<field
+			name="custom_fields"
+			type="hidden"
+		/>
+
+	</fieldset>
+
+
+	<!-- Temporary Fields (to be migrated above) -->
+	<fieldset name="temporary" label="" >
+
+		<field
+			name="notes"
+			type="textarea"
+			label="ICAGENDA_REGISTRATION_FORM_NOTES"
+			description=""
+			cols="60"
+			rows="10"
+			class="row-fluid"
+			hint="ICAGENDA_REGISTRATION_FORM_NOTES_DESC"
+			filter="safehtml"
+		/>
+
+	</fieldset>
+
+
+	<!-- Privacy Fields (in dev.) -->
+	<fields name="consent" label="COM_ICAGENDA_REGISTRATION_CONSENT_PERSONAL_DATA_LEGEND">
+
+		<!--field type="note" name="consent_label" label="Your Personnal Data Privacy" description="blablabla blablabla..." class="controls"/>
+		<field
+			name="consent_visibility"
+			type="radio"
+			label="Who can see your personal data?"
+			description="COM_ICAGENDA_PRIVACY_VISIBILITY_DESC"
+			message="COM_ICAGENDA_PRIVACY_VISIBILITY_DESC"
+			required="true"
+			>
+			<option value="public">COM_ICAGENDA_PRIVACY_VISIBILITY_PUBLIC</option>
+			<option value="user">COM_ICAGENDA_PRIVACY_VISIBILITY_USERS</option>
+			<option value="participant">COM_ICAGENDA_PRIVACY_VISIBILITY_PARTICIPANTS</option>
+			<option value="private">COM_ICAGENDA_PRIVACY_VISIBILITY_PRIVATE</option>
+		</field>
+
+		<field
+			name="consent_visibility2"
+			type="list"
+			label="Who can see your personal data?"
+			description="COM_ICAGENDA_PRIVACY_VISIBILITY_DESC"
+			message="COM_ICAGENDA_PRIVACY_VISIBILITY_DESC"
+			required="true"
+			>
+			<option value="" disabled="disabled">Who should see this?</option>
+			<option value="public">Public</option>
+			<option value="user">Website Members</option>
+			<option value="participant">Event Participants</option>
+			<option value="private">Anonymous (only organisers and administrators)</option>
+		</field>
+
+		<field
+			name="note_public"
+			type="note"
+			label="Public Visibility"
+			description="COM_ICAGENDA_REGISTRATION_PUBLIC_CONSENT_NOTE"
+			class="alert alert-info"
+			showon="consent_visibility:public"
+		/>
+
+		<field
+			name="note_users"
+			type="note"
+			description="COM_ICAGENDA_REGISTRATION_WEBSITE_USERS_CONSENT_NOTE"
+			class="alert alert-info"
+			showon="consent_visibility:user"
+		/>
+
+		<field
+			name="note_participants"
+			type="note"
+			description="COM_ICAGENDA_REGISTRATION_PARTICIPANTS_CONSENT_NOTE"
+			class="alert alert-info"
+			showon="consent_visibility:participant"
+		/>
+
+		<field
+			name="note_private"
+			type="note"
+			description="COM_ICAGENDA_REGISTRATION_PRIVATE_CONSENT_NOTE"
+			class="alert alert-info"
+			showon="consent_visibility:private"
+		/>
+
+		<field
+			name="note_extra"
+			type="note"
+			description="COM_ICAGENDA_REGISTRATION_EXTRA_CONSENT_NOTE"
+			class=""
+			showon="consent_visibility:public,user,participant"
+		/>
+
+		<field
+			name="consent_email"
+			type="checkboxes"
+			label=""
+			showon="consent_visibility:public,user,participant"
+			>
+			<option value="email">Email</option>
+		</field>
+
+		<field
+			name="consent_personal"
+			type="checkboxes"
+			label=""
+			showon="consent_visibility:public,user,participant"
+			>
+			<option value="personal">Other personal data submitted</option>
+		</field>
+
+		<field
+			name="consent_gravatar"
+			type="checkboxes"
+			label=""
+			showon="consent_visibility:public,user,participant"
+			>
+			<option value="gravatar">COM_ICAGENDA_PRIVACY_GRAVATAR_CONSENT</option>
+		</field>
+
+		<field
+			name="consent_visibility_info"
+			type="checkboxes"
+			label=""
+			message="Select the visibility for your information on this website"
+			showon="consent_visibility:public,user,participant"
+			>
+			<option value="email">Email</option>
+			<option value="personal">Other personal data submitted</option>
+			<option value="gravatar">COM_ICAGENDA_PRIVACY_GRAVATAR_CONSENT</option>
+		</field>
+
+		<field
+			name="consent_visibility_info"
+			type="hidden"
+			showon="consent_visibility:private"
+			default="none"
+		/>
+
+		<field
+			name="consent_visibility3"
+			type="checkboxes"
+			label="Your Personal Data"
+			required="true"
+			>
+			<option value="1">Your name is public. We'll use your email address to send you updates.</option>
+		</field-->
+
+
+		<field
+			name="consent_name_public"
+			type="checkboxes"
+			label="COM_ICAGENDA_REGISTRATION_CONSENT_NAME_LABEL"
+			description="COM_ICAGENDA_REGISTRATION_CONSENT_NAME_DESC"
+			class="ic-checkboxes-option"
+			>
+			<option value="public">COM_ICAGENDA_REGISTRATION_CONSENT_NAME</option>
+		</field>
+
+		<field
+			name="consent_name_users"
+			type="checkboxes"
+			label="COM_ICAGENDA_REGISTRATION_CONSENT_NAME_LABEL"
+			description="COM_ICAGENDA_REGISTRATION_CONSENT_NAME_USERS_DESC"
+			class="ic-checkboxes-option"
+			>
+			<option value="users">COM_ICAGENDA_REGISTRATION_CONSENT_NAME_USERS</option>
+		</field>
+
+
+		<field
+			name="consent_gravatar"
+			type="checkboxes"
+			label="COM_ICAGENDA_REGISTRATION_CONSENT_GRAVATAR_LABEL"
+			class="ic-checkboxes-option"
+			>
+			<option value="gravatar">COM_ICAGENDA_REGISTRATION_CONSENT_GRAVATAR</option>
+		</field>
+
+		<field
+			name="consent_organiser"
+			type="checkboxes"
+			label="COM_ICAGENDA_REGISTRATION_CONSENT_ORGANISER_LABEL"
+			description="COM_ICAGENDA_REGISTRATION_CONSENT_ORGANISER_DESC"
+			required="true"
+			class="ic-checkboxes-option"
+			>
+			<option value="organiser">COM_ICAGENDA_REGISTRATION_CONSENT_ORGANISER</option>
+		</field>
+
+		<field
+			name="consent_terms"
+			type="icagenda.terms"
+			label="COM_ICAGENDA_REGISTRATION_CONSENT_TERMS_LABEL"
+			required="true"
+			>
+			<option value="terms">COM_ICAGENDA_REGISTRATION_CONSENT_TERMS</option>
+		</field>
+
+	</fields>
+
+
+	<!-- Extra Fields (to be reviewed...) -->
+	<fieldset name="extra" label="" >
+
+		<!--field
+			name="terms"
+			type="icagenda.registrationterms"
+			label="COM_ICAGENDA_TERMS_AND_CONDITIONS"
+			id="terms"
+			required="true"
+			message="COM_ICAGENDA_TERMS_AND_CONDITIONS_NOT_CHECKED_REGISTRATION"
+		/-->
+
+		<field
+			name="captcha"
+			type="captcha"
+			label="COM_ICAGENDA_CAPTCHA_LABEL"
+			validate="captcha"
+			namespace="registration"
+		/>
+
+	</fieldset>
+
+
+	<!-- Hidden Fields -->
+	<fieldset name="hidden" label="" >
+
+		<field
+			name="eventid"
+			type="hidden"
+		/>
+
+		<field
+			name="menuid"
+			type="hidden"
+		/>
+
+	</fieldset>
+
+
+	<fieldset name="control" label="" >
+
+		<field
+			name="typeReg"
+			type="hidden"
+		/>
+
+		<field
+			name="current_url"
+			type="hidden"
+		/>
+
+		<field
+			name="max_nb_of_tickets"
+			type="hidden"
+		/>
+	</fieldset>
+
+</form>
diff --git a/deployed/icagenda/components/com_icagenda/models/forms/submit.xml b/deployed/icagenda/components/com_icagenda/models/forms/submit.xml
new file mode 100644
index 00000000..e68b4797
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/models/forms/submit.xml
@@ -0,0 +1,459 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+
+	<fieldset name="default" addfieldpath="/administrator/components/com_icagenda/models/fields" >
+
+		<field
+			name="id"
+			type="text"
+			label="JGLOBAL_FIELD_ID_LABEL"
+			description="JGLOBAL_FIELD_ID_DESC"
+			default="0"
+			class="readonly"
+			labelclass="control-label"
+			size="10"
+			readonly="true"
+		/>
+
+		<field
+			name="title"
+			type="text"
+			label="COM_ICAGENDA_FORM_LBL_EVENT_TITLE"
+			description="COM_ICAGENDA_FORM_DESC_EVENT_TITLE"
+			class="input-xxlarge"
+			labelclass="control-label"
+			size="30"
+			required="true"
+		/>
+
+		<field
+			name="alias"
+			type="text"
+			label="JFIELD_ALIAS_LABEL"
+			description="JFIELD_ALIAS_DESC"
+			labelclass="control-label"
+		/>
+
+		<field
+			name="state"
+			type="list"
+			label="JSTATUS"
+			description="JFIELD_PUBLISHED_DESC"
+			default="1"
+			class="span12 small"
+			filter="intval"
+			size="1"
+			>
+			<option value="1">JPUBLISHED</option>
+			<option value="0">JUNPUBLISHED</option>
+			<option value="2">JARCHIVED</option>
+			<option value="-2">JTRASHED</option>
+		</field>
+
+		<field
+			name="access"
+			type="accesslevel"
+			label="JFIELD_ACCESS_LABEL"
+			description="COM_ICAGENDA_ACCESS_DESC"
+			class="span12 small"
+			size="1"
+		/>
+
+		<field
+			name="language"
+			type="contentlanguage"
+			label="JFIELD_LANGUAGE_LABEL"
+			description="COM_ICAGENDA_FORM_DESC_LANGUAGE"
+			class="span12 small"
+			>
+			<option value="*">JALL</option>
+		</field>
+
+		<field
+			name="created"
+			type="calendar"
+			label="JGLOBAL_FIELD_CREATED_LABEL"
+			description="JGLOBAL_FIELD_CREATED_DESC"
+			labelclass="control-label"
+			format="%Y-%m-%d %H:%M:%S"
+			filter="user_utc"
+		/>
+
+		<field
+			name="created_by"
+			type="user"
+			label="JGLOBAL_FIELD_CREATED_BY_LABEL"
+			description="JGLOBAL_FIELD_CREATED_BY_DESC"
+			labelclass="control-label"
+		/>
+
+		<field
+			name="created_by_alias"
+			type="text"
+			label="JGLOBAL_FIELD_CREATED_BY_ALIAS_LABEL"
+			description="JGLOBAL_FIELD_CREATED_BY_ALIAS_DESC"
+			labelclass="control-label"
+		/>
+
+		<field
+			name="username"
+			type="text"
+			label="COM_ICAGENDA_FORM_LBL_EVENT_USERNAME"
+			description="COM_ICAGENDA_FORM_DESC_EVENT_USERNAME"
+			class="inputbox"
+			labelclass="control-label"
+			size="40"
+			required="true"
+			filter="safehtml"
+		/>
+
+		<field
+			name="modified"
+			type="calendar"
+			label="JGLOBAL_FIELD_MODIFIED_LABEL"
+			description="COM_CONTENT_FIELD_MODIFIED_DESC"
+			class="readonly"
+			labelclass="control-label"
+			size="22"
+			readonly="true"
+			format="%Y-%m-%d %H:%M:%S"
+			filter="user_utc"
+		/>
+
+		<field
+			name="modified_by"
+			type="user"
+			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
+			class="readonly"
+			labelclass="control-label"
+			readonly="true"
+			filter="unset"
+		/>
+
+		<field name="checked_out" type="hidden" filter="unset" />
+
+		<field name="checked_out_time" type="hidden" filter="unset" />
+
+		<field
+			name="catid"
+			type="modal_cat"
+			label="COM_ICAGENDA_FORM_LBL_EVENT_CATID"
+			description="COM_ICAGENDA_FORM_DESC_EVENT_CATID"
+			class="inputbox"
+			labelclass="control-label"
+			required="true"
+		/>
+
+		<field
+			name="image"
+			type="file"
+			label="COM_ICAGENDA_FORM_LBL_EVENT_IMAGE"
+			description="COM_ICAGENDA_FORM_DESC_EVENT_IMAGE"
+			labelclass="control-label"
+			accept="image/*"
+			filter="safehtml"
+		/>
+
+		<field
+			name="file"
+			type="file"
+			label="COM_ICAGENDA_FORM_LBL_EVENT_FILE"
+			description="COM_ICAGENDA_FORM_DESC_EVENT_FILE"
+			class="inputbox"
+			labelclass="control-label"
+			id="upload_file"
+		/>
+
+		<field
+			name="displaytime"
+			type="radio"
+			label="COM_ICAGENDA_DISPLAY_TIME_LABEL"
+			description="COM_ICAGENDA_DISPLAY_TIME_DESC"
+			default="1"
+			class="btn-group"
+			labelclass="control-label"
+			>
+			<option value="0" class="ic-btn">JHIDE</option>
+			<option value="1" class="ic-btn">JSHOW</option>
+		</field>
+
+		<field
+			name="dates"
+			type="modal_date"
+			label="COM_ICAGENDA_FORM_LBL_EVENT_DATES"
+			description="COM_ICAGENDA_FORM_DESC_EVENT_DATES"
+			default="0000-00-00 00:00:00"
+			class="inputbox"
+		/>
+
+		<field
+			name="time"
+			type="modal_time"
+			label="COM_ICAGENDA_FORM_LBL_EVENT_TIME"
+			description="COM_ICAGENDA_FORM_DESC_EVENT_TIME"
+			class="inputbox"
+			labelclass="control-label"
+			size="40"
+			filter="safehtml"
+		/>
+
+		<field
+			name="startdate"
+			type="modal_startdate"
+			label="COM_ICAGENDA_FORM_LBL_EVENTPERIOD_START"
+			description="COM_ICAGENDA_FORM_DESC_EVENTPERIOD_START"
+			default="0000-00-00 00:00:00"
+			class="inputbox"
+		/>
+
+		<field
+			name="enddate"
+			type="modal_enddate"
+			label="COM_ICAGENDA_FORM_LBL_EVENTPERIOD_END"
+			description="COM_ICAGENDA_FORM_DESC_EVENTPERIOD_END"
+			default="0000-00-00 00:00:00"
+			class="inputbox"
+		/>
+
+		<field
+			name="weekdays"
+			type="list"
+			label="COM_ICAGENDA_FORM_LBL_WEEK_DAYS"
+			description=""
+			labelclass="control-label"
+			multiple="true"
+			default=""
+			>
+			<option value="0">SUNDAY</option>
+			<option value="1">MONDAY</option>
+			<option value="2">TUESDAY</option>
+			<option value="3">WEDNESDAY</option>
+			<option value="4">THURSDAY</option>
+			<option value="5">FRIDAY</option>
+			<option value="6">SATURDAY</option>
+		</field>
+
+		<field
+			name="shortdesc"
+			type="modal_ictextarea_counter"
+			label="COM_ICAGENDA_SUBMIT_AN_EVENT_SHORT_DESCRIPTION_LBL"
+			description="COM_ICAGENDA_SUBMIT_AN_EVENT_SHORT_DESCRIPTION_DESC"
+			class="ic-submit-shortdesc"
+			row="3"
+			cols="80"
+		/>
+
+		<field
+			name="desc"
+			type="editor"
+			label="COM_ICAGENDA_FORM_LBL_EVENT_DESC"
+			description="COM_ICAGENDA_SUBMIT_AN_EVENT_DESCRIPTION_DESC"
+			labelclass="control-label"
+			buttons="false"
+			filter="safehtml"
+		/>
+
+		<field
+			name="metadesc"
+			type="modal_ictextarea_counter"
+			label="COM_ICAGENDA_FORM_EVENT_METADESC_LBL"
+			description="COM_ICAGENDA_SUBMIT_AN_EVENT_METADESC_DESC"
+			class="ic-submit-metadesc"
+			row="3"
+			cols="80"
+		/>
+
+		<field
+			name="next"
+			type="hidden"
+			label="COM_ICAGENDA_FORM_LBL_EVENT_NEXT"
+			description="COM_ICAGENDA_FORM_DESC_EVENT_NEXT"
+			default="0000-00-00 00:00:00"
+			class="inputbox"
+			labelclass="control-label"
+		/>
+
+		<field
+			name="email"
+			type="email"
+			label="COM_ICAGENDA_FORM_LBL_EVENT_EMAIL"
+			description="COM_ICAGENDA_FORM_DESC_EVENT_EMAIL"
+			class="input-xlarge"
+			labelclass="control-label"
+			size="40"
+			filter="safehtml"
+		/>
+
+		<field
+			name="phone"
+			type="text"
+			label="COM_ICAGENDA_FORM_LBL_EVENT_PHONE"
+			description="COM_ICAGENDA_FORM_DESC_EVENT_PHONE"
+			class="input-large"
+			labelclass="control-label"
+			size="30"
+			filter="safehtml"
+		/>
+
+		<field
+			name="website"
+			type="text"
+			label="COM_ICAGENDA_FORM_LBL_EVENT_WEBSITE"
+			description="COM_ICAGENDA_FORM_DESC_EVENT_WEBSITE"
+			class="input-large"
+			labelclass="control-label"
+			size="30"
+			filter="safehtml"
+		/>
+
+		<field
+			name="place"
+			type="text"
+			label="COM_ICAGENDA_FORM_LBL_EVENT_PLACE"
+			description="COM_ICAGENDA_FORM_DESC_EVENT_PLACE"
+			class="input-large"
+			labelclass="control-label"
+			id="place"
+			size="30"
+			filter="safehtml"
+		/>
+
+		<field
+			name="coordinate"
+			type="modal_coordinate"
+			label="COM_ICAGENDA_FORM_LBL_EVENT_MAP"
+			description="COM_ICAGENDA_FORM_DESC_EVENT_MAP"
+			class="inputbox"
+			labelclass="control-label"
+		/>
+
+		<field
+			name="address"
+			type="text"
+			label="COM_ICAGENDA_GOOGLE_MAPS_ADDRESS_LBL"
+			description="COM_ICAGENDA_FORM_DESC_EVENT_LOCATION"
+			class="input-xlarge"
+			labelclass="control-label"
+			filter="safehtml"
+		/>
+
+		<field
+			name="city"
+			type="icmap_city"
+			label="COM_ICAGENDA_FORM_LBL_EVENT_CITY"
+			description="COM_ICAGENDA_FORM_DESC_EVENT_CITY"
+			class="input-large icmap-input"
+			labelclass="control-label"
+			filter="safehtml"
+		/>
+
+		<field
+			name="country"
+			type="icmap_country"
+			label="COM_ICAGENDA_FORM_LBL_EVENT_COUNTRY"
+			description="COM_ICAGENDA_FORM_DESC_EVENT_COUNTRY"
+			class="input-large icmap-input"
+			labelclass="control-label"
+			filter="safehtml"
+		/>
+
+		<field
+			name="lat"
+			type="icmap_lat"
+			label="LATITUDE"
+			description="COM_ICAGENDA_FORM_DESC_EVENT_MAP"
+			class="input-large icmap-input"
+			labelclass="control-label"
+		/>
+
+		<field
+			name="lng"
+			type="icmap_lng"
+			label="LONGITUDE"
+			description="COM_ICAGENDA_FORM_DESC_EVENT_MAP"
+			class="input-large icmap-input"
+			labelclass="control-label"
+		/>
+
+		<field
+			name="custom_fields"
+			type="hidden"
+			default=""
+			class="input-large"
+		/>
+
+		<field
+			name="site_itemid"
+			type="hidden"
+			label="COM_ICAGENDA_FORM_FRONTEND_SUBMIT_ITEMID_LBL"
+			description="COM_ICAGENDA_FORM_FRONTEND_SUBMIT_ITEMID_DESC"
+			default="0"
+			size="3"
+			class="inputbox"
+		/>
+
+		<field
+			name="captcha"
+			type="captcha"
+			label="COM_ICAGENDA_CAPTCHA_LABEL"
+			description="COM_ICAGENDA_CAPTCHA_DESC"
+			validate="captcha"
+			namespace="submit"
+		/>
+	</fieldset>
+
+	<fields name="params">
+
+		<fieldset
+			name="registrations"
+			label="COM_ICAGENDA_REGISTRATION_OPTIONS"
+			addfieldpath="/administrator/components/com_icagenda/assets/elements"
+			>
+
+			<field
+				name="typeReg"
+				type="list"
+				label="COM_ICAGENDA_TYPE_REG_LABEL"
+				description="COM_ICAGENDA_TYPE_REG_DESC"
+				default="1"
+				>
+				<option value="1">COM_ICAGENDA_REG_BY_INDIVIDUAL_DATE</option>
+				<option value="2">COM_ICAGENDA_REG_FOR_ALL_DATES</option>
+			</field>
+
+			<field
+				name="accessReg"
+				type="hidden"
+				label="JFIELD_ACCESS_LABEL"
+				description="JFIELD_ACCESS_DESC"
+				default=""
+				class="inputbox"
+				labelclass="control-label"
+				size="1"
+			/>
+
+			<field
+				name="maxRlistGlobal"
+				type="hidden"
+				label="COM_ICAGENDA_MAX_PER_REGISTRATION_LABEL"
+				description="COM_ICAGENDA_MAX_PER_REGISTRATION_DESC"
+				default=""
+				class="btn-group"
+				labelclass="control-label"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="2">COM_ICAGENDA_LBL_CUSTOM_VALUE</option>
+			</field>
+
+			<field
+				name="maxRlist"
+				type="hidden"
+				label=" "
+				description="COM_ICAGENDA_DESC_CUSTOM_VALUE"
+				default=""
+				labelclass="control-label"
+				size="2"
+			/>
+		</fieldset>
+	</fields>
+</form>
diff --git a/deployed/icagenda/components/com_icagenda/models/icagenda.php b/deployed/icagenda/components/com_icagenda/models/icagenda.php
new file mode 100644
index 00000000..98a98a9e
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/models/icagenda.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-05-01
+ *
+ * @package     iCagenda.Site
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+jimport('joomla.application.component.model');
+
+/**
+ * iCagenda Model
+ */
+class iCagendaModelicagenda extends JModelItem
+{
+	/**
+	 * @var  object  item
+	 */
+	protected $item;
+
+	function getText()
+	{
+		$db = JFactory::getDbo();
+		$query = 'SELECT * FROM #__icagenda';
+		$db->setQuery( $query );
+
+		$value = $db->loadObjectList();
+
+		return $value;
+	}
+ 
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * This method should only be called once per instantiation and is designed
+	 * to be called on the first call to the getState() method unless the model
+	 * configuration flag to ignore the request is set.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	protected function populateState()
+	{
+		$app    = JFactory::getApplication();
+		$jinput = $app->input;
+
+		// Get the message id
+		$id = $jinput->getInt('id');
+
+		$this->setState('message.id', $id);
+
+		// Load the parameters.
+		$params = $app->getParams();
+
+		$this->setState('params', $params);
+
+		parent::populateState();
+	}
+ 
+	/**
+	 * Returns a reference to the a Table object, always creating it.
+	 *
+	 * @param   type    The table type to instantiate
+	 * @param   string  A prefix for the table class name. Optional.
+	 * @param   array   Configuration array for model. Optional.
+	 * @return  JTable  A database object
+	 *
+	 * @since   1.0
+	 */
+	public function getTable($type = 'iCagenda', $prefix = 'iCagendaTable', $config = array())
+	{
+		return JTable::getInstance($type, $prefix, $config);
+	}
+ 
+}
\ No newline at end of file
diff --git a/deployed/icagenda/components/com_icagenda/models/index.html b/deployed/icagenda/components/com_icagenda/models/index.html
new file mode 100644
index 00000000..fa6d84e8
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/models/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/components/com_icagenda/models/list.php b/deployed/icagenda/components/com_icagenda/models/list.php
new file mode 100644
index 00000000..da324f5b
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/models/list.php
@@ -0,0 +1,468 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-26
+ *
+ * @package     iCagenda.Site
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+if (version_compare(JVERSION, '3.0', 'lt'))
+{
+	jimport('joomla.application.component.modellist');
+}
+
+use Joomla\Registry\Registry;
+
+/**
+ * This models supports retrieving lists of events.
+ */
+class iCagendaModelList extends JModelList
+{
+	/**
+	 * Model context string.
+	 *
+	 * @var        string
+	 */
+	protected $_context = 'com_icagenda.list';
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array        An optional associative array of configuration settings.
+	 * @see     JController
+	 *
+	 * @since   3.6.0
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'id', 'e.id',
+				'ordering', 'e.ordering',
+				'state', 'e.state',
+				'access', 'e.access', 'access_level',
+				'approval', 'e.approval',
+				'created', 'e.created',
+				'title', 'e.title',
+				'username', 'e.username',
+				'email', 'e.email',
+				'category', 'e.category',
+				'cat_color', 'e.catcolor',
+				'image', 'e.image',
+				'file', 'e.file',
+				'next', 'e.next',
+				'place', 'e.place',
+				'city', 'e.city',
+				'country', 'e.country',
+				'desc', 'e.desc',
+				'language', 'e.language',
+				'location', 'e.location',
+				'category_id',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @since  3.6.0
+	 */
+	protected function populateState($ordering = null, $direction = null)
+	{
+		// Initialise variables.
+		$app = JFactory::getApplication();
+
+		// Load the filter search.
+		$search = $app->getUserStateFromRequest($this->context . '.filter.search', 'filter_search');
+		$this->setState('filter.search', $search);
+
+		// Filter (dropdown) category
+		$category = $this->getUserStateFromRequest($this->context . '.filter.category', 'filter_category');
+		$this->setState('filter.category', $category);
+
+		// Filter (date picker) from
+		$from = $this->getUserStateFromRequest($this->context . '.filter.from', 'filter_from', '', 'string');
+		$this->setState('filter.from', $from);
+
+		// Filter (date picker) to
+		$to = $this->getUserStateFromRequest($this->context . '.filter.to', 'filter_to', '', 'string');
+		$this->setState('filter.to', $to);
+
+		// Filter (dropdown) month
+		$month = $this->getUserStateFromRequest($this->context . '.filter.month', 'filter_month', '', 'string');
+		$this->setState('filter.month', $month);
+
+		// Filter (dropdown) year
+		$year = $this->getUserStateFromRequest($this->context . '.filter.year', 'filter_year', '', 'string');
+		$this->setState('filter.year', $year);
+
+		// Load the filter state.
+		$published = $app->getUserStateFromRequest($this->context . '.filter.state', 'filter_published', '', 'string');
+		$this->setState('filter.state', $published);
+
+		// Load the filter access.
+		$access = $app->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', '', 'string');
+		$this->setState('filter.access', $access);
+
+		// Load the filter language.
+		$language = $app->getUserStateFromRequest($this->context . '.filter.language', 'filter_language', '', 'string');
+		$this->setState('filter.language', $language);
+
+		// Filter categoryId
+//		$categoryId = $this->getUserStateFromRequest($this->context . '.filter.category_id', 'filter_category_id');
+//		$this->setState('filter.category_id', $categoryId);
+
+		// Filter (dropdown) upcoming
+//		$upcoming = $this->getUserStateFromRequest($this->context . '.filter.upcoming', 'filter_upcoming', '', 'string');
+//		$this->setState('filter.upcoming', $upcoming);
+
+		// Load the parameters.
+		$params = $app->getParams();
+		$this->setState('params', $params);
+
+		// List state information.
+		parent::populateState('e.id', 'desc');
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id.
+	 * @return  string       A store id.
+	 *
+	 * @since   3.6.0
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id .= ':' . $this->getState('filter.search');
+		$id .= ':' . $this->getState('filter.access');
+		$id .= ':' . $this->getState('filter.state');
+		$id .= ':' . $this->getState('filter.access');
+		$id .= ':' . $this->getState('filter.language');
+		$id .= ':' . $this->getState('filter.category');
+		$id .= ':' . $this->getState('filter.from');
+		$id .= ':' . $this->getState('filter.to');
+		$id .= ':' . $this->getState('filter.month');
+		$id .= ':' . $this->getState('filter.year');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Build an SQL query to load the list data.
+	 *
+	 * @return  JDatabaseQuery
+	 *
+	 * @since   3.6.0
+	 */
+	protected function getListQuery()
+	{
+		$app	= JFactory::getApplication();
+		$params	= $app->getParams();
+		$jinput	= $app->input;
+		$layout	= $jinput->get('layout', '');
+
+		// Get the current user for authorisation checks
+		$user	= JFactory::getUser();
+
+		// Get View Options for filtering
+		$mcatid	= $params->get('mcatid', '');
+
+		// Create a new query object.
+		$db		= $this->getDbo();
+		$query	= $db->getQuery(true);
+
+		// Select the required fields from the table.
+		$query->select(
+			$this->getState(
+				'list.select', 'e.*, ' .
+				'e.name AS contact_name, e.email AS contact_email'
+			)
+		);
+		$query->from($db->qn('#__icagenda_events') . ' AS e');
+
+		// Join over the category
+		$query->select('c.id AS cat_id, c.title AS cat_title, c.color AS cat_color, c.desc AS cat_desc');
+		$query->join('LEFT', '#__icagenda_category AS c ON c.id = e.catid');
+		$query->where('c.state = 1');
+
+		// Features - extract the number of displayable icons per event
+		$query->select('feat.count AS features');
+		$sub_query = $db->getQuery(true);
+		$sub_query->select('fx.event_id, COUNT(*) AS count');
+		$sub_query->from('#__icagenda_feature_xref AS fx');
+		$sub_query->innerJoin("#__icagenda_feature AS f ON fx.feature_id=f.id AND f.state=1 AND f.icon<>'-1'");
+		$sub_query->group('fx.event_id');
+		$query->leftJoin('(' . (string) $sub_query . ') AS feat ON e.id=feat.event_id');
+
+		// Filter by features
+		$query->where(icagendaEventsData::getFeaturesFilter());
+
+		// Join total of registrations
+//		$current_date = $jinput->get('date', '');
+
+//		if ($current_date)
+//		{
+//			$ex = explode('-', $current_date);
+
+//			if (count($ex) == 5)
+//			{
+//				$date_to_check = $ex['0'] . '-' . $ex['1'] . '-' . $ex['2'] . ' ' . $ex['3'] . ':' . $ex['4'] . ':00';
+//			}
+//			else
+//			{
+//				$date_to_check = '';
+//			}
+//		}
+//		else
+//		{
+//			$date_to_check = 'e.next';
+//		}
+
+//		$query->select('r.count AS registered');
+//		$sub_query = $db->getQuery(true);
+//		$sub_query->select('r.state, r.date, r.eventid, sum(r.people) AS count');
+//		$sub_query->from('#__icagenda_registration AS r');
+//		$sub_query->where('r.state > 0');
+//		$sub_query->group('r.date, r.eventid');
+//		$query->leftJoin('(' . (string) $sub_query . ') AS r ON ((' . $db->q($date_to_check) . ' = r.date OR r.date = "") AND e.id = r.eventid)');
+
+		// Filter by published state
+		$published = $this->getState('filter.state');
+
+		if (is_numeric($published))
+		{
+			$query->where('e.state = '.(int) $published);
+		}
+		elseif ($published === '')
+		{
+			$query->where('(e.state IN (0, 1))');
+		}
+
+		$userGroups = $user->getAuthorisedGroups();
+
+		$groupid	= JComponentHelper::getParams('com_icagenda')->get('approvalGroups', array("8"));
+		$groupid	= is_array($groupid) ? $groupid : array($groupid);
+
+		// Test if user login have Approval Rights
+		if ( ! array_intersect($userGroups, $groupid)
+			&& ! in_array('8', $userGroups))
+		{
+			$query->where('e.approval <> 1');
+		}
+		else
+		{
+			$query->where('e.approval < 2');
+		}
+
+		// Filter by access level.
+		$access = $this->getState('filter.access');
+
+		if ( ! empty($access)
+			&& ! in_array('8', $userGroups))
+		{
+			$access_levels = implode(',', $user->getAuthorisedViewLevels());
+
+			$query->where('e.access IN (' . $access_levels . ')');
+//				->where('c.access IN (' . $access_levels . ')'); // To be added later, when access integrated to category
+		}
+
+		// Filter by language
+		if ($this->getState('filter.language'))
+		{
+			$query->where('e.language in (' . $db->q(JFactory::getLanguage()->getTag()) . ',' . $db->q('*') . ')');
+		}
+
+
+		// Prepare to return the list of dates/events
+		$format	        = $jinput->get('format', '');
+		$type	        = $jinput->get('type', '');
+		$limit	        = $jinput->get('limit', '');
+		$number			= ($format == 'feed' && $type == 'rss')
+						? JFactory::getConfig()->get('feed_limit', $params->get('number', 5))
+						: $params->get('number', 5);
+//		$orderdate		= $params->get('orderby', 2); // Processed in getAllDates()
+		$currentPage	= $jinput->get('page', '1');
+
+		// Get array of all [date _ id]
+		$list_date_id 	= icagendaEventsData::getAllDates();
+
+		if ($limit != '' && $limit >= 0)
+		{
+			$number = ($limit == 0) ? count($list_date_id) : (int) $limit;
+		}
+
+		// Set list of PAGE:IDS
+		$pages			= ceil(count($list_date_id) / $number);
+		$list_id		= array();
+
+		for ($n = 1; $n <= $pages; $n++)
+		{
+			$idsArray = array();
+
+			$page_nb		= $number * ($n - 1);
+			$datesPerPage	= array_slice($list_date_id, $page_nb, $number, true);
+
+			foreach ($datesPerPage AS $date_id)
+			{
+				$ex_date_id = explode('_', $date_id);
+
+				$idsArray[] = $ex_date_id['1'];
+			}
+
+			$list_id[] = implode(', ', $idsArray) . '::' . $n;
+		}
+
+		$this_ic_ids = '';
+
+		if ($list_id)
+		{
+			foreach ($list_id as $a)
+			{
+				$ex_listid	= explode('::', $a);
+				$ic_page	= $ex_listid[1];
+				$ic_ids		= $ex_listid[0];
+
+				if ($ic_page == $currentPage)
+				{
+					$this_ic_ids = $ic_ids ? $ic_ids : '0';
+				}
+			}
+
+			if ($this_ic_ids)
+			{
+				$query->where('e.id IN (' . $this_ic_ids . ')');
+			}
+//			else
+//			{
+				// Unlimited: limit already set by getAllDates()
+//				$this->setState('list.limit', 0);
+
+//				return $query; // No Event (if 'All Dates' option selected)
+//			}
+		}
+
+		// Unlimited: limit already set by getAllDates()
+		$this->setState('list.limit', 0);
+
+		return $query;
+	}
+
+	/**
+	 * Method to get an array of data items.
+	 *
+	 * @return  mixed  An array of data items on success, false on failure.
+	 *
+	 * @since   3.6.0
+	 */
+	public function getItems()
+	{
+		if ($items = parent::getItems())
+		{
+			// Do any procesing on fields here if needed
+			foreach ($items AS $item)
+			{
+				$item->evtParams		= $item->params ? icagendaEvent::evtParams($item->params) : '';
+				$item->titleFormat		= $item->title ? icagendaRender::titleToFormat($item->title) : '';
+				$item->metaAsShortDesc	= $item->metadesc ? iCFilterOutput::fullCleanHTML($item->metadesc) : '';
+				$item->shortDescription	= $item->shortdesc
+										? JHtml::_('content.prepare', icagendaEvents::deleteAllBetween('{', '}', $item->shortdesc), $item->params, 'com_icagenda.list')
+										: '';
+				$item->description		= $item->desc
+										? JHtml::_('content.prepare', icagendaEvents::deleteAllBetween('{', '}', $item->desc), $item->params, 'com_icagenda.list')
+										: '';
+				$item->descShort		= $item->desc ? icagendaEvents::shortDescription($item->desc) : '';
+
+				// TO BE REFACTORIED (change css class name)
+				$item->fontColor		= (iCColor::getBrightness($item->cat_color) == 'bright') ? 'fontColor' : '';
+
+				// List only
+				$item->url				= icagendaEvent::url($item->id, $item->alias);
+				$item->titlebar			= icagendaEvent::titleBar($item);
+				$item->rerun 			= icagendaEvent::getCustomField($item->id, 'rerun');
+				$item->lang 			= icagendaEvent::getCustomField($item->id, 'language');
+
+				$rerunEnd = new DateTime($item->rerun);
+				$rerunEnd->modify('+45 minutes');
+				$rerunEnd = date_format($rerunEnd, 'Y-m-d H:i');
+
+				$item->rerunEnd = $rerunEnd;
+
+				// Extract the feature details, if needed
+				if (is_null($item->features))
+				{
+					$item->features = array();
+				}
+				else
+				{
+					$db = $this->getDbo();
+					$query = $db->getQuery(true);
+					$query->select('DISTINCT f.icon, f.icon_alt');
+					$query->from('#__icagenda_feature_xref AS fx');
+					$query->innerJoin("#__icagenda_feature AS f ON fx.feature_id=f.id AND f.state=1 AND f.icon<>'-1'");
+					$query->where('fx.event_id=' . (int)$item->id);
+					$query->order('f.ordering DESC'); // Order descending because the icons are floated right
+					$db->setQuery($query);
+					$item->features = $db->loadObjectList();
+				}
+			}
+		}
+
+		return $items;
+	}
+
+	public function getNextItem()
+	{
+		$app	= JFactory::getApplication();
+		$params	= $app->getParams();
+		$mcatid	= $params->get('mcatid', '');
+
+		$db		= $this->getDbo();
+		$query	= $db->getQuery(true);
+		$query->select('e.*, f.value AS video_url');
+		$query->from('#__icagenda_events e');
+		$query->innerJoin("#__icagenda_customfields_data AS f ON e.id = f.parent_id");
+		$query->where('e.catid = '.$mcatid[0]);
+		$query->where('e.state = 1');
+		$query->where('e.enddate > "'.date('Y-m-d H:i:s').'"');
+		$query->where('f.slug = "video_url"');
+		$query->order('e.startdate ASC');
+		$db->setQuery($query);
+		$nextItem = $db->loadObject();
+
+		$query = $db->getQuery(true);
+		$query->select('*');
+		$query->from('#__icagenda_customfields_data');
+		$query->where('parent_id = '.$nextItem->id);
+		$query->where('slug = "presenter"');
+		$db->setQuery($query);
+		$presenters = $db->loadObject();
+
+		$nextItem->presenters = $presenters->value;
+		$nextItem->url = icagendaEvent::url($nextItem->id, $nextItem->alias);
+
+		return $nextItem;
+	}
+}
diff --git a/deployed/icagenda/components/com_icagenda/models/registration.php b/deployed/icagenda/components/com_icagenda/models/registration.php
new file mode 100644
index 00000000..1b9a8847
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/models/registration.php
@@ -0,0 +1,1445 @@
+<?php
+
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.12 2020-03-03
+ *
+ * @package     iCagenda.Site
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.6.0
+ *----------------------------------------------------------------------------
+ */
+
+defined('_JEXEC') or die;
+
+if (version_compare(JVERSION, '3.4', 'lt')) {
+	jimport('joomla.application.component.modelitem');
+	jimport('joomla.registry.registry');
+}
+
+use Joomla\Registry\Registry;
+
+/**
+ * Registration model class for iCagenda
+ */
+class iCagendaModelRegistration extends JModelForm
+{
+	protected $_context = 'com_icagenda.registration';
+
+	protected $data;
+
+	/**
+	 * Method to get the registration form data.
+	 *
+	 * The base form data is loaded and then an event is fired
+	 * for users plugins to extend the data.
+	 *
+	 * @return  mixed  Data object on success, false on failure.
+	 *
+	 * @since   3.6.0
+	 */
+	public function getData()
+	{
+		if ($this->data === null) {
+			$this->data = new stdClass;
+			$app = JFactory::getApplication();
+			$params = JComponentHelper::getParams('com_icagenda');
+
+			// Override the base user data with any data in the session.
+			$temp = (array) $app->getUserState('com_icagenda.registration.data', array());
+
+			foreach ($temp as $k => $v) {
+				$this->data->$k = $v;
+			}
+		}
+
+		return $this->data;
+	}
+
+	/**
+	 * Method to get the registration form.
+	 *
+	 * The base form is loaded from XML and then an event is fired
+	 * for users plugins to extend the form with extra fields.
+	 *
+	 * @param   array    $data      An optional array of data for the form to interogate.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  JForm  A JForm object on success, false on failure
+	 *
+	 * @since   3.6.0
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		// Get the form.
+		$form = $this->loadForm('com_icagenda.registration', 'registration', array('control' => 'jform', 'load_data' => $loadData));
+
+		// Get the application object.
+		$app = JFactory::getApplication();
+		$params = $app->getParams();
+
+		$user = JFactory::getUser();
+		$user_id = $user->get('id');
+
+		// Autofill name and email if registered user log in
+		if ($user_id && $params->get('autofilluser', 1) == 1) {
+			$form->setValue('uid', null, $user_id);
+
+			// logged-in Users: Name/User Name Option
+			//$user_name = ($params->get('nameJoomlaUser', 1) == 1) ? $user->get('name') : $user->get('username');
+			$user_name = $user->get('name');
+			$user_mail = $user->get('email');
+		} else {
+			$form->setFieldAttribute('uid', 'disabled', 'disabled');
+
+			$user_name = '';
+			$user_mail = '';
+		}
+
+		$nameAttr = !empty($user_name) ? 'readonly' : 'required';
+		$form->setFieldAttribute('name', $nameAttr, 'true');
+
+		if ($user_name) {
+			$form->setValue('name', null, $user_name);
+		}
+
+		// Set CORE 'Email' attributes
+		if ($user_mail) {
+			$form->setValue('email', null, $user_mail);
+			$form->setFieldAttribute('email', 'readonly', 'true');
+			$form->removeField('email2');
+		} else {
+			if (!$params->get('emailConfirm', 1)) {
+				$form->removeField('email2');
+			}
+
+			if ($params->get('emailRequired', 1)) {
+				$form->setFieldAttribute('email', 'required', 'true');
+
+				if ($params->get('emailConfirm', 1)) {
+					$form->setFieldAttribute('email2', 'required', 'true');
+				}
+			}
+		}
+
+		// Set CORE 'Phone' attributes
+		if ($params->get('phoneRequired', 0)) {
+			$form->setFieldAttribute('phone', 'required', 'true');
+			$form->setFieldAttribute('phone', 'validate', 'ic.tel');
+		}
+
+		// Check if Custom Fields required @commented 3.6.5
+		//		$listCustomFields = icagendaCustomfields::getCustomFields(1, $params->get('custom_form', ''), 1);
+
+		//		if ($listCustomFields)
+		//		{
+		//			foreach ($listCustomFields AS $cf)
+		//			{
+		//				if ($cf->required == 1)
+		//				{
+		//					$form->setFieldAttribute(str_replace('core_', '', $cf->slug), 'required', 'true');
+		//				}
+		//			}
+		//		}
+
+		// If Participants List is not enabled, we remove validation for related privacy boxes
+		if ($params->get('participantList', 0) == 0) {
+			// Do not remove name consent if required
+			if ($params->get('participant_name_consent', '') != '1') {
+				$form->removeField('consent_name_public', 'consent');
+				$form->removeField('consent_name_users', 'consent');
+			}
+
+			// Do not remove Gravatar consent if required
+			if ($params->get('participant_gravatar_consent', '') != '1') {
+				$form->removeField('consent_gravatar', 'consent');
+			}
+		} else {
+			$participant_name_visibility = $params->get('participant_name_visibility', '');
+
+			if ($participant_name_visibility == 1) {
+				$form->removeField('consent_name_users', 'consent');
+			} elseif ($participant_name_visibility == 2) {
+				$form->removeField('consent_name_public', 'consent');
+			} else {
+				$form->removeField('consent_name_public', 'consent');
+				$form->removeField('consent_name_users', 'consent');
+			}
+		}
+
+		// If Consent Organiser is not enabled, we remove validation for related privacy box
+		if ($params->get('privacy_organiser', 0) == 0) {
+			$form->removeField('consent_organiser', 'consent');
+		}
+
+		// If Terms and Conditions is not enabled, we remove validation for checkbox
+		if ($params->get('terms', 1) == 0) {
+			$form->removeField('consent_terms', 'consent');
+		}
+
+		// If Captcha not displayed, we remove validation for captcha form field
+		if ($params->get('reg_captcha', 0) == 0) {
+			$form->removeField('captcha');
+		}
+
+		if (empty($form)) {
+			return false;
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return  mixed  The data for the form.
+	 *
+	 * @since   3.6.0
+	 */
+	protected function loadFormData()
+	{
+		$data = $this->getData();
+
+		//		$this->preprocessData('com_icagenda.registration', $data);
+
+		return $data;
+	}
+
+	/**
+	 * Override preprocessForm to load the '#' plugin group instead of content.
+	 *
+	 * @param   JForm   $form   A JForm object.
+	 * @param   mixed   $data   The data expected for the form.
+	 * @param   string  $group  The name of the plugin group to import (defaults to "content").
+	 *
+	 * @return  void
+	 *
+	 * @since   3.6.0
+	 * @throws  Exception if there is an error in the form event.
+	 */
+	//	protected function preprocessForm(JForm $form, $data, $group = 'content')
+	//	{
+	//		parent::preprocessForm($form, $data, $group);
+	//	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.6.0
+	 */
+	protected function populateState()
+	{
+		// Get the application object.
+		$app = JFactory::getApplication();
+
+		// Load the parameters.
+		$params = $app->getParams('com_icagenda');
+		$this->setState('params', $params);
+
+		// Load state from the request.
+		$pk = $app->input->getInt('id');
+		$this->setState('event.id', $pk);
+	}
+
+	/**
+	 * Method to save the form data.
+	 *
+	 * @param   array  $temp  The form data.
+	 *
+	 * @return  mixed  @todo : update return (The user id on success, false on failure).
+	 *
+	 * @since   3.6.0
+	 */
+	public function register($temp)
+	{
+		$app  = JFactory::getApplication();
+		$user = JFactory::getUser();
+
+		$data = (array) $this->getData();
+
+		foreach ($temp as $k => $v) {
+			$data[$k] = $v;
+		}
+
+		$db     = JFactory::getDbo();
+		$date   = JFactory::getDate();
+		$params = $app->getParams();
+
+		$eventTimeZone = null;
+
+		$reg_data = new stdClass();
+
+		// Set the values
+		$reg_data->id               = null;
+		$reg_data->userid           = isset($data['uid']) ? $data['uid'] : '';
+		$reg_data->name             = isset($data['name']) ? $data['name'] : '';
+		$reg_data->email            = isset($data['email']) ? $data['email'] : '';
+		$reg_data->phone            = isset($data['phone']) ? trim($data['phone']) : '';
+		$reg_data->date             = isset($data['date']) ? $data['date'] : '';
+		$reg_data->period           = isset($data['period']) ? $data['period'] : '0';
+		$reg_data->people           = isset($data['people']) ? $data['people'] : '1';
+		//			$reg_data->notes            = isset($data['notes']) ? htmlentities(strip_tags($data['notes'])) : '';
+		$reg_data->notes            = isset($data['notes']) ? $data['notes'] : '';
+		$reg_data->eventid          = isset($data['eventid']) ? $data['eventid'] : '0';
+		$reg_data->itemid           = isset($data['menuid']) ? $data['menuid'] : '';
+		$reg_data->created          = $date->toSql();
+		$reg_data->created_by       = $reg_data->userid;
+		$reg_data->checked_out_time = date('Y-m-d H:i:s');
+
+		$type_registration = isset($data['type_registration']) ? $data['type_registration'] : '1';
+		$current_url       = isset($data['current_url']) ? $data['current_url'] : 'index.php';
+		$max_nb_of_tickets = isset($data['max_nb_of_tickets']) ? $data['max_nb_of_tickets'] : '1000000';
+		$custom_fields     = isset($data['custom_fields']) ? $data['custom_fields'] : false;
+		$email2            = isset($data['email2']) ? $data['email2'] : false;
+		$consent_data      = isset($data['consent']) ? $data['consent'] : array();
+
+
+		// Control if still ticket left
+		$registered = icagendaRegistration::getRegisteredTotal($reg_data->eventid, $reg_data->date, $type_registration);
+
+		// Check number of tickets left
+		$tickets_left = $max_nb_of_tickets - $registered;
+
+		// IF NO TICKETS LEFT
+		if ($tickets_left <= 0 || $registered >= $max_nb_of_tickets) {
+			$app->enqueueMessage(JText::_('COM_ICAGENDA_ALERT_NO_TICKETS_AVAILABLE'), 'warning');
+
+			//				$app->redirect(htmlspecialchars_decode($urlEvent));
+			return false;
+		}
+
+		// IF NOT ENOUGH TICKETS LEFT
+		elseif ($tickets_left < $reg_data->people) {
+			$msg = JText::_('COM_ICAGENDA_ALERT_NOT_ENOUGH_TICKETS_AVAILABLE') . '<br />';
+			$msg .= JText::sprintf('COM_ICAGENDA_ALERT_NOT_ENOUGH_TICKETS_AVAILABLE_NOW', $tickets_left) . '<br />';
+			$msg .= JText::_('COM_ICAGENDA_ALERT_NOT_ENOUGH_TICKETS_AVAILABLE_CHANGE_NUMBER');
+
+			$app->enqueueMessage($msg, 'error');
+
+			//				$app->redirect(htmlspecialchars_decode($current_url));
+			return false;
+		}
+
+
+		// CONTROL NAME VALUE
+		$name_isValid = '1';
+
+		$pattern = "#[/\\\\/\<>/\"%;=\[\]\+()&]|^[0-9]#i";
+		$pattern = "#[/\\\\/\<>/\";=\[\]\+()%&]#i";
+
+		// Filter Name
+		$data['name'] = str_replace("'", '’', $data['name']);
+
+		// Remove non-printable characters.
+		$data['name'] = (string) preg_replace('/[\x00-\x1F\x7F]/', '', $data['name']);
+
+		if ($data['name']) {
+			$nbMatches = preg_match($pattern, $data['name']);
+
+			// Name contains invalid characters
+			if ($nbMatches && $nbMatches == 1) {
+				$name_isValid = '0';
+				$app->enqueueMessage(JText::sprintf('COM_ICAGENDA_REGISTRATION_NAME_NOT_VALID', '<strong>' . htmlentities($data['name'], ENT_COMPAT, 'UTF-8') . '</strong>'), 'error');
+
+				return false;
+			}
+
+			// Name is less than 2 characters
+			// @TODO change minimum to an option or 1 letter ?...
+			if (strlen(utf8_decode(trim($data['name']))) < 2) {
+				$name_isValid = '0';
+				$app->enqueueMessage(JText::_('COM_ICAGENDA_REGISTRATION_NAME_MINIMUM_CHARACTERS'), 'error');
+
+				return false;
+			}
+		}
+
+		$reg_data->name = filter_var($reg_data->name, FILTER_SANITIZE_STRING);
+
+		// Advanced Checkdnsrr email
+		$emailCheckdnsrr = JComponentHelper::getParams('com_icagenda')->get('emailCheckdnsrr', '0');
+
+		if (!empty($reg_data->email)) {
+			$validEmail = true;
+			$checkdnsrr = true;
+
+			if (($emailCheckdnsrr == 1) && function_exists('checkdnsrr')) {
+				$provider = explode('@', $reg_data->email);
+
+				if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+					if (version_compare(phpversion(), '5.3.0', '<')) {
+						$checkdnsrr = true;
+					}
+				} else {
+					$checkdnsrr = checkdnsrr($provider[1]);
+				}
+			} else {
+				$checkdnsrr = true;
+			}
+		} else {
+			$checkdnsrr = true;
+		}
+
+		// Check if valid email address
+		$validEmail = $validEmail ? icagendaRegistration::validEmail($reg_data->email) : false;
+
+		if (
+			!$checkdnsrr
+			|| !$validEmail
+			&& $reg_data->email
+		) {
+			// message if email is invalid
+			$app->enqueueMessage(JText::_('COM_ICAGENDA_REGISTRATION_EMAIL_NOT_VALID'), 'error');
+
+			return false;
+		}
+
+		$eventid = (int) $reg_data->eventid;
+		$period  = (int) $reg_data->period;
+		$people  = (int) $reg_data->people;
+		$userid  = (int) $reg_data->userid;
+		$name    = $reg_data->name;
+		$email   = $reg_data->email;
+		$phone   = $reg_data->phone;
+		$notes   = html_entity_decode($reg_data->notes);
+		$dateReg = $reg_data->date;
+
+		$limitRegEmail = $params->get('limitRegEmail', 1);
+		$limitRegDate  = $params->get('limitRegDate', 1);
+
+		if ($limitRegEmail == 1 || $limitRegDate == 1) {
+			$query = $db->getQuery(true);
+
+			if ($limitRegDate == 0) {
+				$query = "
+						SELECT COUNT(*)
+						FROM `#__icagenda_registration`
+						WHERE `email` = '$email' AND `eventid`='$eventid' AND `state`='1'
+					";
+			} elseif ($limitRegDate == 1) {
+				$query = "
+						SELECT COUNT(*)
+						FROM `#__icagenda_registration`
+						WHERE `email` = '$email' AND `eventid`='$eventid' AND `date`='$dateReg' AND `state`='1'
+					";
+			}
+
+			$db->setQuery($query);
+
+			if ($email != NULL) {
+				if ($db->loadResult() > 0) {
+					$app->enqueueMessage(JText::_('COM_ICAGENDA_REGISTRATION_EMAIL_ALERT') . ' ' . $reg_data->email, 'warning');
+
+					return false;
+				}
+			}
+		}
+
+
+		// Control Custom Fields required if not empty
+		if ($custom_fields && is_array($custom_fields)) {
+			$requiredEmptyFields = icagendaCustomfields::requiredIsEmpty($custom_fields, 1);
+
+			if (!empty($requiredEmptyFields)) {
+				foreach ($requiredEmptyFields as $fieldEmpty) {
+					$app->enqueueMessage(JText::sprintf('JLIB_FORM_VALIDATE_FIELD_INVALID', $fieldEmpty), 'warning');
+				}
+
+				return false;
+			}
+		}
+
+
+		// Get Event params
+		$query = $db->getQuery(true);
+		$query->select('e.params')
+			->from('#__icagenda_events AS e')
+			->where('e.id = ' . (int) $eventid);
+		$db->setQuery($query);
+		$event = $db->loadObject();
+
+		// Check for Registration Actions
+		$evtParams       = icagendaEvent::evtParams($event->params);
+		$reg_actions     = $evtParams->get('registration_actions', $params->get('registration_actions', 0));
+		//		$reg_actions     = ($reg_actions !== 0) ? $reg_actions : '';
+
+		if ($reg_actions) {
+			$reg_data->state = 0;
+			$reg_data->status = 2;
+		}
+		//		else // @todo: enable in 3.8 (3.7.3 ?)
+		//		{
+		//			$reg_data->state = 1;
+		//			$reg_data->status = 3;
+		//		}
+
+
+		// Save Registration data.
+		$db->insertObject('#__icagenda_registration', $reg_data, 'id');
+
+
+		// Save Custom Fields to database.
+		if ($custom_fields && is_array($custom_fields)) {
+			icagendaCustomfields::saveToData($custom_fields, $reg_data->id, 1);
+		}
+
+		// Save Consents to database.
+		if ($consent_data && is_array($consent_data)) {
+			foreach ($consent_data as $key => $value) {
+				if ($value) {
+					$key_suffix = '';
+					$key_string = $key;
+
+					//					if (is_array($value) && $key == 'consent_name')
+					//					{
+					//						$key_suffix.= '_';
+
+					//						foreach ($value as $k => $v)
+					//						{
+					//							$key_suffix.= '_' . $v;
+					//						}
+					//					}
+
+					// Create and populate an object.
+					$action = new stdClass();
+
+					$action->user_id        = $reg_data->userid;
+					$action->user_action    = $key . $key_suffix;
+					$action->parent_form    = 1; // Registration
+					$action->parent_id      = $reg_data->id; // Registration ID
+
+					switch ($key_string) {
+							// Name Visibility: Public
+						case 'consent_name_public':
+							$action->action_subject = JText::_('COM_ICAGENDA_REGISTRATION_CONSENT_NAME_LABEL');
+							$action->action_body    = strip_tags(JText::_('COM_ICAGENDA_REGISTRATION_CONSENT_NAME'));
+							break;
+
+							// Name Visibility: Users
+						case 'consent_name_users':
+							$action->action_subject = JText::_('COM_ICAGENDA_REGISTRATION_CONSENT_NAME_LABEL');
+							$action->action_body    = strip_tags(JText::_('COM_ICAGENDA_REGISTRATION_' . strtoupper($key_string)));
+							break;
+
+							// Terms
+						case 'consent_terms':
+							$action->action_subject = JText::_('COM_ICAGENDA_REGISTRATION_' . strtoupper($key_string) . '_LABEL');
+							$action->action_body    = JText::sprintf('COM_ICAGENDA_REGISTRATION_' . strtoupper($key_string), JText::_('COM_ICAGENDA_REGISTRATION_CONSENT_TERMS_LABEL'));
+							break;
+
+							// Default
+						default:
+							$action->action_subject = JText::_('COM_ICAGENDA_REGISTRATION_' . strtoupper($key_string) . '_LABEL');
+							$action->action_body    = strip_tags(JText::_('COM_ICAGENDA_REGISTRATION_' . strtoupper($key_string)));
+							break;
+					}
+
+					$action->user_ip        = $app->input->server->get('REMOTE_ADDR', '', 'string');
+					$action->user_agent     = $app->input->server->get('HTTP_USER_AGENT', '', 'string');
+					$action->state          = 1;
+					$action->created_time   = JFactory::getDate()->toSql();
+
+					// Insert the object into the user profile table.
+					$result = JFactory::getDbo()->insertObject('#__icagenda_user_actions', $action);
+				}
+			}
+		}
+
+
+		// Set Registration ID in the session.
+		$app->setUserState('com_icagenda.registration.regid', $reg_data->id);
+
+
+		if ($reg_actions) {
+			return $reg_actions;
+		} else {
+			$this->sendNotificationEmails($reg_data);
+
+			return 'complete';
+		}
+	}
+
+
+	/**
+	 * Method to complete action on the form data.
+	 *
+	 * @since   3.6.13
+	 */
+	public function actions($action, $data, $regData)
+	{
+		if ($data) {
+			JPluginHelper::importPlugin('icagenda');
+
+			$dispatcher = JEventDispatcher::getInstance();
+			$complete   = $dispatcher->trigger('iCagendaOnRegistrationActionsComplete', array('com_icagenda.registration', $data, $regData['id']));
+
+			if ($complete) {
+				$this->sendNotificationEmails((object)$regData, $data);
+			}
+		}
+
+		return $complete;
+	}
+
+
+	/**
+	 * Method to cancel date(s) registration for one event.
+	 *
+	 * @since   3.6.13
+	 */
+	public function cancel($dates_cancelled = array(), $user_id = null)
+	{
+		if (!empty($dates_cancelled) && (int) $user_id) {
+			$app  = JFactory::getApplication();
+			$date = JFactory::getDate();
+			$db   = JFactory::getDbo();
+
+			JArrayHelper::toInteger($dates_cancelled);
+			$dates_cancelled = implode(',', $dates_cancelled);
+
+			// Conditions for which records should be cancelled.
+			$conditions = array(
+				$db->quoteName('state') . ' <> 0',
+				$db->quoteName('id') . ' IN (' . $dates_cancelled . ')',
+				$db->quoteName('userid') . ' = ' . $db->quote($user_id),
+			);
+
+			// Check if any to be cancelled.
+			$query = $db->getQuery(true);
+			$query->select('r.*');
+			$query->from('#__icagenda_registration AS r');
+			$query->where($conditions);
+			$db->setQuery($query);
+			$result = $db->loadObjectList();
+
+			if (!$result) return false;
+
+			// Update registration(s) cancelled
+			$query = $db->getQuery(true);
+
+			$user_ip     = $app->input->server->get('REMOTE_ADDR', '', 'string');
+			$user_agent  = $app->input->server->get('HTTP_USER_AGENT', '', 'string');
+			$date_cancel = $date->toSql();
+
+			// Save user action for each registration cancelled.
+			foreach ($result as $k => $v) {
+				// Create and populate an object.
+				$action = new stdClass();
+
+				$action->user_id        = $user_id;
+				$action->user_action    = 'cancel_registration';
+				$action->parent_form    = 1; // Registration
+				$action->parent_id      = $v->id; // Registration ID
+				$action->action_subject = JText::_('COM_ICAGENDA_REGISTRATION_CANCEL_USERACTION_SUBJECT');
+				$action->action_body    = strip_tags(JText::_('COM_ICAGENDA_REGISTRATION_CANCEL_USERACTION_BODY'));
+				$action->user_ip        = $user_ip;
+				$action->user_agent     = $user_agent;
+				$action->state          = 1;
+				$action->created_time   = $date_cancel;
+
+				// Insert the object into the user profile table.
+				$result = $db->insertObject('#__icagenda_user_actions', $action);
+
+				// Update params for each registration cancelled, adding cancelled date and by user id.
+				//				$params = json_decode($v->params, true);
+
+				//				$params['cancelled']    = (string) $date->toSql();
+				//				$params['cancelled_by'] = (string) $user_id;
+
+				// Store the combined new and existing values back as a JSON string
+				//				$paramsString = json_encode($params);
+
+				//				$query->update($db->quoteName('#__icagenda_registration'))->set($db->quoteName('params') . ' = ' . $db->quote($paramsString));
+				//				$db->setQuery($query);
+			}
+
+			// Common fields to update.
+			$fields = array(
+				$db->quoteName('state') . ' = 0',
+				$db->quoteName('status') . ' = 0',
+			);
+
+			$query->update($db->quoteName('#__icagenda_registration'))->set($fields)->where($conditions);
+			$db->setQuery($query);
+
+			$result = $db->execute();
+
+			return $result;
+		}
+	}
+
+
+	/**
+	 * Method to get event data.
+	 *
+	 * @param   integer  $pk  The id of the event.
+	 *
+	 * @return  mixed  Event item data object on success, false on failure.
+	 *
+	 * @since   3.6.0
+	 */
+	public function getItem($pk = null)
+	{
+		$app     = JFactory::getApplication();
+		$session = JFactory::getSession();
+		$user    = JFactory::getUser();
+
+		$input = $app->input;
+
+		$pk = (!empty($pk)) ? $pk : (int) $this->getState('event.id');
+
+		if (!isset($this->_item[$pk])) {
+			try {
+				$db = $this->getDbo();
+				$query = $db->getQuery(true)
+					->select(
+						$this->getState(
+							'item.select',
+							'e.*'
+						)
+					);
+				$query->from('#__icagenda_events AS e');
+
+				// Join on category table.
+				$query->select('c.title AS cat_title, c.color AS cat_color')
+					->join('LEFT', '#__icagenda_category AS c on c.id = e.catid');
+
+				// Filter by language
+				if ($this->getState('filter.language')) {
+					$query->where('e.language in (' . $db->quote(JFactory::getLanguage()->getTag()) . ',' . $db->quote('*') . ')');
+				}
+
+				$query->where('e.id = ' . (int) $pk);
+
+				// Features - extract the number of displayable icons per event
+				$query->select('feat.count AS features');
+				$sub_query = $db->getQuery(true);
+				$sub_query->select('fx.event_id, COUNT(*) AS count');
+				$sub_query->from('`#__icagenda_feature_xref` AS fx');
+				$sub_query->innerJoin("`#__icagenda_feature` AS f ON fx.feature_id=f.id AND f.state=1 AND f.icon<>'-1'");
+				$sub_query->group('fx.event_id');
+				$query->leftJoin('(' . (string) $sub_query . ') AS feat ON e.id=feat.event_id');
+
+				// Registrations - Get total of registered people
+				$evtParams  = icagendaEvent::getParams((int) $pk);
+
+				$typeReg    = $evtParams->get('typeReg', 1);
+
+				$query->select($db->qn('r.count', 'registered'));
+				$sub_query  = $db->getQuery(true)
+					->select(array(
+						$db->qn('r.eventid'),
+						'sum(' . $db->qn('r.people') . ') AS count',
+					))
+					->from($db->qn('#__icagenda_registration', 'r'))
+					->where($db->qn('r.state') . ' = 1');
+
+				// Get var event date alias if set or var 'event_date' set to session in event details view
+				$event_date = $session->get('event_date', '');
+				$get_date   = $input->get('date', ($event_date ? date('Y-m-d-H-i', strtotime($event_date)) : ''));
+
+				// Convert to SQL datetime if set, or return empty.
+				$dateday    = icagendaEvent::convertDateAliasToSQLDatetime($get_date);
+
+				// Redirect and remove date var, if not correctly set
+				if (
+					$get_date
+					&& !$dateday
+				) {
+					$event_url = JUri::getInstance()->toString();
+					$cleanurl  = preg_replace('/&date=[^&]*/', '', $event_url);
+					$cleanurl  = preg_replace('/\?date=[^\?]*/', '', $cleanurl);
+
+					$app->redirect($cleanurl);
+
+					return false;
+				}
+
+				// Registration type: by single date/period (1)
+				if ($dateday && $typeReg == 1) {
+					//					$sub_query->where('r.date = ' . $db->q($dateday)); // This is the good logic if correctly set
+					$sub_query->where('(r.date = ' . $db->q($dateday) . ' OR (r.date = "" AND r.period = 1))');
+				} elseif (!$dateday && $typeReg == 1) {
+					//					$sub_query->where('r.date = "" AND r.period = 0'); // This is the good logic if correctly set
+					$sub_query->where('r.date = ""');
+				}
+
+				$sub_query->group('r.eventid');
+				$query->leftJoin('(' . (string) $sub_query . ') AS r ON e.id = r.eventid');
+
+				$db->setQuery($query);
+
+				$item = $db->loadObject();
+
+				if (empty($item)) {
+					throw new \Exception(\JText::_('COM_ICAGENDA_ERROR_EVENT_NOT_FOUND'), 404);
+				} else {
+					// Convert parameter fields to objects.
+					$registry = version_compare(JVERSION, '3.4', 'lt') ? new JRegistry : new Registry;
+					$registry->loadString($item->params);
+
+					// Merge Event params to app params
+					$item->params = clone $this->getState('params');
+					$item->params->merge($registry);
+
+					// iCagenda event view variables
+					//					$item->typeReg             = $item->params->get('typeReg', ''); // DEPRECATED 3.6.0
+					//					$item->maxNbTicketsPerReg  = icagendaRegistration::maxNbTicketsPerReg($item->params); // DEPRECATED (to be refactoried)
+					//					$item->maxNbTickets = icagendaRegistration::maxNbTickets($item); // DEPRECATED 3.6.0
+
+					$item->typeReg      = $item->params->get('typeReg', '1');
+					$item->maxReg       = $item->params->get('maxReg', '1000000');
+					$maxNbTicketsPerReg = icagendaRegistration::maxNbTicketsPerReg($item->params);
+
+					// Set default nb of tickets bookable
+					$session_date       = $session->get('session_date', '');
+
+					$item->ticketsBookable = icagendaRegistration::getTicketsBookable($item->id, $session_date, $item->typeReg, $item->maxReg, $maxNbTicketsPerReg);
+
+					if ($session_date) {
+						$item->default_tickets      = $item->ticketsBookable;
+					}
+
+					$item->tickets      = ($item->maxReg >= $maxNbTicketsPerReg) ? $maxNbTicketsPerReg : $item->maxReg;
+
+					$item->eventHasPeriod      = icagendaEvent::eventHasPeriod($item->period, $item->startdate, $item->enddate);
+					$item->periodIsNotFinished = icagendaEvent::periodIsNotFinished($item->enddate);
+
+					// Extract the feature details, if needed
+					if (is_null($item->features)) {
+						$item->features = array();
+					} else {
+						$db = $this->getDbo();
+						$query = $db->getQuery(true);
+						$query->select('DISTINCT f.icon, f.icon_alt');
+						$query->from('`#__icagenda_feature_xref` AS fx');
+						$query->innerJoin("`#__icagenda_feature` AS f ON fx.feature_id=f.id AND f.state=1 AND f.icon<>'-1'");
+						$query->where('fx.event_id=' . $item->id);
+						$query->order('f.ordering DESC'); // Order descending because the icons are floated right
+						$db->setQuery($query);
+						$item->features = $db->loadObjectList();
+					}
+				}
+
+				$this->_item[$pk] = $item;
+			} catch (Exception $e) {
+				if ($e->getCode() == 404) {
+					// Need to go thru the error handler to allow Redirect to work.
+					throw new \Exception($e->getMessage(), 404);
+				} else {
+					$this->setError($e);
+					$this->_item[$pk] = false;
+				}
+			}
+		}
+
+		return $this->_item[$pk];
+	}
+
+	/**
+	 * Method to get registration data.
+	 *
+	 * @param   integer  $regid  The id of the registration.
+	 *
+	 * @return  mixed  Registration processed data object on success, false on failure.
+	 *
+	 * @since   3.6.0
+	 */
+	public function getRegistration($regid = null)
+	{
+		$app = JFactory::getApplication();
+
+		$regid = (!empty($regid)) ? $regid : $app->getUserState('com_icagenda.registration.regid', '');
+
+		if ($regid) {
+			try {
+				$db = $this->getDbo();
+				$query = $db->getQuery(true)
+					->select(
+						$this->getState(
+							'item.select',
+							'r.*'
+						)
+					);
+				$query->from('#__icagenda_registration AS r');
+				$query->where('r.id = ' . (int) $regid);
+				$db->setQuery($query);
+
+				$registration = $db->loadObject();
+
+				if (empty($registration)) {
+					return false;
+				}
+			} catch (Exception $e) {
+				if ($e->getCode() == 404) {
+					// Need to go thru the error handler to allow Redirect to work.
+					throw new \Exception($e->getMessage(), 404);
+				} else {
+					$this->setError($e);
+					$registration = false;
+				}
+			}
+		} else {
+			return false;
+		}
+
+		return $registration;
+	}
+
+	/**
+	 * Method to get registrations of the current user for one event.
+	 *
+	 * @param   integer  $eventID  The id of the event.
+	 *
+	 * @since   3.6.13
+	 */
+	public function getParticipantEventRegistrations($eventID = null) // getRegistrationsPublished
+	{
+		$app  = JFactory::getApplication();
+		$user = JFactory::getUser();
+
+		//		$eventID = ( ! empty($eventID)) ? $eventID : $app->input->getInt('id');
+		$eventID = (!empty($eventID)) ? $eventID : (int) $this->getState('event.id');
+
+		if ($eventID && $user->get('id')) {
+			try {
+				$db = $this->getDbo();
+				$query = $db->getQuery(true);
+				$query->select('r.id, r.state, r.date, r.period');
+				$query->from('#__icagenda_registration AS r');
+				$query->where('r.state = 1');
+				$query->where('r.eventid = ' . (int) $eventID);
+				$query->where('r.userid = ' . (int) $user->get('id'));
+				$db->setQuery($query);
+
+				$registrationIDs = $db->loadObjectList();
+
+				if (empty($registrationIDs)) {
+					return false;
+				}
+			} catch (Exception $e) {
+				if ($e->getCode() == 404) {
+					// Need to go thru the error handler to allow Redirect to work.
+					throw new \Exception($e->getMessage(), 404);
+				} else {
+					$this->setError($e);
+					$registrationIDs = false;
+				}
+			}
+		} else {
+			return false;
+		}
+
+		return $registrationIDs;
+	}
+
+	private function generateRandomString($length)
+	{
+		$characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+		$charactersLength = strlen($characters);
+		$randomString = '';
+		for ($i = 0; $i < $length; $i++) {
+			$randomString .= $characters[rand(0, $charactersLength - 1)];
+		}
+		return $randomString;
+	}
+
+	public function sendEmail($data)
+	{
+		$eventid	= $data['evt_id'];
+		$email 		= $data['email'];
+		$date 		= $data['date'];
+		$url 		= $data['req_url'];
+		$country 	= explode('_', $data['country']);
+		$ctrID 		= $country[0];
+		$ctrName	= $country[1];
+		$name 		= $data['name'];
+
+		$app	= JFactory::getApplication();
+		$db		= JFactory::getDbo();
+
+		$query  = $db->getQuery(true);
+		$query->select('v.voucher')
+			->from('cl_hlusers.vouchers v')
+			->where('v.email = "' . $email . '"');
+		$db->setQuery($query);
+		$vouchers = $db->loadObject();
+
+		if (empty($vouchers) == false) {
+			$voucher = $vouchers->voucher;
+		} else {
+			$voucher = $this->generateRandomString(16);
+
+			$vouchers 			= new stdClass();
+			$vouchers->voucher 	= $voucher;
+			$vouchers->email	= $email;
+			JFactory::getDbo()->insertObject('cl_hlusers.vouchers', $vouchers);
+		}
+
+		$query = $db->getQuery(true);
+		$query->select('e.*,
+				e.created_by AS authorID, e.email AS contactemail')
+			->from('#__icagenda_events AS e')
+			->where('e.id = ' . (int) $eventid);
+		$db->setQuery($query);
+		$event = $db->loadObject();
+
+		$app    		= JFactory::getApplication();
+		$mailer 		= JFactory::getMailer();
+		$adminmailer 	= JFactory::getMailer();
+
+		$mailfrom 	= $app->getCfg('mailfrom');
+		$fromname 	= $app->getCfg('fromname');
+		$sitename 	= $app->getCfg('sitename');
+
+		$mailer->setSender(array($mailfrom, $fromname));
+		$adminmailer->setSender(array($mailfrom, $fromname));
+
+		$mailer->addRecipient($email);
+		$adminmailer->addRecipient('info@archlinexp.com');
+
+		$mailer->addReplyTo($mailfrom, $fromname);
+
+		$subject 	= JText::_('COM_ICAGENDA_REGISTRATION_EMAIL_USER_DATE_DEFAULT_SUBJECT');
+		$body		= JText::_('COM_ICAGENDA_REGISTRATION_EMAIL_USER_NEW');
+		$adminbody 	= JText::_('COM_ICAGENDA_REGISTRATION_EMAIL_ADMIN_NEW');
+
+		$displayTime  = $event->displaytime;
+		$regDate = strip_tags(icagendaRender::dateToFormat($date));
+		$regTime = icagendaRender::dateToTime($date);
+
+		$regDateTime = !empty($displayTime) ? $regDate . ' - ' . $regTime : $regDate;
+
+		$replacements = array(
+			'[SITENAME]'	=> $sitename,
+			'[LINK]'		=> $url,
+			'[TITLE]'   	=> $event->title,
+			'[DATE]'    	=> $regDateTime,
+			'[EMAIL]' 		=> $email,
+			'[COUNTRY]' 	=> $ctrName,
+			'[NAME]'		=> $name,
+			'[VOUCHER]'		=> $voucher
+		);
+
+		foreach ($replacements as $key => $value) {
+			$subject      = str_replace($key, $value, $subject);
+			$body         = str_replace($key, $value, $body);
+			$adminbody    = str_replace($key, $value, $adminbody);
+		}
+
+		$adminsubject = 'Event registration';
+
+		$mailer->setBody($body);
+		$adminmailer->setBody($adminbody);
+
+		$mailer->setSubject($subject);
+		$adminmailer->setSubject($adminsubject);
+
+		$mailer->isHTML(true);
+		$adminmailer->isHTML(true);
+
+		$send 		= $mailer->Send();
+		if ($_SERVER['REMOTE_ADDR'] != '212.40.89.255') $sendadmin 	= $adminmailer->Send();
+
+		$query  = $db->getQuery(true);
+		$query->select('p.email')
+			->from('cl_hlusers.partners p')
+			->where('p.ctrID = ' . (int) $ctrID);
+		$db->setQuery($query);
+		$partner = $db->loadObject();
+
+		if (empty($partner) == false && $_SERVER['REMOTE_ADDR'] != '212.40.89.255') {
+			$partnermailer = JFactory::getMailer();
+
+			$partnermailer->setSender(array($mailfrom, $fromname));
+			$partnermailer->addRecipient($partner->email);
+			$partnermailer->setBody($adminbody);
+			$partnermailer->setSubject($adminsubject);
+			$partnermailer->isHTML(true);
+
+			$sendpartner = $partnermailer->Send();
+		}
+	}
+
+
+	/**
+	 * Method to send Notification emails.
+	 *
+	 * @since   3.6.13
+	 */
+	private function sendNotificationEmails($reg_data, $data = null)
+	{
+		$app    = JFactory::getApplication();
+		$db     = JFactory::getDbo();
+		$user   = JFactory::getUser();
+
+		$params = $app->getParams();
+		$input  = $app->input;
+
+
+		$eventid = $reg_data->eventid;
+
+		// Get Event details
+		$query  = $db->getQuery(true);
+		$query->select('e.*,
+				e.created_by AS authorID, e.email AS contactemail')
+			->from('#__icagenda_events AS e')
+			->where('e.id = ' . (int) $eventid);
+		$db->setQuery($query);
+		$event  = $db->loadObject();
+
+
+		// Set Date in url
+		$dateInUrl  = ($reg_data->date && $params->get('datesDisplay', 1) == 1)
+			? '&amp;date=' . iCDate::dateToAlias(date('Y-m-d H:i', strtotime($reg_data->date)))
+			: '';
+
+		// Get the "event" URL
+		$baseURL    = JUri::base();
+		$subpathURL = JUri::base(true);
+
+		$baseURL    = str_replace('/administrator', '', $baseURL);
+		$subpathURL = str_replace('/administrator', '', $subpathURL);
+
+		// Sub Path filtering
+		$subpathURL = ltrim($subpathURL, '/');
+
+		// URL Event Details filtering
+		$urlEvent  = str_replace('&amp;', '&', JRoute::_('index.php?option=com_icagenda&view=event&id=' . (int) $reg_data->eventid . '&Itemid=' . $input->getInt('Itemid') . $dateInUrl));
+		$urlEvent  = ltrim($urlEvent, '/');
+
+		if (substr($urlEvent, 0, strlen($subpathURL) + 1) == "$subpathURL/") {
+			$urlEvent = substr($urlEvent, strlen($subpathURL) + 1);
+		}
+
+		$urlEvent  = rtrim($baseURL, '/') . '/' . ltrim($urlEvent, '/');
+
+		// URL Registration Cancellation filtering
+		$urlRegistrationCancel  = str_replace('&amp;', '&', JRoute::_('index.php?option=com_icagenda&view=registration&layout=cancel&id=' . (int) $reg_data->eventid . '&Itemid=' . $input->getInt('Itemid')));
+		$urlRegistrationCancel  = ltrim($urlRegistrationCancel, '/');
+
+		if (substr($urlRegistrationCancel, 0, strlen($subpathURL) + 1) == "$subpathURL/") {
+			$urlRegistrationCancel = substr($urlRegistrationCancel, strlen($subpathURL) + 1);
+		}
+
+		$urlRegistrationCancel  = rtrim($baseURL, '/') . '/' . ltrim($urlRegistrationCancel, '/');
+
+
+		$startdate    = $event->startdate;
+		$enddate      = $event->enddate;
+		//			$title        = $event->title;
+		$authorID     = $event->authorID;
+		//			$contactemail = $event->contactemail;
+		$displayTime  = $event->displaytime;
+
+		$startD = strip_tags(icagendaRender::dateToFormat($startdate));
+		$endD   = strip_tags(icagendaRender::dateToFormat($enddate));
+		$startT = !empty($displayTime) ? icagendaRender::dateToTime($startdate) : '';
+		$endT   = !empty($displayTime) ? icagendaRender::dateToTime($enddate) : '';
+
+		$regDate = strip_tags(icagendaRender::dateToFormat($reg_data->date));
+		$regTime = icagendaRender::dateToTime($reg_data->date);
+
+		$regDateTime      = !empty($displayTime) ? $regDate . ' - ' . $regTime : $regDate;
+		$regStartDateTime = !empty($displayTime) ? $startD . ' - ' . $startT : $startD;
+		$regEndDateTime   = !empty($displayTime) ? $endD . ' - ' . $endT : $endD;
+
+		$periodreg = $reg_data->period;
+
+		$defaultemail           = $params->get('regEmailUser', '1');
+		$emailUserSubjectPeriod = $params->get('emailUserSubjectPeriod', '');
+		$emailUserBodyPeriod    = $params->get('emailUserBodyPeriod', '');
+		$emailUserSubjectDate   = $params->get('emailUserSubjectDate', '');
+		$emailUserBodyDate      = $params->get('emailUserBodyDate', '');
+
+		$emailAdminSend         = $params->get('emailAdminSend', '1');
+		$emailAdminSend_select  = $params->get('emailAdminSend_select', array('0'));
+		$emailAdminSend_custom  = $params->get('emailAdminSend_Placeholder', '');
+
+		$emailUserSend          = $params->get('emailUserSend', '1');
+
+		$eUSP = isset($emailUserSubjectPeriod)
+			? $emailUserSubjectPeriod
+			: JText::_('COM_ICAGENDA_REGISTRATION_EMAIL_USER_PERIOD_DEFAULT_SUBJECT');
+
+		$eUBP = isset($emailUserBodyPeriod)
+			? $emailUserBodyPeriod
+			: JText::_('COM_ICAGENDA_REGISTRATION_EMAIL_USER_PERIOD_DEFAULT_BODY');
+
+		$eUSD = isset($emailUserSubjectDate)
+			? $emailUserSubjectDate
+			: JText::_('COM_ICAGENDA_REGISTRATION_EMAIL_USER_DATE_DEFAULT_SUBJECT');
+
+		$eUBD = isset($emailUserBodyDate)
+			? $emailUserBodyDate
+			: JText::_('COM_ICAGENDA_REGISTRATION_EMAIL_USER_DATE_DEFAULT_BODY');
+
+		$period_set = substr($startdate, 0, 4);
+
+		// Registration Type is set 'for all dates of the event'
+		if ($periodreg == 1) {
+			$adminsubject = JText::_('COM_ICAGENDA_REGISTRATION_EMAIL_ADMIN_DEFAULT_SUBJECT');
+			$adminbody    = JText::_('COM_ICAGENDA_REGISTRATION_EMAIL_ADMIN_DATE_DEFAULT_BODY');
+
+			if ($defaultemail == 0) {
+				$subject = $eUSP;
+				$body    = $eUBP;
+			} else {
+				$subject = JText::_('COM_ICAGENDA_REGISTRATION_EMAIL_USER_DATE_DEFAULT_SUBJECT');
+				$body    = JText::_('COM_ICAGENDA_REGISTRATION_EMAIL_USER_DATE_DEFAULT_BODY');
+			}
+		}
+
+		// Registration Type is 'select list of dates' (single dates + period)
+		// Period (no date, and period = 0)
+		elseif ($reg_data->date == '' && !$periodreg) {
+			$adminsubject   = JText::_('COM_ICAGENDA_REGISTRATION_EMAIL_ADMIN_DEFAULT_SUBJECT');
+			$adminbody      = JText::_('COM_ICAGENDA_REGISTRATION_EMAIL_ADMIN_PERIOD_DEFAULT_BODY');
+
+			if ($defaultemail == 0) {
+				$subject = $eUSP;
+				$body    = $eUBP;
+			} else {
+				$subject = JText::_('COM_ICAGENDA_REGISTRATION_EMAIL_USER_PERIOD_DEFAULT_SUBJECT');
+				$body    = JText::_('COM_ICAGENDA_REGISTRATION_EMAIL_USER_PERIOD_DEFAULT_BODY');
+			}
+		}
+
+		// Registration Type is 'select list of dates' (single dates + period)
+		// Single date
+		else {
+			$adminsubject = JText::_('COM_ICAGENDA_REGISTRATION_EMAIL_ADMIN_DEFAULT_SUBJECT');
+			$adminbody    = JText::_('COM_ICAGENDA_REGISTRATION_EMAIL_ADMIN_DATE_DEFAULT_BODY');
+
+			if ($defaultemail == 0) {
+				$subject = $eUSD;
+				$body    = $eUBD;
+			} else {
+				$subject = JText::_('COM_ICAGENDA_REGISTRATION_EMAIL_USER_DATE_DEFAULT_SUBJECT');
+				$body    = JText::_('COM_ICAGENDA_REGISTRATION_EMAIL_USER_DATE_DEFAULT_BODY');
+			}
+		}
+
+		// Get the site name
+		$sitename = $app->getCfg('sitename');
+
+		$siteURL = JURI::base();
+		$siteURL = rtrim($siteURL, '/');
+
+		// Get Author Email
+		$authormail = '';
+
+		if ($authorID != NULL) {
+			// Preparing the query
+			$query = $db->getQuery(true);
+			$query->select('email AS authormail, name AS authorname')->from('#__users AS u')->where("(u.id=$authorID)");
+			$db->setQuery($query);
+			$result = $db->loadObject();
+
+			$authormail = $result->authormail;
+			$authorname = $result->authorname;
+
+			if ($authormail == NULL) {
+				$authormail = $app->getCfg('mailfrom');
+			}
+		}
+
+		// Generates filled custom fields into email body
+		$customfields = icagendaCustomfields::getListNotEmpty($reg_data->id, 1);
+
+		$custom_fields = '';
+
+		$newline = ($defaultemail == '0') ? "<br />" : "\n";
+
+		if ($customfields) {
+			foreach ($customfields as $customfield) {
+				$cf_value      = isset($customfield->cf_value) ? $customfield->cf_value : JText::_('IC_NOT_SPECIFIED');
+				$custom_fields .= JText::_($customfield->cf_title) . ": " . JText::_($cf_value) . $newline;
+			}
+		}
+
+		if ($data) {
+			JPluginHelper::importPlugin('icagenda');
+
+			$dispatcher   = JEventDispatcher::getInstance();
+			$replacements = $dispatcher->trigger('iCagendaOnRegistrationActionsCompleteEmail', array('com_icagenda.registration', $data, $reg_data));
+
+			list($replacements) = $replacements;
+
+			foreach ($replacements as $key => $value) {
+				$subject      = str_replace($key, $value, $subject);
+				$body         = str_replace($key, $value, $body);
+				$adminsubject = str_replace($key, $value, $adminsubject);
+				$adminbody    = str_replace($key, $value, $adminbody);
+			}
+		}
+
+		$date = str_replace(' ', 'T', $event->next) . 'Z';
+		$date = str_replace('-', '', $date);
+		$date = str_replace(':', '', $date);
+
+		$url = 'http://www.google.com/calendar/event?action=TEMPLATE';
+		$url .= '&text=' . str_replace(" ", "+", $event->title);
+		$url .= '&dates=' . $date . '/' . $date;
+		$url .= '&details=' . html_entity_decode($reg_data->notes);
+		$url .= '&location=online';
+
+		// MAIL REPLACEMENTS
+		$replacements = array(
+			'[CALENDAR]'	  => $url,
+			'[SITENAME]'      => $sitename,
+			'[SITEURL]'       => $siteURL,
+			'[AUTHOR]'        => $authorname,
+			'[AUTHOREMAIL]'   => $authormail,
+			'[CONTACTEMAIL]'  => $event->contactemail,
+			'[TITLE]'         => $event->title,
+			'[SHORTDESC]'     => $event->shortdesc,
+			'[DESC]'          => $event->desc,
+			'[METADESC]'      => $event->metadesc,
+			'[EVENTID]'       => (int) $reg_data->eventid,
+			'[EVENTURL]'      => $urlEvent,
+			'[URL_CANCEL]'    => $reg_data->userid
+				? $urlRegistrationCancel
+				: '',
+			'[NAME]'          => $reg_data->name,
+			'[USERID]'        => $reg_data->userid,
+			'[EMAIL]'         => $reg_data->email
+				? $reg_data->email
+				: JText::_('COM_ICAGENDA_NOT_SPECIFIED'),
+			'[PHONE]'         => $reg_data->phone
+				? $reg_data->phone
+				: JText::_('COM_ICAGENDA_NOT_SPECIFIED'),
+			'[TICKETS]'       => $reg_data->people,
+			'[CUSTOMFIELDS]'  => $custom_fields,
+			'[NOTES]'         => html_entity_decode($reg_data->notes),
+			'[STARTDATE]'     => $startD,
+			'[ENDDATE]'       => $endD,
+			'[DATE]'          => $regDate          ? $regDate          : '',
+			'[TIME]'          => $regDate          ? $regTime          : '',
+			'[DATETIME]'      => ($periodreg != 1) ? $regDateTime      : JText::_('COM_ICAGENDA_REG_FOR_ALL_DATES'),
+			'[STARTDATETIME]' => $startD           ? $regStartDateTime : '',
+			'[ENDDATETIME]'   => $endD             ? $regEndDateTime   : '',
+			'&nbsp;'          => ' ',
+			'[PLACES]'        => $reg_data->people,
+		);
+
+		foreach ($replacements as $key => $value) {
+			$subject      = str_replace($key, $value, $subject);
+			$body         = str_replace($key, $value, $body);
+			$adminsubject = str_replace($key, $value, $adminsubject);
+			$adminbody    = str_replace($key, $value, $adminbody);
+		}
+
+		// Set Sender of USER and ADMIN emails
+		$mailer = JFactory::getMailer();
+		$adminmailer = JFactory::getMailer();
+
+		$mailfrom = $app->getCfg('mailfrom');
+		$fromname = $app->getCfg('fromname');
+
+		$mailer->setSender(array($mailfrom, $fromname));
+		$adminmailer->setSender(array($mailfrom, $fromname));
+
+		// Set Recipient of USER email
+		$user = JFactory::getUser();
+
+		if (!isset($reg_data->email)) {
+			$recipient = $user->email;
+		} else {
+			$recipient = $reg_data->email;
+		}
+
+		if ($reg_data->email) {
+			$mailer->addRecipient($recipient);
+		}
+
+		// Set Recipient of ADMIN email
+		$admin_array = array();
+
+		if (in_array('0', $emailAdminSend_select)) {
+			array_push($admin_array, $mailfrom);
+		}
+
+		if (in_array('1', $emailAdminSend_select)) {
+			if ($adminmailer->validateAddress($authormail)) {
+				array_push($admin_array, $authormail);
+			}
+		}
+
+		if (in_array('2', $emailAdminSend_select)) {
+			$customs_emails = explode(',', $emailAdminSend_custom);
+			$customs_emails = str_replace(' ', '', $customs_emails);
+
+			foreach ($customs_emails as $cust_mail) {
+				if ($adminmailer->validateAddress($cust_mail)) {
+					array_push($admin_array, $cust_mail);
+				}
+			}
+		}
+
+		if (in_array('3', $emailAdminSend_select)) {
+			if ($adminmailer->validateAddress($event->contactemail)) {
+				array_push($admin_array, $event->contactemail);
+			}
+		}
+
+		$adminrecipient = count($admin_array) ? $admin_array : $mailfrom;
+		$adminmailer->addRecipient($adminrecipient);
+
+		// FIX Joomla 3.5.1 issue on some servers, by addition of "Optional" ReplyTo, not previously set.
+		$mailer->addReplyTo($mailfrom, $fromname);
+		$adminmailer->addReplyTo($mailfrom, $fromname);
+
+		// Set Subject of USER and ADMIN email
+		$mailer->setSubject($subject);
+		$adminmailer->setSubject($adminsubject);
+
+		// Set Body of USER and ADMIN email
+		if ($defaultemail == 0) {
+			// HTML custom notification email send to user
+			$mailer->isHTML(true);
+
+			// JDocs: When sending HTML emails you should normally set the Encoding to base64
+			//        in order to avoid unwanted characters in the output.
+			//        See https://docs.joomla.org/Sending_email_from_extensions
+			$mailer->Encoding = 'base64'; // JDocs Sending HTML Email
+		}
+
+		$adminbody = str_replace("<br />", "\n", $adminbody);
+
+		$mailer->setBody($body);
+		$adminmailer->setBody($adminbody);
+
+
+		// Send USER email confirmation, if enabled
+		if (
+			$emailUserSend == 1
+			&& isset($reg_data->email)
+			&& $reg_data->email
+		) {
+			$send = $mailer->Send();
+		}
+
+
+		// Send ADMIN email notification, if enabled
+		if (
+			$emailAdminSend == 1
+			&& isset($reg_data->eventid)
+			&& $reg_data->eventid != '0'
+			&& $reg_data->name != NULL
+		) {
+			$sendadmin = $adminmailer->Send();
+		}
+	}
+}
diff --git a/deployed/icagenda/components/com_icagenda/models/submit.php b/deployed/icagenda/components/com_icagenda/models/submit.php
new file mode 100644
index 00000000..a1b1ddc2
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/models/submit.php
@@ -0,0 +1,1295 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.14 2020-04-09
+ *
+ * @package     iCagenda.Site
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.2.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+jimport('joomla.application.component.modelitem');
+jimport('joomla.form.form');
+jimport('joomla.filesystem.file');
+jimport('joomla.filesystem.folder');
+
+/**
+ * iCagenda Submit Event Model
+ */
+class iCagendaModelSubmit extends JModelItem
+{
+	protected $data;
+
+	protected $msg;
+
+	function getForm()
+	{
+		$form = JForm::getInstance('submit', JPATH_COMPONENT . '/models/forms/submit.xml');
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		return $form;
+	}
+
+	public function test_input($data)
+	{
+		$this->data = trim($data);
+		$this->data = stripslashes($this->data);
+
+		return $this->data;
+	}
+
+	public function getData()
+	{
+		$app     = JFactory::getApplication();
+		$user    = JFactory::getUser();
+		$lang    = JFactory::getLanguage();
+		$session = JFactory::getSession();
+
+		$jinput = $app->input;
+
+		jimport('joomla.filter.output');
+
+		$eventTimeZone  = null;
+		$error_messages = array();
+
+		// Get Params
+		$params = $app->getParams();
+
+		$submitAccess   = $params->get('submitAccess', '');
+		$approvalGroups = $params->get('approvalGroups', array("8"));
+
+		$user_id = $user->get('id');
+
+		// logged-in Users: Name/User Name Option
+		$nameJoomlaUser = $params->get('nameJoomlaUser', 1);
+		$u_name         = ($nameJoomlaUser == 1) ? $user->get('name') : $user->get('username');
+
+		// Redirection settings
+		$baseURL    = JUri::base();
+		$subpathURL = JUri::base(true);
+
+		$baseURL    = str_replace('/administrator', '', $baseURL);
+		$subpathURL = str_replace('/administrator', '', $subpathURL);
+
+		$urlsend = str_replace('&amp;','&', JRoute::_('index.php?option=com_icagenda&view=submit&layout=send'));
+
+		// Sub Path filtering
+		$subpathURL = ltrim($subpathURL, '/');
+
+		// URL List filtering
+		$urlsend = ltrim($urlsend, '/');
+
+		if (substr($urlsend, 0, strlen($subpathURL)+1) == "$subpathURL/")
+		{
+			$urlsend = substr($urlsend, strlen($subpathURL)+1);
+		}
+
+		$urlsend = rtrim($baseURL, '/') . '/' . ltrim($urlsend, '/');
+
+		// Get return params
+		$submit_return         = $params->get('submitReturn', '');
+		$submit_return_article = $params->get('submitReturn_Article', $urlsend);
+		$submit_return_url     = $params->get('submitReturn_Url', $urlsend);
+
+		if (($submit_return == 1) && is_numeric($submit_return_article))
+		{
+			$url_return = JUri::root().'index.php?option=com_content&view=article&id=' . $submit_return_article;
+		}
+		elseif ($submit_return == 2)
+		{
+			$url_return = $submit_return_url;
+		}
+		else
+		{
+			$url_return = $urlsend;
+		}
+
+		// Set alert messages
+		$alert_title          = $params->get('alert_title', '');
+		$alert_body           = $params->get('alert_body', '');
+		$url_redirect         = isset($urlsend_custom) ? $urlsend_custom : $urlsend; // Url custom not yet available.
+		$alert_title_redirect = $alert_title ? $alert_title : JText::_( 'COM_ICAGENDA_EVENT_SUBMISSION' );
+		$alert_body_redirect  = $alert_body ? $alert_body : JText::_( 'COM_ICAGENDA_EVENT_SUBMISSION_CONFIRMATION' );
+
+		// Set post data
+		$this->data = new stdClass();
+
+		$this->data->id       = null;
+		$this->data->ordering = 0;
+		$this->data->state    = 1;
+
+
+		// Control: if Manager
+		jimport('joomla.access.access');
+
+		$adminUsersArray = array();
+
+		foreach ($approvalGroups AS $ag)
+		{
+			$adminUsers      = JAccess::getUsersByGroup($ag, False);
+			$adminUsersArray = array_merge($adminUsersArray, $adminUsers);
+		}
+
+		$this->data->approval = (in_array($user_id, $adminUsersArray)) ? '0' : '1';
+		$this->data->access   = 1 ;
+		$this->data->language = '*';
+
+
+		// USER NAME
+		$this->data->username = $jinput->post->get('username', '', 'USERNAME');
+
+		if ( ! $this->data->username)
+		{
+			$error_messages[] = JText::sprintf('COM_ICAGENDA_FORM_VALIDATE_FIELD_REQUIRED_NAME', JText::_('COM_ICAGENDA_SUBMIT_FORM_USER_NAME'));
+		}
+
+		// USER EMAIL
+		$this->data->created_by_email = $jinput->post->getString('created_by_email', '');
+
+		if ( ! $this->data->created_by_email)
+		{
+			$error_messages[] = JText::sprintf('COM_ICAGENDA_FORM_VALIDATE_FIELD_REQUIRED_NAME', JText::_('COM_ICAGENDA_SUBMIT_FORM_USER_EMAIL'));
+		}
+
+
+		// EVENT TITLE
+		$this->data->title = $jinput->post->getString('title', '');
+
+		if ( ! $this->data->title)
+		{
+			$error_messages[] = JText::sprintf('COM_ICAGENDA_FORM_VALIDATE_FIELD_REQUIRED_NAME', JText::_('COM_ICAGENDA_FORM_LBL_EVENT_TITLE'));
+		}
+
+
+		// EVENT CATEGORY
+		$this->data->catid = $jinput->post->getInt('catid', '');
+
+		if ( ! $this->data->catid)
+		{
+			$error_messages[] = JText::sprintf('COM_ICAGENDA_FORM_VALIDATE_FIELD_REQUIRED_NAME', JText::_('COM_ICAGENDA_FORM_LBL_EVENT_CATID'));
+		}
+
+
+		// EVENT IMAGE - Get and Upload Image
+		$image         = $jinput->files->get('image', null);
+		$image_session = $jinput->post->getString('image_session', '');
+
+		if ($image_session && empty($image))
+		{
+			$this->data->image = $image_session;
+		}
+		else
+		{
+			// Process upload of image
+			$this->data->image = ! empty($image['name']) ? $this->frontendImageUpload($image) : '';
+		}
+
+		$noDateTime      = '0000-00-00 00:00:00';
+		$noDateTimeShort = '0000-00-00 00:00';
+
+
+		// Get Single Dates
+		$single_dates = $jinput->post->get('dates', '', 'RAW');
+
+		if (iCString::isSerialized($single_dates))
+		{
+			$dates = unserialize($single_dates);
+
+			if ($dates)
+			{
+				foreach ($dates as $key => $date)
+				{
+					if ($date == '-0001-11-30 00:00')
+					{
+						unset($dates[$key]);
+					}
+				}
+			}
+		}
+		else
+		{
+
+			$dates = $this->getDates($single_dates);
+
+			if ($lang->getTag() == 'fa-IR'
+				&& $dates != array('0000-00-00 00:00')
+				&& $dates != array('')
+				)
+			{
+				$dates_to_sql = array();
+
+				foreach ($dates AS $date)
+				{
+					if (iCDate::isDate($date))
+					{
+						$year  = date('Y', strtotime($date));
+						$month = date('m', strtotime($date));
+						$day   = date('d', strtotime($date));
+						$time  = date('H:i', strtotime($date));
+
+						$converted_date = iCGlobalizeConvert::jalaliToGregorian($year, $month, $day, true) . ' ' . $time;
+						$dates_to_sql[] = date('Y-m-d H:i', strtotime($converted_date));
+					}
+				}
+
+				$dates = $dates_to_sql;
+			}
+		}
+
+//		$dates = !empty($dates[0]) ? $dates : array($noDateTime);
+
+		rsort($dates);
+
+		$datesall = iCDate::isDate($dates[0]) ? $dates[0] : $noDateTimeShort;
+
+		if ($datesall != $noDateTimeShort)
+		{
+			$this->data->dates = serialize($dates);
+		}
+		else
+		{
+			$no_date_array = array($noDateTimeShort);
+
+			$this->data->dates = serialize($no_date_array);
+		}
+
+
+		// Set Next Date from Single Dates
+		$dates_array = unserialize($this->data->dates);
+
+		$today = JHtml::date('now', 'Y-m-d H:i:s', $eventTimeZone);
+		$next  = JHtml::date($this->data->dates[0], 'Y-m-d H:i:s', $eventTimeZone);
+
+		rsort($dates_array);
+
+		$nextDate = $next;
+
+		if ($next <= $today)
+		{
+			foreach ($dates_array as $date)
+			{
+				$single_date = JHtml::date($date, 'Y-m-d H:i:s', $eventTimeZone);
+
+				if ($single_date >= $today)
+				{
+					$nextDate = $single_date;
+				}
+			}
+		}
+
+		$single_dates_next = $nextDate;
+
+
+		// PERIOD DATES
+		$this->data->startdate = $jinput->post->getString('startdate', '');
+		$this->data->enddate   = $jinput->post->getString('enddate', '');
+
+		$isDate_startdate = iCDate::isDate($this->data->startdate);
+		$isDate_enddate   = iCDate::isDate($this->data->enddate);
+
+		// Check start and end date format (note: am/pm to sql date)
+		$this->data->startdate = $isDate_startdate ? date('Y-m-d H:i:s', strtotime($this->data->startdate)) : $noDateTime;
+		$this->data->enddate   = $isDate_enddate   ? date('Y-m-d H:i:s', strtotime($this->data->enddate))   : $noDateTime;
+
+		// Dates from the period
+		if ($isDate_startdate && $isDate_enddate)
+		{
+			$startdate = $this->data->startdate;
+			$enddate   = $this->data->enddate;
+
+			if ($startdate == $noDateTime
+				&& $enddate != $noDateTime)
+			{
+				$enddate = $noDateTime;
+			}
+
+			$startcontrol = JHtml::date($startdate, 'Y-m-d H:i', $eventTimeZone);
+			$endcontrol   = JHtml::date($enddate, 'Y-m-d H:i', $eventTimeZone);
+
+			$errorperiod = '';
+
+			if ($startcontrol > $endcontrol)
+			{
+				$errorperiod = '1';
+			}
+			else
+			{
+				$period_all_dates_array = iCDatePeriod::listDates($startdate, $enddate);
+			}
+
+			// Serialize Dates of the Period
+			if ($isDate_startdate && $isDate_enddate)
+			{
+				if ($errorperiod != '1')
+				{
+					$this->data->period = serialize($period_all_dates_array);
+
+					$ctrl = unserialize($this->data->period);
+
+					if (is_array($ctrl))
+					{
+						$period = unserialize($this->data->period);
+					}
+					else
+					{
+						$period = $this->getPeriod($this->data->period);
+					}
+
+					if ($lang->getTag() == 'fa-IR')
+					{
+						$period_to_sql = array();
+
+						foreach ($period AS $date)
+						{
+							if (iCDate::isDate($date))
+							{
+								$year  = date('Y', strtotime($date));
+								$month = date('m', strtotime($date));
+								$day   = date('d', strtotime($date));
+								$time  = date('H:i', strtotime($date));
+
+								$converted_date = iCGlobalizeConvert::jalaliToGregorian($year, $month, $day, true) . ' ' . $time;
+
+								$period_to_sql[] = date('Y-m-d H:i', strtotime($converted_date));
+							}
+						}
+
+						$period = $period_to_sql;
+					}
+
+					rsort($period);
+
+					$this->data->period = serialize($period);
+				}
+				else
+				{
+					$this->data->period = '';
+				}
+			}
+
+			$period_dates_next = $this->data->startdate;
+
+			$dates_next  = JHtml::date($single_dates_next, 'Y-m-d H:i:s', $eventTimeZone);
+			$period_next = JHtml::date($period_dates_next, 'Y-m-d H:i:s', $eventTimeZone);
+
+			if ($dates_next < $period_next)
+			{
+				$this->data->next = $period_next;
+			}
+			else
+			{
+				$this->data->next = $dates_next;
+			}
+		}
+		else
+		{
+			$this->data->period = '';
+			$this->data->next   = $single_dates_next;
+		}
+
+		// Period and Single Dates not displayed
+		if ( (in_array($noDateTime, $dates_array) || in_array($noDateTimeShort, $dates_array))
+			&& ( ! $isDate_startdate || ! $isDate_enddate) )
+		{
+			$this->data->state = '0';
+			$this->data->next  = $today;
+
+			// Error message if no valid dates
+			$error_messages[] = JText::sprintf('COM_ICAGENDA_FORM_WARNING', JText::_('COM_ICAGENDA_FORM_ERROR_NO_DATES'));
+		}
+
+
+		// WEEK DAYS
+		$this->data->weekdays = $jinput->post->get('weekdays', '', 'array');
+
+		if (!isset($this->data->weekdays)
+			&& !is_array($this->data->weekdays))
+		{
+			$this->data->weekdays = '';
+		}
+
+		if (isset($this->data->weekdays)
+			&& is_array($this->data->weekdays))
+		{
+			$this->data->weekdays = implode(",", $this->data->weekdays);
+		}
+
+		$this->data->displaytime = $jinput->post->get('displaytime', '');
+		$this->data->desc        = $jinput->post->get('desc', '', 'RAW');
+		$this->data->shortdesc   = $jinput->post->getString('shortdesc', '');
+		$this->data->metadesc    = $jinput->post->getString('metadesc', '');
+		$this->data->place       = $jinput->post->getString('place', '');
+		$this->data->email       = $jinput->post->getString('email', '');
+		$this->data->phone       = $jinput->post->getString('phone', '');
+		$this->data->website     = $jinput->post->getString('website', '');
+
+		// ATTACHMENT FILE
+		$file         = $jinput->files->get('file', null);
+		$file_session = $jinput->post->getString('file_session', '');
+
+		if ($file_session && empty($file))
+		{
+			$this->data->file = $file_session;
+		}
+		else
+		{
+			// Process upload of files
+			$this->data->file = ! empty($file['name']) ? $this->frontendFileUpload($file) : '';
+		}
+
+
+
+		$this->data->address          = $jinput->post->getString('address', '');
+		$this->data->city             = $jinput->post->getString('city', '');
+		$this->data->country          = $jinput->post->getString('country', '');
+		$this->data->lat              = $jinput->post->getString('lat', '');
+		$this->data->lng              = $jinput->post->getString('lng', '');
+
+		$this->data->created_by       = $user_id;
+		$this->data->created_by_alias = $jinput->post->getString('created_by_alias', '');
+		$this->data->created          = JHtml::Date('now', 'Y-m-d H:i:s');
+		$this->data->checked_out      = $jinput->post->getString('checked_out', '');
+		$this->data->checked_out_time = $jinput->post->getString('checked_out_time', '');
+
+		$this->data->params           = $jinput->post->get('params', '', 'array');
+		$this->data->site_itemid      = $jinput->post->getInt('site_itemid', '0');
+		$site_menu_title              = $jinput->post->getString('site_menu_title', '');
+
+
+		// Generate Alias
+		$this->data->alias = JFilterOutput::stringURLSafe($this->data->title);
+
+		// Alias is not generated if non-latin characters, so we fix it by using created date, or title if unicode is activated, as alias
+		if ($this->data->alias == null)
+		{
+			if (JFactory::getConfig()->get('unicodeslugs') == 1)
+			{
+				$this->data->alias = JFilterOutput::stringURLUnicodeSlug($this->data->title);
+			}
+			else
+			{
+				$this->data->alias = JFilterOutput::stringURLSafe($this->data->created);
+			}
+		}
+
+		// Update param 'first_published_and_approved'
+		if ($this->data->state == 1
+			&& $this->data->approval == 0)
+		{
+			$this->data->params['first_published_and_approved'] = '1';
+
+			$first_published_and_approved = true;
+		}
+		else
+		{
+			$first_published_and_approved = false;
+		}
+
+		// Convert the params field to a string.
+		if ( isset($this->data->params)
+			&& is_array($this->data->params) )
+		{
+			$parameter = new JRegistry;
+			$parameter->loadArray($this->data->params);
+
+			$this->data->params = (string) $parameter;
+		}
+
+		$custom_fields = $jinput->post->get('custom_fields', '', 'array');
+
+		// Control Custom Fields required if not empty
+		if ($custom_fields && is_array($custom_fields))
+		{
+			$requiredEmptyFields = icagendaCustomfields::requiredIsEmpty($custom_fields, 2);
+
+			if ( ! empty($requiredEmptyFields))
+			{
+				foreach ($requiredEmptyFields as $fieldEmpty)
+				{
+//					$app->enqueueMessage(JText::sprintf('JLIB_FORM_VALIDATE_FIELD_INVALID', $fieldEmpty), 'warning');
+					$error_messages[] = JText::_( 'COM_ICAGENDA_FORM_VALIDATE_FIELD_REQUIRED' ) . ' ' . $fieldEmpty;
+				}
+
+//				return false;
+			}
+		}
+
+		// Check if Custom Fields required not empty
+//		$customfields_list = icagendaCustomfields::getCustomFields(2);
+
+//		if ($customfields_list)
+//		{
+//			foreach ($customfields_list AS $cf)
+//			{
+//				if (isset($custom_fields[$cf->cf_slug])
+//					&& $cf->cf_required == 1
+//					&& $custom_fields[$cf->cf_slug] == '')
+//				{
+
+//					$options_required = array('list', 'radio');
+
+					// If type is list or radio, should have options
+//					if ((in_array($cf->cf_type, $options_required) && $cf->cf_options)
+//						|| ! in_array($cf->cf_type, $options_required))
+//					{
+//						$error_messages[] = JText::_( 'COM_ICAGENDA_FORM_VALIDATE_FIELD_REQUIRED' ) . ' ' . $cf->cf_title;
+//					}
+//				}
+//			}
+//		}
+
+		$address_session = $jinput->post->getString('address_session', '');
+		$submit_tos      = $jinput->post->get('tos', '');
+
+		$tos = $params->get('tos', 1);
+
+		if ($tos == 1 && ! $submit_tos)
+		{
+			$error_messages[] = JText::_('COM_ICAGENDA_TERMS_OF_SERVICE_NOT_CHECKED_SUBMIT_EVENT');
+		}
+
+		// Set Form Data to Session
+		$sessionData = $this->data;
+		$session->set('ic_submit', $sessionData);
+		$session->set('custom_fields', $custom_fields);
+
+		$session->set('ic_submit_dates', $this->data->dates);
+		$session->set('ic_submit_catid', $this->data->catid);
+		$session->set('ic_submit_shortdesc', $this->data->shortdesc);
+		$session->set('ic_submit_metadesc', $this->data->metadesc);
+		$session->set('ic_submit_city', $this->data->city);
+		$session->set('ic_submit_country', $this->data->country);
+		$session->set('ic_submit_lat', $this->data->lat);
+		$session->set('ic_submit_lng', $this->data->lng);
+		$session->set('ic_submit_address', $this->data->address);
+		$session->set('ic_submit_tos', $submit_tos);
+
+		// Captcha Control
+		$captcha = $jinput->post->get('recaptcha_response_field', '');
+
+		$captcha_plugin = $params->get('captcha') ? $params->get('captcha') : $app->getCfg('captcha');
+		$submit_captcha = $params->get('submit_captcha', 1);
+
+
+		// JOOMLA 3.x/2.5 SWITCH
+		if (version_compare(JVERSION, '3.0', 'ge'))
+		{
+			$dispatcher = JEventDispatcher::getInstance();
+		}
+		else
+		{
+			$dispatcher = JDispatcher::getInstance();
+		}
+
+		if ($captcha_plugin && $submit_captcha != '0')
+		{
+			JPluginHelper::importPlugin('captcha');
+
+			$res = $dispatcher->trigger('onCheckAnswer', $captcha);
+
+			if (!$res[0])
+			{
+				// message if captcha is invalid
+				$error_messages[] = JText::sprintf('COM_ICAGENDA_FORM_ERROR', JText::_('COM_ICAGENDA_FORM_ERROR_INCORRECT_CAPTCHA_SOL'));
+			}
+		}
+
+		// Get the message queue
+		if (count($error_messages))
+		{
+			$app->enqueueMessage('<strong>' . JText::_( 'COM_ICAGENDA_FORM_NC' ) . '</strong>', 'error');
+
+			foreach ($error_messages AS $msg)
+			{
+				$app->enqueueMessage($msg, 'error');
+			}
+
+			return false;
+		}
+
+		// clear the data so we don't process it again
+		$session->clear('ic_submit');
+		$session->clear('custom_fields');
+		$session->clear('ic_submit_dates');
+		$session->clear('ic_submit_catid');
+		$session->clear('ic_submit_shortdesc');
+		$session->clear('ic_submit_metadesc');
+		$session->clear('ic_submit_city');
+		$session->clear('ic_submit_country');
+		$session->clear('ic_submit_lat');
+		$session->clear('ic_submit_lat');
+		$session->clear('ic_submit_address');
+		$session->clear('ic_submit_tos');
+
+
+		// insert Event in Database
+		$db = JFactory::getDbo();
+
+		if (($this->data->username != NULL)
+			&& ($this->data->title != NULL)
+			&& ($this->data->created_by_email != NULL))
+		{
+			$db->insertObject('#__icagenda_events', $this->data, id);
+		}
+		elseif (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+
+			return false;
+		}
+
+		// Save Custom Fields to database
+		if (isset($custom_fields) && is_array($custom_fields))
+		{
+			icagendaCustomfields::saveToData($custom_fields, $this->data->id, 2);
+		}
+
+		// Save Consents to database.
+		if ($tos == 1 && $submit_tos)
+		{
+			// Create and populate an object.
+			$action = new stdClass();
+			$action->user_id        = $user_id;
+			$action->user_action    = 'consent';
+			$action->parent_form    = 2; // Submit an Event
+			$action->parent_id      = $this->data->id; // Event ID
+			$action->action_subject = JText::_('COM_ICAGENDA_TERMS_OF_SERVICE');
+			$action->action_body    = strip_tags(JText::_('COM_ICAGENDA_TERMS_OF_SERVICE_AGREE'));
+			$action->user_ip        = $app->input->server->get('REMOTE_ADDR', '', 'string');
+			$action->user_agent     = $app->input->server->get('HTTP_USER_AGENT', '', 'string');;
+			$action->state          = 1;
+			$action->created_time   = JFactory::getDate()->toSql();
+
+			// Insert the object into the user profile table.
+			$result = JFactory::getDbo()->insertObject('#__icagenda_user_actions', $action);
+		}
+
+		// Send Notification Emails
+		if (isset($this->data->id) && $this->data->id != '0'
+			&& $this->data->username != NULL
+			&& $this->data->title != NULL)
+		{
+			// Manager Notification Email
+			self::notificationManagerEmail($this->data, $site_menu_title, $user_id);
+
+			// User Notification Email
+			if ( ! in_array($user_id, $adminUsersArray ))
+			{
+				self::notificationUserEmail($this->data, $urlsend);
+			}
+
+			// Plugin Event handler 'iCagendaOnNewEvent'
+			JPluginHelper::importPlugin('icagenda');
+
+			if ($first_published_and_approved)
+			{
+				$dispatcher->trigger('iCagendaOnNewEvent', array(&$this->data));
+			}
+		}
+		elseif (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+
+			return false;
+		}
+
+		// Redirect after successful submission
+		if ($submit_return != 2)
+		{
+			$app->enqueueMessage($alert_body_redirect, $alert_title_redirect);
+
+			$app->redirect(htmlspecialchars_decode($url_return));
+		}
+		else
+		{
+			$url_return = iCUrl::urlParsed($url_return, 'scheme');
+
+			$app->redirect($url_return);
+		}
+	}
+
+
+	protected function notificationManagerEmail($data, $site_menu_title, $user_id)
+	{
+		$event_id          = $data->id;
+		$event_title       = $data->title;
+		$event_site_itemid = $data->site_itemid;
+		$event_username    = $data->username;
+		$event_user_email  = $data->created_by_email;
+		$event_ref         = JHtml::date('now', 'Ymd') . $data->id;
+
+		// Load iCagenda Global Options
+		$iCparams = JComponentHelper::getParams('com_icagenda');
+
+		// Load Joomla Application
+		$app = JFactory::getApplication();
+
+		// Load Joomla Config Mail Options
+		$sitename = $app->getCfg('sitename');
+		$mailfrom = $app->getCfg('mailfrom');
+		$fromname = $app->getCfg('fromname');
+
+		$siteURL = JURI::base();
+		$siteURL = rtrim($siteURL,'/');
+
+		// Itemid Request (automatic detection of the first iCagenda menu-link, by menuID, and depending of current language)
+		$menu_items   = icagendaMenus::iClistMenuItems();
+		$itemid_array = array();
+
+		foreach ($menu_items as $l)
+		{
+			array_push($itemid_array, $l->id);
+		}
+
+		sort($itemid_array);
+
+		$itemID = $itemid_array[0];
+
+		// Set Notification Email to each User groups allowed to approve event submitted
+		$groupid = $iCparams->get('approvalGroups', array("8"));
+
+		// Load Global Option for Autologin
+		$autologin = $iCparams->get('auto_login', 1);
+
+		jimport( 'joomla.access.access' );
+
+		$adminUsersArray = array();
+
+		foreach ($groupid AS $gp)
+		{
+			$adminUsers      = JAccess::getUsersByGroup($gp, False);
+			$adminUsersArray = array_merge($adminUsersArray, $adminUsers);
+		}
+
+		$db    = JFactory::getDbo();
+		$query = $db->getQuery(true);
+
+		if ($user_id == NULL)
+		{
+			$user_id = 0;
+		}
+
+		if (!in_array($user_id, $adminUsersArray))
+		{
+			$matches = implode(',', $adminUsersArray);
+			$query->select('ui.username AS username, ui.email AS email, ui.password AS passw, ui.block AS block, ui.activation AS activation')->from('#__users AS ui')->where( "ui.id IN ($matches) ");
+		}
+		else
+		{
+			$matches = $user_id;
+			$query->select('ui.username AS username, ui.email AS email, ui.password AS passw, ui.block AS block, ui.activation AS activation')->from('#__users AS ui')->where( "ui.id = $matches ");
+		}
+
+		$db->setQuery($query);
+		$managers = $db->loadObjectList();
+
+		foreach ($managers AS $manager)
+		{
+			// Mail Replacements
+			$replacements = array(
+				"\\n"               => "\n",
+				'[SITENAME]'        => $sitename,
+				'[USERNAME]'        => $event_username,
+				'[EMAIL]'           => $event_user_email,
+				'[EVENT_TITLE]'     => $event_title,
+				'[EVENT_REF]'       => $event_ref,
+				'[SHORTDESC]'       => isset($data->shortdesc) ? $data->shortdesc : '',
+				'[DESC]'            => isset($data->desc)      ? $data->desc      : '',
+				'[METADESC]'        => isset($data->metadesc)  ? $data->metadesc  : '',
+				'&nbsp;'            => ' ',
+			);
+
+			if (!in_array($user_id, $adminUsersArray))
+			{
+				$type = 'approval';
+			}
+			else
+			{
+				$type = 'confirmation';
+			}
+
+			// Create Admin Mailer
+			$adminmailer = JFactory::getMailer();
+
+			// Set Sender of Notification Email
+			$adminmailer->setSender(array( $mailfrom, $fromname ));
+
+			// FIX Joomla 3.5.1 issue on some servers, by addition of "Optional" ReplyTo, not previously set.
+			// JOOMLA 3.x/2.5 SWITCH
+			if (version_compare(JVERSION, '3.0', 'ge'))
+			{
+				$adminmailer->addReplyTo($mailfrom, $fromname);
+			}
+			else
+			{
+				$adminmailer->addReplyTo(array($mailfrom, $fromname));
+			}
+
+			$username = $manager->username;
+			$passw    = $manager->passw;
+			$email    = $manager->email;
+
+			// Set Recipient of Notification Email
+			$adminrecipient = $email;
+			$adminmailer->addRecipient($adminrecipient);
+
+			// Set Subject of Admin Notification Email
+			if ( ! in_array($user_id, $adminUsersArray))
+			{
+				$adminsubject = JText::sprintf('COM_ICAGENDA_SUBMISSION_ADMIN_EMAIL_SUBJECT', $event_username, $sitename);
+			}
+			else
+			{
+				$adminsubject = JText::sprintf('COM_ICAGENDA_LEGEND_NEW_EVENT').': '.$event_title;
+			}
+
+			// Set Url to preview and checking of event submitted
+			$baseURL    = JUri::base();
+			$subpathURL = JUri::base(true);
+
+			$baseURL    = str_replace('/administrator', '', $baseURL);
+			$subpathURL = str_replace('/administrator', '', $subpathURL);
+
+			if ($autologin == 1)
+			{
+				$urlpreview = str_replace('&amp;', '&', JRoute::_('index.php?option=com_icagenda&view=event&id='.(int)$event_id.'&Itemid='.(int)$itemID.'&icu='.$username.'&icp='.$passw));
+//				$urlcheck = str_replace('&amp;', '&', JRoute::_('administrator/index.php?option=com_icagenda&view=events&Itemid='.(int)$itemID).'&icu='.$username.'&icp='.$passw.'&filter_search='.$event_id);
+			}
+			else
+			{
+				$urlpreview = str_replace('&amp;', '&', JRoute::_('index.php?option=com_icagenda&view=event&id='.(int)$event_id.'&Itemid='.(int)$itemID));
+//				$urlcheck = str_replace('&amp;', '&', JRoute::_('administrator/index.php?option=com_icagenda&view=events&Itemid='.(int)$itemID).'&filter_search='.$event_id);
+			}
+
+//			$urlpreview = str_replace('&amp;', '&', $siteURL.'/index.php?option=com_icagenda&view=event&id='.(int)$event_id.'&Itemid='.(int)$itemID.'&icu='.$username.'&icp='.$passw);
+			$urlpreviewshort = str_replace('&amp;', '&', JRoute::_('index.php?option=com_icagenda&view=event&id='.(int)$event_id.'&Itemid='.(int)$itemID));
+
+//			$urlcheckshort = str_replace('&amp;', '&', $siteURL . '/administrator/index.php?option=com_icagenda&view=events');
+
+			// Sub Path filtering
+			$subpathURL = ltrim($subpathURL, '/');
+
+			// URL Event Preview filtering
+			$urlpreview      = ltrim($urlpreview, '/');
+			$urlpreviewshort = ltrim($urlpreviewshort, '/');
+
+			if (substr($urlpreview, 0, strlen($subpathURL)+1) == "$subpathURL/")
+			{
+				$urlpreview = substr($urlpreview, strlen($subpathURL)+1);
+			}
+
+			if (substr($urlpreviewshort, 0, strlen($subpathURL)+1) == "$subpathURL/")
+			{
+				$urlpreviewshort = substr($urlpreviewshort, strlen($subpathURL)+1);
+			}
+
+			$urlpreview      = rtrim($baseURL, '/') . '/' . ltrim($urlpreview, '/');
+			$urlpreviewshort = rtrim($baseURL, '/') . '/' . ltrim($urlpreviewshort, '/');
+
+			// URL Event Check filtering
+//			$urlcheck = ltrim($urlcheck, '/');
+
+//			if (substr($urlcheck, 0, strlen($subpathURL)+1) == "$subpathURL/")
+//			{
+//				$urlcheck = substr($urlcheck, strlen($subpathURL)+1);
+//			}
+
+//			$urlcheck = rtrim($baseURL, '/') . '/' . ltrim($urlcheck, '/');
+
+			// Set Body of User Notification Email
+			$adminbodycontent = JText::sprintf('COM_ICAGENDA_SUBMISSION_ADMIN_EMAIL_HELLO', $username) . ',<br /><br />';
+
+			if ($type == 'approval')
+			{
+				$adminbodycontent.= JText::_('COM_ICAGENDA_SUBMISSION_ADMIN_EMAIL_NEW_EVENT') . '<br /><br />';
+				$adminbodycontent.= JText::sprintf('COM_ICAGENDA_SUBMISSION_ADMIN_EMAIL_APPROVE_INFO', $sitename) . '<br /><br />';
+				$adminbodycontent.= JText::_('COM_ICAGENDA_SUBMISSION_ADMIN_EMAIL_APPROVE_LINK') . ': <a href="' . $urlpreview . '">' . $urlpreviewshort . '</a><br /><br />';
+			}
+
+			if ($type == 'confirmation')
+			{
+				$adminbodycontent.= JText::_('COM_ICAGENDA_SUBMISSION_ADMIN_EMAIL_APPROVED_REVIEW') . '<br /><br />';
+				$adminbodycontent.= '<a href="' . $urlpreview . '">' . $urlpreviewshort . '</a><br /><br />';
+			}
+
+			$user_email_mailto = '<a href="mailto:' . $event_user_email . '">' . $event_user_email . '</a>';
+
+			$adminbodycontent.= JText::sprintf('COM_ICAGENDA_SUBMISSION_ADMIN_EMAIL_SITE_MENUID', $event_site_itemid, $site_menu_title) . '<br />';
+			$adminbodycontent.= JText::sprintf('COM_ICAGENDA_SUBMISSION_ADMIN_EMAIL_USER_INFO', $event_username, $user_email_mailto) . '<br /><br />';
+
+			if ($autologin == 1)
+			{
+				$adminbodycontent.= '<hr><small>' . JText::sprintf('COM_ICAGENDA_SUBMISSION_ADMIN_EMAIL_FOOTER', $sitename) . '<small>';
+			}
+			else
+			{
+				$adminbodycontent.= '<hr><small>' . JText::sprintf('COM_ICAGENDA_SUBMISSION_ADMIN_EMAIL_FOOTER_NO_AUTOLOGIN', $sitename) . '<small>';
+			}
+
+			$adminbody = rtrim($adminbodycontent);
+
+			// Apply Replacements
+			foreach ($replacements as $key => $value)
+			{
+				$adminsubject = str_replace($key, $value, $adminsubject);
+				$adminbody    = str_replace($key, $value, $adminbody);
+			}
+
+			$adminmailer->isHTML(true);
+
+			// JDocs: When sending HTML emails you should normally set the Encoding to base64
+			//        in order to avoid unwanted characters in the output.
+			//        See https://docs.joomla.org/Sending_email_from_extensions
+			$adminmailer->Encoding = 'base64'; // JDocs Sending HTML Email
+
+			// Set Subject
+			$adminmailer->setSubject($adminsubject);
+
+			// Set Body
+			$adminmailer->setBody($adminbody);
+
+			// Send User Notification Email
+			if (isset($email))
+			{
+				if ($manager->block == '0' && empty($manager->activation))
+				{
+					$send = $adminmailer->Send();
+				}
+			}
+		}
+	}
+
+	protected function notificationUserEmail ($data, $url)
+	{
+		$email       = $data->created_by_email;
+		$username    = $data->username;
+		$event_title = $data->title;
+		$event_ref   = JHtml::date( 'now', 'Ymd' ) . $data->id;
+
+		// Load Joomla Application
+		$app = JFactory::getApplication();
+
+		// Create User Mailer
+		$mailer = JFactory::getMailer();
+
+		// Load Joomla Config Mail Options
+		$sitename = $app->getCfg('sitename');
+		$mailfrom = $app->getCfg('mailfrom');
+		$fromname = $app->getCfg('fromname');
+
+		// Set Sender of Notification Email
+		$mailer->setSender(array($mailfrom, $fromname));
+
+		// FIX Joomla 3.5.1 issue on some servers, by addition of "Optional" ReplyTo, not previously set.
+		// JOOMLA 3.x/2.5 SWITCH
+		if (version_compare(JVERSION, '3.0', 'ge'))
+		{
+			$mailer->addReplyTo($mailfrom, $fromname);
+		}
+		else
+		{
+			$mailer->addReplyTo(array($mailfrom, $fromname));
+		}
+
+		// Set Recipient of User Notification Email
+		$userrecipient = $data->created_by_email;
+		$mailer->addRecipient($userrecipient);
+
+		// MAIL
+		$replacements = array(
+			"\\n"               => "\n",
+			'[SITENAME]'        => $sitename,
+			'[EMAIL]'           => $email,
+			'[EVENT_TITLE]'     => $event_title,
+			'[EVENT_REF]'       => $event_ref,
+			'&nbsp;'            => ' ',
+		);
+
+		// Set Body of Notification Email
+		$user_submit_body = JText::sprintf('COM_ICAGENDA_USER_EMAIL_HELLO', $username) . ',<br /><br />';
+		$user_submit_body.= JText::sprintf('COM_ICAGENDA_EVENT_SUBMISSION_THANK_YOU', $sitename) . '<br />';
+		$user_submit_body.= JText::_('COM_ICAGENDA_EVENT_SUBMISSION_EDITOR_REVIEW') . '<br />';
+		$user_submit_body.= JText::_('COM_ICAGENDA_EVENT_SUBMISSION_CONFIRMATION_EMAIL') . '<br /><br />';
+		$user_submit_body.= JText::sprintf('COM_ICAGENDA_USER_EMAIL_EVENT_TITLE_AND_REF_NO', $event_title, $event_ref) . '<br /><br />';
+		$user_submit_body.= JText::_('COM_ICAGENDA_USER_EMAIL_BEST_REGARDS') . '<br />';
+
+		$user_submit_body = rtrim($user_submit_body);
+
+		foreach ($replacements as $key => $value)
+		{
+			$subject          = str_replace($key, $value, $subject);
+			$user_submit_body = str_replace($key, $value, $user_submit_body);
+		}
+
+		$mailer->isHTML(true);
+
+		// JDocs: When sending HTML emails you should normally set the Encoding to base64
+		//        in order to avoid unwanted characters in the output.
+		//        See https://docs.joomla.org/Sending_email_from_extensions
+		$mailer->Encoding = 'base64'; // JDocs Sending HTML Email
+
+		// Set Subject of User Notification Email
+		$subject = JText::sprintf('COM_ICAGENDA_EVENT_SUBMISSION_THANK_YOU', $sitename);
+		$mailer->setSubject($subject);
+
+		// Set Body of User Notification Email
+		$mailer->setBody($user_submit_body);
+
+		// Send User Notification Email
+		if (isset($email))
+		{
+			$send = $mailer->Send();
+		}
+	}
+
+
+	protected function getDates($dates)
+	{
+		$dates    = str_replace('d=', '', $dates);
+		$dates    = str_replace('+', ' ', $dates);
+		$dates    = str_replace('%3A', ':', $dates);
+		$ex_dates = explode('&', $dates);
+
+		$setDates = array();
+
+		foreach ($ex_dates as $date)
+		{
+			$setDates[] = iCDate::isDate($date)
+						? date('Y-m-d H:i', strtotime($date))
+						: '0000-00-00 00:00';
+		}
+
+		return $setDates;
+	}
+
+	protected function getPeriod($period)
+	{
+		$period    = str_replace('d=', '', $period);
+		$period    = str_replace('+', ' ', $period);
+		$period    = str_replace('%3A', ':', $period);
+		$ex_period = explode('&', $period);
+
+		return $ex_period;
+	}
+
+
+	/**
+	 * Image Upload
+	 *
+	 * @since   3.2.0
+	 */
+	protected function frontendImageUpload($image)
+	{
+		// Get Joomla Images PATH setting
+		$image_path = JComponentHelper::getParams('com_media')->get('image_path', 'images');
+
+		// Get imagename (name + ext)
+		$imagename = $image['name'];
+
+		// Get image extension
+		$imageExtension = JFile::getExt($imagename);
+
+		// Clean up image name to url safe string
+		$imageTitle = iCFilterOutput::stringToSlug(JFile::stripExt($imagename), '-');
+
+		// If slug generated is empty, new slug based on current date/time
+		if ( ! $imageTitle)
+		{
+			$imageTitle = JFactory::getDate()->format("YmdHis");
+		}
+
+		// Return new filename
+		$imagename = $imageTitle . '.' . $imageExtension;
+
+		$src = $image['tmp_name'];
+
+		// Controls image mimetype, and fixes file extension if missing in filename
+		$allowed_mimetypes = array('jpg', 'jpeg', 'png', 'gif');
+
+		if ( ! in_array($imageExtension, $allowed_mimetypes))
+		{
+			$fileinfos      = getimagesize($src);
+			$mimeType       = $fileinfos['mime'];
+			$ex_mimeType    = explode('/', $mimeType);
+			$file_extension = $ex_mimeType[1];
+
+			$imagename = $imageTitle . '.' . $file_extension;
+		}
+
+		// Process filename
+		while (JFile::exists(JPATH_SITE . '/' . $image_path . '/icagenda/frontend/images/' . $imagename))
+		{
+			// Get image extension
+			$imageExtension = JFile::getExt($imagename);
+
+			// Get image title
+			$imageTitle = JFile::stripExt($imagename);
+
+			// Increment image title if already exists (eg. filename-3.jpg)
+			$imageTitle = iCString::increment($imageTitle, 'dash');
+
+			$imagename = $imageTitle . '.' . $imageExtension;
+		}
+
+		if ($imagename != '')
+		{
+			// Set up the source and destination of the file
+			$src  = $image['tmp_name'];
+			$dest = JPATH_SITE . '/' . $image_path . '/icagenda/frontend/images/' . $imagename;
+
+			// Create Folder iCagenda in ROOT/IMAGES_PATH/icagenda and sub-folders if do not exist
+			$folder[0][0] = 'icagenda/frontend/' ;
+			$folder[0][1] = JPATH_ROOT . '/' . $image_path . '/' . $folder[0][0];
+			$folder[1][0] = 'icagenda/frontend/images/';
+			$folder[1][1] = JPATH_ROOT . '/' . $image_path . '/' . $folder[1][0];
+
+			$error = array();
+
+			foreach ($folder as $key => $value)
+			{
+				if ( ! JFolder::exists( $value[1]))
+				{
+					if (JFolder::create( $value[1], 0755 ))
+					{
+						$this->data = "<html>\n<body bgcolor=\"#FFFFFF\">\n</body>\n</html>";
+						JFile::write($value[1] . "/index.html", $this->data);
+						$error[] = 0;
+					}
+					else
+					{
+						$error[] = 1;
+					}
+				}
+				else //Folder exist
+				{
+					$error[] = 0;
+				}
+			}
+
+			if (JFile::upload($src, $dest, false))
+			{
+				return $image_path . '/icagenda/frontend/images/' . $imagename;
+			}
+		}
+	}
+
+	/**
+	 * File Upload
+	 *
+	 * @since   3.2.0
+	 */
+	protected function frontendFileUpload($file)
+	{
+		// Get Joomla Images PATH setting
+		$image_path = JComponentHelper::getParams('com_media')->get('image_path', 'images');
+
+		// Get filename (name + ext)
+		$filename = $file['name'];
+
+		// Get file extension
+		$fileExtension = JFile::getExt($filename);
+
+		// Clean up file name to url safe string
+		$fileTitle = iCFilterOutput::stringToSlug(JFile::stripExt($filename), '-');
+
+		// If slug generated is empty, new slug based on current date/time
+		if ( ! $fileTitle)
+		{
+			$fileTitle = JFactory::getDate()->format("YmdHis");
+		}
+
+		// Return new filename
+		$filename = $fileTitle . '.' . $fileExtension;
+
+		// Increment file name if filename already exists
+		while (JFile::exists(JPATH_SITE . '/' . $image_path . '/icagenda/frontend/attachments/' . $filename))
+		{
+			// Get file extension
+			$fileExtension = JFile::getExt($filename);
+
+			// Get file title
+			$fileTitle = JFile::stripExt($filename);
+
+			// Increment file title (eg. filename-3.jpg)
+			$fileTitle = iCString::increment($fileTitle, 'dash');
+
+			$filename = $fileTitle . '.' . $fileExtension;
+		}
+
+		// Save file
+		if ($filename != '')
+		{
+			// Set up the temporary source and destination of the file
+			$src = $file['tmp_name'];
+			$dest =  JPATH_SITE . '/' . $image_path . '/icagenda/frontend/attachments/' . $filename;
+
+			// Create Folder iCagenda in ROOT/IMAGES_PATH/icagenda and sub-folders if do not exist
+			$folder[0][0] = 'icagenda/frontend/' ;
+			$folder[0][1] = JPATH_ROOT . '/' . $image_path . '/' . $folder[0][0];
+			$folder[1][0] = 'icagenda/frontend/attachments/';
+			$folder[1][1] = JPATH_ROOT . '/' . $image_path . '/' . $folder[1][0];
+
+			$error = array();
+
+			foreach ($folder as $key => $value)
+			{
+				if ( ! JFolder::exists( $value[1]))
+				{
+					if (JFolder::create( $value[1], 0755 ))
+					{
+						$this->data = "<html>\n<body bgcolor=\"#FFFFFF\">\n</body>\n</html>";
+						JFile::write($value[1] . "/index.html", $this->data);
+						$error[] = 0;
+					}
+					else
+					{
+						$error[] = 1;
+					}
+				}
+				else //Folder exist
+				{
+					$error[] = 0;
+				}
+			}
+
+			if (JFile::upload($src, $dest, false))
+			{
+				return $image_path . '/icagenda/frontend/attachments/' . $filename;
+			}
+		}
+	}
+
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2.0
+	 */
+	protected function populateState()
+	{
+		$app = JFactory::getApplication('site');
+
+		// Load the parameters.
+		$params = $app->getParams();
+
+		$this->setState('params', $params);
+	}
+}
diff --git a/deployed/icagenda/components/com_icagenda/router.php b/deployed/icagenda/components/com_icagenda/router.php
new file mode 100644
index 00000000..48f7aa57
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/router.php
@@ -0,0 +1,336 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.13 2017-12-01
+ *
+ * @package     iCagenda.Site
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+function iCagendaBuildRoute( &$query )
+{
+	$segments = array();
+
+	// @DEPRECATED (@since 3.6.0 - @removed 3.7.0): link event
+	if (isset($query['layout']) && $query['layout'] == 'event')
+	{
+		// Make sure we have the id and the alias
+		if (strpos($query['id'], ':') === false)
+		{
+			$db = JFactory::getDbo();
+			$aquery = $db->setQuery($db->getQuery(true)
+				->select('alias')
+				->from('#__icagenda_events')
+				->where('id=' . (int) $query['id'])
+			);
+			$alias = $db->loadResult();
+
+			$query['id'] = $query['id'] . ':' . $alias;
+		}
+
+		$segments[] = $query['id'];
+
+		unset($query['id']);
+		unset($query['view']);
+		unset($query['layout']);
+	}
+
+
+	// Event view (since 3.6.0)
+	if (isset($query['view']) && $query['view'] == 'event')
+	{
+		// Make sure we have the id and the alias
+		if (strpos($query['id'], ':') === false)
+		{
+			$db = JFactory::getDbo();
+			$aquery = $db->setQuery($db->getQuery(true)
+				->select('alias')
+				->from('#__icagenda_events')
+				->where('id=' . (int) $query['id'])
+			);
+			$alias = $db->loadResult();
+
+			$query['id'] = $query['id'] . ':' . $alias;
+		}
+
+		$segments[] = $query['id'];
+
+		unset($query['id']);
+		unset($query['view']);
+		unset($query['layout']);
+	}
+
+	// link submit
+	if (isset($query['layout']) && $query['layout'] == 'send')
+	{
+		$segments[] = 'sending';
+
+		unset($query['view']);
+		unset($query['layout']);
+	}
+
+	// Registration Cancel
+	if (isset($query['layout']) && $query['layout'] == 'cancel')
+	{
+		// Make sure we have the id and the alias
+		if (strpos($query['id'], ':') === false)
+		{
+			$db = JFactory::getDbo();
+			$aquery = $db->setQuery($db->getQuery(true)
+				->select('alias')
+				->from('#__icagenda_events')
+				->where('id='.(int)$query['id'])
+			);
+			$alias = $db->loadResult();
+
+			$query['id'] = $query['id'].':'.$alias;
+		}
+
+		$segments[] = $query['id'];
+		$segments[] = 'cancel';
+
+		unset($query['id']);
+		unset($query['view']);
+		unset($query['layout']);
+	}
+
+	// Registration Actions
+	if (isset($query['layout']) && $query['layout'] == 'actions')
+	{
+		// Make sure we have the id and the alias
+		if (strpos($query['id'], ':') === false)
+		{
+			$db = JFactory::getDbo();
+			$aquery = $db->setQuery($db->getQuery(true)
+				->select('alias')
+				->from('#__icagenda_events')
+				->where('id='.(int)$query['id'])
+			);
+			$alias = $db->loadResult();
+
+			$query['id'] = $query['id'].':'.$alias;
+		}
+
+		$segments[] = $query['id'];
+		$segments[] = 'actions';
+
+		unset($query['id']);
+		unset($query['view']);
+		unset($query['layout']);
+	}
+
+	// Registration Complete
+	if (isset($query['layout']) && $query['layout'] == 'complete')
+	{
+		// Make sure we have the id and the alias
+		if (strpos($query['id'], ':') === false)
+		{
+			$db = JFactory::getDbo();
+			$aquery = $db->setQuery($db->getQuery(true)
+				->select('alias')
+				->from('#__icagenda_events')
+				->where('id='.(int)$query['id'])
+			);
+			$alias = $db->loadResult();
+
+			$query['id'] = $query['id'].':'.$alias;
+		}
+
+		$segments[] = $query['id'];
+		$segments[] = 'complete';
+
+		unset($query['id']);
+		unset($query['view']);
+		unset($query['layout']);
+	}
+
+	// @DEPRECATED (@since 3.6.0 - @removed 3.7.0): link registration
+	if (isset($query['layout']) && $query['layout'] == 'registration')
+	{
+		// Make sure we have the id and the alias
+		if (strpos($query['id'], ':') === false)
+		{
+			$db = JFactory::getDbo();
+			$aquery = $db->setQuery($db->getQuery(true)
+				->select('alias')
+				->from('#__icagenda_events')
+				->where('id='.(int)$query['id'])
+			);
+			$alias = $db->loadResult();
+
+			$query['id'] = $query['id'].':'.$alias;
+		}
+
+		$segments[] = $query['id'];
+		$segments[] = 'registration';
+
+		unset($query['id']);
+		unset($query['view']);
+		unset($query['layout']);
+	}
+
+	// Registration view (since 3.6.0)
+	if (isset($query['view']) && $query['view'] == 'registration')
+	{
+		// Make sure we have the id and the alias
+		if (strpos($query['id'], ':') === false)
+		{
+			$db = JFactory::getDbo();
+			$aquery = $db->setQuery($db->getQuery(true)
+				->select('alias')
+				->from('#__icagenda_events')
+				->where('id=' . (int)$query['id'])
+			);
+			$alias = $db->loadResult();
+
+			$query['id'] = $query['id'] . ':' . $alias;
+		}
+
+		$segments[] = $query['id'];
+
+		// Additional alias to registration form (en-GB = registration)
+		$add_alias = JText::_('COM_ICAGENDA_REGISTRATION_TITLE');
+
+		if (JFactory::getConfig()->get('unicodeslugs') == 1)
+		{
+			$add_alias = JFilterOutput::stringURLUnicodeSlug($add_alias);
+		}
+		else
+		{
+			$add_alias = JFilterOutput::stringURLSafe($add_alias);
+		}
+
+		if (trim($add_alias) == '') $add_alias = JText::_('COM_ICAGENDA_REGISTRATION_TITLE');
+
+		$segments[] = $add_alias;
+
+		unset($query['id']);
+		unset($query['view']);
+		unset($query['layout']);
+	}
+
+	// Submit view
+	if (isset($query['view']) && $query['view'] == 'submit')
+	{
+		$segments[] = 'submission';
+
+		unset($query['view']);
+		unset($query['layout']);
+	}
+
+	// List of events view
+	if (isset($query['view']) && $query['view'] == 'list')
+	{
+		unset($query['view']);
+		unset($query['layout']);
+	}
+
+	return $segments;
+}
+
+function iCagendaParseRoute( $segments )
+{
+	$app = JFactory::getApplication();
+	$menu = $app->getMenu();
+	$item = $menu->getActive();
+	$vars = array();
+
+	// Count route segments
+	$count = count($segments);
+
+	// Routing submit an event to complete ('send' view) page
+	if (in_array('sending', $segments))
+	{
+		$vars['option'] = 'com_icagenda';
+		$vars['view']   = 'submit';
+		$vars['layout'] = 'send';
+	}
+
+	// Registration Cancel
+	elseif (in_array('cancel', $segments))
+	{
+		$vars['option'] = 'com_icagenda';
+		$vars['view']   = 'registration';
+		$vars['layout'] = 'cancel';
+		$vars['id']     = $segments[0];
+	}
+
+	// Registration Actions
+	elseif (in_array('actions', $segments))
+	{
+		$vars['option'] = 'com_icagenda';
+		$vars['view']   = 'registration';
+		$vars['layout'] = 'actions';
+		$vars['id']     = $segments[0];
+	}
+
+	// Registration Complete
+	elseif (in_array('complete', $segments))
+	{
+		$vars['option'] = 'com_icagenda';
+		$vars['view']   = 'registration';
+		$vars['layout'] = 'complete';
+		$vars['id']     = $segments[0];
+	}
+
+	// Routing registration form (2 segments: ID, view)
+	elseif ($count == '2')
+	{
+		$vars['option'] = 'com_icagenda';
+		$vars['view']   = 'registration';
+		$vars['id']     = $segments[0];
+	}
+
+	// @DEPRECATED (@since 3.6.0 - @removed 3.7.0): Routing registration form (2 segment: ID, view)
+	elseif (in_array('registration', $segments))
+	{
+		$vars['option'] = 'com_icagenda';
+		$vars['view']   = 'list';
+		$vars['layout'] = 'registration';
+		$vars['id']     = $segments[0];
+	}
+
+	// Submit an event form
+	elseif (in_array('submission', $segments))
+	{
+		$vars['option'] = 'com_icagenda';
+		$vars['view']   = 'submit';
+	}
+
+	// List of events
+	elseif ($count == '0')
+	{
+		$vars['option'] = 'com_icagenda';
+		$vars['view']   = 'list';
+	}
+
+	// New routing event details view (1 segment: ID)
+	elseif ($count == '1')
+	{
+		$vars['option'] = 'com_icagenda';
+		$vars['view']   = 'event';
+		$vars['id']     = $segments[0];
+	}
+
+	// @DEPRECATED (@since 3.6.0 - @removed 3.7.0) : Routing event details view (1 segment: ID)
+	elseif (in_array('event', $segments))
+	{
+		$vars['option'] = 'com_icagenda';
+		$vars['view']   = 'list';
+		$vars['layout'] = 'event';
+		$vars['id']     = $segments[0];
+	}
+
+	return $vars;
+}
diff --git a/deployed/icagenda/components/com_icagenda/themes/default.xml b/deployed/icagenda/components/com_icagenda/themes/default.xml
new file mode 100644
index 00000000..6fbb486d
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/themes/default.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<installtheme method="icthemes" type="component" version="3.2.4">
+
+	<name>Default - iCagenda Theme</name>
+	<author>Cyril Rezé / Jooml!C</author>
+	<creationDate>2020-03-25</creationDate>
+	<copyright>Copyright (c) 2012-2020 Jooml!C / Cyril Rezé. All rights reserved.</copyright>
+	<license>GNU General Public License version 3 or later; see LICENSE.txt</license>
+	<authorEmail>info@joomlic.com</authorEmail>
+	<authorWebsite>www.Jooml!C.com</authorWebsite>
+	<authorUrl>https://www.joomlic.com</authorUrl>
+	<version>3.7.12</version>
+	<description>Theme pack by default for iCagenda (component + module)</description>
+
+	<administration>
+	</administration>
+
+	<files folder="site">
+		<folder>default</folder>
+		<filename>default.xml</filename>
+	</files>
+
+	<themeUpdate>http://www.joomlic.com/icupdate/themes</themeUpdate>
+
+</installtheme>
diff --git a/deployed/icagenda/components/com_icagenda/themes/ic_rounded.xml b/deployed/icagenda/components/com_icagenda/themes/ic_rounded.xml
new file mode 100644
index 00000000..59a71632
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/themes/ic_rounded.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<installtheme method="icthemes" type="component" version="3.2.4">
+
+	<name>iC rounded - iCagenda Theme</name>
+	<author>Cyril Rezé / Jooml!C</author>
+	<creationDate>2020-03-25</creationDate>
+	<copyright>Copyright (c) 2012-2020 Jooml!C / Cyril Rezé. All rights reserved.</copyright>
+	<license>GNU General Public License version 3 or later; see LICENSE.txt</license>
+	<authorEmail>info@joomlic.com</authorEmail>
+	<authorWebsite>www.Jooml!C.com</authorWebsite>
+	<authorUrl>https://www.joomlic.com</authorUrl>
+	<version>3.7.12</version>
+	<description>Theme pack iC rounded for iCagenda (component + module)</description>
+
+	<administration>
+	</administration>
+
+	<files folder="site">
+		<folder>ic_rounded</folder>
+		<filename>ic_rounded.xml</filename>
+	</files>
+
+	<themeUpdate>http://www.joomlic.com/icupdate/themes</themeUpdate>
+
+</installtheme>
diff --git a/deployed/icagenda/components/com_icagenda/themes/index.html b/deployed/icagenda/components/com_icagenda/themes/index.html
new file mode 100644
index 00000000..fa6d84e8
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/themes/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/default/css/default_component-rtl.css b/deployed/icagenda/components/com_icagenda/themes/packs/default/css/default_component-rtl.css
new file mode 100644
index 00000000..69ab2c97
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/themes/packs/default/css/default_component-rtl.css
@@ -0,0 +1,156 @@
+/*
+ * COM_ICAGENDA
+ * iCagenda by JoomliC
+ * Theme Pack Official
+ * Default Theme - component
+ *
+ * @name		default - RTL Styles
+ * @author		Lyr!C (JoomliC)
+ * @version 	3.4.0 2014-12-01
+ * @since		3.4.0
+ */
+
+
+/*
+ * Common Styles
+ */
+
+/* Align styles */
+.ic-align-left {
+	text-align: right;
+}
+.ic-align-right {
+	text-align: left;
+}
+
+/* Float styles */
+.ic-float-left {
+	float: right;
+}
+.ic-float-right {
+	float: left;
+}
+
+/* Table styles */
+.ic-divCell {
+	float: right; /* fix for buggy browsers */
+}
+
+/* Feature Icons */
+.ic-content > .ic-features-container {
+	float: left;
+	margin-right: auto;
+	margin-left: -5px;
+}
+.ic-feature-icon {
+	float: left;
+}
+
+/* Buttons (print, Add to Cal, ...) */
+.ic-buttons {
+	float: left;
+}
+.ic-icon {
+	margin-left: auto;
+	margin-right: 7px;
+}
+div.ic-tip-link {
+	text-align: right;
+}
+div.ic-tip-link img {
+	margin-right: auto;
+	margin-left: 5px;
+}
+
+
+/*
+ * List of Events
+ */
+
+/* Box Date */
+.ic-box-date {
+	float: right;
+}
+
+/* Box Content */
+.ic-content {
+	float: right;
+}
+
+
+/*
+ * Event Details
+ */
+
+/* Back button */
+.ic-back {
+	text-align: right;
+}
+
+/* Description */
+.ic-detail-desc {
+	text-align: right;
+}
+
+/* Content Box */
+.ic-info-box-content {
+	text-align: right;
+}
+
+/* File attachment */
+.ic-info-box-file {
+	float: left;
+}
+
+/* List of Participants */
+#icagenda .panel h3.pane-toggler a {
+	background: #f5f5f5 url(../images/pluslist.png) 1% 50% no-repeat;
+}
+#icagenda .panel h3.pane-toggler-down a {
+	background: #f5f5f5 url(../images/minuslist.png) 1% 50% no-repeat;
+}
+#icagenda .pane-slider {
+	margin-right: -1px;
+}
+#icagenda .list_table {
+	float: right;
+}
+
+
+/*
+ * Form
+ */
+
+/* Label */
+.ic-control-label {
+	float: right;
+}
+
+/* Radio Buttons */
+.btn-group > .btn:first-child,
+.radio.btn-group > label:first-of-type {
+	border-radius: 4px 0 0 4px !important;
+}
+.btn-group > .btn:last-child {
+	border-radius: 0 4px 4px 0 !important;
+}
+
+/* Google Maps */
+.icmap-label {
+	float: right !important;
+	text-align: right !important;
+}
+.icmap-input {
+	text-align: right;
+}
+
+
+/*
+ * STYLES for classes not presents in Theme Pack php files, but in iCagenda core php files
+ */
+
+/* Header - List of Categories */
+#icagenda .cat_header_title {
+	float: right;
+	margin: 3px 0 -2px 10px;
+}
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/default/css/default_component.css b/deployed/icagenda/components/com_icagenda/themes/packs/default/css/default_component.css
new file mode 100644
index 00000000..b6f94f18
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/themes/packs/default/css/default_component.css
@@ -0,0 +1,1066 @@
+/*
+ * COM_ICAGENDA
+ * iCagenda by JoomliC
+ * Theme Pack Official
+ * Default Theme - component
+ *
+ * @name        default
+ * @author      Lyr!C (JoomliC)
+ * @version     3.7.12 2020-03-25
+ * @since       1.0
+ */
+
+
+/*
+ * GENERAL STYLES (list and event details)
+ */
+
+/* General */
+#icagenda {
+	display: block;
+	width: auto;
+	margin: 0px;
+	padding:0px
+}
+
+/* Align styles */
+.ic-align-left {
+	text-align: left;
+}
+.ic-align-right {
+	text-align: right;
+}
+.ic-align-center {
+	text-align: center;
+}
+
+/* Float styles */
+.ic-float-left {
+	float: left;
+}
+.ic-float-right {
+	float: right;
+}
+.ic-float-none {
+	float: none;
+}
+
+/* Clear Float div */
+.ic-clearfix {
+	*zoom: 1;
+}
+.ic-clearfix:before,
+.ic-clearfix:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.ic-clearfix:after {
+	clear: both;
+}
+
+/* Style iC Alert */
+.ic-alert-info {}
+.ic-alert-error {}
+
+/* Feature Icons */
+.ic-content > .ic-features-container {
+	margin-right: -5px;
+	margin-top: 5px;
+}
+.ic-feature-icon {
+	float: right;
+}
+
+
+/*
+ * LIST PAGE CSS (CONTENT)
+ */
+
+/*
+ * Style Pagination
+ */
+.ic-pagination {
+	font-size: 14px;
+	line-height: 18px;
+	vertical-align: middle;
+}
+.ic-pagination a {
+	text-decoration: none;
+	background: #fff;
+}
+.ic-pagination a:hover,
+.ic-pagination a:active,
+.ic-pagination a:focus {
+	cursor: pointer;
+}
+.ic-pagination .ic-prev {
+	float: left;
+}
+.ic-pagination .ic-next {
+	float: right;
+}
+.ic-pagination .ic-prev,
+.ic-pagination .ic-next {
+	margin: 2px 0;
+}
+.ic-pagination .ic-prev a,
+.ic-pagination .ic-next a {
+	padding: 5px;
+	background: none;
+}
+.ic-pagination .ic-prev a:hover,
+.ic-pagination .ic-next a:hover {
+	background: #f3f3f3;
+	background: rgba(221, 221, 221, 0.2);
+}
+.ic-pagination .ic-prev-text,
+.ic-pagination .ic-next-text,
+.ic-pagination .iCicon-backic,
+.ic-pagination .iCicon-nextic {
+	font-family: inherit;
+	vertical-align: middle;
+}
+.ic-pagination .ic-go-to-page {
+	padding: 2px;
+	background: none;
+}
+.ic-pagination .ic-current-page {
+	padding: 2px;
+	background: none;
+}
+.ic-pagination .ic-current-page .ic-active {
+	color: #fff;
+	font-weight: bold;
+}
+.ic-pagination .ic-hidden-pages {
+	padding: 2px;
+	background: none;
+}
+
+
+/*
+ * Style Search Filters
+ */
+.ic-filters {
+	padding: 5px;
+	background: none; /* Old IE version */
+	background: rgba(221,221,221,0.2);
+}
+
+/* Search Filters - Main */
+.ic-filters-label {
+	background: #f0ad4e;
+	font-size : 20px;
+	line-height: 20px;
+	color: #fff;
+	text-align: center;
+	text-transform: uppercase;
+	word-wrap: break-word;
+	-webkit-hyphens: auto;
+	-moz-hyphens: auto;
+	-ms-hyphens: auto;
+	hyphens: auto;
+	font-weight: bold;
+	text-shadow: -1px 0 #eea236, 0 1px #eea236, 1px 0 #eea236, 0 -1px #eea236;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+}
+.ic-filters-label-title-3 {
+	height: 128px;
+	line-height: 128px;
+}
+.ic-filters-label-title-2 {
+	height: 84px;
+	line-height: 84px;
+}
+.ic-filters-label-title-1 {
+	height: 40px;
+	line-height: 40px;
+}
+.ic-filters-btn-3 {
+	height: 128px;
+	line-height: 128px;
+}
+.ic-filters-btn-2 {
+	height: 84px;
+	line-height: 84px;
+}
+.ic-filters-btn-1 {
+	height: 40px;
+	line-height: 40px;
+}
+
+/* Search Filters - filters */
+.ic-filter-search {
+	background: #dddddd;
+	background: rgba(221,221,221,0.2);
+	padding: 5px 19px 5px 5px;
+}
+.ic-filter-from,
+.ic-filter-to,
+.ic-filter-category,
+.ic-filter-month,
+.ic-filter-year {
+	background: #dddddd;
+	background: rgba(221,221,221,0.2);
+	padding: 5px;
+}
+.ic-filter-search input,
+.ic-filter-from input,
+.ic-filter-to input,
+.ic-filter-from button,
+.ic-filter-to button {
+	display: inline-block;
+	height: auto;
+	padding: 4px 6px !important;
+}
+.ic-filter-search input {
+	width: 100%;
+}
+.ic-filter-category select,
+.ic-filter-month select,
+.ic-filter-year select {
+	width: 100%;
+	height: 100%;
+}
+
+/* Search Filters - buttons */
+.ic-button-more {
+	background: rgba(221,221,221,0);
+	padding: 0;
+}
+.ic-filter-more-btn {
+	display: block;
+    width: auto;
+	height: 40px;
+	line-height: 40px;
+	padding: 0;
+	background: #5bc0de;
+	border: 1px solid #46b8da;
+    border-radius: 0;
+	text-align: center;
+	color: #fff;
+	font-weight: bold;
+	text-shadow: -1px 0 #269abc, 0 1px #269abc, 1px 0 #269abc, 0 -1px #269abc;
+	word-wrap: break-word;
+	-webkit-hyphens: auto;
+	-moz-hyphens: auto;
+	-ms-hyphens: auto;
+	hyphens: auto;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+}
+.ic-filter-more-btn .iCicon-arrow-down,
+.ic-filter-more-btn .iCicon-arrow-up {
+	vertical-align: middle;
+}
+
+.ic-filter-more-btn:hover {
+	background: #31b0d5;
+	color: #fff;
+	border: 1px solid #269abc;
+	cursor: pointer;
+}
+.ic-filter-more-btn.ic-active {
+	background: #5bc0de;
+	color: #fff;
+	text-shadow: -1px 0 #2083a1, 0 1px #2083a1, 1px 0 #2083a1, 0 -1px #2083a1;
+	border: 1px solid #2083a1;
+}
+.ic-filter-more-btn.ic-inactive {
+	background: #5bc0de;
+	color: #fff;
+	border: 1px solid #46b8da;
+}
+.ic-filters-controls {
+	background: #dddddd;
+	background: rgba(221,221,221,0.2);
+	text-align: center;
+	padding: 0;
+}
+.ic-control-submit {
+}
+.ic-control-reset {
+}
+.ic-filters-controls button {
+	width: 100%;
+	border-radius: 0;
+	word-wrap: break-word;
+	-webkit-hyphens: auto;
+	-moz-hyphens: auto;
+	-ms-hyphens: auto;
+	hyphens: auto;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+}
+.ic-filter-submit-btn {
+	font-size: 16px;
+	color: #fff;
+	background: #5cb85c;
+	border: 1px solid #4cae4c;
+	font-weight: bold;
+	text-shadow: -1px 0 #398439, 0 1px #398439, 1px 0 #398439, 0 -1px #398439;
+}
+.ic-filter-submit-btn:hover {
+	background: #449d44;
+	border: 1px solid #398439;
+}
+.ic-filter-reset-btn {
+	font-size: 13px;
+	color: #fff;
+	background: #d9534f;
+	border: 1px solid #d43f3a;
+	font-weight: bold;
+	text-shadow: -1px 0 #ac2925, 0 1px #ac2925, 1px 0 #ac2925, 0 -1px #ac2925;
+}
+.ic-filter-reset-btn:hover {
+	background: #c9302c;
+	border: 1px solid #ac2925;
+}
+
+
+
+/* Style Background alternative */
+.ic-event {
+	background: none;
+	background: rgba(221,221,221,0.1);
+	border-radius: 6px;
+	/*
+	-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.025);
+	-moz-box-shadow: inset 0 1px 1px rgba(0,0,0,0.025);
+	box-shadow: inset 0 1px 1px rgba(0,0,0,0.025);
+	*/
+	margin: 5px 0;
+	padding: 0px;
+}
+.ic-event:nth-child(2n+1) {
+	background: none;
+	background: rgba(221,221,221,0.3);
+}
+
+/* Style Category */
+.ic-cat {
+	margin-top: 0px;
+	font-weight: bold;
+	text-transform: uppercase;
+	font-size:11px;
+}
+
+/* Style Left (Container Box Date) */
+.ic-box {
+	display: block;
+	min-height: 96px;
+	border: 0px;
+}
+
+/* Font color if bright background for date box */
+#icagenda .fontColor {color: #333 !important;}
+
+/* Style Box Date */
+.ic-box-date {
+	display: block;
+	text-transform: capitalize;
+	width: 60px;
+	height: 60px;
+	padding: 10px;
+	color: #fff;
+	margin: 8px 28px 2px 8px;
+	border-radius: 6px;
+	/* css3 box-sizing added to prevent conflict */
+	box-sizing: content-box !important;
+}
+
+/* Current period */
+.ic-current-period {
+	text-decoration: overline;
+}
+
+.ic-date {
+	line-height: 0px !important;
+	font-size: 30px;
+}
+.ic-day {
+	line-height: 30px !important;
+	font-size: 30px;
+	font-weight: bold;
+}
+.ic-month {
+	line-height: 16px !important;
+	font-size: 16px;
+	letter-spacing: 0px;
+	margin-left: 1px;
+	font-weight: normal;
+}
+.ic-year {
+	line-height: 11px !important;
+	font-size: 11px;
+	letter-spacing: 2px;
+	margin-left: 2px;
+	font-weight: bold;
+}
+.ic-time {
+	line-height: 10px !important;
+	font-size: 10px;
+	letter-spacing: 2px;
+	margin-left: 2px;
+	font-weight: bold;
+}
+
+/* Style Right (Container Title, Cat, Desc...) */
+.ic-content {
+	display: block;
+	border: 0px;
+	margin: 0px;
+	padding: 8px;
+	vertical-align: top;
+}
+.ic-content h2 {
+	font-size: 24px;
+	line-height: 24px;
+	margin: 3px 0px 3px 0px;
+	padding: 0;
+}
+.ic-place {
+	font-weight: normal;
+	font-size: 11px;
+	line-height: 15px;
+}
+.ic-descshort {}
+
+
+
+
+/*
+ * EVENT PAGE CSS
+ */
+
+/* Style full-width div containing Sharing and Register Button */
+.ic-event-buttons {
+	display: block;
+	width: 100%;
+	margin-bottom: 10px;
+}
+
+/* Style Event General */
+.ic-info {
+	padding: 1%;
+	background: none; /* old versions of IE */
+	background: rgba(221,221,221,0.3);
+	border: 0px solid #ccc;
+	margin-bottom: 10px;
+	border-radius: 6px;
+	word-break: break-word;
+	word-wrap: break-word;
+	-webkit-hyphens: auto;
+	-moz-hyphens: auto;
+	hyphens: auto;
+}
+.ic-info .ic-details {
+	padding: 1%;
+}
+
+/* Style Image */
+.ic-image img {
+	max-width: 100%;
+	border: 0px solid #ccc;
+	margin-bottom: 10px;
+}
+
+/* Style Table-style List */
+.ic-divTable {
+	display: table;
+	width: auto;
+	border-spacing: 5px;
+	/* border-collapse: separate; */
+}
+.ic-divRow {
+	display: table-row;
+}
+.ic-divCell {
+/*	float: left; */ /* fix for buggy browsers */
+	padding: 1px 5px;
+}
+.ic-label {
+	display: table-cell;
+	min-width: 110px;
+	font-weight: bold;
+}
+.ic-value {
+	display: table-cell;
+	width: auto;
+}
+
+/* Style Description */
+.ic-short-description {
+	font-weight: bold;
+}
+.ic-full-description {
+}
+
+/* Style Google Maps */
+#ic-detail-map {}
+#ic-detail-map .icagenda_map {
+	margin: auto;
+	border: 0px solid #ccc;
+	text-shadow: none;
+	border-radius: 0px;
+	box-shadow:none;
+}
+
+/* Style All Dates */
+#ic-list-of-dates {}
+.ic-dates-list {}
+.ic-all-dates ul {
+	padding-left: 1%;
+}
+.ic-all-dates li {
+	background-image: none
+}
+.ic-all-dates h3 {
+	display: block;
+	font-size: 18px;
+	margin-top: 10px;
+	font-weight: bold;
+}
+
+/* Style List of Participants */
+#ic-list-of-participants {}
+.ic-dates-list {}
+.ic-participants h3 {
+	display: block;
+	font-size: 18px;
+	margin-top: 10px;
+	font-weight: bold;
+}
+
+/* Slider */
+#icagenda .icpanel {
+}
+.ic-participants .panel {
+	border: none !important;
+}
+.ic-participants .panel h3 {
+	border: none !important;
+}
+.ic-participants {
+	padding: 5px;
+	background: #f5f5f5;
+	background: rgba(221,221,221,0.3);
+}
+.ic-participants h3 a {
+	display: block;
+	text-decoration: none;
+	padding: 0 1%;
+/*	color: #444; Removed to be more friendly with dark site templates */
+	width: 98%;
+}
+.ic-participants .panel h3.pane-toggler a {
+	background: url(../images/pluslist.png) 99% 50% no-repeat;
+}
+.ic-participants .panel h3.pane-toggler-down a {
+	background: url(../images/minuslist.png) 99% 50% no-repeat;
+}
+#icagenda .pane-slider .ic-content {
+}
+#icagenda .pane-slider {
+	overflow: unset;
+}
+
+/* Slider Full list of Participants */
+#icagenda .list_table {
+	background:#cccccc;
+	background:rgba(204,204,204,0.5);
+	border-radius:3px 3px 3px 3px;
+	float:left;
+}
+#icagenda .imgbox {
+	width: 40px;
+	padding: 3px;
+}
+#icagenda .imgbox img {
+	border-radius: 3px 3px 3px 3px;
+	margin: 1px 0;
+}
+#icagenda .imgbox .ic-avatar {
+	font-size: 36px;
+	border-radius: 3px 3px 3px 3px;
+	margin: 1px 0;
+	color: #c4c4c4;
+	background: #fff;
+}
+#icagenda .list_name {
+	font-weight:bold;
+}
+#icagenda .list_places {
+	font-size:smaller;
+}
+#icagenda .list_date {
+	font-size:smaller;
+}
+
+
+/*
+ * FORMS - COMMON STYLES
+ */
+
+/* Style Form (general) */
+.icagenda_form {}
+.icagenda_form h3 {
+	color: #333;
+	font-weight: bold;
+	font-size: 14px;
+	margin: 15px 0 10px 0px;
+}
+.icagenda_form .fieldset {
+	border-radius: 2px;
+	margin: 10px 0;
+	background: #f3f3f3;
+	padding: 10px;
+}
+.icagenda_form legend {
+	font-weight: bold;
+}
+
+/* Style Label */
+.icagenda_form label {
+	color: #333;
+	display: block;
+	width: 130px;
+	float: left;
+	margin: 0px 3px;
+}
+
+/* Style Input field */
+.icagenda_form input {
+	display: inline-block;
+	background-color: #fff;
+	border: 1px solid #ccc;
+	box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.075) inset;
+	transition: border 0.2s linear 0s, box-shadow 0.2s linear 0s;
+	border-radius: 3px;
+	padding: 3px;
+	width: auto;
+}
+.icagenda_form input[type="file"] {
+	width: 270px;
+}
+.icagenda_form .input-small {
+	width: 90px;
+}
+.icagenda_form .select-small {
+	width: 104px;
+}
+.icagenda_form .input-large {
+	width: 210px;
+}
+.icagenda_form .select-large {
+	width: 224px;
+}
+.icagenda_form .input-xlarge {
+	width: 270px;
+}
+.icagenda_form .select-xlarge {
+	width: 284px;
+}
+.icagenda_form .input-xxlarge {
+	width: 330px;
+}
+.icagenda_form .select-xxlarge {
+	width: 344px;
+}
+.icagenda_form .ic-date-input {
+	width: auto;
+}
+
+/* Style Form Invalid */
+.icagenda_form label.invalid {
+	color: red;
+	font-weight: bold;
+}
+.icagenda_form input.invalid,
+.icagenda_form select.invalid {
+	border: 2px solid red;
+	color: red;
+	font-weight: bold;
+}
+
+/* Style button left (joomla 2.5) */
+.icagenda_form .button2-left {
+	margin: 3px 3px 3px 0px;
+	float: left;
+}
+
+/* Style Terms of Service */
+.icagenda_form .ic-tos-content {
+	background: #c0c0c0;
+	color: #fff;
+	margin-top: 25px;
+	padding: 5px;
+	border: none;
+	border-radius: 2px;
+	text-align: center;
+}
+.icagenda_form .ic-tos-text {
+	padding: 25px;
+	background: #fff;
+	color: #333;
+	text-align: left
+}
+.icagenda_form .ic-tos-agree {
+	color: #fff;
+	font-weight: bold;
+}
+
+/* Style Button Submit */
+.icagenda_form .button {
+	font-family: arial;
+	font-size: 12px;
+	background: #555;
+	color: #fff;
+	padding: 5px;
+	border: none;
+	border-radius: 6px;
+	text-align: center;
+}
+.icagenda_form .button:hover {
+	background: #c72031;
+	color: #fff;
+}
+.icagenda_form .ic-loader {
+	display: block;
+	width: 100%;
+	height: 60px;
+	background: url(../../../../../../media/com_icagenda/images/loader.gif) 50% 50% no-repeat;
+}
+
+/* Style Button Cancel */
+.icagenda_form .buttonx a {
+	font-family: arial;
+	font-size: 12px;
+	background: none !important;
+	text-decoration: none;
+	color: #555;
+	padding: 0;
+	border: none;
+	border-radius: 6px;
+	text-align: center;
+}
+.icagenda_form .buttonx a:hover {
+	background: none !important;
+	text-decoration: none;
+	color: #c72031 !important;
+}
+
+
+
+/*
+ * SUBMIT AN EVENT FORM
+ */
+
+/* Short Description textarea */
+.ic-submit-shortdesc,
+.ic-submit-metadesc {
+	width: 100%;
+	box-sizing: border-box;
+}
+
+
+/*
+ * REGISTRATION
+ */
+
+/* Style Title Registration */
+.ic-form-title h2 {}
+
+/* Style fields required info */
+.ic-required-info {
+	font-size: 0.95em;
+}
+
+/* Style Header*/
+.ic-reg-event {
+	background: none;
+	background: rgba(221,221,221,0.3);
+	border-radius: 2px;
+	margin: 5px 0;
+	padding: 0px;
+}
+
+/* Registration icon */
+.ic-reg-icon {
+	background: url(../../../../../../media/com_icagenda/images/registration-48.png) 50% 50% no-repeat;
+	display: block;
+	width: 48px;
+	height: 48px;
+	padding: 8px;
+	margin-right: 8px;
+}
+
+/* Style Right (Container Event title, category) */
+.ic-reg-content {
+	display: block;
+	border: 0;
+	margin: 0;
+	padding: 8px;
+	vertical-align: top;
+}
+
+/* Category */
+.ic-reg-cat {
+	color: #555555;
+	font-size: 12px;
+	line-height: 20px;
+	font-weight: bold;
+	text-transform: uppercase;
+}
+
+/* Event title */
+.ic-reg-event-title {
+	font-size: 22px;
+	line-height: 28px;
+	font-weight: bold;
+}
+
+/* Style Registration infos */
+.ic-reg-info {
+	font-size:0.8em;
+}
+
+/* Google Maps */
+.icmap-label {
+	float: left;
+	width: 140px;
+	padding-top: 5px;
+	padding-right: 5px;
+	text-align: left;
+}
+.icmap-field {
+	margin: 5px;
+}
+.form-validate .icmap-field input,
+.icagenda_form .icmap-field input {
+	background-color: #eee;
+/*	width: auto; */
+	color: #777;
+}
+
+/* Terms and Conditions Legend */
+.ic-terms-legend {
+	margin: 12px 0;
+}
+
+
+/*
+ * STYLES for classes not presents in Theme Pack php files, but in iCagenda core php files
+ */
+
+/* Style Navigation (list of events) */
+#icagenda .navigator {margin: 7px 0;}
+#icagenda .navigator a {text-decoration:none;}
+#icagenda .navigator a:link, #icagenda .navigator a:visited {}
+#icagenda .navigator a:hover, #icagenda .navigator a:active, #icagenda .navigator a:focus {cursor:pointer;}
+#icagenda .icagenda_back {float:left; margin-left:20px;}
+#icagenda .icagenda_next {float: right; margin-right:20px;}
+#icagenda .navigator button {border:0; padding:5px; color:#fff; background:#f3f3f3; margin-right:5px;}
+
+/* Header - List of Categories */
+.ic-header-categories {
+	display: block;
+	width: 100%;
+	margin-bottom: 20px;
+}
+#icagenda .cat_header_title {
+	display: block;
+	padding: 1px 7px;
+	font-size: 1em;
+	text-align: center;
+	color: #fff;
+	font-weight: normal;
+	float: left;
+	margin: 3px 10px -2px 0;
+	border-radius: 4px;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.15);
+	background: #dddddd;
+	background-size: cover;
+}
+#icagenda .cat_header_desc {
+	display: block;
+	padding: 3px 7px;
+	margin: 2px 0;
+}
+
+/* Share buttons (AddThis) */
+.ic-share {
+	display: block;
+	background: none;
+	padding: 5px 10px 5px 0;
+	text-shadow: none;
+	z-index: 1;
+}
+.ic-share a:link,
+.ic-share a:visited {
+/*	background: none; */
+	text-decoration: none;
+}
+.ic-share a:hover,
+.ic-share a:active,
+.ic-share a:focus {
+/*	background: none; */
+}
+
+/* Style Registration button */
+.ic-registration-box {
+	float: none;
+	margin: 3px 0;
+}
+.ic-registration-box a {
+	text-decoration: none;
+	float: none;
+}
+
+/* Text Register Button */
+.ic-event-register {
+	display: inline-block;
+	margin: 2px 3px 0 0;
+	line-height: 16px;
+}
+
+/* Text Event Full Button */
+.ic-event-full {
+	display: inline-block;
+	margin: 2px 3px 0 0;
+	line-height: 16px;
+}
+
+/* Text Event Finished Button */
+.ic-event-finished {
+	display: inline-block;
+	margin: 2px 3px 0 0;
+	line-height: 16px;
+}
+
+/* Image Button (removed in 3.3.7) */
+#icagenda .regis_imgbutton {display:inline-block; margin:0 3px; height:16px; line-height:16px; width:16px;  background: url('../../../../../../media/com_icagenda/images/btn-regis.png') no-repeat}
+#icagenda .regis_imgbutton:hover {text-decoration:none; color:#111111; cursor: pointer;}
+
+/* icon people (nb of registered users) (added in 3.3.7) */
+.ic-people {
+	color: #999;
+}
+
+/* Nb of registered people (in bubble) */
+.ic-registered {
+	display: inline-block;
+	color: #333333;
+	text-align: center;
+	background: url('../images/regis-baloon.png');
+	height: 16px;
+	line-height: 16px;
+	width: 36px;
+	font-size: 11px;
+	font-weight: bold;
+}
+
+/* Style Time (in date) */
+#icagenda .evttime {
+	font-size: 0.8em;
+}
+.ic-next-today {
+	font-weight: bold;
+}
+.ic-period-starttime,
+.ic-period-endtime,
+.ic-single-starttime,
+.ic-single-endtime,
+.ic-datetime-separator {
+	font-size: 0.8em;
+}
+
+/* Style File Download link */
+#icagenda .icDownload {}
+
+
+/*
+ * STYLES for classes not presents in Theme Pack php files, but in iCagenda core php files
+ */
+
+/* Style iCagenda Header - List of Events */
+.ic-header-container {
+}
+.ic-header-title {
+}
+.ic-header-subtitle {
+	font-size: 0.85em;
+}
+.ic-subtitle-string {
+}
+.ic-subtitle-pages {
+}
+
+/* Style Back Button (event details) */
+.ic-back {
+	display: block;
+	width: auto;
+	text-align: left;
+	font-size: 10px;
+	font-weight: normal;
+	text-decoration: none;
+	letter-spacing: 1px;
+}
+.ic-back a:link,
+.ic-back a:visited {
+	text-decoration:none;
+}
+.ic-back a:hover,
+.ic-back a:active,
+.ic-back a:focus {
+	text-decoration:none;
+}
+
+/* Buttons (print, Add to Cal, ...) */
+.ic-buttons {
+	display: block;
+	float: right;
+}
+.ic-icon {
+	display: inline-block;
+	margin-left: 7px;
+}
+.ic-printpopup-btn {
+	display: block;
+	text-align: center;
+	margin: 15px 0;
+}
+div.ic-tip-title {
+	text-align: center;
+	font-weight: bold;
+	margin-bottom: 3px;
+}
+div.ic-tip-link {
+	display: block;
+	text-align: left;
+	margin-bottom: 3px;
+}
+div.ic-tip-link a {
+	color: #D4D4D4;
+	text-decoration: none;
+}
+div.ic-tip-link a:hover {
+	color: #FFFFFF;
+}
+div.ic-tip-link img {
+	margin-right: 5px;
+}
+
+/* Columns List of Participants (Full) */
+#icagenda .total {width:99%; min-width:180px; margin:0.5%;}
+#icagenda .demi {width:49%; min-width:180px; margin:0.5%;}
+#icagenda .tiers {width:32.3%; min-width:180px; margin:0.5%;}
+#icagenda .quart {width:24%; min-width:150px; margin:0.5%;}
+
+.names_noslide {text-align:justify;}
+.names_slide {padding:6px !important; text-align:justify;}
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/default/css/default_component_large.css b/deployed/icagenda/components/com_icagenda/themes/packs/default/css/default_component_large.css
new file mode 100644
index 00000000..d8b47528
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/themes/packs/default/css/default_component_large.css
@@ -0,0 +1,6 @@
+/*
+ * COM_ICAGENDA
+ * Large devices (usually a desktop computer)
+ * SCREEN WIDTH > 'Large Screen Threshold'
+ * Default : SCREEN WIDTH > 1201
+ */
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/default/css/default_component_medium.css b/deployed/icagenda/components/com_icagenda/themes/packs/default/css/default_component_medium.css
new file mode 100644
index 00000000..565c88dc
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/themes/packs/default/css/default_component_medium.css
@@ -0,0 +1,28 @@
+/*
+ * COM_ICAGENDA
+ * Medium devices (usually a laptop computer)
+ * 'Medium Screen Threshold' < SCREEN WIDTH < ('Large Screen Threshold' - 1)
+ * Default : 769 < SCREEN WIDTH < 1200
+ */
+
+/* Filters */
+.ic-filters-label {
+	margin-bottom: 8px;
+}
+.ic-filters-label-title-2,
+.ic-filters-label-title-3 {
+	margin-bottom: -5px;
+	height: 40px;
+	line-height: 40px;
+}
+.ic-filters-btn-2 {
+	height: 40px;
+	line-height: 40px;
+}
+.ic-filters-controls {
+	padding: 0;
+}
+.ic-search-submit,
+.ic-search-reset {
+	width: 50%;
+}
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/default/css/default_component_small.css b/deployed/icagenda/components/com_icagenda/themes/packs/default/css/default_component_small.css
new file mode 100644
index 00000000..0c69cd33
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/themes/packs/default/css/default_component_small.css
@@ -0,0 +1,28 @@
+/*
+ * COM_ICAGENDA
+ * Small devices (usually a tablet computer)
+ * 'Small Screen Threshold' < SCREEN WIDTH < ('Medium Screen Threshold' - 1)
+ * Default : 481 < SCREEN WIDTH < 768
+ */
+
+/* Filters */
+.ic-filters-label {
+	margin-bottom: 8px;
+}
+.ic-filters-label-title-2,
+.ic-filters-label-title-3 {
+	margin-bottom: -5px;
+	height: 40px;
+	line-height: 40px;
+}
+.ic-filters-btn-2 {
+	height: 40px;
+	line-height: 40px;
+}
+.ic-filters-controls {
+	padding: 0;
+}
+.ic-search-submit,
+.ic-search-reset {
+	width: 50%;
+}
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/default/css/default_component_xsmall.css b/deployed/icagenda/components/com_icagenda/themes/packs/default/css/default_component_xsmall.css
new file mode 100644
index 00000000..3cb738a2
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/themes/packs/default/css/default_component_xsmall.css
@@ -0,0 +1,65 @@
+/*
+ * COM_ICAGENDA
+ * Extra small devices (usually a mobile phone)
+ * 0 < SCREEN WIDTH < ('Small Screen Threshold' - 1)
+ * Default : 0 < SCREEN WIDTH < 480
+ */
+
+/* Share buttons (AddThis) */
+#icagenda .share {
+	display:none;
+}
+
+/* Style Information */
+.ic-divCell {
+	float: left;
+}
+
+/* Style Input field */
+.icagenda_form input,
+.icagenda_form input[type="file"],
+.icagenda_form .input-large,
+.icagenda_form .input-xlarge,
+.icagenda_form .input-xxlarge,
+.icagenda_form .select-large,
+.icagenda_form .select-xlarge,
+.icagenda_form .select-xxlarge {
+	width: 90%;
+}
+.icagenda_form .input-small {
+	width: 90px;
+}
+.icagenda_form .select-small {
+	width: 114px;
+}
+.icagenda_form .ic-date-input {
+	width: auto;
+}
+.ic-captcha-label {
+	display: none;
+}
+
+/* Filters */
+.ic-filters-label {
+	margin-bottom: 8px;
+}
+.ic-filters-label-title-2,
+.ic-filters-label-title-3 {
+	margin-bottom: -5px;
+	height: 40px;
+	line-height: 40px;
+}
+.ic-filters-btn-2 {
+	height: 40px;
+	line-height: 40px;
+}
+.ic-filters-controls {
+	padding: 0;
+}
+.ic-search-submit,
+.ic-search-reset {
+	width: 100%;
+}
+.ic-button-more > .ic-row1 {
+	height: 40px;
+}
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/default/css/default_module-rtl.css b/deployed/icagenda/components/com_icagenda/themes/packs/default/css/default_module-rtl.css
new file mode 100644
index 00000000..4a5e0e5c
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/themes/packs/default/css/default_module-rtl.css
@@ -0,0 +1,31 @@
+/*
+ * MOD_ICCALENDAR
+ * iCagenda by JoomliC
+ * Theme Pack Official
+ * Default Theme - module calendar
+ *
+ * @name		default - RTL
+ * @author		Lyr!C (JoomliC)
+ * @version 	3.4.0 2014-12-01
+ * @since		3.4.0
+ */
+
+
+#ictip {
+	text-align: right;
+}
+#ictip span.bloc {
+	float: right;
+}
+#ictip a.close {
+	right: auto;
+	left: 15px;
+}
+#ictip span.img {
+	float: right;
+}
+
+/* Features */
+#ictip .ic-feature-icon {
+	float: left;
+}
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/default/css/default_module.css b/deployed/icagenda/components/com_icagenda/themes/packs/default/css/default_module.css
new file mode 100644
index 00000000..ed6dbc58
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/themes/packs/default/css/default_module.css
@@ -0,0 +1,524 @@
+/*
+ * MOD_ICCALENDAR
+ * iCagenda by JoomliC
+ * Theme Pack Official
+ * Default Theme - module calendar
+ *
+ * @name		default
+ * @author		Lyr!C (JoomliC)
+ * @version 	3.5.14 2016-01-19
+ * @since		1.0
+ */
+
+
+/* Clear Float div */
+.ic-clearfix {
+	*zoom: 1;
+}
+.ic-clearfix:before,
+.ic-clearfix:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.ic-clearfix:after {
+	clear: both;
+}
+
+/*
+ * CALENDAR STYLES
+ */
+
+/* General Calendar */
+.iccalendar {
+	display: block;
+	margin: auto !important;
+	padding: 3px !important;
+}
+.iccalendar div {
+	padding: 0px !important;
+	margin: 0px !important;
+	border: 0px;
+	text-align: center;
+}
+
+/* General Table */
+.iccalendar table {
+	padding: 1% !important;
+	margin: 0px !important;
+	border:0px;
+}
+.iccalendar table th {
+	font-size: 10px;
+	font-weight: 500;
+	padding: 0px !important;
+	margin: 0px !important;
+	text-align: center;
+	border: 0px;
+}
+.iccalendar table tr {
+	padding: 0px !important;
+	margin: 0px !important;
+	border: 0px;
+}
+
+
+/*
+ * DAYS STYLES
+ */
+
+/* General */
+.iccalendar table td {
+	padding: 3px !important;
+	margin: 0px !important;
+	border: 0px;
+}
+.iccalendar table td div {
+	text-align: center;
+	font-size: 10px;
+	border-radius: 3px;
+	line-height: 20px;
+	border: 0px solid #DDDDDD;
+	width: auto !important;
+}
+
+/* Styles for days (today or else) */
+.iccalendar table td div.style_Today {
+	border: 1px solid #777;
+	line-height: 18px;
+	font-size: 12px;
+	font-weight: bold;
+	text-shadow: 0px 0px 10px #777;
+	box-shadow: 0px 0px 5px #999;
+}
+.iccalendar table td div.style_Day {
+	border: none;
+}
+
+/* In case of no event */
+.iccalendar .no-event {
+}
+
+/* In case of event */
+.iccalendar table td .icevent a {
+	display: block;
+	text-align: center;
+	height: 100%;
+	color: #fff;
+	text-decoration: none;
+	z-index: 1000;
+}
+.iccalendar table td .icevent a:hover,
+.iccalendar table td .icevent a:focus {
+	border-radius: 3px;
+	background: #333;
+}
+
+/* Dark background */
+.ic-dark {
+	color: #fff !important;
+}
+/* Bright background */
+.ic-bright {
+	color: #111 !important;
+}
+.iccalendar table td .icevent a .ic-bright {
+	display: block;
+	text-align: center;
+	height: 100%;
+	color: #111 !important;
+	text-decoration: none;
+}
+.iccalendar table td .icevent a:hover .ic-bright,
+.iccalendar table td .icevent a:focus .ic-bright {
+	border-radius: 3px;
+	color: #fff !important;
+	background: #333;
+}
+
+/* In case of multi-event day */
+.iccalendar table td .icmulti a {
+	background: url(../images/plus.png) top right no-repeat;
+	display: block;
+	text-align: center;
+	height: 100%;
+	color: #fff !important;
+	text-decoration: none;
+	border-radius: 3px;
+}
+.iccalendar table td .icmulti a:hover,
+.iccalendar table td .icevent a:focus {
+	background: #333;
+}
+
+/* In case of multi-event day (bright background) */
+.iccalendar table td .icmulti a .bright {
+	background: url(../images/plus.png) top right no-repeat;
+	display: block;
+	text-align: center;
+	height: 100%;
+	color: #111 !important;
+	text-decoration: none;
+	border-radius: 3px;
+}
+.iccalendar table td .icmulti a:hover .bright,
+.iccalendar table td .icevent a:focus .bright {
+	color: #fff !important;
+	background: #333;
+}
+
+/* Loading... */
+.icloading_box {
+	display: block;
+	height: 172px;
+	font-size: 10px;
+}
+.icloading_img {
+	display: block;
+	width: 100%;
+	height: 172px;
+	background: url(../images/ic_load.gif) 50% 50% no-repeat
+}
+
+
+/*
+ * SCRIPT FUNCTION (Dates with event)
+ */
+
+/* General */
+.icevent,
+.icmulti {}
+
+/* Text (Don't modify it!) */
+.icevent .spanEv,
+.icmulti .spanEv {
+	display: none !important;
+}
+
+/* Date (Don't modify it!) */
+.icevent .date,
+.icmulti .date {
+	display: none !important;
+}
+
+/* Link */
+.icevent a,
+.icmulti a {
+	cursor: pointer;
+}
+
+
+/*
+ * NAVIGATOR
+ */
+
+/* Arrows General */
+.icagendabtn {
+	font-family: arial;
+}
+
+/* Navigator General */
+.icnav {
+	font-size: 10px;
+	padding: 0px !important;
+	margin: 0px !important;
+	min-height: 24px;
+}
+
+/* Arrows General */
+.icnav .backicY,
+.icnav .backic,
+.icnav .nextic,
+.icnav .nexticY {
+	display: block;
+	text-decoration: none;
+	color: #555555;
+}
+.icnav .backicY {
+	letter-spacing: -3px;
+	margin-right: 2px !important;
+}
+.icnav .backic {
+	letter-spacing: 0px;
+	margin-right: 2px !important;
+	margin-left: 3px !important;
+}
+.icnav .nextic {
+	letter-spacing: 0px;
+	margin-left: 2px !important;
+}
+.icnav .nexticY {
+	letter-spacing: -3px;
+	margin-right: 2px !important;
+	margin-left: 2px !important;
+}
+
+/* Arrows Back Month and Year (Left) */
+.icnav .backic,
+.icnav .backicY {
+	float: left !important;
+}
+
+/* Arrows Next Month and Year (Right) */
+.icnav .nextic,
+.icnav .nexticY {
+	float: right !important;
+}
+
+/* Arrows Back and Next - Month */
+.icnav .backic,
+.icnav .nextic {
+	background: none;
+	font-size: 12px;
+	width: auto !important;
+	cursor: pointer;
+}
+
+/* Arrows Back and Next - Year */
+.icnav .backicY,
+.icnav .nexticY {
+	background: none;
+	font-size: 12px;
+	width: auto !important;
+	cursor: pointer;
+}
+
+/* Arrows Over */
+.icnav .backic:hover,
+.icnav .nextic:hover,
+.icnav .backicY:hover,
+.icnav .nexticY:hover {
+	background: none;
+	color: #333333;
+	cursor: pointer;
+}
+
+/* Navigator Title (month and year) */
+.icnav .titleic {
+	font-size: 12px;
+	text-align: center;
+	width: auto !important;
+}
+
+
+/*
+ * INFO TIP
+ */
+
+/* General */
+#ictip {
+	font-family: arial;
+	text-align: left;
+	background: #ffffff;
+	background: rgba(255,255,255,1);
+	border: 1px solid #ccc;
+	padding: 15px;
+	width: auto;
+	min-width: 350px;
+	border-radius: 7px;
+	z-index: 10000;
+	max-height: 100%;
+	overflow-y: auto;
+}
+#ictip .ictip-event {
+	display: block;
+	float: left;
+	width: 100%;
+	padding: 15px 0;
+	border-top: 1px solid #eee;
+}
+#ictip span {
+	margin: 10px;
+	font-size: 0.8em;
+}
+#ictip a {
+	display: block;
+	font-size: 1.2em;
+	text-decoration: none;
+	background: none;
+}
+
+/* Date Header */
+#ictip .ictip-date {
+}
+#ictip span.ictip-date-lbl {
+	font-variant: small-caps;
+}
+#ictip span.ictip-date-format {
+	font-size: 1em;
+}
+
+/* Close "X" */
+#ictip a.close {
+	position: absolute;
+	display: block;
+	width: auto;
+	top: 15px;
+	right: 15px;
+	color: red;
+	text-decoration: none !important;
+}
+#ictip a.close:hover {
+	background: none !important;
+	color: black;
+	cursor: pointer;
+}
+
+/* Event Div */
+#ictip div.linkTo {
+	color: #333;
+	background: none;
+	text-decoration: none;
+	transition: all 0.5s;
+	-moz-transition: all 0.5s;
+	-webkit-transition: all 0.5s;
+	-o-transition: all 0.5s;
+}
+#ictip div.linkTo:hover {
+	color: #111;
+	background: rgba(0,0,0,0.1);
+	border-radius: 5px;
+}
+
+/* Contener of the image */
+#ictip span.img {
+	display: block;
+	width: 100px;
+	float: left;
+	text-align: center;
+	padding: 3px;
+	border-radius: 3px;
+	box-sizing: content-box;
+}
+
+/* Image Thumb */
+#ictip span.img img {
+	width: 100px;
+	border: 0px solid #ccc;
+	border-radius: 3px;
+	opacity: 1 !important; /* Added due to override of some site templates (Shape5 vertex, ...) */
+}
+
+/* no-image */
+#ictip div.noimg {
+	color: #FFFFFF;
+	font-size: 10px;
+	text-align: center;
+	padding: 3px;
+}
+#ictip .bright {
+	color: #111111 !important;
+}
+
+/* Event Title */
+#ictip .ictip-event-title {
+	display: block;
+	min-width: 200px;
+	font-weight: bold;
+	padding: 8px 5px 3px 5px;
+}
+
+/* Event Info */
+#ictip .ictip-info {
+	display: block;
+	min-width: 200px;
+	font-size: 12px;
+	padding: 0 8px 2px 8px;
+}
+#ictip .ictip-time {
+	font-size: 14px;
+	padding: 0 8px;
+}
+#ictip .ictip-location {
+	font-size: 12px;
+	padding: 0 8px 3px 8px;
+}
+#ictip .ictip-desc {
+	font-size: 12px;
+	color: #555;
+	line-height: 14px;
+}
+
+/* Contener of the description */
+#ictip span.bloc {
+	display: block;
+	width: 300px;
+	float: left;
+	margin: 3px;
+}
+
+/* Registration Infos */
+#ictip div.regButtons {
+	text-align: center;
+	padding: 5px 1px;
+}
+#ictip span.iCreg {
+	display: inline-block;
+	font-size: 11px;
+	margin: 0 3px;
+	padding: 1px 5px;
+	text-align: center;
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
+	-o-border-radius: 5px;
+	border-radius: 5px;
+	box-shadow: 0px 0px 1px #333;
+/*	cursor: pointer; */
+}
+#ictip span.iCreg.available,
+#ictip span.iCreg.closed {
+	color: black;
+	background: white;
+}
+#ictip span.iCreg.ticketsleft {
+	color: #fff;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+	background-color: #5bb75b;
+	background-image: -moz-linear-gradient(top,#62c462,#51a351);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#51a351));
+	background-image: -webkit-linear-gradient(top,#62c462,#51a351);
+	background-image: -o-linear-gradient(top,#62c462,#51a351);
+	background-image: linear-gradient(to bottom,#62c462,#51a351);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0);
+	border-color: #51a351 #51a351 #387038;
+	*background-color: #51a351;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+#ictip span.iCreg.registered {
+	color: #fff;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+	background-color: #1d6cb0;
+	background-image: -moz-linear-gradient(top,#2384d3,#15497c);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#2384d3),to(#15497c));
+	background-image: -webkit-linear-gradient(top,#2384d3,#15497c);
+	background-image: -o-linear-gradient(top,#2384d3,#15497c);
+	background-image: linear-gradient(to bottom,#2384d3,#15497c);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff2384d3', endColorstr='#ff15497c', GradientType=0);
+	border-color: #15497c #15497c #0a223b;
+	border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+	*background-color: #15497c;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+
+/* End function clear <div> */
+#ictip .clr {
+	clear: both;
+	display: block;
+}
+
+/* Features */
+#ictip .ic-features-container {
+	margin: 2px 8px 2px 2px;
+}
+#ictip .ic-feature-icon {
+	float: right;
+	margin: 0px 0.5px;
+}
+
+/* Messages Info */
+.ic-msg-no-event {
+	font-size: 0.8em;
+	text-align: center;
+}
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/default/css/default_module_large.css b/deployed/icagenda/components/com_icagenda/themes/packs/default/css/default_module_large.css
new file mode 100644
index 00000000..e7dcaa94
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/themes/packs/default/css/default_module_large.css
@@ -0,0 +1,6 @@
+/*
+ * MOD_ICCALENDAR
+ * Large devices (usually a desktop computer)
+ * SCREEN WIDTH > 'Large Screen Threshold'
+ * Default : SCREEN WIDTH > 1201
+ */
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/default/css/default_module_medium.css b/deployed/icagenda/components/com_icagenda/themes/packs/default/css/default_module_medium.css
new file mode 100644
index 00000000..01d21203
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/themes/packs/default/css/default_module_medium.css
@@ -0,0 +1,6 @@
+/*
+ * MOD_ICCALENDAR
+ * Medium devices (usually a laptop computer)
+ * 'Medium Screen Threshold' < SCREEN WIDTH < ('Large Screen Threshold' - 1)
+ * Default : 769 < SCREEN WIDTH < 1200
+ */
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/default/css/default_module_small.css b/deployed/icagenda/components/com_icagenda/themes/packs/default/css/default_module_small.css
new file mode 100644
index 00000000..87b04673
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/themes/packs/default/css/default_module_small.css
@@ -0,0 +1,6 @@
+/*
+ * MOD_ICCALENDAR
+ * Small devices (usually a tablet computer)
+ * 'Small Screen Threshold' < SCREEN WIDTH < ('Medium Screen Threshold' - 1)
+ * Default : 481 < SCREEN WIDTH < 768
+ */
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/default/css/default_module_xsmall.css b/deployed/icagenda/components/com_icagenda/themes/packs/default/css/default_module_xsmall.css
new file mode 100644
index 00000000..cd02807d
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/themes/packs/default/css/default_module_xsmall.css
@@ -0,0 +1,11 @@
+/*
+ * MOD_ICCALENDAR
+ * Extra small devices (usually a mobile phone)
+ * 0 < SCREEN WIDTH < ('Small Screen Threshold' - 1)
+ * Default : 0 < SCREEN WIDTH < 480
+ */
+
+/* Close "X" */
+	#ictip a.close {
+		padding-right:15px;
+	}
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/default/css/index.html b/deployed/icagenda/components/com_icagenda/themes/packs/default/css/index.html
new file mode 100644
index 00000000..fa6d84e8
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/themes/packs/default/css/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/default/default_calendar.php b/deployed/icagenda/components/com_icagenda/themes/packs/default/default_calendar.php
new file mode 100644
index 00000000..08e59618
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/themes/packs/default/default_calendar.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-05-04
+ *
+ * @package     iCagenda.Site
+ * @subpackage  Themes.Packs
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+ * @themepack   default
+ * @template    calendar
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+?>
+
+<!-- Calendar -->
+
+<?php // Code can be added at Top of calendar ?>
+
+<?php // Calendar Template ?>
+<?php
+	$stamp->days();
+?>
+
+<?php // Code can be added at Bottom of calendar ?>
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/default/default_day.php b/deployed/icagenda/components/com_icagenda/themes/packs/default/default_day.php
new file mode 100644
index 00000000..9fcdf39d
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/themes/packs/default/default_day.php
@@ -0,0 +1,179 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-05-04
+ *
+ * @package     iCagenda.Site
+ * @subpackage  Themes.Packs
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+ * @themepack   default
+ * @template    day
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+?>
+
+<!-- Module Calendar Day Pop-up -->
+
+<?php // Day with event ?>
+<?php if ($stamp->events) : ?>
+
+	<?php // Main Background of a day ?>
+
+	<div class="icevent <?php echo $multi_events; ?>" style="background:<?php echo $bg_day; ?> !important;">
+
+		<?php // Color of date text depending of the category color ?>
+		<a href="#" rel="nofollow" tabindex="0">
+		<div class="<?php echo $stamp->ifToday; ?> <?php echo $bgcolor; ?>" data-cal-date="<?php echo $stamp->this_day; ?>">
+			<?php echo $stamp->Days; ?>
+		</div>
+		</a>
+
+		<?php // Start of the Tip ?>
+		<div class="spanEv">
+
+			<?php foreach($events as $e) : ?>
+
+				<div class="ictip-event">
+					<?php echo '<a href="' . $e['url'] . '">'; ?>
+
+					<div class="linkTo">
+
+						<?php // Show image if exist ?>
+						<div class="ictip-img">
+						<?php
+						echo '<span style="background: ' . $e['cat_color'] . ';" class="img">';
+
+						if ($e['image'])
+						{
+							echo '<img src="' . $e['image'] . '" alt="" />';
+						}
+						else
+						{
+							echo '<span class="noimg ' . $bgcolor . '">' . $e['cat_title'] . '</span>';
+						}
+
+						echo '</span>';
+						?>
+						</div>
+
+						<?php // Display Title (with link to event) and other infos if set (city, country) ?>
+						<div class="ictip-event-title titletip">
+							<?php //echo '&rsaquo; ' . $e['title']; ?>
+							<?php echo $e['title']; ?>
+						</div>
+
+						<?php // Display feature icons, if required ?>
+						<?php if (!empty($e['features_icon_size'])) : ?>
+						<div class="ic-features-container">
+							<?php foreach ($e['features'] as $icon) : ?>
+								<div class="ic-feature-icon">
+									<img src="<?php echo $e['features_icon_root'] . $icon['icon'] ?>" alt="<?php echo $icon['icon_alt'] ?>" title="<?php echo $e['show_icon_title'] == '1' ? $icon['icon_alt'] : '' ?>">
+								</div>
+							<?php endforeach ?>
+						</div>
+						<?php endif; ?>
+
+						<?php // INFO ?>
+						<div class="ictip-info ic-clearfix">
+
+							<?php // Display Time (start) for each date ?>
+							<?php if ($e['displaytime']) : ?>
+								<div class="ictip-time">
+									<?php echo $e['time']; ?>
+								</div>
+							<?php endif; ?>
+
+							<?php // Display Venue Name, City and/or Country for each date ?>
+							<?php if ($e['place'] OR $e['city'] OR $e['country']) : ?>
+								<div class="ictip-location">
+									<?php // Display Venue Name ?>
+									<?php if ($e['place'] AND ($e['city'] OR $e['country']) ) : ?>
+										<?php echo $e['place'].', '; ?>
+									<?php else : ?>
+										<?php echo $e['place']; ?>
+									<?php endif; ?>
+									<?php // Display City and/or Country for each date ?>
+									<?php if ($e['city']) : ?>
+										<?php echo $e['city']; ?>
+									<?php endif; ?>
+									<?php if (($e['country']) && ($e['city'])) : ?>
+										<?php echo ', '.$e['country']; ?>
+									<?php endif; ?>
+									<?php if (($e['country']) AND (!$e['city'])) : ?>
+										<?php echo $e['country']; ?>
+									<?php endif; ?>
+								</div>
+							<?php endif; ?>
+
+							<?php // Display Short Description ?>
+							<?php if ($e['descShort']) : ?>
+								<div class="ictip-desc">
+									<?php echo $e['descShort']; ?>
+								</div>
+							<?php endif; ?>
+
+						</div>
+
+						<?php // Display Registration Information ?>
+						<?php if ($e['registrations']) : ?>
+						<div class="regButtons ic-reg-buttons">
+
+							<?php if (!$e['date_sold_out']) : ?>
+								<?php if ($e['maxTickets']) : ?>
+									<span class="iCreg available">
+										<?php echo JText::_( 'MOD_ICCALENDAR_SEATS_NUMBER' ) . ': ' . $e['maxTickets']; ?>
+									</span>
+								<?php endif; ?>
+								<?php if ($e['TicketsLeft'] && $e['maxTickets']) : ?>
+									<span class="iCreg ticketsleft">
+										<?php echo JText::_( 'MOD_ICCALENDAR_SEATS_AVAILABLE' ) . ': ' . $e['TicketsLeft']; ?>
+									</span>
+								<?php endif; ?>
+								<?php if ($e['registered']) : ?>
+									<span class="iCreg registered">
+										<?php echo JText::_( 'MOD_ICCALENDAR_ALREADY_REGISTERED' ) . ': ' . $e['registered']; ?>
+									</span>
+								<?php endif; ?>
+							<?php else : ?>
+								<span class="iCreg closed">
+									<?php echo $e['date_sold_out']; ?>
+								</span>
+							<?php endif; ?>
+
+						</div>
+						<?php endif; ?>
+					</div>
+					<?php echo '</a>'; ?>
+				</div>
+			<?php endforeach; ?>
+		</div>
+
+		<?php // Display Date at the top of the info-tip ?>
+		<div class="date ictip-date">
+			<span class="ictip-date-lbl">
+				<?php echo JTEXT::_('JDATE');  ?> :
+			</span>
+			<span class="ictip-date-format">
+				<?php echo $stamp->dateTitle; ?>
+			</span>
+		</div>
+
+	</div><?php // end of the day ?>
+
+<?php // Day with no event ?>
+<?php else : ?>
+	<div class="no-event <?php echo $stamp->ifToday; ?>" data-cal-date="<?php echo $stamp->this_day; ?>">
+		<?php echo $stamp->Days; ?>
+	</div>
+<?php endif; ?>
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/default/default_event.php b/deployed/icagenda/components/com_icagenda/themes/packs/default/default_event.php
new file mode 100644
index 00000000..a31b8bd0
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/themes/packs/default/default_event.php
@@ -0,0 +1,230 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.12 2020-01-16
+ *
+ * @package     iCagenda.Site
+ * @subpackage  Themes.Packs
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2020 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+ * @themepack   default
+ * @template    event
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+?>
+
+<!-- Event details -->
+
+<?php // Event Details Template ?>
+
+	<?php // Header ?>
+	<div class="ic-event-header ic-clearfix">
+		<h1>
+			<?php // Feature icons ?>
+			<?php if (!empty($FEATURES_ICONSIZE_EVENT)) : ?>
+			<div class="ic-features-container">
+				<?php foreach ($FEATURES_ICONS as $icon) : ?>
+				<div class="ic-feature-icon">
+					<img class="iCtip" src="<?php echo $FEATURES_ICONROOT_EVENT . $icon['icon'] ?>" alt="<?php echo $icon['icon_alt'] ?>" title="<?php echo $SHOW_ICON_TITLE == '1' ? $icon['icon_alt'] : '' ?>">
+				</div>
+				<?php endforeach ?>
+			</div>
+			<?php endif ?>
+
+			<?php // Title of the event ?>
+			<?php echo $EVENT_TITLE; ?>
+		</h1>
+	</div>
+
+	<?php // Sharing and Registration ?>
+	<div class="ic-event-buttons ic-clearfix">
+
+		<?php // AddThis Social Sharing ?>
+		<div class="ic-event-addthis ic-float-left">
+			<?php echo $EVENT_SHARING; ?>
+		</div>
+
+		<?php // Registration button ?>
+		<div class="ic-event-registration ic-float-right">
+			<?php echo $EVENT_REGISTRATION; ?>
+		</div>
+
+	</div>
+
+	<?php // Event Display ?>
+	<div class="ic-info ic-clearfix">
+
+		<?php // Show Image of the event ?>
+		<?php if ($EVENT_IMAGE): ?>
+			<div class="ic-image ic-align-center">
+				<?php echo $EVENT_IMAGE_TAG; ?>
+			</div>
+		<?php endif; ?>
+
+		<?php // Details of the event ?>
+		<div class="ic-details ic-align-left">
+
+			<div class="ic-divTable ic-align-left ic-clearfix">
+
+				<?php // Category ?>
+				<div class="ic-divRow ic-details-cat">
+					<div class="ic-divCell ic-label"><?php echo JTEXT::_('COM_ICAGENDA_EVENT_CAT');  ?></div>
+					<div class="ic-divCell ic-value"><?php echo $CATEGORY_TITLE; ?></div>
+				</div>
+
+				<?php // Next Date ('next' 'today' or 'last date' if no next date) ?>
+				<div class="ic-divRow ic-event-date">
+					<div class="ic-divCell ic-label"><?php echo $EVENT_VIEW_DATE_TEXT; ?></div>
+					<div class="ic-divCell ic-value"><?php echo $EVENT_VIEW_DATE; ?></div>
+				</div>
+
+				<?php // Venue name and/or address (different display, depending on the fields filled) ?>
+				<?php if ($EVENT_VENUE OR $EVENT_ADDRESS): ?>
+					<div class="ic-divRow">
+						<div class="ic-divCell ic-label"><?php echo JTEXT::_('COM_ICAGENDA_EVENT_PLACE'); ?></div>
+						<div class="ic-divCell ic-value">
+							<?php if (($EVENT_VENUE) and (!$EVENT_ADDRESS)): ?>
+								<?php echo $EVENT_VENUE; ?><?php if ($EVENT_CITY): ?> - <?php echo $EVENT_CITY;?><?php endif; ?>
+							<?php endif; ?>
+							<?php if ((!$EVENT_VENUE) and ($EVENT_ADDRESS)): ?>
+								<?php echo $EVENT_ADDRESS; ?>
+							<?php endif; ?>
+							<?php if (($EVENT_VENUE) and ($EVENT_ADDRESS)): ?>
+								<?php echo $EVENT_VENUE; ?> - <?php echo $EVENT_ADDRESS;?>
+							<?php endif; ?>
+						</div>
+					</div>
+				<?php endif; ?>
+
+				<?php // Information ?>
+				<?php if ($EVENT_INFOS): ?>
+
+					<?php // Max. Nb of tickets ?>
+					<?php if ($MAX_NB_OF_SEATS): ?>
+					<div class="ic-divRow ic-info-tickets">
+						<div class="ic-divCell ic-label"><?php echo JTEXT::_('COM_ICAGENDA_REGISTRATION_NUMBER_PLACES');  ?></div>
+						<div class="ic-divCell ic-value"><?php echo $MAX_NB_OF_SEATS; ?></div>
+					</div>
+					<?php endif; ?>
+
+					<?php // Nb of tickets available ?>
+					<?php if ($SEATS_AVAILABLE): ?>
+					<div class="ic-divRow ic-info-tickets-left">
+						<div class="ic-divCell ic-label"><?php echo JTEXT::_('COM_ICAGENDA_REGISTRATION_PLACES_LEFT');  ?></div>
+						<div class="ic-divCell ic-value"><?php echo $SEATS_AVAILABLE; ?></div>
+					</div>
+					<?php endif; ?>
+
+					<?php // Phone Number ?>
+					<?php if ($EVENT_PHONE): ?>
+					<div class="ic-divRow ic-info-phone">
+						<div class="ic-divCell ic-label"><?php echo JTEXT::_('COM_ICAGENDA_EVENT_PHONE');  ?></div>
+						<div class="ic-divCell ic-value"><?php echo $EVENT_PHONE; ?></div>
+					</div>
+					<?php endif; ?>
+
+					<?php // Email ?>
+					<?php if ($EVENT_EMAIL): ?>
+					<div class="ic-divRow ic-info-email">
+						<div class="ic-divCell ic-label"><?php echo JTEXT::_('COM_ICAGENDA_EVENT_MAIL');  ?></div>
+						<div class="ic-divCell ic-value"><?php echo $EVENT_EMAIL_CLOAKING; ?></div>
+					</div>
+					<?php endif; ?>
+
+					<?php // Website ?>
+					<?php if ($EVENT_WEBSITE): ?>
+					<div class="ic-divRow ic-info-website">
+						<div class="ic-divCell ic-label"><?php echo JTEXT::_('COM_ICAGENDA_EVENT_WEBSITE');  ?></div>
+						<div class="ic-divCell ic-value"><?php echo $EVENT_WEBSITE_LINK; ?></div>
+					</div>
+					<?php endif; ?>
+
+					<?php // Custom Fields ?>
+					<?php if ($CUSTOM_FIELDS): ?>
+						<?php foreach ($CUSTOM_FIELDS AS $FIELD): ?>
+							<?php if ($FIELD->title && $FIELD->value) : ?>
+								<div class="ic-divRow ic-info-<?php echo $FIELD->slug; ?>">
+									<div class="ic-divCell ic-label"><?php echo $FIELD->title;  ?></div>
+									<div class="ic-divCell ic-value"><?php echo $FIELD->value; ?></div>
+								</div>
+							<?php endif; ?>
+						<?php endforeach; ?>
+					<?php endif; ?>
+
+					<?php // File attached ?>
+					<?php if ($EVENT_ATTACHEMENTS): ?>
+						<div class="ic-divRow">
+							<div class="ic-divCell ic-label"><?php echo JTEXT::_('COM_ICAGENDA_EVENT_FILE'); ?></div>
+							<div class="ic-divCell ic-value"><?php echo $EVENT_ATTACHEMENTS_TAG; ?></div>
+						</div>
+					<?php endif; ?>
+
+				<?php endif; ?>
+
+			</div>
+
+		</div><?php // end div.details ?>
+
+
+		<?php // description text ?>
+		<?php if ($EVENT_DESC): ?>
+		<div class="ic-short-description">
+			<?php echo $EVENT_SHORTDESC; ?>
+		</div>
+		<div class="ic-full-description">
+			<?php echo $EVENT_DESCRIPTION; ?>
+		</div>
+		<?php endif; ?>
+
+	<div>&nbsp;</div>
+
+	<?php // Google Maps ?>
+	<?php if ($GOOGLEMAPS_COORDINATES): ?>
+	<div id="ic-detail-map" class="ic-clearfix">
+		<div class="icagenda_map">
+			<?php echo $EVENT_MAP; ?>
+		</div>
+	</div>
+	<?php endif; ?>
+
+	<div>&nbsp;</div>
+
+	<?php // List of all dates (multi-dates and/or period from to) ?>
+	<?php if ($EVENT_SINGLE_DATES OR $EVENT_PERIOD): ?>
+	<div id="ic-list-of-dates" class="ic-all-dates ic-clearfix">
+		<h3>
+			<?php echo JTEXT::_('COM_ICAGENDA_EVENT_DATES'); ?>
+		</h3>
+		<div class="ic-dates-list">
+
+			<?php // Period from X to X ?>
+			<?php echo $EVENT_PERIOD; ?>
+
+			<?php // Individual dates ?>
+			<?php echo $EVENT_SINGLE_DATES; ?>
+
+		</div>
+	</div>
+	<?php endif; ?>
+
+	</div><?php // end div.info ?>
+
+	<?php // List of Participants ?>
+	<?php if ($PARTICIPANTS_DISPLAY == 1 && $EVENT_PARTICIPANTS) : ?>
+	<div id="ic-list-of-participants" class="ic-participants ic-clearfix">
+		<h3><?php echo $PARTICIPANTS_HEADER; ?></h3>
+		<?php echo $EVENT_PARTICIPANTS; ?>
+	</div>
+	<?php endif; ?>
+
+<?php // end div Event-details ?>
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/default/default_events.php b/deployed/icagenda/components/com_icagenda/themes/packs/default/default_events.php
new file mode 100644
index 00000000..d437dc0a
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/themes/packs/default/default_events.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-05-04
+ *
+ * @package     iCagenda.Site
+ * @subpackage  Themes.Packs
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.2.8
+ *----------------------------------------------------------------------------
+ * @themepack   default
+ * @template    events
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+?>
+
+<!-- Event -->
+
+<?php // List of Events Template ?>
+
+	<?php // Show event ?>
+	<div class="ic-event ic-clearfix">
+
+		<?php // Display Date ?>
+		<?php if ($EVENT_NEXT): ?>
+
+			<div class="ic-box">
+				<div class="ic-box-date ic-float-left ic-align-center <?php echo $CATEGORY_FONTCOLOR; ?>" style="background:<?php echo $CATEGORY_COLOR; ?>;">
+					<div class="ic-date">
+
+						<?php // Day ?>
+						<div class="ic-day">
+							<?php echo $EVENT_DAY; ?>
+						</div>
+
+						<?php // Month ?>
+						<div class="ic-month">
+							<?php echo $EVENT_MONTH; ?>
+						</div>
+
+						<?php // Year ?>
+						<div class="ic-year">
+							<?php echo $EVENT_YEAR; ?>
+						</div>
+
+						<?php // Time ?>
+						<div class="ic-time">
+							<?php echo $EVENT_TIME; ?>
+						</div>
+
+					</div>
+				</div>
+
+				<?php // Right-Box with Infos ?>
+				<div class="ic-content">
+					<div>
+
+						<?php // Feature icons ?>
+						<?php if (!empty($FEATURES_ICONSIZE_LIST)) : ?>
+						<div class="ic-features-container">
+							<?php foreach ($FEATURES_ICONS as $icon) : ?>
+							<div class="ic-feature-icon">
+								<img class="iCtip" src="<?php echo $FEATURES_ICONROOT_LIST . $icon['icon'] ?>" alt="<?php echo $icon['icon_alt'] ?>" title="<?php echo $SHOW_ICON_TITLE == '1' ? $icon['icon_alt'] : '' ?>">
+							</div>
+							<?php endforeach ?>
+						</div>
+						<?php endif ?>
+
+						<?php // Category ?>
+						<div class="ic-cat">
+							<?php echo $CATEGORY_TITLE; ?>
+						</div>
+
+						<?php // Event Title with link to event + Manager Icons (included in titlebar) ?>
+						<h2>
+							<a href="<?php echo $EVENT_URL; ?>" title="<?php echo $EVENT_TITLE; ?>">
+								<?php echo $EVENT_TITLEBAR; ?>
+							</a>
+						</h2>
+
+						<?php // Location (different display, depending on the fields filled) ?>
+						<?php if ($EVENT_VENUE OR $EVENT_CITY): ?>
+						<div class="ic-place">
+
+							<?php // Venue name ?>
+							<?php if ($EVENT_VENUE): ?>
+								<strong><?php echo JTEXT::_('COM_ICAGENDA_EVENT_PLACE'); ?>:</strong> <?php echo $EVENT_VENUE;?>
+							<?php endif; ?>
+
+							<?php // If Venue Name exists and city set (Google Maps). Displays Country if set. ?>
+							<?php if (($EVENT_VENUE) AND ($EVENT_CITY)): ?>
+								<span>&nbsp;|&nbsp;</span>
+								<strong><?php echo JTEXT::_('COM_ICAGENDA_EVENT_CITY'); ?>:</strong> <?php echo $EVENT_CITY;?><?php if ($EVENT_COUNTRY): ?>, <?php echo $EVENT_COUNTRY;?><?php endif; ?>
+							<?php endif; ?>
+
+							<?php // If Venue Name doesn't exist and city set (Google Maps). Displays Country if set. ?>
+							<?php if ((!$EVENT_VENUE) AND ($EVENT_CITY)): ?>
+								<strong><?php echo JTEXT::_('COM_ICAGENDA_EVENT_CITY'); ?>:</strong> <?php echo $EVENT_CITY;?><?php if ($EVENT_COUNTRY): ?>, <?php echo $EVENT_COUNTRY;?><?php endif; ?>
+							<?php endif; ?>
+
+						</div>
+						<?php endif; ?>
+
+						<?php // Short Description ?>
+						<?php if ($EVENT_DESC): ?>
+							<div class="ic-descshort">
+								<?php echo $EVENT_INTRO_TEXT ; ?><?php echo $READ_MORE ; ?>
+							</div>
+						<?php endif; ?>
+
+						<?php // Addons Plugins (JComments, ...) - onListAddEventInfo ?>
+						<?php if ($IC_LIST_ADD_EVENT_INFO): ?>
+							<?php echo $IC_LIST_ADD_EVENT_INFO; ?>
+						<?php endif; ?>
+
+					</div>
+				</div>
+			</div>
+
+		<?php endif; ?>
+
+	</div>
+
+<?php // END Event ?>
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/default/default_registration.php b/deployed/icagenda/components/com_icagenda/themes/packs/default/default_registration.php
new file mode 100644
index 00000000..9d2fb2a4
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/themes/packs/default/default_registration.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-05-04
+ *
+ * @package     iCagenda.Site
+ * @subpackage  Themes.Packs
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       2.0
+ *----------------------------------------------------------------------------
+ * @themepack   default
+ * @template    registration
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+?>
+
+<!-- Event registration -->
+
+<?php // Header of Registration page ?>
+<?php // Show event ?>
+<div class="ic-reg-event ic-clearfix">
+	<div class="ic-reg-box">
+		<?php if ($EVENT_NEXT): ?>
+		<div class="ic-reg-icon ic-float-left">
+		</div>
+		<?php endif; ?>
+		<div class="ic-reg-content">
+
+			<?php // Category ?>
+			<div class="ic-reg-cat">
+				<?php echo $CATEGORY_TITLE; ?>
+			</div>
+
+			<?php // Event Title with link to event ?>
+			<div class="ic-reg-event-title">
+				<a href="<?php echo $EVENT_URL; ?>" title="<?php echo $EVENT_TITLE; ?>"><?php echo $EVENT_TITLE; ?></a>
+			</div>
+		</div>
+	</div>
+</div>
+<?php // END Header ?>
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/default/images/default_preview.png b/deployed/icagenda/components/com_icagenda/themes/packs/default/images/default_preview.png
new file mode 100644
index 00000000..8d768a59
Binary files /dev/null and b/deployed/icagenda/components/com_icagenda/themes/packs/default/images/default_preview.png differ
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/default/images/default_thumbnail.png b/deployed/icagenda/components/com_icagenda/themes/packs/default/images/default_thumbnail.png
new file mode 100644
index 00000000..bb46d099
Binary files /dev/null and b/deployed/icagenda/components/com_icagenda/themes/packs/default/images/default_thumbnail.png differ
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/default/images/ic_load.gif b/deployed/icagenda/components/com_icagenda/themes/packs/default/images/ic_load.gif
new file mode 100644
index 00000000..97d7e15b
Binary files /dev/null and b/deployed/icagenda/components/com_icagenda/themes/packs/default/images/ic_load.gif differ
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/default/images/index.html b/deployed/icagenda/components/com_icagenda/themes/packs/default/images/index.html
new file mode 100644
index 00000000..fa6d84e8
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/themes/packs/default/images/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/default/images/info.png b/deployed/icagenda/components/com_icagenda/themes/packs/default/images/info.png
new file mode 100644
index 00000000..cb6b2f02
Binary files /dev/null and b/deployed/icagenda/components/com_icagenda/themes/packs/default/images/info.png differ
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/default/images/minuslist.png b/deployed/icagenda/components/com_icagenda/themes/packs/default/images/minuslist.png
new file mode 100644
index 00000000..7f7e6762
Binary files /dev/null and b/deployed/icagenda/components/com_icagenda/themes/packs/default/images/minuslist.png differ
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/default/images/plus.png b/deployed/icagenda/components/com_icagenda/themes/packs/default/images/plus.png
new file mode 100644
index 00000000..f95a1d60
Binary files /dev/null and b/deployed/icagenda/components/com_icagenda/themes/packs/default/images/plus.png differ
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/default/images/pluslist.png b/deployed/icagenda/components/com_icagenda/themes/packs/default/images/pluslist.png
new file mode 100644
index 00000000..b90ad050
Binary files /dev/null and b/deployed/icagenda/components/com_icagenda/themes/packs/default/images/pluslist.png differ
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/default/images/regis-baloon.png b/deployed/icagenda/components/com_icagenda/themes/packs/default/images/regis-baloon.png
new file mode 100644
index 00000000..f63cbf78
Binary files /dev/null and b/deployed/icagenda/components/com_icagenda/themes/packs/default/images/regis-baloon.png differ
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/default/images/selector-arrow.png b/deployed/icagenda/components/com_icagenda/themes/packs/default/images/selector-arrow.png
new file mode 100644
index 00000000..80a89468
Binary files /dev/null and b/deployed/icagenda/components/com_icagenda/themes/packs/default/images/selector-arrow.png differ
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/default/index.html b/deployed/icagenda/components/com_icagenda/themes/packs/default/index.html
new file mode 100644
index 00000000..fa6d84e8
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/themes/packs/default/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/css/ic_rounded_component-rtl.css b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/css/ic_rounded_component-rtl.css
new file mode 100644
index 00000000..7f8bb1c3
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/css/ic_rounded_component-rtl.css
@@ -0,0 +1,160 @@
+/*
+ * COM_ICAGENDA
+ * iCagenda by JoomliC
+ * Theme Pack Official
+ * iC Rounded Theme - component
+ *
+ * @name		ic_rounded - RTL Styles
+ * @author		Lyr!C (JoomliC)
+ * @version 	3.4.0 2014-12-01
+ * @since		3.4.0
+ */
+
+
+/*
+ * Common Styles
+ */
+
+/* Align styles */
+.ic-align-left {
+	text-align: right;
+}
+.ic-align-right {
+	text-align: left;
+}
+
+/* Float styles */
+.ic-float-left {
+	float: right;
+}
+.ic-float-right {
+	float: left;
+}
+
+/* Table styles */
+.ic-divCell {
+	float: right; /* fix for buggy browsers */
+}
+
+/* Feature Icons */
+/* Event Detail */
+.event-header > .ic-features-container {
+	float: left;
+	margin-right: auto;
+	margin-left: -5px;
+}
+.ic-feature-icon {
+	float: left;
+}
+
+/* Buttons (print, Add to Cal, ...) */
+.ic-buttons {
+	float: left;
+}
+.ic-icon {
+	margin-left: auto;
+	margin-right: 7px;
+}
+div.ic-tip-link {
+	text-align: right;
+}
+div.ic-tip-link img {
+	margin-right: auto;
+	margin-left: 5px;
+}
+
+
+/*
+ * List of Events
+ */
+
+/* Box Date */
+.ic-box-date {
+	float: right;
+}
+
+/* Box Content */
+.ic-content {
+	float: right;
+}
+
+
+/*
+ * Event Details
+ */
+
+/* Back button */
+.ic-back {
+	text-align: right;
+}
+
+/* Description */
+.ic-detail-desc {
+	text-align: right;
+}
+
+/* Content Box */
+.ic-info-box-content {
+	text-align: right;
+}
+
+/* File attachment */
+.ic-info-box-file {
+	float: left;
+}
+
+/* List of Participants */
+#icagenda .panel h3.pane-toggler a {
+	background: #f5f5f5 url(../images/pluslist.png) 1% 50% no-repeat;
+}
+#icagenda .panel h3.pane-toggler-down a {
+	background: #f5f5f5 url(../images/minuslist.png) 1% 50% no-repeat;
+}
+#icagenda .pane-slider {
+	margin-right: -1px;
+}
+#icagenda .list_table {
+	float: right;
+}
+
+
+/*
+ * Form
+ */
+
+/* Label */
+.ic-control-label {
+	float: right;
+}
+
+/* Radio Buttons */
+.btn-group > .btn:first-child,
+.radio.btn-group > label:first-of-type {
+	border-radius: 4px 0 0 4px !important;
+}
+.btn-group > .btn:last-child {
+	border-radius: 0 4px 4px 0 !important;
+}
+
+/* Google Maps */
+.icmap-label {
+	float: right !important;
+	text-align: right !important;
+}
+.icmap-input {
+	text-align: right;
+}
+#geo_label {
+	float: right !important;
+}
+
+/*
+ * STYLES for classes not presents in Theme Pack php files, but in iCagenda core php files
+ */
+
+/* Header - List of Categories */
+#icagenda .cat_header_title {
+	float: right;
+	margin: 3px 0 -2px 10px;
+}
+
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/css/ic_rounded_component.css b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/css/ic_rounded_component.css
new file mode 100644
index 00000000..da77ffce
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/css/ic_rounded_component.css
@@ -0,0 +1,1317 @@
+/*
+ * COM_ICAGENDA
+ * iCagenda by JoomliC
+ * Theme Pack Official
+ * iC Rounded Theme - component
+ *
+ * @name        ic_rounded
+ * @author      Lyr!C (JoomliC)
+ * @version     3.7.12 2020-03-25
+ * @since       1.0
+ */
+
+
+/*
+ * GENERAL STYLES (list and event details)
+ */
+
+/* General */
+#icagenda {
+	width: auto;
+	margin: 0;
+	padding: 0;
+}
+
+/* Align styles */
+.ic-align-left {
+	text-align: left;
+}
+.ic-align-right {
+	text-align: right;
+}
+.ic-align-center {
+	text-align: center;
+}
+
+/* Float styles */
+.ic-float-left {
+	float: left;
+}
+.ic-float-right {
+	float: right;
+}
+.ic-float-none {
+	float: none;
+}
+
+/* Global Styling - colors */
+.ic-box-shadow {
+	box-shadow: 1px 1px 3px rgba(0, 0, 0, 0.15);
+}
+.ic-border {
+/*	border: 1px solid #E3E3E3; */
+	border: 1px solid #999;
+}
+
+/* Global Styling */
+.ic-rounded-10 {
+	border-radius: 10px;
+}
+
+/* Clear Float div */
+.ic-clearfix {
+	*zoom: 1;
+}
+.ic-clearfix:before,
+.ic-clearfix:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.ic-clearfix:after {
+	clear: both;
+}
+
+/* Style iC Alert */
+.ic-alert-info {}
+.ic-alert-error {}
+
+
+#icagenda .clr {
+	clear: both;
+}
+
+#icagenda a:hover {
+	text-decoration: none;
+}
+
+/* Style Title/Category Header */
+.ic-title-header {
+	display: block;
+	width: 70%;
+}
+.ic-title-header h2,
+.ic-title-header h2 a {
+	padding: 0;
+	margin: 0;
+	font-size: 22px;
+	line-height: 24px;
+	text-decoration: none;
+	text-shadow: none;
+	border-bottom: 0;
+	background: none;
+}
+.ic-title-header h2 a:link,
+.ic-title-header h2 a:visited {
+	padding: 0;
+	margin: 0;
+	text-decoration: none;
+	text-shadow: none;
+	background: none;
+}
+.ic-title-header a:hover,
+.ic-title-header a:active,
+.ic-title-header a:focus {
+	text-decoration: none;
+	text-shadow: none;
+	background: none;
+}
+.ic-title-cat {
+	display: block;
+	width: 30%;
+	margin-top: 9px;
+	font-size: 13px;
+	line-height: 15px;
+	font-weight: bold;
+	text-align: right;
+	text-transform: uppercase;
+    /*	border-radius: 4px; */
+}
+.ic-text-border-grey {
+	text-shadow:
+		-1px 0 grey,
+		0 1px grey,
+		1px 0 grey,
+		0 -1px grey;
+}
+.ic-text-border {
+	text-shadow: 0 0 #000; /* horizontal-offset vertical-offset 'blur' colour */
+	-moz-text-shadow: 0 0 #000;
+	-webkit-text-shadow: 0 0 #000;
+}
+.ic-text-shadow {
+	text-shadow: 0 0 2px #000; /* horizontal-offset vertical-offset 'blur' colour */
+	-moz-text-shadow: 0 0 2px #000;
+	-webkit-text-shadow: 0 0 2px #000;
+}
+.ic-title-cat .caticon {
+	color: #FFFFFF;
+	font-weight: normal;
+	padding: 2px;
+	border-radius:3px;
+	box-shadow: 0 0 0 1px rgba(0,0,0,0.25);
+	cursor: default;
+}
+
+
+/*
+ * LIST PAGE CSS
+ */
+
+/*
+ * Style Pagination
+ */
+.ic-pagination {
+	font-size: 14px;
+	line-height: 18px;
+	vertical-align: middle;
+}
+.ic-pagination a {
+	text-decoration: none;
+	background: #fff;
+}
+.ic-pagination a:hover,
+.ic-pagination a:active,
+.ic-pagination a:focus {
+	cursor: pointer;
+}
+.ic-pagination .ic-prev {
+	float: left;
+}
+.ic-pagination .ic-next {
+	float: right;
+}
+.ic-pagination .ic-prev,
+.ic-pagination .ic-next {
+	margin: 2px 0;
+}
+.ic-pagination .ic-prev a,
+.ic-pagination .ic-next a {
+	padding: 5px;
+	background: none;
+}
+.ic-pagination .ic-prev a:hover,
+.ic-pagination .ic-next a:hover {
+	background: #f3f3f3;
+	background: rgba(221, 221, 221, 0.2);
+}
+.ic-pagination .ic-prev-text,
+.ic-pagination .ic-next-text,
+.ic-pagination .iCicon-backic,
+.ic-pagination .iCicon-nextic {
+	font-family: inherit;
+	vertical-align: middle;
+}
+.ic-pagination .ic-go-to-page {
+	padding: 2px;
+	background: none;
+}
+.ic-pagination .ic-current-page {
+	padding: 2px;
+	background: none;
+}
+.ic-pagination .ic-current-page .ic-active {
+	color: #fff;
+	font-weight: bold;
+}
+.ic-pagination .ic-hidden-pages {
+	padding: 2px;
+	background: none;
+}
+
+
+/*
+ * Style Search Filters
+ */
+.ic-filters {
+	padding: 5px;
+	background: none; /* Old IE version */
+	background: rgba(221,221,221,0.2);
+}
+
+/* Search Filters - Main */
+.ic-filters-label {
+	background: #f0ad4e;
+	font-size : 20px;
+	line-height: 20px;
+	color: #fff;
+	text-align: center;
+	text-transform: uppercase;
+	word-wrap: break-word;
+	-webkit-hyphens: auto;
+	-moz-hyphens: auto;
+	-ms-hyphens: auto;
+	hyphens: auto;
+	font-weight: bold;
+	text-shadow: -1px 0 #eea236, 0 1px #eea236, 1px 0 #eea236, 0 -1px #eea236;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+}
+.ic-filters-label-title-3 {
+	height: 128px;
+	line-height: 128px;
+}
+.ic-filters-label-title-2 {
+	height: 84px;
+	line-height: 84px;
+}
+.ic-filters-label-title-1 {
+	height: 40px;
+	line-height: 40px;
+}
+.ic-filters-btn-3 {
+	height: 128px;
+	line-height: 128px;
+}
+.ic-filters-btn-2 {
+	height: 84px;
+	line-height: 84px;
+}
+.ic-filters-btn-1 {
+	height: 40px;
+	line-height: 40px;
+}
+
+/* Search Filters - filters */
+.ic-filter-search {
+	background: #dddddd;
+	background: rgba(221,221,221,0.2);
+	padding: 5px 19px 5px 5px;
+}
+.ic-filter-from,
+.ic-filter-to,
+.ic-filter-category,
+.ic-filter-month,
+.ic-filter-year {
+	background: #dddddd;
+	background: rgba(221,221,221,0.2);
+	padding: 5px;
+}
+.ic-filter-search input,
+.ic-filter-from input,
+.ic-filter-to input,
+.ic-filter-from button,
+.ic-filter-to button {
+	display: inline-block;
+	height: auto;
+	padding: 4px 6px !important;
+}
+.ic-filter-search input {
+	width: 100%;
+}
+.ic-filter-category select,
+.ic-filter-month select,
+.ic-filter-year select {
+	width: 100%;
+	height: 100%;
+}
+
+/* Search Filters - buttons */
+.ic-button-more {
+	background: rgba(221,221,221,0);
+	padding: 0;
+}
+.ic-filter-more-btn {
+	display: block;
+    width: auto;
+	height: 40px;
+	line-height: 40px;
+	padding: 0;
+	background: #5bc0de;
+	border: 1px solid #46b8da;
+    border-radius: 0;
+	text-align: center;
+	color: #fff;
+	font-weight: bold;
+	text-shadow: -1px 0 #269abc, 0 1px #269abc, 1px 0 #269abc, 0 -1px #269abc;
+	word-wrap: break-word;
+	-webkit-hyphens: auto;
+	-moz-hyphens: auto;
+	-ms-hyphens: auto;
+	hyphens: auto;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+}
+.ic-filter-more-btn .iCicon-arrow-down,
+.ic-filter-more-btn .iCicon-arrow-up {
+	vertical-align: middle;
+}
+
+.ic-filter-more-btn:hover {
+	background: #31b0d5;
+	color: #fff;
+	border: 1px solid #269abc;
+	cursor: pointer;
+}
+.ic-filter-more-btn.ic-active {
+	background: #5bc0de;
+	color: #fff;
+	text-shadow: -1px 0 #2083a1, 0 1px #2083a1, 1px 0 #2083a1, 0 -1px #2083a1;
+	border: 1px solid #2083a1;
+}
+.ic-filter-more-btn.ic-inactive {
+	background: #5bc0de;
+	color: #fff;
+	border: 1px solid #46b8da;
+}
+.ic-filters-controls {
+	background: #dddddd;
+	background: rgba(221,221,221,0.2);
+	text-align: center;
+	padding: 0;
+}
+.ic-control-submit {
+}
+.ic-control-reset {
+}
+.ic-filters-controls button {
+	width: 100%;
+	border-radius: 0;
+	margin: 0;
+	padding: 0;
+	word-wrap: break-word;
+	-webkit-hyphens: auto;
+	-moz-hyphens: auto;
+	-ms-hyphens: auto;
+	hyphens: auto;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+}
+.ic-filter-submit-btn {
+	font-size: 16px;
+	color: #fff;
+	background: #5cb85c;
+	border: 1px solid #4cae4c;
+	font-weight: bold;
+	text-shadow: -1px 0 #398439, 0 1px #398439, 1px 0 #398439, 0 -1px #398439;
+}
+.ic-filter-submit-btn:hover {
+	background: #449d44;
+	border: 1px solid #398439;
+}
+.ic-filter-reset-btn {
+	font-size: 13px;
+	color: #fff;
+	background: #d9534f;
+	border: 1px solid #d43f3a;
+	font-weight: bold;
+	text-shadow: -1px 0 #ac2925, 0 1px #ac2925, 1px 0 #ac2925, 0 -1px #ac2925;
+}
+.ic-filter-reset-btn:hover {
+	background: #c9302c;
+	border: 1px solid #ac2925;
+}
+
+
+/*
+ * Style Background alternative
+ */
+.ic-event {
+	margin: 2% 0;
+	padding: 0.5%;
+	border-radius: 6px;
+	background: none; /* Old IE version */
+	background: rgba(221,221,221,0.1);
+}
+.ic-event:nth-child(2n+1) {
+	background: none; /* Old IE version */
+	background: rgba(221,221,221,0.2);
+}
+
+
+/*
+ * Style Box Date
+ */
+.ic-box-date {
+	width: 18%;
+	height: 80px;
+	padding: 3%;
+	padding-top: 25px;
+	text-align: center;
+	font-size: 20px;
+	color: #fff;
+	font-weight: bold;
+	float: left;
+	margin: 0.5%;
+	border-radius: 10px;
+	text-shadow: #000 2px 2px 10px;
+	background-color: #ddd;
+	background-repeat: no-repeat;
+	background-position: center center;
+	background-size: cover;
+	border-width: 1px;
+	border-style: solid;
+	border-color: #ddd; /*overrided inline by category color in ic_rounded_events.php file */
+	/* css3 box-sizing added to prevent conflict with a site template provider who adds a 'problematic' style for div tags */
+	box-sizing: content-box;
+}
+.ic-box-date:hover {
+	transition: border-radius 0.5s, color 0.5s;
+	-moz-transition: border-radius 0.5s, color 0.5s;
+	-webkit-transition: border-radius 0.5s, color 0.5s;
+	-o-transition: border-radius 0.5s, color 0.5s;
+	border-radius: 15px;
+}
+
+/* Current period */
+.ic-current-period {
+	text-decoration: overline;
+}
+
+#icagenda .fontColor {
+	color: #333 !important;
+}
+
+/* Box Date content */
+.ic-date {
+	line-height: 0 !important;
+	font-size: 30px;
+}
+.ic-day {
+	line-height: 40px !important;
+	font-size: 40px;
+	font-weight: bold;
+	margin: 0 -6%;
+}
+.ic-month {
+	line-height: 24px !important;
+	font-size: 24px;
+	letter-spacing: 0;
+	margin-left: 0;
+	font-weight: normal;
+}
+.ic-year {
+	line-height: 17px !important;
+	font-size: 15px;
+	letter-spacing: 2px;
+	margin-left: 3px;
+	font-weight: bold;
+}
+.ic-time {
+	line-height: 15px !important;
+	font-size: 13px;
+	letter-spacing: 1px;
+	margin-left: 3px;
+	font-weight: bold;
+}
+.ic-no-image {
+	line-height: 13px !important;
+	font-size: 8px;
+}
+
+
+/*
+ * Style Content (Title, Category, Description...)
+ */
+.ic-content {
+	width: 72%;
+	margin: 1%;
+	float: left;
+/*	color: #555; Removed to be more friendly with dark site templates */
+}
+.ic-content .ic-event-title {
+	border-bottom: 1px solid #cccccc;
+	height: auto;
+	margin: 0;
+	padding-bottom: 3px !important;
+}
+.ic-content .category {
+	text-align: right;
+	float: right;
+	font-size: 0.8em;
+	text-transform: uppercase;
+	margin: 0;
+	padding: 0;
+}
+.ic-content .ic-next-date {
+	margin: 5px 0;
+	font-size: 16px;
+}
+.ic-place {
+	font-weight: normal;
+	font-size: 14px;
+}
+.ic-descshort {
+	font-weight: normal;
+	font-size: 12px;
+	margin: 5px 0 0 0 !important;
+}
+.ic-descshort p {
+	margin: 0px !important;
+}
+.ic-more-info {
+	background: none;
+	float: right;
+	font-weight: bold;
+	font-size: 10px;
+	text-transform: uppercase;
+	cursor: pointer;
+}
+.ic-more-info a:link,
+.ic-more-info a:visited {
+	background: none;
+/*	color: #555; Removed to be more friendly with dark site templates */
+	text-decoration: none;
+}
+.ic-more-info a:hover,
+.ic-more-info a:active,
+.ic-more-info a:focus {
+	background: none;
+/*	color: #111; Removed to be more friendly with dark site templates */
+	cursor: pointer;
+}
+
+
+
+/*
+ * EVENT PAGE CSS
+ */
+
+/* Event Header */
+.ic-event-header {
+	display: block;
+	width: auto;
+	height: auto;
+	margin-top: 10px;
+	margin-bottom: 10px;
+	background: #f5f5f5;
+	background: rgba(221,221,221,0.3);
+	padding: 10px 15px;
+	border: 1px solid #999;
+	border-radius: 10px;
+}
+.ic-event-header h1 {
+	font-size: 26px;
+/*	color: #333; Removed to be more friendly with dark site templates */
+	margin: 0;
+	padding: 0;
+	text-shadow: none;
+	text-decoration: none;
+	border: 0;
+}
+
+/* Event Header - Category */
+.ic-details-cat {
+	font-size: larger;
+	display: table-cell;
+	vertical-align: middle;
+}
+
+/* Style AddThis div */
+.ic-event-addthis {
+}
+
+/* Style Registration button */
+.ic-registration-box {
+	float: right;
+	margin: 3px 0;
+}
+.ic-registration-box a {
+	float: left;
+	text-decoration: none !important;
+}
+.ic-registration-box a:hover,
+.ic-registration-box a:focus {
+	float: left;
+	text-decoration: none !important;
+	cursor: pointer;
+}
+
+/* Text Register Button */
+.ic-event-register {
+	display: inline-block;
+	margin: 2px 3px 0 0;
+	line-height: 16px;
+}
+
+/* Text Event Full Button */
+.ic-event-full {
+	display: inline-block;
+	margin: 2px 3px 0 0;
+	line-height: 16px;
+}
+
+/* Text Event Finished Button */
+.ic-event-finished {
+	display: inline-block;
+	margin: 2px 3px 0 0;
+	line-height: 16px;
+}
+
+/* Image Button (removed in 3.3.7) */
+#icagenda .regis_imgbutton {display:block; margin:0 3px; height:16px; line-height:16px; width:16px; background:url('../../../../../../media/com_icagenda/images/btn-regis.png') no-repeat;}
+#icagenda .regis_imgbutton:hover {text-decoration:none; cursor: pointer;}
+
+/* icon people (nb of registered users) (added in 3.3.7) */
+.ic-people {
+	color: #999;
+}
+
+/* Nb of registered people (in bubble) */
+.ic-registered {
+	display: inline-block;
+	color: #333333;
+	text-align: center;
+	background: url('../images/regis-baloon.png');
+	height: 16px;
+	line-height: 16px;
+	width: 36px;
+	font-size: 11px;
+	font-weight: bold;
+}
+
+/* Style Event General */
+.ic-info {
+	margin: 10px 0;
+	padding: 10px 5px 10px 5px;
+/*	color:#333333; Removed to be more friendly with dark site templates */
+	text-align: center;
+	background: #e5e5e5;
+	background: rgba(0,0,0,0.1);
+	border: 1px solid #999;
+	border-radius: 10px;
+	word-break: break-word;
+	word-wrap: break-word;
+	-webkit-hyphens: auto;
+	-moz-hyphens: auto;
+	hyphens: auto;
+}
+.ic-info .ic-details {
+	text-align: center;
+	padding: 1%;
+}
+.ic-info .ic-details label {
+	float: none !important;
+	font-weight: bold;
+}
+
+/* Style Image */
+.ic-image {
+	text-align: center;
+}
+.ic-image img {
+	max-width: 98%;
+	border: 0px solid #ccc;
+	margin-bottom: 10px;
+	border-radius: 5px;
+}
+
+/* Style Time (in date) */
+#icagenda .evttime {
+	font-size: 0.8em;
+}
+.ic-next-today {
+	font-weight: bold;
+}
+.ic-period-starttime,
+.ic-period-endtime,
+.ic-single-starttime,
+.ic-single-endtime,
+.ic-datetime-separator {
+	font-size: 0.8em;
+}
+
+/* Style Table-style List */
+.ic-divTable {
+	display: table;
+	width: auto;
+	border-collapse: separate;
+	border-spacing: 5px;
+}
+.ic-divRow {
+	display: table-row;
+}
+.ic-divCell {
+/*	float: left; */ /* fix for buggy browsers */
+	padding: 1px 5px;
+}
+.ic-label {
+	display: table-cell;
+	min-width: 110px;
+	font-weight: bold;
+}
+.ic-value {
+	display: table-cell;
+	width: auto;
+}
+
+/* Style Description */
+.ic-detail-desc {
+	padding: 10px;
+	margin: 10px;
+	background: #fff;
+	background: rgba(255,255,255,0.9);
+	color: #333;
+	text-align: left;
+	text-shadow: none;
+	border: 0;
+	border-radius: 5px;
+}
+.ic-short-description {
+	font-weight: bold;
+}
+.ic-full-description {
+}
+
+/* Style Information */
+.ic-info-box {
+	display: block;
+	width: 100%;
+	text-align:center;
+	background: #ccc;
+	color: #333;
+	padding-top: 0px;
+	margin: 0;
+	border: 0;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	-o-border-radius: 5px;
+	border-radius: 5px;
+}
+.ic-info-box-header label {
+	text-transform:uppercase;
+	font-weight:bold;
+}
+.ic-info-box-header {
+	display: block;
+	background: #555;
+	vertical-align: middle;
+	border: 0;
+	padding: 10px;
+	text-align: center;
+	color: #fff;
+	-webkit-border-radius: 5px 5px 0 0;
+	-moz-border-radius: 5px 5px 0 0;
+	-o-border-radius: 5px 5px 0 0;
+	border-radius: 5px 5px 0 0;
+}
+.ic-info-box-content {
+	display: block;
+	width: auto;
+	vertical-align: top;
+	border: 0;
+	margin: 10px;
+	text-align: left;
+	color: #111;
+}
+.ic-info-box-file {
+	display: block;
+	float: right;
+	width: auto;
+	background: #fafafa;
+	vertical-align: top;
+	text-align: center;
+	padding: 10px;
+	margin: 10px;
+	color: #333;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	-o-border-radius: 5px;
+	border-radius: 5px;
+}
+.ic-info-box-file label {
+	font-size: 0.8em;
+	color: #555;
+}
+.ic-download {
+	font-weight: bold;
+	text-decoration:none !important;
+}
+
+/* Slider */
+#icagenda .icpanel {
+}
+.ic-participants .panel {
+	border: none !important;
+}
+.ic-participants .panel h3 {
+	border: none !important;
+}
+.ic-participants {
+	padding: 5px;
+	border: 1px solid #999;
+	background: #f5f5f5;
+	background: rgba(221,221,221,0.3);
+}
+.ic-participants h3 a {
+	display: block;
+	text-decoration: none;
+	padding: 0 1%;
+/*	color: #444; Removed to be more friendly with dark site templates */
+	width: 98%;
+}
+.ic-participants .panel h3.pane-toggler a {
+	background: url(../images/pluslist.png) 99% 50% no-repeat;
+}
+.ic-participants .panel h3.pane-toggler-down a {
+	background: url(../images/minuslist.png) 99% 50% no-repeat;
+}
+#icagenda .pane-slider .ic-content {
+}
+#icagenda .pane-slider {
+	overflow: unset;
+}
+
+/* Slider Full list of Participants */
+#icagenda .list_table {
+	background:#cccccc;
+	background:rgba(204,204,204,0.5);
+	border-radius:3px 3px 3px 3px;
+	float:left;
+}
+#icagenda .imgbox {
+	width: 40px;
+	padding: 3px;
+}
+#icagenda .imgbox img {
+	border-radius: 3px 3px 3px 3px;
+	margin: 1px 0;
+}
+#icagenda .imgbox .ic-avatar {
+	font-size: 36px;
+	border-radius: 3px 3px 3px 3px;
+	margin: 1px 0;
+	color: #c4c4c4;
+	background: #fff;
+}
+#icagenda .list_name {
+	font-weight:bold;
+}
+#icagenda .list_places {
+	font-size:smaller;
+}
+#icagenda .list_date {
+	font-size:smaller;
+}
+
+/* Style Google Maps */
+#detail-map {
+	margin: 0px 2px 0 0;
+}
+#detail-map .icagenda_map {
+	margin: auto;
+	text-shadow: none;
+	border: 1px solid #999;
+	border-radius: 10px;
+	background: #ffffff;
+}
+
+/* Style All Dates */
+#detail-date-list {}
+#detail-date-list .datesList {}
+#detail-date-list .alldates ul {
+	padding-left:1%;
+}
+#detail-date-list .alldates li {
+	background-image:none;
+}
+#detail-date-list .alldates h3 {
+	font-size:12px;
+	margin-top:10px;
+	font-weight:bold;
+}
+
+
+/*
+ * Feature Icons
+ */
+
+/* Event List */
+.ic-event-title > .ic-features-container {
+}
+/* Event Detail */
+.ic-event-header > .ic-features-container {
+	display: block;
+	margin-right: -5px;
+	margin-top: 5px;
+}
+.ic-feature-icon {
+	float: right;
+	margin: 3px 0.5px;
+}
+
+
+/*
+ * FORMS - COMMON STYLES
+ */
+
+/* Terms and Conditions Legend */
+.ic-terms-legend {
+	margin: 12px 0;
+}
+
+
+/* deprecated 3.6.0 (kept for Joomla 2.5 ?)
+/* Style Form (general) */
+.icagenda_form {
+	color: #333;
+}
+.icagenda_form h3 {
+	color: #333;
+	font-weight: bold;
+	font-size: 14px;
+	margin: 15px 0 10px 0;
+}
+.icagenda_form legend {
+	font-weight: bold;
+}
+.icagenda_form .fieldset {
+	border-radius: 5px;
+	margin: 10px 0;
+	background: #f3f3f3;
+	padding: 10px;
+}
+
+/* Style Label */
+.icagenda_form label {
+	color: #333;
+	display: block;
+	width: 130px;
+	float: left;
+	margin: 0 3px;
+}
+
+/* Style Input field */
+.icagenda_form input {
+	display: inline-block;
+	background-color: #fff;
+	border: 1px solid #ccc;
+	box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.075) inset;
+	transition: border 0.2s linear 0s, box-shadow 0.2s linear 0s;
+	border-radius: 3px;
+	padding: 3px;
+	width: auto;
+}
+.icagenda_form input[type="file"] {
+	width: 270px;
+}
+.icagenda_form .input-small {
+	width: 90px;
+}
+.icagenda_form .select-small {
+	width: 104px;
+}
+.icagenda_form .input-large {
+	width: 210px;
+}
+.icagenda_form .select-large {
+	width: 224px;
+}
+.icagenda_form .input-xlarge {
+	width: 270px;
+}
+.icagenda_form .select-xlarge {
+	width: 284px;
+}
+.icagenda_form .input-xxlarge {
+	width: 330px;
+}
+.icagenda_form .select-xxlarge {
+	width: 344px;
+}
+.icagenda_form .ic-date-input {
+	width: auto;
+}
+
+/* Style Form Invalid */
+.icagenda_form label.invalid {
+	color: red;
+	font-weight: bold;
+}
+.icagenda_form input.invalid,
+.icagenda_form select.invalid {
+	border: 2px solid red;
+	color: red;
+	font-weight: bold;
+}
+
+/* Style button left (joomla 2.5) */
+.icagenda_form .button2-left {
+	margin: 3px 3px 3px 0;
+	float: left;
+}
+
+/* Style Terms of Service content */
+.icagenda_form .ic-tos-content {
+	background: #c0c0c0;
+	color: #fff;
+	margin-top: 25px;
+	padding: 5px;
+	border: none;
+	border-radius: 5px;
+	text-align: center;
+}
+
+/* Style Terms of Service */
+.icagenda_form .ic-tos-text {
+	padding: 25px;
+	background: #fff;
+	color: #333;
+	text-align: left
+}
+.icagenda_form .ic-tos-agree {
+	color: #fff;
+	font-weight: bold;
+}
+
+/* Style Button Submit */
+.icagenda_form .button {
+	font-family: arial;
+	font-size: 12px;
+	background: #555;
+	color: #fff;
+	padding: 5px;
+	border: none;
+	border-radius: 6px;
+	text-align: center;
+}
+.icagenda_form .button:hover {
+	background: #c72031;
+	color: #fff;
+}
+.icagenda_form .ic-loader {
+	display: block;
+	width: 100%;
+	height: 60px;
+	background: url(../../../../../../media/com_icagenda/images/loader.gif) 50% 50% no-repeat;
+}
+
+/* Style Button Cancel */
+.icagenda_form .buttonx a {
+	font-family: arial;
+	font-size: 12px;
+	background: none !important;
+	text-decoration: none;
+	color: #555;
+	padding: 0px;
+	border: none;
+	border-radius: 6px;
+	text-align: center;
+}
+.icagenda_form .buttonx a:hover {
+	background: none !important;
+	text-decoration: none;
+	color: #c72031 !important;
+}
+
+
+/*
+ * SUBMIT AN EVENT FORM
+ */
+
+/* Short Description textarea */
+.ic-submit-shortdesc,
+.ic-submit-metadesc {
+	width: 100%;
+	box-sizing: border-box;
+}
+
+
+/*
+ * REGISTRATION FORM
+ */
+
+/* Style Title Registration */
+.ic-form-title h2 {}
+
+/* Style fields required info */
+.ic-required-info {
+	font-size: 0.95em;
+}
+
+/* Style Header*/
+.ic-reg-event {
+	background: none; /* Old IE version */
+	background: rgba(221,221,221,0.2);
+	border-radius: 5px;
+	margin: 5px 0;
+	padding: 0px;
+}
+
+/* Registration icon */
+.ic-reg-icon {
+	background: url(../../../../../../media/com_icagenda/images/registration-48.png) 50% 50% no-repeat;
+	display: block;
+	width: 48px;
+	height: 48px;
+	padding: 8px;
+	margin-right: 8px;
+}
+
+/* Style Right (Container Event title, category) */
+.ic-reg-content {
+	display: block;
+	border: 0;
+	margin: 0;
+	padding: 8px;
+	vertical-align: top;
+}
+
+/* Category */
+.ic-reg-cat {
+	color: #555555;
+	font-size: 12px;
+	line-height: 20px;
+	font-weight: bold;
+	text-transform: uppercase;
+}
+
+/* Event title */
+.ic-reg-event-title {
+	font-size: 22px;
+	line-height: 28px;
+	font-weight: bold;
+}
+
+/* Style Registration infos */
+.ic-reg-info {
+	font-size: 0.8em;
+}
+
+/* Google Maps */
+.icmap-label {
+	float: left;
+	width: 140px;
+	padding-top: 5px;
+	padding-right: 5px;
+	text-align: left;
+}
+.icmap-field {
+	margin: 5px;
+}
+.form-validate .icmap-field input,
+.icagenda_form .icmap-field input {
+	background-color: #eee;
+/*	width: auto; */
+	color: #777;
+}
+
+
+/*
+ * STYLES for classes not presents in Theme Pack php files, but in iCagenda core php files
+ */
+
+/* Style iCagenda Header - List of Events */
+.ic-header-container {
+}
+.ic-header-title {
+}
+.ic-header-subtitle {
+	font-size: 0.85em;
+}
+.ic-subtitle-string {
+}
+.ic-subtitle-pages {
+}
+
+/* Style Back Button */
+.ic-back {
+	display: block;
+	width: auto;
+	text-align: left;
+	font-size: 10px;
+	font-weight: normal;
+	text-decoration: none;
+	letter-spacing: 1px;
+}
+.ic-back a:link,
+.ic-back a:visited {
+	text-decoration:none;
+}
+.ic-back a:hover,
+.ic-back a:active,
+.ic-back a:focus {
+	text-decoration:none;
+}
+
+/* Buttons (print, Add to Cal, ...) */
+.ic-buttons {
+	display: block;
+	float: right;
+}
+.ic-icon {
+	display: inline-block;
+	margin-left: 7px;
+}
+.ic-printpopup-btn {
+	display: block;
+	text-align: center;
+	margin: 15px 0;
+}
+div.ic-tip-title {
+	text-align: center;
+	font-weight: bold;
+	margin-bottom: 3px;
+}
+div.ic-tip-link {
+	display: block;
+	text-align: left;
+	margin-bottom: 3px;
+}
+div.ic-tip-link a {
+	color: #D4D4D4;
+	text-decoration: none;
+}
+div.ic-tip-link a:hover {
+	color: #FFFFFF;
+}
+div.ic-tip-link img {
+	margin-right: 5px;
+}
+
+/* Header - List of Categories */
+.ic-header-categories {
+	display: block;
+	width: 100%;
+	margin-bottom: 20px;
+}
+#icagenda .cat_header_title {
+	display: block;
+	padding: 1px 7px;
+	font-size: 1em;
+	text-align: center;
+	color: #fff;
+	font-weight: normal;
+	float: left;
+	margin: 3px 10px -2px 0;
+	border-radius: 4px;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.15);
+	background: #dddddd;
+	background-size: cover;
+}
+#icagenda .cat_header_desc {
+	display: block;
+	padding: 3px 7px;
+	margin: 2px 0;
+}
+
+/* Share buttons (AddThis) */
+.ic-share {
+	float: right;
+	background: none;
+	padding: 5px 10px 5px 0;
+	text-shadow: none;
+	z-index: 1;
+}
+.ic-share a:link,
+.ic-share a:visited {
+/*	background: none; */
+	text-decoration: none;
+}
+.ic-share a:hover,
+.ic-share a:active,
+.ic-share a:focus {
+/*	background: none; */
+}
+
+/* Columns List of Participants (Full) */
+#icagenda .total {width:99%; min-width:180px; margin:0.5%;}
+#icagenda .demi {width:49%; min-width:180px; margin:0.5%;}
+#icagenda .tiers {width:32.3%; min-width:180px; margin:0.5%;}
+#icagenda .quart {width:24%; min-width:150px; margin:0.5%;}
+
+.names_noslide {text-align:justify;}
+.names_slide { padding:6px !important; text-align:justify;}
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/css/ic_rounded_component_large.css b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/css/ic_rounded_component_large.css
new file mode 100644
index 00000000..d8b47528
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/css/ic_rounded_component_large.css
@@ -0,0 +1,6 @@
+/*
+ * COM_ICAGENDA
+ * Large devices (usually a desktop computer)
+ * SCREEN WIDTH > 'Large Screen Threshold'
+ * Default : SCREEN WIDTH > 1201
+ */
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/css/ic_rounded_component_medium.css b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/css/ic_rounded_component_medium.css
new file mode 100644
index 00000000..d1b212cf
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/css/ic_rounded_component_medium.css
@@ -0,0 +1,46 @@
+/*
+ * COM_ICAGENDA
+ * Medium devices (usually a laptop computer)
+ * 'Medium Screen Threshold' < SCREEN WIDTH < ('Large Screen Threshold' - 1)
+ * Default : 769 < SCREEN WIDTH < 1200
+ */
+
+/* Style Information */
+.ic-info-box {
+	text-align: center;
+	width: auto;
+}
+
+.ic-info-box .ic-info-box-header {
+	width: 86%;
+}
+
+.ic-info-box .ic-info-box-content {
+	width: 64%;
+}
+
+.ic-info-box .ic-info-box-file {
+	width: 100px;
+}
+
+/* Filters */
+.ic-filters-label {
+	margin-bottom: 8px;
+}
+.ic-filters-label-title-2,
+.ic-filters-label-title-3 {
+	margin-bottom: -5px;
+	height: 40px;
+	line-height: 40px;
+}
+.ic-filters-btn-2 {
+	height: 40px;
+	line-height: 40px;
+}
+.ic-filters-controls {
+	padding: 0;
+}
+.ic-search-submit,
+.ic-search-reset {
+	width: 50%;
+}
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/css/ic_rounded_component_small.css b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/css/ic_rounded_component_small.css
new file mode 100644
index 00000000..8c0f7e56
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/css/ic_rounded_component_small.css
@@ -0,0 +1,59 @@
+/*
+ * COM_ICAGENDA
+ * Small devices (usually a tablet computer)
+ * 'Small Screen Threshold' < SCREEN WIDTH < ('Medium Screen Threshold' - 1)
+ * Default : 481 < SCREEN WIDTH < 768
+ */
+
+/* Style Title/Category Header (event details view) */
+.ic-event-header {
+	width: auto;
+}
+.ic-title-header {
+	width: 98%;
+	text-align: left;
+}
+.ic-title-cat {
+	width: 98%;
+	text-align: left;
+}
+
+/* Feature Icons */
+/* Event List */
+.ic-event-title > .ic-features-container {
+}
+/* Event Detail */
+.ic-event-header > .ic-features-container {
+	margin-right: 0;
+	margin-top: 0;
+}
+.ic-features-container {
+	clear: both;
+	text-align: center;
+}
+.ic-feature-icon {
+	float: none;
+	display: inline-block;
+}
+
+/* Filters */
+.ic-filters-label {
+	margin-bottom: 8px;
+}
+.ic-filters-label-title-2,
+.ic-filters-label-title-3 {
+	margin-bottom: -5px;
+	height: 40px;
+	line-height: 40px;
+}
+.ic-filters-btn-2 {
+	height: 40px;
+	line-height: 40px;
+}
+.ic-filters-controls {
+	padding: 0;
+}
+.ic-search-submit,
+.ic-search-reset {
+	width: 50%;
+}
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/css/ic_rounded_component_xsmall.css b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/css/ic_rounded_component_xsmall.css
new file mode 100644
index 00000000..83d1a916
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/css/ic_rounded_component_xsmall.css
@@ -0,0 +1,113 @@
+/*
+ * COM_ICAGENDA
+ * Extra small devices (usually a mobile phone)
+ * 0 < SCREEN WIDTH < ('Small Screen Threshold' - 1)
+ * Default : 0 < SCREEN WIDTH < 480
+ */
+
+/* Style Background alternative */
+.ic-event{
+	margin: 20px 0;
+}
+.ic-box-date {
+	width: auto;
+	float: none;
+}
+.ic-content {
+	width: auto;
+	float:none;
+}
+
+/* Style Title/Category Header (event details view) */
+.ic-event-header {
+	width: auto;
+}
+.ic-title-header {
+	width: 98%;
+	text-align: center;
+}
+.ic-title-cat {
+	width: 98%;
+	text-align: center;
+}
+
+/* Share buttons (AddThis) */
+.ic-share {
+	display:none;
+}
+
+/* Feature Icons */
+/* Event List */
+.ic-event-title > .ic-features-container {
+}
+/* Event Detail */
+.ic-event-header > .ic-features-container {
+	margin-right: 0;
+	margin-top: 0;
+}
+.ic-features-container {
+	clear: both;
+	text-align: center;
+}
+.ic-feature-icon {
+	float: none;
+	display: inline-block;
+}
+
+/* Style Information */
+.ic-info-box .ic-info-box-file {
+	width: auto;
+	float: none;
+}
+.ic-divCell {
+	float: left;
+}
+
+/* Style Input field */
+.icagenda_form input,
+.icagenda_form input[type="file"],
+.icagenda_form .input-large,
+.icagenda_form .input-xlarge,
+.icagenda_form .input-xxlarge,
+.icagenda_form .select-large,
+.icagenda_form .select-xlarge,
+.icagenda_form .select-xxlarge {
+	width: 90%;
+}
+.icagenda_form .input-small {
+	width: 90px;
+}
+.icagenda_form .select-small {
+	width: 114px;
+}
+.icagenda_form .ic-date-input {
+	width: auto;
+}
+.ic-captcha-label {
+	display: none;
+}
+
+/* Filters */
+.ic-filters-label {
+	margin-bottom: 8px;
+}
+.ic-filters-label-title-2,
+.ic-filters-label-title-3 {
+	margin-bottom: -5px;
+	height: 40px;
+	line-height: 40px;
+}
+.ic-filters-btn-2 {
+	height: 40px;
+	line-height: 40px;
+}
+.ic-filters-controls {
+	padding: 0;
+}
+.ic-search-submit,
+.ic-search-reset {
+	width: 100%;
+}
+.ic-button-more > .ic-row1 {
+	height: 40px;
+}
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/css/ic_rounded_module-rtl.css b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/css/ic_rounded_module-rtl.css
new file mode 100644
index 00000000..848321fb
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/css/ic_rounded_module-rtl.css
@@ -0,0 +1,31 @@
+/*
+ * MOD_ICCALENDAR
+ * iCagenda by JoomliC
+ * Theme Pack Official
+ * iC Rounded Theme - module calendar
+ *
+ * @name		ic_rounded - RTL
+ * @author		Lyr!C (JoomliC)
+ * @version 	3.4.0 2014-12-01
+ * @since		3.4.0
+ */
+
+
+#ictip {
+	text-align: right;
+}
+#ictip span.bloc {
+	float: right;
+}
+#ictip a.close {
+	right: auto;
+	left: 15px;
+}
+#ictip span.img {
+	float: right;
+}
+
+/* Features */
+#ictip .ic-feature-icon {
+	float: left;
+}
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/css/ic_rounded_module.css b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/css/ic_rounded_module.css
new file mode 100644
index 00000000..b30b2cef
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/css/ic_rounded_module.css
@@ -0,0 +1,516 @@
+/*
+ * MOD_ICCALENDAR
+ * iCagenda by JoomliC
+ * Theme Pack Official
+ * iC Rounded Theme - module calendar
+ *
+ * @name		ic_rounded
+ * @author		Lyr!C (JoomliC)
+ * @version 	3.7.10 2019-08-08
+ * @since		1.0
+ */
+
+
+/* Clear Float div */
+.ic-clearfix {
+	*zoom: 1;
+}
+.ic-clearfix:before,
+.ic-clearfix:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.ic-clearfix:after {
+	clear: both;
+}
+
+/*
+ * CALENDAR STYLES
+ */
+
+/* General Calendar */
+.ic_rounded.iccalendar {
+	display: block;
+	margin: auto;
+	padding: 3px;
+	border: 3px solid #ddd;
+	border-radius: 10px;
+	min-width: 150px;
+}
+
+/* General Table */
+.ic_rounded.iccalendar .ic-table table {
+	padding: 1%;
+	margin: 0;
+	border: 0;
+	border-collapse: collapse;
+}
+.ic_rounded.iccalendar .ic-table thead {
+	font-size: 10px;
+	font-weight: 500;
+}
+.ic_rounded.iccalendar .ic-table th {
+	padding: 0;
+	margin: 0;
+	text-align: center;
+	border: 0;
+}
+.ic_rounded.iccalendar .ic-table tr {
+	padding: 0;
+	margin: 0;
+	border: 0;
+}
+
+
+/*
+ * DAYS STYLES
+ */
+
+/* General */
+.ic_rounded.iccalendar .ic-table td {
+	padding: 3px;
+	margin: 0;
+	border: 0;
+}
+.ic_rounded.iccalendar .ic-table td div {
+	text-align: center;
+	font-size: 10px;
+	border-radius: 3px;
+	line-height: 20px;
+	border: none;
+	width: auto;
+}
+
+/* Styles for days (today or else) */
+.ic_rounded.iccalendar div.style_Today {
+	border: 1px;
+	border-color: #777;
+	line-height: 18px;
+	border-style: solid;
+	font-size: 12px;
+	font-weight: bold;
+	text-shadow: 0px 0px 10px #777;
+	box-shadow: 0px 0px 5px #999;
+}
+.ic_rounded.iccalendar div.style_Day {
+	border: none;
+}
+
+/* In case of no event */
+.ic_rounded.iccalendar .no-event {
+}
+
+/* In case of event */
+.ic_rounded.iccalendar .icevent a {
+	display: block;
+	text-align: center;
+	height: 100%;
+	color: #fff;
+	text-decoration: none;
+	z-index: 1000;
+}
+
+/* Dark background */
+.ic-dark {
+	color: #fff !important;
+}
+/* Bright background */
+.ic-bright {
+	color: #111 !important;
+}
+.ic_rounded.iccalendar .icevent a .ic-bright {
+	display: block;
+	text-align: center;
+	height: 100%;
+	color: #111;
+	text-decoration: none;
+}
+
+/* In case of multi-event day */
+.ic_rounded.iccalendar .icmulti a {
+	background: url(../images/plus.png) top right no-repeat;
+	display: block;
+	text-align: center;
+	height: 100%;
+	color: #fff;
+	text-decoration: none;
+	border-radius: 3px;
+}
+
+/* In case of multi-event day (bright background) */
+.ic_rounded.iccalendar .icmulti a .bright {
+	background: url(../images/plus.png) top right no-repeat;
+	display: block;
+	text-align: center;
+	height: 100%;
+	color: #111;
+	text-decoration: none;
+	border-radius: 3px;
+}
+
+/* Loading... */
+.ic_rounded.iccalendar .icloading_box {
+	display: block;
+	height: 172px;
+	font-size: 10px;
+}
+.ic_rounded.iccalendar .icloading_img {
+	display: block;
+	width: 100%;
+	height: 172px;
+	background: url(../images/ic_load.gif) 50% 50% no-repeat;
+}
+
+
+/*
+ * SCRIPT FUNCTION (Dates with event)
+ */
+
+/* General */
+.ic_rounded .icevent,
+.ic_rounded .icmulti {}
+
+/* Text (Don't modify it!) */
+.ic_rounded .icevent .spanEv,
+.ic_rounded .icmulti .spanEv {
+	display: none !important; /* !important to prevent issue with stupid site templates... */
+}
+
+/* Date (Don't modify it!) */
+.ic_rounded .icevent .date,
+.ic_rounded .icmulti .date {
+	display: none !important; /* !important to prevent issue with stupid site templates... */
+}
+
+/* Link */
+.ic_rounded .icevent a,
+.ic_rounded .icmulti a {
+	cursor: pointer;
+}
+
+
+/*
+ * NAVIGATOR
+ */
+
+/* Arrows General */
+.ic_rounded .icagendabtn {
+	font-family: arial;
+}
+
+/* Navigator General */
+.ic_rounded .icnav {
+	font-size: 10px;
+	padding: 0px;
+	margin: 0px;
+	min-height: 24px;
+}
+
+/* Arrows General */
+.ic_rounded .icnav .backicY,
+.ic_rounded .icnav .backic,
+.ic_rounded .icnav .nextic,
+.ic_rounded .icnav .nexticY {
+	display: block;
+	text-decoration: none;
+	color: #555555;
+}
+
+/* Arrows Back Month and Year (Left) */
+.ic_rounded .icnav .backic,
+.ic_rounded .icnav .backicY {
+	float: left
+}
+
+/* Arrows Next Month and Year (Right) */
+.ic_rounded .icnav .nextic,
+.ic_rounded .icnav .nexticY {
+	float: right
+}
+
+/* Arrows Back and Next - Month */
+.ic_rounded .icnav .backic,
+.ic_rounded .icnav .nextic {
+	background: none;
+	font-size: 12px;
+	width: auto;
+	cursor: pointer;
+}
+
+/* Arrows Back and Next - Year */
+.ic_rounded .icnav .backicY,
+.ic_rounded .icnav .nexticY {
+	background: none;
+	font-size: 12px;
+	width: auto;
+	cursor: pointer;
+}
+
+/* Arrows General Button Style */
+.ic_rounded .icnav .backic,
+.ic_rounded .icnav .nextic,
+.ic_rounded .icnav .backicY,
+.ic_rounded .icnav .nexticY {
+	border: 1px solid #ccc;
+	border-radius: 3px;
+	line-height: 12px;
+	margin: 0;
+	padding: 2px 0;
+	text-align: center;
+	vertical-align: middle;
+	width: 12%;
+}
+.ic_rounded .icnav .backic,
+.ic_rounded .icnav .backicY {
+	margin-right: 3px;
+}
+
+.ic_rounded .icnav .nextic,
+.ic_rounded .icnav .nexticY {
+	margin-left: 3px;
+}
+
+/* Arrows General Hover */
+.ic_rounded .icnav .backicY:hover,
+.ic_rounded .icnav .backic:hover,
+.ic_rounded .icnav .nextic:hover,
+.ic_rounded .icnav .nexticY:hover {
+	display: block;
+	text-decoration: none;
+	border: 1px solid #999999;
+	color: #333333;
+}
+
+/* Navigator Title (month and year) */
+.ic_rounded .icnav .titleic {
+	font-size: 12px;
+	text-align: center;
+	width: auto;
+}
+
+
+/*
+ * INFO TIP
+ */
+
+/* General */
+#ictip {
+	color: #333333;
+	font-family: arial;
+	text-align: left;
+	background: #f3f3f3;
+	border: 5px solid #ccc;
+	margin: 4px 10px;
+	padding: 15px;
+	width: auto;
+	min-width: 320px;
+	border-radius: 10px;
+	z-index: 10000;
+	-webkit-box-shadow: 2px 2px 4px #999;
+	-moz-box-shadow: 2px 2px 4px #999;
+	box-shadow: 2px 2px 4px #999;
+	max-height: 100%;
+	overflow-y: auto;
+}
+#ictip .ictip-event {
+	display: block;
+	float: left;
+	width: 100%;
+	padding: 15px 0;
+	border-top: 1px solid #eee;
+}
+#ictip span {
+	margin: 10px;
+	font-size: 0.8em;
+}
+#ictip a {
+	display: block;
+	font-size: 1.2em;
+	text-decoration: none;
+	background: none;
+}
+
+/* Date Header */
+#ictip .ictip-date {
+}
+#ictip span.ictip-date-lbl {
+	font-variant: small-caps;
+}
+#ictip span.ictip-date-format {
+	font-size: 1em;
+}
+
+/* Close "X" */
+#ictip a.close {
+	position: absolute;
+	display: block;
+	width: auto;
+	top: 15px;
+	right: 15px;
+	color: red;
+	text-decoration: none !important;
+}
+#ictip a.close:hover {
+	background: none !important;
+	color: black;
+	cursor: pointer;
+}
+
+/* Event Div */
+#ictip div.linkTo {
+	color: #333;
+	background: none;
+	text-decoration: none;
+	transition: all 0.5s;
+	-moz-transition: all 0.5s;
+	-webkit-transition: all 0.5s;
+	-o-transition: all 0.5s;
+}
+#ictip div.linkTo:hover {
+	color: #111;
+	background: rgba(0,0,0,0.1);
+	background-color: rgba(0,0,0,0.1);
+	border-radius: 5px;
+}
+
+/* Contener of the image */
+#ictip span.img {
+	display: block;
+	width: 100px;
+	float: left;
+	text-align: center;
+	padding: 5px;
+	border-radius: 3px;
+	box-sizing: content-box;
+}
+
+/* Image Thumb */
+#ictip span.img img {
+	max-width: 100px;
+	border: 0px solid #ccc;
+	border-radius: 3px;
+	opacity: 1 !important; /* Added due to override of some site templates (Shape5 vertex, ...) */
+}
+
+/* no-image */
+#ictip div.noimg {
+	color: #FFFFFF;
+	font-size: 10px;
+	text-align: center;
+	padding: 5px;
+}
+#ictip .bright {
+	color: #111111 !important;
+}
+
+/* Event Title */
+#ictip .ictip-event-title {
+	display: block;
+	min-width: 200px;
+	font-weight: bold;
+	margin-top: 10px;
+	padding: 5px;
+}
+
+/* Event Info */
+#ictip .ictip-info {
+	display: block;
+	min-width: 200px;
+	font-size: 12px;
+	padding: 0 8px 2px 8px;
+}
+#ictip .ictip-time {
+	font-size: 14px;
+	padding: 0 8px;
+}
+#ictip .ictip-location {
+	font-size: 12px;
+	padding: 0 8px 3px 8px;
+}
+#ictip .ictip-desc {
+	font-size: 12px;
+	color: #555;
+	line-height: 14px;
+}
+
+/* Contener of the description */
+#ictip span.bloc {
+	display: block;
+	width: 300px;
+	float: left;
+	margin: 3px;
+}
+
+/* Registration Infos */
+#ictip div.ic-reg-buttons {
+	text-align: center;
+	padding: 7px 1px;
+}
+#ictip span.iCreg {
+	display: inline-block;
+	font-size: 11px;
+	margin: 0 3px;
+	padding: 1px 5px;
+	text-align: center;
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
+	-o-border-radius: 5px;
+	border-radius: 5px;
+	box-shadow: 0px 0px 1px #333;
+/*	cursor: pointer; */
+}
+#ictip span.iCreg.available,
+#ictip span.iCreg.closed {
+	color: black;
+	background: white;
+}
+#ictip span.iCreg.ticketsleft {
+	color: #fff;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+	background-color: #5bb75b;
+	background-image: -moz-linear-gradient(top,#62c462,#51a351);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#51a351));
+	background-image: -webkit-linear-gradient(top,#62c462,#51a351);
+	background-image: -o-linear-gradient(top,#62c462,#51a351);
+	background-image: linear-gradient(to bottom,#62c462,#51a351);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0);
+	border-color: #51a351 #51a351 #387038;
+	*background-color: #51a351;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+#ictip span.iCreg.registered {
+	color: #fff;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+	background-color: #1d6cb0;
+	background-image: -moz-linear-gradient(top,#2384d3,#15497c);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#2384d3),to(#15497c));
+	background-image: -webkit-linear-gradient(top,#2384d3,#15497c);
+	background-image: -o-linear-gradient(top,#2384d3,#15497c);
+	background-image: linear-gradient(to bottom,#2384d3,#15497c);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff2384d3', endColorstr='#ff15497c', GradientType=0);
+	border-color: #15497c #15497c #0a223b;
+	border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+	*background-color: #15497c;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+
+/* End function clear <div> */
+#ictip .clr {clear:both; display:block;}
+
+/* Features */
+#ictip .ic-features-container {
+	margin: 2px;
+}
+#ictip .ic-feature-icon {
+	float: right;
+	margin: 0px 0.5px;
+}
+
+/* Messages Info */
+.ic-msg-no-event {
+	font-size: 0.8em;
+	text-align: center;
+}
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/css/ic_rounded_module_large.css b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/css/ic_rounded_module_large.css
new file mode 100644
index 00000000..e7dcaa94
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/css/ic_rounded_module_large.css
@@ -0,0 +1,6 @@
+/*
+ * MOD_ICCALENDAR
+ * Large devices (usually a desktop computer)
+ * SCREEN WIDTH > 'Large Screen Threshold'
+ * Default : SCREEN WIDTH > 1201
+ */
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/css/ic_rounded_module_medium.css b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/css/ic_rounded_module_medium.css
new file mode 100644
index 00000000..01d21203
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/css/ic_rounded_module_medium.css
@@ -0,0 +1,6 @@
+/*
+ * MOD_ICCALENDAR
+ * Medium devices (usually a laptop computer)
+ * 'Medium Screen Threshold' < SCREEN WIDTH < ('Large Screen Threshold' - 1)
+ * Default : 769 < SCREEN WIDTH < 1200
+ */
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/css/ic_rounded_module_small.css b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/css/ic_rounded_module_small.css
new file mode 100644
index 00000000..9400f773
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/css/ic_rounded_module_small.css
@@ -0,0 +1,51 @@
+/*
+ * MOD_ICCALENDAR
+ * Small devices (usually a tablet computer)
+ * 'Small Screen Threshold' < SCREEN WIDTH < ('Medium Screen Threshold' - 1)
+ * Default : 481 < SCREEN WIDTH < 768
+ */
+
+.ic_rounded.iccalendar table td .icevent a:hover,
+.ic_rounded.iccalendar table td .icevent a:focus {
+	border-radius:3px;
+	background:#333;
+}
+.ic_rounded.iccalendar table td .icevent a:hover .bright,
+.ic_rounded.iccalendar table td .icevent a:focus .bright {
+	border-radius:3px;
+	color:#fff;
+	background:#333;
+}
+.ic_rounded.iccalendar table td .icmulti a:hover,
+.ic_rounded.iccalendar table td .icevent a:focus {
+	background:#333;
+}
+.ic_rounded.iccalendar table td .icmulti a:hover .bright,
+.ic_rounded.iccalendar table td .icevent a:focus .bright {
+	color:#fff;
+	background:#333;
+}
+
+/* Arrows Over */
+.ic_rounded .icnav .backic:hover,
+.ic_rounded .icnav .nextic:hover,
+.ic_rounded .icnav .backicY:hover,
+.ic_rounded .icnav .nexticY:hover {
+	color:#333333;
+	background:none;
+	cursor:pointer;
+}
+#ictip a.close:hover {
+	color:black;
+	background:none;
+	cursor:pointer;
+}
+#ictip div.linkTo:hover {
+	color:#000;
+	background:#ddd;
+	text-decoration:none;
+	border-radius:3px;
+}
+#ictip a:hover {
+	background:none;
+}
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/css/ic_rounded_module_xsmall.css b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/css/ic_rounded_module_xsmall.css
new file mode 100644
index 00000000..cd02807d
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/css/ic_rounded_module_xsmall.css
@@ -0,0 +1,11 @@
+/*
+ * MOD_ICCALENDAR
+ * Extra small devices (usually a mobile phone)
+ * 0 < SCREEN WIDTH < ('Small Screen Threshold' - 1)
+ * Default : 0 < SCREEN WIDTH < 480
+ */
+
+/* Close "X" */
+	#ictip a.close {
+		padding-right:15px;
+	}
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/css/index.html b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/css/index.html
new file mode 100644
index 00000000..fa6d84e8
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/css/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/ic_rounded_calendar.php b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/ic_rounded_calendar.php
new file mode 100644
index 00000000..03da2992
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/ic_rounded_calendar.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-05-04
+ *
+ * @package     iCagenda.Site
+ * @subpackage  Themes.Packs
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+ * @themepack   ic_rounded
+ * @template    calendar
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+?>
+
+<!-- Calendar -->
+
+<?php // Code can be added at Top of calendar ?>
+
+<?php // Calendar Template ?>
+<?php
+	$stamp->days();
+?>
+
+<?php // Code can be added at Bottom of calendar
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/ic_rounded_day.php b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/ic_rounded_day.php
new file mode 100644
index 00000000..38621aa7
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/ic_rounded_day.php
@@ -0,0 +1,181 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-05-04
+ *
+ * @package     iCagenda.Site
+ * @subpackage  Themes.Packs
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+ * @themepack   ic_rounded
+ * @template    day
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+?>
+
+<!-- Module Calendar Day Pop-up -->
+
+<?php // Day with event ?>
+<?php if ($stamp->events) : ?>
+
+	<?php // Main Background of a day ?>
+
+	<div class="icevent <?php echo $multi_events; ?>" style="background:<?php echo $bg_day; ?> !important;">
+
+		<?php // Color of date text depending of the category color ?>
+		<a href="#" rel="nofollow" tabindex="0">
+		<div class="<?php echo $stamp->ifToday; ?> <?php echo $bgcolor; ?>" style="color: #fff !important" data-cal-date="<?php echo $stamp->this_day; ?>">
+			<?php echo $stamp->Days; ?>
+		</div>
+		</a>
+
+		<?php // Start of the Tip ?>
+		<div class="spanEv">
+
+			<?php foreach($events as $e) : ?>
+
+				<div class="ictip-event">
+					<?php echo '<a href="' . $e['url'] . '">'; ?>
+
+					<div class="linkTo">
+
+						<?php // Show image if exist ?>
+						<div class="ictip-img">
+						<?php
+						echo '<span style="background: ' . $e['cat_color'] . ';" class="img">';
+
+						if ($e['image'])
+						{
+							echo '<img src="' . $e['image'] . '" alt="" />';
+						}
+						else
+						{
+							echo '<span class="noimg ' . $bgcolor . '">' . $e['cat_title'] . '</span>';
+						}
+
+						echo '</span>';
+						?>
+						</div>
+
+						<?php // Display Title (with link to event) and other infos if set (city, country) ?>
+						<div class="ictip-event-title titletip">
+							<?php //echo '&rsaquo; ' . $e['title']; ?>
+							<?php echo $e['title']; ?>
+						</div>
+
+						<?php // Display feature icons, if required ?>
+						<?php if (!empty($e['features_icon_size'])) : ?>
+						<div class="ic-features-container">
+							<?php foreach ($e['features'] as $icon) : ?>
+								<div class="ic-feature-icon">
+									<img src="<?php echo $e['features_icon_root'] . $icon['icon'] ?>" alt="<?php echo $icon['icon_alt'] ?>" title="<?php echo $e['show_icon_title'] == '1' ? $icon['icon_alt'] : '' ?>">
+								</div>
+							<?php endforeach ?>
+						</div>
+						<?php endif; ?>
+
+						<?php // INFO ?>
+						<div class="ictip-info ic-clearfix">
+
+							<?php // Display Time (start) for each date ?>
+							<?php if ($e['displaytime']) : ?>
+								<div class="ictip-time">
+									<?php echo $e['time']; ?>
+								</div>
+							<?php endif; ?>
+
+							<?php // Display Venue Name, City and/or Country for each date ?>
+							<?php if ($e['place'] OR $e['city'] OR $e['country']) : ?>
+								<div class="ictip-location">
+									<?php // Display Venue Name ?>
+									<?php if ($e['place'] AND ($e['city'] OR $e['country']) ) : ?>
+										<?php echo $e['place'].', '; ?>
+									<?php else : ?>
+										<?php echo $e['place']; ?>
+									<?php endif; ?>
+									<?php // Display City and/or Country for each date ?>
+									<?php if ($e['city']) : ?>
+										<?php echo $e['city']; ?>
+									<?php endif; ?>
+									<?php if (($e['country']) && ($e['city'])) : ?>
+										<?php echo ', '.$e['country']; ?>
+									<?php endif; ?>
+									<?php if (($e['country']) AND (!$e['city'])) : ?>
+										<?php echo $e['country']; ?>
+									<?php endif; ?>
+								</div>
+							<?php endif; ?>
+
+							<?php // Display Short Description ?>
+							<?php if ($e['descShort']) : ?>
+								<div class="ictip-desc">
+									<?php echo $e['descShort']; ?>
+								</div>
+							<?php endif; ?>
+
+						</div>
+
+						<?php // Display Registration Information ?>
+						<div style="clear:both"></div>
+
+						<?php if ($e['registrations']) : ?>
+						<div class="regButtons ic-reg-buttons">
+
+							<?php if (!$e['date_sold_out']) : ?>
+								<?php if ($e['maxTickets']) : ?>
+									<span class="iCreg available">
+										<?php echo JText::_( 'MOD_ICCALENDAR_SEATS_NUMBER' ) . ': ' . $e['maxTickets']; ?>
+									</span>
+								<?php endif; ?>
+								<?php if ($e['TicketsLeft'] && $e['maxTickets']) : ?>
+									<span class="iCreg ticketsleft">
+										<?php echo JText::_( 'MOD_ICCALENDAR_SEATS_AVAILABLE' ) . ': ' . $e['TicketsLeft']; ?>
+									</span>
+								<?php endif; ?>
+								<?php if ($e['registered']) : ?>
+									<span class="iCreg registered">
+										<?php echo JText::_( 'MOD_ICCALENDAR_ALREADY_REGISTERED' ) . ': ' . $e['registered']; ?>
+									</span>
+								<?php endif; ?>
+							<?php else : ?>
+								<span class="iCreg closed">
+									<?php echo $e['date_sold_out']; ?>
+								</span>
+							<?php endif; ?>
+
+						</div>
+						<?php endif; ?>
+					</div>
+					<?php echo '</a>'; ?>
+				</div>
+			<?php endforeach; ?>
+		</div>
+
+		<?php // Display Date at the top of the info-tip ?>
+		<div class="date ictip-date">
+			<span class="ictip-date-lbl">
+				<?php echo JTEXT::_('JDATE');  ?> :
+			</span>
+			<span class="ictip-date-format">
+				<?php echo $stamp->dateTitle; ?>
+			</span>
+		</div>
+
+	</div><?php // end of the day ?>
+
+<?php // Day with no event ?>
+<?php else : ?>
+	<div class="no-event <?php echo $stamp->ifToday; ?>" data-cal-date="<?php echo $stamp->this_day; ?>">
+		<?php echo $stamp->Days; ?>
+	</div>
+<?php endif; ?>
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/ic_rounded_event.php b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/ic_rounded_event.php
new file mode 100644
index 00000000..55c11dc1
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/ic_rounded_event.php
@@ -0,0 +1,734 @@
+<?php
+
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-05-04
+ *
+ * @package     iCagenda.Site
+ * @subpackage  Themes.Packs
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+ * @themepack   ic_rounded
+ * @template    event
+ *----------------------------------------------------------------------------
+ */
+
+defined('_JEXEC') or die;
+require_once $_SERVER['DOCUMENT_ROOT'] . '/libraries/vendor/google-api/src/Google/autoload.php';
+
+$user = JFactory::getUser();
+$actual_link = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on' ? "https" : "http") . "://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]";
+$enddate = substr($item->enddate, -8);
+$enddate = substr($enddate, 0, 5);
+$presenters = explode(';', $CUSTOM_FIELDS[0]->value);
+
+$client = new Google_Client();
+$client->setClientId('427394287601-f5fvh3809726dah7lq7d4pkl4af8p7av.apps.googleusercontent.com');
+$client->setClientSecret('_qMqFv2zuk2b0z7fazwgNuBk');
+$client->setRedirectUri('https://www.archlinexp.com/maintenance/google_redirect.php');
+$client->addScope('email');
+$client->addScope('profile');
+
+$authUrl = $client->createAuthUrl();
+?>
+
+<script src="/media/plg_captcha_recaptcha/js/recaptcha.min.js?b2802ea557ed706aee0213f83ec66152" type="text/javascript"></script>
+<script src="https://www.google.com/recaptcha/api.js?onload=JoomlaInitReCaptcha2&render=explicit&hl=en-GB" type="text/javascript"></script>
+
+<style media="screen">
+	#sp-banner {
+		display: none;
+	}
+
+	.ic-info-box {
+		margin-top: -10%;
+	}
+
+	.lower {
+		font-size: 20px;
+	}
+
+	.iCtip>span {
+		font-size: 13px;
+	}
+
+	.voucher-text {
+		margin-top: 3%;
+	}
+
+	.change_time {
+		width: 100% !important;
+	}
+
+	.date-text {
+		font-size: 36px;
+	}
+
+	.header {
+		line-height: 1;
+		margin-top: -4px !important;
+	}
+
+	img {
+		display: block;
+		margin-left: auto;
+		margin-right: auto;
+	}
+
+	.title-header {
+		width: 100%;
+		text-align: center !important;
+		margin-bottom: 2%;
+		margin-top: -5% !important;
+	}
+
+	.reg-btn {
+		margin-top: 1.5%;
+		margin-left: 2%;
+	}
+
+	.arrow-div {
+		margin-top: 2%;
+		margin-left: 7%;
+	}
+
+	.input-bg {
+		padding-top: 20px;
+		padding-bottom: 20px;
+		background-color: rgba(230, 230, 230, 1);
+	}
+
+	.div-text {
+		font-size: 17px;
+	}
+
+	.or-divider {
+		margin-top: 30px;
+		border-top: 1px solid #d8d8d8;
+		box-sizing: border-box;
+		display: flex;
+		justify-content: center;
+	}
+
+	.divider-text {
+		text-align: center;
+		margin-top: -11px;
+		background-color: white;
+		width: 30px;
+		font-size: 17px;
+	}
+
+	.custom-btn {
+		width: 100% !important;
+		margin-top: 16px !important;
+	}
+
+	.at-icon-wrapper {
+		margin-left: -10px;
+	}
+
+	.table-header {
+		margin-top: 10px;
+	}
+
+	@media only screen and (min-width: 600px) {
+		.table-header {
+			font-size: 36px;
+		}
+
+		.left-div {
+			margin-left: -30px;
+		}
+
+		.btn-left {
+			margin-left: 5px;
+		}
+
+		.frame {
+			width: 105%;
+			height: 370px !important;
+			margin-left: -10px;
+			/*margin-bottom: 15px;*/
+		}
+
+		.ic-clearfix {
+			margin-left: -8.5%;
+			width: 120%;
+		}
+
+		#table-div table tr td p,
+		#table-div table tr td ul li {
+			font-size: 17px;
+		}
+
+		.header {
+			font-size: 36px;
+		}
+
+		#presenter-list {
+			margin-left: 20px;
+			font-size: 17px;
+		}
+
+		.g-recaptcha {
+			margin-left: -20px;
+		}
+
+		.google-cntry {
+			width: 100% !important;
+		}
+
+		.custom-input {
+			width: 100% !important;
+		}
+
+		#timezone_btn {
+			margin-left: -30px;
+		}
+	}
+
+	@media only screen and (max-width: 600px) {
+
+		iframe,
+		.frame {
+			height: 250px;
+			width: 100%;
+		}
+
+		.modal-body {
+			max-height: 80vh;
+			overflow-y: auto;
+		}
+
+		.modal-dialog {
+			margin: 10vh auto 0px auto !important;
+		}
+
+		.google-cntry {
+			width: 100% !important;
+		}
+
+		.custom-input {
+			width: 100% !important;
+		}
+	}
+
+	.ic-top-buttons {
+		display: none;
+	}
+
+	.custom-btn {
+		background-color: #F0C318;
+		border-color: #F0C318;
+		color: #000000;
+		font-size: 22px;
+	}
+
+	.custom-btn:hover {
+		background-color: #F0C318;
+		border-color: #F0C318;
+		color: #000000;
+	}
+</style>
+
+<!-- Event details -->
+<?php // Event Details Template 
+$eventUrl = 'https://www.archlinexp.com/events';
+
+if ($item->id == 107) {
+	$eventUrl = 'https://www.archlinexp.com/education/events/2025-update-day-march';
+}
+?>
+
+<?php // Header (Title/Category) of the event 
+?>
+<div class="event-header ic-event-header ic-clearfix">
+	<div class="row">
+		<div class="col-md-4"></div>
+
+		<div class="col-md-3 arrow-div">
+			<?php if (false) : ?>
+				<?php echo icagendaEvent::backArrow($this->item); ?>
+			<?php else : ?>
+				<div class="ic-back">
+					<a href="<?= $eventUrl ?>"><span class="iCicon iCicon-backic"></span> <span style="font-size: 20px !important;">Back to the topics</span></a>
+				</div>
+			<?php endif; ?>
+		</div>
+	</div>
+	<br />
+
+	<!--<div class="row">
+			<div class="col-md-1"></div>
+			<div class="col-md-6 voucher-text">
+				<b>Sign up to the presentation and we give you a voucher for 50 EUR off of your ARCHLine.XP LIVE purchase.</b><br/>
+				The voucher can be redeemed at any sales point before 31 December, 2020.
+				Only one voucher can be used per purchase, vouchers are non-transferable, and non-refundable.
+			</div>
+
+			<div class="col-md-4">
+				<img src="/images/2020/11/02/expo_live_voucher_50_red.png" />
+			</div>
+		</div>
+		<br/>-->
+
+	<?php // Feature icons 
+	?>
+	<?php if (!empty($FEATURES_ICONSIZE_EVENT)) : ?>
+		<div class="ic-features-container">
+			<?php foreach ($FEATURES_ICONS as $icon) : ?>
+				<div class="ic-feature-icon">
+					<img class="iCtip" src="<?php echo $FEATURES_ICONROOT_EVENT . $icon['icon'] ?>" alt="<?php echo $icon['icon_alt'] ?>" title="<?php echo $SHOW_ICON_TITLE == '1' ? $icon['icon_alt'] : '' ?>">
+				</div>
+			<?php endforeach ?>
+		</div>
+	<?php endif ?>
+
+	<?php /* Category ?>
+		<div class="title-cat ic-title-cat ic-float-right ic-details-cat" style="color:<?php echo $CATEGORY_COLOR; ?>;">
+			<?php echo $CATEGORY_TITLE; ?>
+		</div>
+		<?php */ ?>
+
+</div>
+
+<?php // Sharing and Registration 
+?>
+<div class="ic-clearfix">
+
+	<?php // AddThis Social Sharing 
+	?>
+	<div class="ic-event-addthis ic-float-left">
+		<?php echo $EVENT_SHARING; ?>
+	</div>
+
+	<?php // Registration button 
+	?>
+
+	<?php if (false) : ?>
+		<div class="ic-event-registration">
+			<?php echo $EVENT_REGISTRATION; ?>
+		</div>
+	<?php endif; ?>
+</div>
+
+<?php // Event Informations Display 
+?>
+<?php if (true) : ?>
+	<div class="icinfo ic-info ic-clearfix">
+		<div class="row">
+			<div class="col-md-5">
+
+				<?php foreach ($CUSTOM_FIELDS as $value) : ?>
+					<?php if ($value->slug == 'video_url') : ?>
+						<!--<img src="/<?= $item->image ?>" alt="" style="height: 370px;">-->
+						<iframe class="frame" src="<?= $value->value ?>"></iframe>
+					<?php endif; ?>
+				<?php endforeach; ?>
+
+				<?php if ($item->id != 106) : ?>
+					<!--<p class="table-header">Presenters:</p>
+					<br />
+
+					<p id="presenter-list">
+						<?php foreach ($presenters as $presenter) : ?>
+							<?= $presenter ?><br />
+						<?php endforeach; ?>
+					</p>-->
+				<?php endif; ?>
+			</div>
+
+			<div class="col-md-7">
+				<p class="header"><?php echo $EVENT_TITLE; ?></p>
+				<br />
+
+				<p class="date-text">Premiere starts at <?= substr($item->startdate, 0, 16) ?>
+					<!--<span class="lower"><?= $enddate ?></span>-->
+				</p>
+				<br />
+
+				<!--<?php if (!is_null($item->rerun)) : ?>
+					<p class="date-text">Rerun starts at <?= substr($item->rerun, 0, 16) ?>
+						<span class="lower"><?= $enddate ?></span>
+					</p>
+					<br />
+				<?php endif; ?>-->
+
+				<div class="row">
+					<form method="POST">
+						<div class="col-md-5 div-text">
+							Choose your time zone to see when the presentation will air according to your time.
+						</div>
+						<div class="col-md-5 left-div">
+							<select name="timezone" class="change_time">
+								<?php foreach ($this->timeZones as $key => $timeZone) : ?>
+									<?php if (!isset($_SESSION['timezone']) && strpos($timeZone['id'], 'Europe/Budapest') !== false) : ?>
+										<option value="<?= $timeZone['id'] ?>" selected>
+											<?= $timeZone['zone'] ?> (<?= $timeZone['diff_from_GMT'] ?>)
+										</option>
+									<?php else : ?>
+										<option value="<?= $timeZone['id'] ?>" <?= $timeZone['id'] == $_SESSION['timezone'] ? 'selected' : '' ?>>
+											<?= $timeZone['zone'] ?> (<?= $timeZone['diff_from_GMT'] ?>)
+										</option>
+									<?php endif; ?>
+								<?php endforeach; ?>
+							</select>
+						</div>
+						<div class="col-md-1 btn-left">
+							<input type="submit" id="timezone_btn" name="change_timezone" class="btn btn-default" value="Change my time zone" />
+						</div>
+					</form>
+				</div>
+
+				<?php if ($EVENT_DESC || $EVENT_INFOS) : ?>
+					<?php if ($EVENT_DESC) : ?>
+						<div id="ic-detail-desc" class="ic-detail-desc">
+							<div class="ic-short-description">
+								<?php echo $EVENT_SHORTDESC; ?>
+							</div>
+							<div class="ic-full-description">
+								<?php echo $EVENT_DESCRIPTION; ?>
+							</div>
+						</div>
+					<?php endif; ?>
+				<?php endif; ?>
+
+				<?php if ($item->startdate >= date('Y-m-d H:i:s')) : ?>
+					<p>&nbsp;</p>
+
+					<button type="button" class="btn btn-primary btn-lg custom-btn" data-toggle="modal" data-target="#myModal">
+						<?= JTEXT::_('COM_ICAGENDA_SIGN_UP') ?>
+					</button>
+					<br />
+					<br />
+				<?php endif; ?>
+
+				<!--<p class="table-header" style="text-align: center;">What you will learn about:</p>-->
+				<br />
+
+				<div id="table-div"></div>
+			</div>
+		</div>
+	</div>
+<?php else : ?>
+	<div class="icinfo ic-info ic-clearfix">
+
+		<?php if ($EVENT_DESC || $EVENT_INFOS) : ?>
+
+			<?php // description text 
+			?>
+			<?php if ($EVENT_DESC) : ?>
+				<div id="ic-detail-desc" class="ic-detail-desc">
+					<div class="ic-short-description">
+						<?php echo $EVENT_SHORTDESC; ?>
+					</div>
+					<div class="ic-full-description">
+						<?php echo $EVENT_DESCRIPTION; ?>
+					</div>
+				<?php endif; ?>
+
+				<?php if (!$EVENT_DESC && $EVENT_INFOS) : ?>
+					<div id="ic-detail-info" class="ic-detail-info">
+					<?php endif; ?>
+
+					<p>&nbsp;</p>
+
+					<?php // Information 
+					?>
+					<?php if ($EVENT_INFOS) : ?>
+						<div class="ic-info-box">
+
+							<?php // Title Box Information 
+							?>
+							<div class="ic-info-box-header">
+								<label><?php echo JTEXT::_('COM_ICAGENDA_EVENT_INFOS'); ?></label>
+							</div>
+
+							<?php // Information Details 
+							?>
+							<div class="ic-info-box-content ic-divTable ic-align-left ic-clearfix">
+
+								<?php // file attached 
+								?>
+								<?php if ($EVENT_ATTACHEMENTS) : ?>
+									<div class="ic-info-box-file">
+										<label><?php echo JTEXT::_('COM_ICAGENDA_EVENT_FILE'); ?></label>
+										<div class="ic-download"><?php echo $EVENT_ATTACHEMENTS_TAG; ?></div>
+									</div>
+								<?php endif; ?>
+
+								<?php // Nb of tickets available 
+								?>
+								<?php if ($SEATS_AVAILABLE) : ?>
+									<div class="ic-divRow ic-info-tickets-left">
+										<div class="ic-divCell ic-label"><?php echo JTEXT::_('COM_ICAGENDA_REGISTRATION_PLACES_LEFT');  ?></div>
+										<div class="ic-divCell ic-value"><?php echo $SEATS_AVAILABLE; ?></div>
+									</div>
+								<?php endif; ?>
+
+								<?php // Max. Nb of tickets 
+								?>
+								<?php if ($MAX_NB_OF_SEATS) : ?>
+									<div class="ic-divRow ic-info-tickets">
+										<div class="ic-divCell ic-label"><?php echo JTEXT::_('COM_ICAGENDA_REGISTRATION_NUMBER_PLACES');  ?></div>
+										<div class="ic-divRow ic-info-phone">
+											<div class="ic-divCell ic-value"><?php echo $MAX_NB_OF_SEATS; ?></div>
+										</div>
+									<?php endif; ?>
+
+									<?php // Phone Number 
+									?>
+									<?php if ($EVENT_PHONE) : ?>
+										<div class="ic-divCell ic-label"><?php echo JTEXT::_('COM_ICAGENDA_EVENT_PHONE');  ?></div>
+										<div class="ic-divCell ic-value"><?php echo $EVENT_PHONE; ?></div>
+									</div>
+								<?php endif; ?>
+
+								<?php // Email 
+								?>
+								<?php if ($EVENT_EMAIL) : ?>
+									<div class="ic-divRow ic-info-email">
+										<div class="ic-divCell ic-label"><?php echo JTEXT::_('COM_ICAGENDA_EVENT_MAIL');  ?></div>
+										<div class="ic-divCell ic-value"><?php echo $EVENT_EMAIL_CLOAKING; ?></div>
+									</div>
+								<?php endif; ?>
+
+								<?php // Website 
+								?>
+								<?php if ($EVENT_WEBSITE) : ?>
+									<div class="ic-divRow ic-info-website">
+										<div class="ic-divCell ic-label"><?php echo JTEXT::_('COM_ICAGENDA_EVENT_WEBSITE');  ?></div>
+										<div class="ic-divCell ic-value"><?php echo $EVENT_WEBSITE_LINK; ?></div>
+									</div>
+								<?php endif; ?>
+
+								<?php // Custom Fields 
+								?>
+								<?php if ($CUSTOM_FIELDS) : ?>
+									<?php foreach ($CUSTOM_FIELDS as $FIELD) : ?>
+										<?php if ($FIELD->title && $FIELD->value && $FIELD->slug != 'video_url' && $FIELD->slug != 'presenter') : ?>
+											<div class="ic-divRow ic-info-<?php echo $FIELD->slug; ?>">
+												<div class="ic-divCell ic-label"><?php echo $FIELD->title;  ?></div>
+												<div class="ic-divCell ic-value"><?php echo $FIELD->value; ?></div>
+											</div>
+										<?php endif; ?>
+									<?php endforeach; ?>
+								<?php endif; ?>
+
+								<?php // Address 
+								?>
+								<?php if ($EVENT_ADDRESS) : ?>
+									<div class="ic-divRow ic-info-address">
+										<div class="ic-divCell ic-label"><?php echo JTEXT::_('COM_ICAGENDA_EVENT_ADDRESS');  ?></div>
+										<div class="ic-divCell ic-value"><?php echo $EVENT_ADDRESS; ?></div>
+									</div>
+								<?php endif; ?>
+							</div>
+
+						</div><?php // end div.details 
+								?>
+					<?php endif; ?>
+
+					</div>
+				<?php endif; ?>
+				</div>
+			<?php endif; ?>
+
+			<?php // Google Maps 
+			?>
+			<?php if ($GOOGLEMAPS_COORDINATES) : ?>
+				<p>&nbsp;</p>
+				<div id="detail-map" class="ic-clearfix">
+					<h3><?php echo JTEXT::_('COM_ICAGENDA_EVENT_MAP'); ?></h3><br />
+					<div id="icagenda_map">
+						<?php echo $EVENT_MAP; ?>
+					</div>
+				</div>
+			<?php endif; ?>
+
+			<?php // List of Participants 
+			?>
+			<?php if ($PARTICIPANTS_DISPLAY == 1 && $EVENT_PARTICIPANTS) : ?>
+				<p>&nbsp;</p>
+				<div class="ic-participants ic-rounded-10 ic-clearfix">
+					<h3><?php echo $PARTICIPANTS_HEADER; ?></h3>
+					<?php echo $EVENT_PARTICIPANTS; ?>
+				</div>
+			<?php endif; ?>
+
+			<!-- Modal -->
+			<div id="myModal" class="modal fade" role="dialog">
+				<div class="modal-dialog">
+					<!-- Modal content-->
+					<div class="modal-content">
+						<div class="modal-header">
+							<button type="button" class="close" data-dismiss="modal">&times;</button>
+							<h4 class="modal-title"><?= $EVENT_TITLE ?></h4>
+						</div>
+						<div class="modal-body">
+							<form method="post" id="icagenda-registration" class="form-horizontal" action="<?php echo JRoute::_('index.php?option=com_icagenda&task=registration.registerWithoutForm'); ?>">
+								<input type="hidden" name="zone" value="<?= $_SESSION['timezone'] ?>" />
+								<input type="hidden" name="evt_id" value="<?= $item->id ?>" />
+								<input type="hidden" name="startDate" value="<?= substr($item->startdate, 0, 16) ?>" />
+								<input type="hidden" name="endDate" value="<?= substr($item->enddate, 0, 16) ?>" />
+								<input type="hidden" name="rerun" value="<?= substr($item->rerun, 0, 16) ?>" />
+
+								<div class="form-group">
+									<div class="col-sm-2">
+										<label>Country:</label>
+									</div>
+									<div class="col-sm-10">
+										<div class="input-group">
+											<select class="google-cntry">
+												<option value="">-- Choose country --</option>
+												<?php
+												$tomb = parse_ini_file($_SERVER['DOCUMENT_ROOT'] . '/language/' . JFactory::getLanguage()->getTag() . '/' . JFactory::getLanguage()->getTag() . '.countries.ini');
+												foreach ($tomb as $k => $v) echo '<option value = "' . $k . '_' . $v . '">' . $v . '</option>';
+												?>
+											</select>
+										</div>
+									</div>
+								</div>
+
+								<div class="form-group">
+									<div class="col-sm-3"></div>
+									<div class="col-sm-5" style="margin-left: 40px !important;">
+										<input type="image" class="login" id="google-login" src="/images/btn_google_signin_light_normal_web.png" data-alt-image="/images/btn_google_signin_dark_normal_web.png" />
+									</div>
+									<div class="col-sm-4"></div>
+								</div>
+
+								<div class="or-divider">
+									<div class="divider-text">or</div>
+								</div>
+								<br />
+
+								<div class="form-group">
+									<div class="col-sm-2">
+										<label>Name:</label>
+									</div>
+									<div class="col-sm-10">
+										<div class="input-group">
+											<input class="custom-input" type="text" name="name" required />
+										</div>
+									</div>
+								</div>
+
+								<div class="form-group">
+									<div class="col-sm-2">
+										<label>Email:</label>
+									</div>
+									<div class="col-sm-10">
+										<div class="input-group">
+											<input class="custom-input" type="email" name="email" required />
+										</div>
+									</div>
+								</div>
+
+								<div class="form-group">
+									<div class="col-sm-2">
+										<label>Country:</label>
+									</div>
+									<div class="col-sm-10">
+										<div class="input-group">
+											<select name="country" class="google-cntry">
+												<option value="">-- Choose country --</option>
+												<?php
+												$tomb = parse_ini_file($_SERVER['DOCUMENT_ROOT'] . '/language/' . JFactory::getLanguage()->getTag() . '/' . JFactory::getLanguage()->getTag() . '.countries.ini');
+												foreach ($tomb as $k => $v) echo '<option value = "' . $k . '_' . $v . '">' . $v . '</option>';
+												?>
+											</select>
+										</div>
+									</div>
+								</div>
+
+								<div class="form-group">
+									<div class="col-sm-2">
+
+									</div>
+									<div class="col-sm-10">
+										<input type="checkbox" name="policy" required /> I have read and agree to the ARCHLine.XP <a href="https://www.archlinexp.com/legal/privacy-policy">Privacy Policy</a>
+									</div>
+								</div>
+
+								<div class="form-group">
+									<div class="col-sm-3">
+
+									</div>
+									<div class="col-sm-9">
+										<div id="jform_captcha" class="g-recaptcha  required" data-sitekey="6LeqnB8TAAAAAJXgoIg0gtTxwsjM4d22jZIs74hS" data-theme="light" data-size="normal"></div>
+									</div>
+								</div>
+
+								<div class="form-group">
+									<div class="col-sm-3"></div>
+									<div class="col-sm-5" style="margin-left: 40px !important;">
+										<input id="signup-btn" type="submit" class="btn btn-primary btn-lg" value="Sign up with email" />
+									</div>
+									<div class="col-sm-4"></div>
+								</div>
+							</form>
+						</div>
+					</div>
+				</div>
+			</div>
+
+			<script>
+				jQuery('#icagenda-registration').on('submit', function(e) {
+					if (grecaptcha.getResponse() == "") {
+						e.preventDefault();
+						alert("Please complete the CAPTCHA.");
+					}
+				});
+
+				var url = '<?= $authUrl ?>';
+				jQuery('#google-login').click(function() {
+					var cntry = jQuery('.google-cntry').val();
+
+					if (cntry == '') {
+						alert('Please choose a country.');
+						return false;
+					}
+
+					var obj = {
+						evt_id: "<?= $item->id ?>",
+						date: "<?= substr($item->startdate, 0, 16) ?>",
+						endDate: "<?= substr($item->enddate, 0, 16) ?>",
+						zone: "<?= $_SESSION['timezone'] ?>",
+						cntry: cntry,
+						rerun: "<?= substr($item->rerun, 0, 16) ?>",
+						action: "event_registration"
+					};
+
+					var jsonData = JSON.stringify(obj);
+
+					url += '&state=' + btoa(jsonData);
+
+					var win = window.open(url, '_self');
+					win.focus();
+				});
+
+				jQuery('#table-div').append(jQuery('table')[2]);
+				jQuery('#table-div').append(jQuery('.learn-div'));
+
+				var inputs = document.getElementsByTagName('input');
+
+				for (var i = 0, len = inputs.length; i < len; i++) {
+					input = inputs[i];
+					input.onmouseover = function() {
+						this.setAttribute('data-orig-image', this.getAttribute('src'));
+						this.src = this.getAttribute('data-alt-image');
+					};
+					input.onmouseout = function() {
+						this.src = this.getAttribute('data-orig-image');
+					};
+				}
+			</script>
\ No newline at end of file
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/ic_rounded_events.php b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/ic_rounded_events.php
new file mode 100644
index 00000000..8e8235ef
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/ic_rounded_events.php
@@ -0,0 +1,162 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-05-04
+ *
+ * @package     iCagenda.Site
+ * @subpackage  Themes.Packs
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.2.8
+ *----------------------------------------------------------------------------
+ * @themepack   ic_rounded
+ * @template    events
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+?>
+
+<!-- Event -->
+
+<?php // List of Events Template ?>
+
+	<?php // START Event ?>
+	<div class="event ic-event ic-clearfix">
+
+		<?php // START Date Box with Event Image as background ?>
+		<?php if ($EVENT_NEXT): ?>
+
+		<?php // Link to Event ?>
+		<a href="<?php echo $EVENT_URL; ?>" title="<?php echo $EVENT_TITLE; ?>">
+
+		<?php // If no Event Image set ?>
+		<?php if ( ! $EVENT_IMAGE) : ?>
+		<div class="ic-box-date" style="background-color: <?php echo $CATEGORY_COLOR; ?>; border-color: <?php echo $CATEGORY_COLOR; ?>">
+		<?php // In case of Event Image ?>
+		<?php else : ?>
+		<div class="ic-box-date" style="background-image:url(<?php echo $IMAGE_MEDIUM; ?>); border-color: <?php echo $CATEGORY_COLOR; ?>">
+		<?php endif; ?>
+			<div class="ic-date">
+
+				<?php // Day ?>
+				<div class="ic-day">
+					<?php echo $EVENT_DAY; ?>
+				</div>
+
+				<?php // Month ?>
+				<div class="ic-month">
+					<?php echo $EVENT_MONTH; ?>
+				</div>
+
+				<?php // Year ?>
+				<div class="ic-year">
+					<?php echo $EVENT_YEAR; ?>
+				</div>
+
+				<?php // Time ?>
+				<div class="ic-time">
+					<?php echo $EVENT_TIME; ?>
+				</div>
+
+			</div>
+		</div>
+
+		</a>
+		<?php endif; ?><?php // END Date Box ?>
+
+		<?php // START Right Content ?>
+		<div class="ic-content">
+
+			<?php // Header (Title/Category) of the event ?>
+			<div class="eventtitle ic-event-title ic-clearfix">
+
+				<?php // Title of the event ?>
+				<div class="title-header ic-title-header ic-float-left">
+					<h2>
+						<a href="<?php echo $EVENT_URL; ?>" title="<?php echo $EVENT_TITLE; ?>">
+							<?php echo $EVENT_TITLEBAR; ?>
+						</a>
+					</h2>
+				</div>
+
+				<?php // Category ?>
+				<div class="title-cat ic-title-cat ic-float-right <?php if ($CATEGORY_FONTCOLOR == 'fontColor') : ?>ic-text-border<?php endif; ?>"
+					style="color: <?php echo $CATEGORY_COLOR; ?>;">
+					<?php echo $CATEGORY_TITLE; ?>
+				</div>
+				<!--div class="title-cat">
+					<i class="icTip icon-folder-3 caticon <?php echo $CATEGORY_FONTCOLOR; ?>" style="background:<?php echo $CATEGORY_COLOR; ?>" title="<?php echo $CATEGORY_TITLE; ?>"></i> <?php echo $CATEGORY_TITLE; ?>
+				</div-->
+
+			</div>
+
+			<?php // Feature icons ?>
+			<?php if (!empty($FEATURES_ICONSIZE_LIST)) : ?>
+			<div class="ic-features-container">
+				<?php foreach ($FEATURES_ICONS as $icon) : ?>
+				<div class="ic-feature-icon">
+					<img class="iCtip" src="<?php echo $FEATURES_ICONROOT_LIST . $icon['icon'] ?>" alt="<?php echo $icon['icon_alt'] ?>" title="<?php echo $SHOW_ICON_TITLE == '1' ? $icon['icon_alt'] : '' ?>">
+				</div>
+				<?php endforeach ?>
+			</div>
+			<?php endif ?>
+
+			<?php // Next Date ('next' 'today' or 'last date' if no next date) ?>
+			<?php if ($EVENT_DATE): ?>
+			<div class="nextdate ic-next-date ic-clearfix">
+				<strong><?php echo $EVENT_DATE; ?></strong>
+			</div>
+			<?php endif; ?>
+
+			<?php // Location (different display, depending on the fields filled) ?>
+			<?php if ($EVENT_VENUE OR $EVENT_CITY): ?>
+			<div class="place ic-place">
+
+				<?php // Place name ?>
+				<?php if ($EVENT_VENUE): ?><?php echo $EVENT_VENUE;?><?php endif; ?>
+
+				<?php // If Place Name exists and city set (Google Maps). Displays Country if set. ?>
+				<?php if ($EVENT_CITY AND $EVENT_VENUE): ?>
+					<span> - </span>
+					<?php echo $EVENT_CITY;?><?php if ($EVENT_COUNTRY): ?>, <?php echo $EVENT_COUNTRY;?><?php endif; ?>
+				<?php endif; ?>
+
+				<?php // If Place Name doesn't exist and city set (Google Maps). Displays Country if set. ?>
+				<?php if ($EVENT_CITY AND !$EVENT_VENUE): ?>
+					<?php echo $EVENT_CITY;?><?php if ($EVENT_COUNTRY): ?>, <?php echo $EVENT_COUNTRY;?><?php endif; ?>
+				<?php endif; ?>
+
+			</div>
+			<?php endif; ?>
+
+			<?php // Short Description ?>
+			<?php if ($EVENT_DESC): ?>
+			<div class="descshort ic-descshort">
+				<?php echo $EVENT_INTRO_TEXT ; ?><?php echo $READ_MORE ; ?>
+			</div>
+			<?php endif; ?>
+
+			<?php // Addons Plugins (JComments, ...) - onListAddEventInfo ?>
+			<?php if ($IC_LIST_ADD_EVENT_INFO): ?>
+				<?php echo $IC_LIST_ADD_EVENT_INFO; ?>
+			<?php endif; ?>
+
+			<?php // + infos Text ?>
+			<div class="moreinfos ic-more-info">
+			 	<a href="<?php echo $EVENT_URL; ?>" title="<?php echo $EVENT_TITLE; ?>">
+			 		<?php echo JTEXT::_('COM_ICAGENDA_EVENTS_MORE_INFO'); ?>
+			 	</a>
+			</div>
+
+		</div><?php // END Right Content ?>
+
+	</div>
+
+<?php // END Event ?>
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/ic_rounded_registration.php b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/ic_rounded_registration.php
new file mode 100644
index 00000000..2f202e0c
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/ic_rounded_registration.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-05-04
+ *
+ * @package     iCagenda.Site
+ * @subpackage  Themes.Packs
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       2.0
+ *----------------------------------------------------------------------------
+ * @themepack   ic_rounded
+ * @template    registration
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+?>
+
+<!-- Event registration -->
+
+<?php // Header of Registration page ?>
+<?php // Show event ?>
+<div class="ic-reg-event ic-clearfix">
+	<div class="ic-reg-box">
+		<?php if ($EVENT_NEXT): ?>
+		<div class="ic-reg-icon ic-float-left">
+		</div>
+		<?php endif; ?>
+		<div class="ic-reg-content">
+
+			<?php // Category ?>
+			<div class="ic-reg-cat">
+				<?php echo $CATEGORY_TITLE; ?>
+			</div>
+
+			<?php // Event Title with link to event ?>
+			<div class="ic-reg-event-title">
+				<a href="<?php echo $EVENT_URL; ?>" title="<?php echo $EVENT_TITLE; ?>"><?php echo $EVENT_TITLE; ?></a>
+			</div>
+		</div>
+	</div>
+</div>
+<?php // END Header ?>
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/images/ic_load.gif b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/images/ic_load.gif
new file mode 100644
index 00000000..97d7e15b
Binary files /dev/null and b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/images/ic_load.gif differ
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/images/ic_rounded_preview.png b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/images/ic_rounded_preview.png
new file mode 100644
index 00000000..2b7ebd57
Binary files /dev/null and b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/images/ic_rounded_preview.png differ
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/images/ic_rounded_thumbnail.png b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/images/ic_rounded_thumbnail.png
new file mode 100644
index 00000000..a2ef8b05
Binary files /dev/null and b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/images/ic_rounded_thumbnail.png differ
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/images/index.html b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/images/index.html
new file mode 100644
index 00000000..fa6d84e8
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/images/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/images/info.png b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/images/info.png
new file mode 100644
index 00000000..cb6b2f02
Binary files /dev/null and b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/images/info.png differ
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/images/minuslist.png b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/images/minuslist.png
new file mode 100644
index 00000000..7f7e6762
Binary files /dev/null and b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/images/minuslist.png differ
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/images/plus.png b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/images/plus.png
new file mode 100644
index 00000000..f95a1d60
Binary files /dev/null and b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/images/plus.png differ
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/images/pluslist.png b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/images/pluslist.png
new file mode 100644
index 00000000..b90ad050
Binary files /dev/null and b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/images/pluslist.png differ
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/images/regis-baloon.png b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/images/regis-baloon.png
new file mode 100644
index 00000000..f63cbf78
Binary files /dev/null and b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/images/regis-baloon.png differ
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/images/selector-arrow.png b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/images/selector-arrow.png
new file mode 100644
index 00000000..80a89468
Binary files /dev/null and b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/images/selector-arrow.png differ
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/index.html b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/index.html
new file mode 100644
index 00000000..fa6d84e8
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/themes/packs/ic_rounded/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/components/com_icagenda/themes/packs/index.html b/deployed/icagenda/components/com_icagenda/themes/packs/index.html
new file mode 100644
index 00000000..fa6d84e8
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/themes/packs/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/components/com_icagenda/views/event/index.html b/deployed/icagenda/components/com_icagenda/views/event/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/views/event/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/components/com_icagenda/views/event/tmpl/default.php b/deployed/icagenda/components/com_icagenda/views/event/tmpl/default.php
new file mode 100644
index 00000000..fa10a547
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/views/event/tmpl/default.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.6.7 2016-03-26
+ * @since       3.6.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+// Shortcut for item
+$item = $this->item;
+?>
+
+<div id="icagenda" class="ic-event-view<?php echo $this->pageclass_sfx; ?>">
+
+	<?php // Top Buttons ?>
+	<?php echo $this->loadTemplate('top'); ?>
+
+	<?php echo "<!-- " . $this->template . " -->"; ?>
+
+	<?php // Content is generated by content plugin event "iCagendaOnEventBeforeDisplay" ?>
+	<?php echo $item->event->iCagendaOnEventBeforeDisplay; ?>
+
+	<?php // iCagenda Vars ?>
+	<?php require_once $this->icevent_vars; ?>
+
+	<?php // Layout for Event Details view (from Theme Pack) ?>
+	<?php require_once $this->themeEvent; ?>
+
+	<?php // Content is generated by content plugin event "iCagendaOnEventAfterDisplay" ?>
+	<?php echo $item->event->iCagendaOnEventAfterDisplay; ?>
+</div>
+
+<script type="text/javascript">
+	jQuery('.alert-danger > .alert-heading').html('Warning');
+</script>
diff --git a/deployed/icagenda/components/com_icagenda/views/event/tmpl/default_top.php b/deployed/icagenda/components/com_icagenda/views/event/tmpl/default_top.php
new file mode 100644
index 00000000..d7176b48
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/views/event/tmpl/default_top.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.12 2020-03-25
+ *
+ * @package     iCagenda.Site
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2020 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.6.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+$app        = JFactory::getApplication();
+$isSef      = $app->getCfg('sef');
+$item       = $this->item;
+$iCicons    = new iCicons();
+
+$uri        = JUri::getInstance()->toString();
+$evt_id     = $app->input->getInt('id', 0);
+$event_link = JRoute::_('index.php?option=com_icagenda&view=event&id=' . $evt_id);
+
+$print_url  = ($isSef == 1) ? $event_link . '?tmpl=component' : $event_link . '&tmpl=component';
+$ical_url   = ($isSef == 1) ? $uri . '?vcal=1' : $uri . '&vcal=1';
+$ical_url   = preg_replace('/\?date=[^\?]*/', '', $ical_url);
+$ical_url   = preg_replace('/&date=[^&]*/', '', $ical_url);
+?>
+
+<?php // Top Buttons ?>
+<div class="ic-top-buttons">
+
+<?php if ($app->input->get('tmpl') != 'component') : ?>
+	<div class="ic-buttons ic-clearfix">
+
+		<?php // Print icon ?>
+		<?php if ($this->iconPrint_global == 2) : ?>
+		<div class="ic-icon">
+			<?php echo $iCicons->showIcon('printpreview', $print_url); ?>
+		</div>
+		<?php endif; ?>
+
+		<?php // Add to Cal icon ?>
+		<?php if ($this->iconAddToCal_global == 2) :  ?>
+		<div class="ic-icon">
+			<?php echo $iCicons->showIcon('vcal', $uri, $ical_url, $item->googleCalendar, $item->windowsliveCalendar, $item->yahooCalendar); ?>
+		</div>
+		<?php endif; ?>
+
+		<?php // Manager Icons ?>
+		<div class="ic-icon">
+			<?php echo $item->managerToolBar; ?>
+		</div>
+
+	</div>
+
+<?php else : ?>
+
+	<?php // Print Icon ?>
+	<div class="ic-printpopup-btn">
+		<?php echo $iCicons->showIcon('print'); ?>
+	</div>
+
+<?php endif; ?>
+
+</div>
+<div class="ic-clearfix">&nbsp;</div>
diff --git a/deployed/icagenda/components/com_icagenda/views/event/tmpl/default_vcal.php b/deployed/icagenda/components/com_icagenda/views/event/tmpl/default_vcal.php
new file mode 100644
index 00000000..3312b856
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/views/event/tmpl/default_vcal.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Tom-Henning (MaW) / Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.6.1 2016-08-23
+ * @since       3.2.9
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+require_once JPATH_LIBRARIES . '/ic_library/iCalcreator/iCalcreator.class.php';
+
+$app			= JFactory::getApplication();
+
+// Load Joomla config options
+$sitename		= $app->getCfg('sitename');
+$offset			= $app->getCfg('offset');
+
+// Shortcut for item
+$item			= $this->item;
+
+// Get date from the session (current date of the event page)
+$session		= JFactory::getSession();
+$session_date	= $session->get('session_date');
+
+if ($session_date)
+{
+	$eventDateTime	= iCDate::isDate($session_date) ? $session_date : '';
+}
+else
+{
+	$url_date		= $app->input->get('date', '');
+
+	if ($url_date)
+	{
+		$sd_ex			= explode('-', $url_date);
+		$eventDateTime	= $sd_ex['0'] . '-' . $sd_ex['1'] . '-' . $sd_ex['2'] . ' ' . $sd_ex['3'] . ':' . $sd_ex['4'] . ':00';
+	}
+}
+
+//$new_date		= isset($eventDateTime) ? $eventDateTime : 'now';
+$new_date		= isset($eventDateTime) ? $eventDateTime : $item->next;
+
+// Set Time Offset for date of the event
+$dateTimeZone	= new DateTimeZone($offset);
+$dateTime		= new DateTime($new_date, $dateTimeZone);
+$timeOffset		= $dateTimeZone->getOffset($dateTime);
+$timezone		= ($timeOffset / 3600);
+
+$event_date		= isset($eventDateTime)
+				? date('Y-m-d-H-i', (strtotime($eventDateTime) - $timeOffset))
+				: date('Y-m-d-H-i', (strtotime($item->next) - $timeOffset));
+
+// Set vCalendar config;
+$config = array( "unique_id" => $sitename
+  // set a (site) unique id
+               , "TZID"      => $offset );
+  // opt. "calendar" timezone
+
+// Create a new calendar instance
+$v = new vCalendar($config);
+$v->setConfig( 'filename', 'icagenda.ics' );
+$v->prodid = 'iCagenda';
+
+//$tz = 'UTC';
+$tz = $offset;
+$v->setProperty( 'method', 'PUBLISH' );
+$v->setProperty( 'X-WR-CALDESC', '' );
+$v->setProperty( 'X-WR-TIMEZONE', $tz);
+$xprops = array( 'X-LIC-LOCATION' => $tz);
+
+if (version_compare(PHP_VERSION, '5.3.0') >= 0)
+{
+	iCalUtilityFunctions::createTimezone($v, $tz, $xprops);
+}
+
+$s_dates		= $item->dates;
+$single_dates	= unserialize($s_dates);
+
+$ex			= explode('-', $event_date);
+$this_date	= $ex['0'].'-'.$ex['1'].'-'.$ex['2'].' '.$ex['3'].':'.$ex['4'];
+
+$startdate	= date('Y-m-d-H-i', (strtotime($item->startdate) - $timeOffset));
+$enddate	= date('Y-m-d-H-i', (strtotime($item->enddate) - $timeOffset));
+
+if ( ($event_date >= $startdate)
+	&& ($event_date <= $enddate)
+	&& ( ! in_array($this_date, $single_dates)) )
+{
+	$weekdays	= ($item->weekdays || $item->weekdays == '0') ? true : false;
+
+	if ($weekdays)
+	{
+		$startdate	= date('Y-m-d-H-i', strtotime($this_date));
+		$enddate	= date('Y-m-d', strtotime($this_date)) . '-' . date('H-i', strtotime($item->enddate)-$timeOffset);
+	}
+
+	$ex_S = explode('-', $startdate);
+	$ex_E = explode('-', $enddate);
+
+	$start_Datetime	= $ex_S['0'] . $ex_S['1'] . $ex_S['2'] . 'T' . $ex_S['3'] . $ex_S['4'] . '00Z';
+	$end_Datetime	= $ex_E['0'] . $ex_E['1'] . $ex_E['2'] . 'T' . $ex_E['3'] . $ex_E['4'] . '00Z';
+}
+else
+{
+	$start_Datetime = $end_Datetime = $ex['0'] . $ex['1'] . $ex['2'] . 'T' . $ex['3'] . $ex['4'] . '00Z';
+}
+
+// Not yet used
+$urllink	= JUri::getInstance()->toString();
+$cleanurl	= preg_replace('/&tmpl=[^&]*/', '', $urllink);
+$cleanurl	= preg_replace('/&vcal=[^&]*/', '', $cleanurl);
+
+$vevent = &$v->newComponent('vevent');
+$vevent->setProperty('categories', $item->cat_title);
+$vevent->setProperty('summary', $item->title);
+$vevent->setProperty('description', strip_tags($item->desc));
+$vevent->setProperty('url', $cleanurl);
+$vevent->setUID($item->id);
+
+if ($item->contact_name != '')
+{
+	$vevent->setOrganizer($item->contact_name, $item->contact_email);
+}
+
+$vevent->setProperty('dtstart', $start_Datetime);
+$vevent->setProperty('dtend', $end_Datetime);
+
+$vevent->setProperty('location',$item->place);
+
+$v->returnCalendar();
diff --git a/deployed/icagenda/components/com_icagenda/views/event/tmpl/index.html b/deployed/icagenda/components/com_icagenda/views/event/tmpl/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/views/event/tmpl/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/components/com_icagenda/views/event/view.html.php b/deployed/icagenda/components/com_icagenda/views/event/view.html.php
new file mode 100644
index 00000000..ed7acbdf
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/views/event/view.html.php
@@ -0,0 +1,382 @@
+<?php
+
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-04-30
+ *
+ * @package     iCagenda.Site
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.6.0
+ *----------------------------------------------------------------------------
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+
+/**
+ * HTML Event View class for the iCagenda component
+ *
+ * @since   3.6.0
+ */
+class iCagendaViewEvent extends JViewLegacy
+{
+	protected $item;
+
+	protected $state;
+
+	protected $user;
+
+	protected $params;
+
+	protected $icevent_vars = 'components/com_icagenda/add/elements/icevent_vars.php';
+
+	protected $print;
+
+	protected $timeZones;
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise a Error object.
+	 */
+	public function display($tpl = null)
+	{
+		$app  = JFactory::getApplication();
+		$user = JFactory::getUser();
+
+		$this->item   = $this->get('Item');
+		$this->state  = $this->get('State');
+		$this->params = $this->state->get('params');
+		$this->user   = $user;
+
+		$this->timeZones = icagendaEventsData::getAllTimeZone(1);
+
+		if (isset($_POST['change_timezone'])) $_SESSION['timezone'] = $_POST['timezone'];
+
+		$offset = substr($_SESSION['timezone'], 0, strpos($_SESSION['timezone'], "_"));
+
+		$this->item->rerun = icagendaEvent::getCustomField($this->item->id, 'rerun');
+
+		$rerunEnd = new DateTime($this->item->rerun);
+		$rerunEnd->modify('+45 minutes');
+		$rerunEnd = date_format($rerunEnd, 'Y-m-d H:i');
+
+		$this->item->rerunEnd = $rerunEnd;
+
+		icagendaEventsData::changeDate($offset, $this->item->startdate, $this->item->enddate);
+		icagendaEventsData::changeDate($offset, $this->item->rerun, $this->item->rerunEnd);
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors'))) {
+			throw new Exception(implode("\n", $errors), 500);
+
+			return false;
+		}
+
+		// Shortcuts
+		$item   = $this->item;
+		$params = $this->params;
+
+		// For Dev.
+		$time_loading = $params->get('time_loading', '');
+
+		if ($time_loading) {
+			$starttime_list = iCLibrary::getMicrotime();
+		}
+
+		// Check Access
+		$userLevels = $user->getAuthorisedViewLevels();
+		$userGroups = $user->getAuthorisedGroups();
+
+		$groupid = JComponentHelper::getParams('com_icagenda')->get('approvalGroups', array("8"));
+		$groupid = is_array($groupid) ? $groupid : array($groupid);
+
+		$uri    = JFactory::getUri();
+		$return = base64_encode($uri); // Encode Return URL
+		$rlink  = JRoute::_("index.php?option=com_users&view=login&return=$return", false);
+
+		if (
+			!in_array('8', $userGroups)
+			&& (!in_array($item->access, $userLevels)
+				|| ($item->approval == 1 && !array_intersect($userGroups, $groupid)))
+		) {
+			if ($user->id) {
+				$app->enqueueMessage(JText::_('JERROR_LOGIN_DENIED'), 'warning');
+			} else {
+				$app->enqueueMessage(JText::_('JGLOBAL_YOU_MUST_LOGIN_FIRST'), 'info');
+			}
+
+			$app->redirect($rlink);
+		}
+
+		// Load Theme pack layout for event details view
+		$this->template = $params->get('template', 'ic_rounded');
+		$themeEvent     = icagendaTheme::getThemeLayout($this->template, 'event');
+
+		// Check if errors (file missing)
+		if ($themeEvent[1]) {
+			$msg = ($themeEvent[1] !== 'deprecated')
+				? 'iCagenda ' . JText::_('PHPMAILER_FILE_OPEN') . ' <strong>' . $this->template . '_event.php</strong>'
+				: JText::_('COM_ICAGENDA_ERROR_THEME_PACK_OUTDATED') . '<br/>' .
+				JText::sprintf('COM_ICAGENDA_ERROR_THEME_PACK_EDIT_OR_CHANGE', '<strong>' . $this->template . '_list.php</strong>');
+			$app->enqueueMessage($msg, 'warning');
+
+			if ($themeEvent[1] !== 'alert') {
+				return false;
+			}
+		}
+
+		$this->themeEvent = $themeEvent[0];
+
+
+		// Component Options
+		$this->GoogleMaps           = $params->get('GoogleMaps', 1);
+		$this->iconPrint_global     = $params->get('iconPrint_global', 0);
+		$this->iconAddToCal_global  = $params->get('iconAddToCal_global', 0);
+		$this->iconAddToCal_options = $params->get('iconAddToCal_options', 0); // To be checked
+
+
+		// Increment the hit counter of the event.
+		$model = $this->getModel();
+		$model->hit();
+
+		// Check vcal view (ics file for export to calendar)
+		$vcal = $app->input->get('vcal');
+
+		if ($vcal) {
+			$tpl = 'vcal';
+		} else {
+			icagendaInfo::commentVersion();
+		}
+
+
+		// Content Object needs a "text" property
+		$item->text = $item->desc;
+
+		// Process the content plugins.
+		if (version_compare(JVERSION, '3.0', 'lt')) {
+			$this->dispatcher = JDispatcher::getInstance();
+		} else {
+			$this->dispatcher = JEventDispatcher::getInstance();
+		}
+
+		JPluginHelper::importPlugin('content');
+
+		//		$this->dispatcher->trigger('onContentPrepare', array ('com_icagenda.event', &$item, &$this->params, '0'));
+
+		$this->dispatcher->trigger('onEventPrepare', array('com_icagenda.event', &$item, &$this->params)); // @deprecated. Kept for B/C
+		$this->dispatcher->trigger('iCagendaOnEventPrepare', array('com_icagenda.event', &$item, &$this->params));
+
+		$item->event = new stdClass;
+
+		$results = $this->dispatcher->trigger('iCagendaOnEventBeforeDisplay', array('com_icagenda.event', &$item, &$this->params));
+		$item->event->iCagendaOnEventBeforeDisplay = trim(implode("\n", $results));
+
+		$results = $this->dispatcher->trigger('iCagendaOnEventAfterDisplay', array('com_icagenda.event', &$item, &$this->params));
+		$item->event->iCagendaOnEventAfterDisplay = trim(implode("\n", $results));
+
+
+		// Escape strings for HTML output
+		$this->pageclass_sfx = htmlspecialchars($this->item->params->get('pageclass_sfx'));
+
+		$this->_prepareDocument();
+
+		$this->icevent_vars = 'components/com_icagenda/add/elements/icevent_vars.php';
+
+		parent::display($tpl);
+
+		$this->dispatcher->trigger('onEventAfterDisplay', array('com_icagenda.event', &$item, &$this->params)); // @deprecated. Kept for B/C
+
+		// Loads jQuery Library
+		if (version_compare(JVERSION, '3.0', 'lt')) {
+			icagendaThemeJoomla25::loadjQuery();
+		}
+		// Joomla 3
+		else {
+			JHtml::_('bootstrap.framework');
+			JHtml::_('jquery.framework');
+		}
+
+		// Google Maps api V3
+		// @TODO: simplify this loading!
+		if (
+			!empty($item->lng)
+			&& !empty($item->lat)
+			&& $item->lng != '0.0000000000000000'
+			&& $item->lat != '0.0000000000000000'
+			&& $this->GoogleMaps == 1
+		) {
+			icagendaGooglemaps::loadGMapScripts();
+		}
+
+		// Loading Script tipTip used for iCtips
+		JHtml::script('com_icagenda/jquery.tipTip.js', false, true);
+
+		// Add ic-addtocal tipTip
+		$iCAddToCal	  = array();
+		$iCAddToCal[] = '	jQuery(document).ready(function(){';
+		$iCAddToCal[] = '		jQuery(".ic-addtocal").tipTip({maxWidth: "200px", defaultPosition: "bottom", edgeOffset: 1, activation:"hover", keepAlive: true});';
+		$iCAddToCal[] = '	});';
+
+		// Add the script to the document head.
+		JFactory::getDocument()->addScriptDeclaration(implode("\n", $iCAddToCal));
+
+		// Add CSS
+		$document = Factory::getDocument();
+		$document->addStyleSheet('https://www.archlinexp.com/components/com_icagenda/themes/packs/default/css/default_component.css');
+		//icagendaTheme::loadComponentCSS($this->template);
+		icagendaThemeStyle::addMediaCss($this->template, 'component');
+
+		// For Dev.
+		if ($time_loading) {
+			$endtime_list = iCLibrary::getMicrotime();
+
+			echo '<center style="font-size:8px;">Time to create page: ' . round($endtime_list - $starttime_list, 3) . ' seconds</center>';
+		}
+	}
+
+	/**
+	 * Prepares the document.
+	 *
+	 * @return  void.
+	 */
+	protected function _prepareDocument()
+	{
+		$app     = JFactory::getApplication();
+		$menus   = $app->getMenu();
+		$pathway = $app->getPathway();
+		$title   = null;
+
+		// Because the application sets a default page title,
+		// we need to get it from the menu item itself
+		$menu = $menus->getActive();
+
+		if ($menu) {
+			$this->params->def('page_heading', $this->params->get('page_title', $menu->title));
+		} else {
+			$this->params->def('page_heading', JText::_('IC_EVENT'));
+		}
+
+		$title = $this->params->get('page_title', '');
+
+		$id = (int) @$menu->query['id'];
+
+		// If the menu item does not concern this event
+		if ($menu && ($menu->query['option'] != 'com_icagenda' || $menu->query['view'] != 'event' || $id != $this->item->id)) {
+			// If this is not a single event menu item, set the page title to the event title
+			if ($this->item->title) {
+				$title = $this->item->title;
+			}
+
+			$pathway->addItem($this->item->title, '');
+		}
+
+		// Check for empty title and add site name if param is set
+		if (empty($title)) {
+			$title = $app->get('sitename');
+		} elseif ($app->get('sitename_pagetitles', 0) == 1) {
+			$title = JText::sprintf('JPAGETITLE', $app->get('sitename'), $title);
+		} elseif ($app->get('sitename_pagetitles', 0) == 2) {
+			$title = JText::sprintf('JPAGETITLE', $title, $app->get('sitename'));
+		}
+
+		if (empty($title)) {
+			$title = $this->item->title;
+		}
+
+		$this->document->setTitle($title);
+
+		if ($this->item->metadesc) {
+			$this->document->setDescription($this->item->metadesc);
+		} elseif ($this->params->get('menu-meta_description')) {
+			$this->document->setDescription($this->params->get('menu-meta_description'));
+		}
+
+		//		if ($this->item->metakey)
+		//		{
+		//			$this->document->setMetadata('keywords', $this->item->metakey);
+		//		}
+		//		elseif ($this->params->get('menu-meta_keywords'))
+		//		{
+		$this->document->setMetadata('keywords', $this->params->get('menu-meta_keywords'));
+		//		}
+
+		if ($this->params->get('robots')) {
+			$this->document->setMetadata('robots', $this->params->get('robots'));
+		}
+
+		//		if ($app->get('MetaAuthor') == '1')
+		//		{
+		//			$author = $this->item->created_by_alias ? $this->item->created_by_alias : $this->item->author;
+		//			$this->document->setMetaData('author', $author);
+		//		}
+
+		//		$mdata = $this->item->metadata->toArray();
+
+		//		foreach ($mdata as $k => $v)
+		//		{
+		//			if ($v)
+		//			{
+		//				$this->document->setMetadata($k, $v);
+		//			}
+		//		}
+
+		// If there is a pagebreak heading or title, add it to the page title
+		if (!empty($this->item->page_title)) {
+			$this->item->title = $this->item->title . ' - ' . $this->item->page_title;
+			$this->document->setTitle(
+				$this->item->page_title . ' - ' . JText::sprintf('PLG_CONTENT_PAGEBREAK_PAGE_NUM', $this->state->get('list.offset') + 1)
+			);
+		}
+
+		if ($this->print) {
+			$this->document->setMetaData('robots', 'noindex, nofollow');
+		}
+
+		// Open Graph Tags
+		$eventTitle = icagendaEvent::setMetaTitle($this->item);
+		$eventType  = 'article';
+		$eventImage = $this->item->image;
+		$imgLink    = filter_var($eventImage, FILTER_VALIDATE_URL);
+		$eventUrl   = JUri::getInstance()->toString();
+		$sitename   = $app->getCfg('sitename');
+		$og_desc    = icagendaEvent::setMetaDesc($this->item);
+
+		if ($app->input->get('tmpl') != 'component') {
+			if ($eventTitle) {
+				$this->document->setTitle($title);
+				$this->document->addCustomTag('<meta property="og:title" content="' . $eventTitle . '" />');
+			}
+			if ($eventType) {
+				$this->document->addCustomTag('<meta property="og:type" content="' . $eventType . '" />');
+			}
+			if ($eventImage) {
+				if ($imgLink) {
+					$this->document->addCustomTag('<meta property="og:image" content="' . $eventImage . '" />');
+				} else {
+					$this->document->addCustomTag('<meta property="og:image" content="' . JURI::base() . $eventImage . '" />');
+				}
+			}
+			if ($eventUrl) {
+				$this->document->addCustomTag('<meta property="og:url" content="' . $eventUrl . '" />');
+			}
+			if ($og_desc) {
+				$this->document->setDescription($og_desc);
+				$this->document->addCustomTag('<meta property="og:description" content="' . $og_desc . '" />');
+			}
+			if ($sitename) {
+				$this->document->addCustomTag('<meta property="og:site_name" content="' . $sitename . '" />');
+			}
+		}
+	}
+}
diff --git a/deployed/icagenda/components/com_icagenda/views/index.html b/deployed/icagenda/components/com_icagenda/views/index.html
new file mode 100644
index 00000000..fa6d84e8
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/views/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/components/com_icagenda/views/list/index.html b/deployed/icagenda/components/com_icagenda/views/list/index.html
new file mode 100644
index 00000000..fa6d84e8
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/views/list/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/components/com_icagenda/views/list/tmpl/default.php b/deployed/icagenda/components/com_icagenda/views/list/tmpl/default.php
new file mode 100644
index 00000000..1fb2c2ca
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/views/list/tmpl/default.php
@@ -0,0 +1,559 @@
+<?php
+
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.6.9 2017-06-17
+ * @since       3.6.0
+ *------------------------------------------------------------------------------
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+$user = JFactory::getUser();
+$actual_link = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on' ? "https" : "http") . "://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]";
+
+if (count((array)$this->nextItem)) {
+	$nextItemDate	= explode(' ', $this->nextItem->next);
+	$nextItemEnd 	= substr($this->nextItem->enddate, -8);
+	$nextItemEnd 	= substr($nextItemEnd, 0, -3);
+	$nextItemStart 	= substr($nextItemDate[1], 0, 5);
+
+	$presenters = explode(';', $this->nextItem->presenters);
+}
+
+$pos = strpos($actual_link, '-update-day');
+?>
+
+<?php if ($pos) : ?>
+	<meta property="og:image" content="https://www.archlinexp.com/public/blog/ARCHLineXP_23_fHD_ENG.jpg" />
+	<meta name="twitter:image:src" content="https://www.archlinexp.com/public/blog/ARCHLineXP_23_fHD_ENG.jpg" />
+<?php else : ?>
+	<meta property="og:image" content="https://www.archlinexp.com/images/2023/03/28/archlinexp_23_expo_webslider_1920_410px.png" />
+	<meta name="twitter:image:src" content="https://www.archlinexp.com/images/2023/03/28/archlinexp_23_expo_webslider_1920_410px.png" />
+<?php endif; ?>
+
+<style media="screen">
+	.ic-list-events {
+		margin-left: 7%;
+	}
+
+	.column>p {
+		text-align: center;
+	}
+
+	.header-date {
+		font-size: 18px;
+	}
+
+	.time {
+		font-size: 24px;
+	}
+
+	.sppb-btn:hover {
+		color: #FFFFFF !important;
+	}
+
+	.ic-clearfix,
+	.custom-text {
+		text-align: center;
+	}
+
+	.border-top {
+		margin-top: -30px;
+	}
+
+	p:not(.time),
+	.div-text {
+		font-size: 16px !important;
+	}
+
+	.box-header {
+		width: 100%;
+		border: 2px solid #bbbbbb;
+		position: absolute;
+		margin-bottom: 10%;
+	}
+
+	.nextShow {
+		background-color: rgba(230, 230, 230, 1);
+		border: 2px solid #bbbbbb;
+	}
+
+	.row:after {
+		content: "";
+		display: table;
+		clear: both;
+	}
+
+	.border-top {
+		border-top: 2px solid #bbbbbb;
+		width: 75%;
+		margin-left: 10%;
+	}
+
+	.custom-btn {
+		width: 100% !important;
+		height: 30% !important;
+		margin-top: -10px !important;
+	}
+
+	.sppb-btn-custom-2 {
+		background-color: rgba(56, 151, 211, 1);
+		color: #FFFFFF;
+		font-size: 16px;
+		bottom: 0;
+	}
+
+	.sppb-btn-custom-2:active,
+	.sppb-btn-custom-2:focus,
+	.sppb-btn-custom-2:hover {
+		color: #FFFFFF !important;
+	}
+
+	.sppb-btn {
+		display: inline-block;
+		font-weight: 400;
+		text-align: center;
+		white-space: pre-line;
+		vertical-align: middle;
+		user-select: none;
+		border: 1px solid transparent;
+		padding: 8px 12px;
+		line-height: 1.25;
+		border-radius: 4px;
+	}
+
+	.componentheading {
+		text-align: center;
+	}
+
+	.upcoming {
+		margin-left: 8%;
+		margin-bottom: 0%;
+	}
+
+	.nextShow>.header-date,
+	.nextShow>.time {
+		text-align: center;
+	}
+
+	.nextShow-date {
+		font-size: 20px;
+	}
+
+	.nextShow-lower {
+		font-size: 20px;
+		text-align: center;
+	}
+
+	.nextShow>#ckimgrsz {
+		display: none;
+	}
+
+	.at-icon-wrapper {
+		margin-left: -10px;
+	}
+
+	@media only screen and (min-width: 600px) {
+		#prev-button {
+			margin-bottom: -50px !important;
+		}
+
+		.sppb-btn-custom {
+			background-color: rgba(56, 151, 211, 1);
+			color: #FFFFFF;
+			font-size: 16px;
+			bottom: 0;
+			margin-bottom: 5px;
+		}
+
+		.column-row {
+			margin-left: -85px;
+		}
+
+		.sppb-btn-custom:active,
+		.sppb-btn-custom:focus,
+		.sppb-btn-custom:hover {
+			color: #FFFFFF !important;
+		}
+
+		.borderless-column {
+			height: 470px;
+			width: 30%;
+			border: 2px solid white;
+			margin-left: 2%;
+			margin-bottom: 2%;
+		}
+
+		.column {
+			height: 470px;
+			border: 2px solid #bbbbbb;
+			margin-left: 2%;
+			margin-bottom: 2%;
+			width: 30%;
+		}
+
+		.frame {
+			width: 100%;
+			height: 340px;
+			margin-bottom: 20px;
+		}
+
+		.left-div {
+			margin-left: -25px !important;
+		}
+
+		#presenter-list {
+			margin-left: 20px;
+			font-size: 17px;
+		}
+
+		.table-header {
+			font-size: 20px;
+		}
+
+		#table-div table tr td p,
+		#table-div table tr td ul li {
+			font-size: 16px;
+		}
+
+		.item-desc {
+			margin-bottom: 95px;
+		}
+	}
+
+	@media only screen and (max-width: 600px) {
+		#prev-button {
+			margin-bottom: -100px !important;
+		}
+
+		.sppb-btn-custom {
+			background-color: rgba(56, 151, 211, 1);
+			color: #FFFFFF;
+			font-size: 16px;
+			bottom: 0;
+		}
+
+		.sppb-btn-custom:active,
+		.sppb-btn-custom:focus,
+		.sppb-btn-custom:hover {
+			color: #FFFFFF !important;
+		}
+
+		.column {
+			width: 90%;
+			border: 2px solid #bbbbbb;
+			margin-bottom: 10px;
+		}
+
+		iframe,
+		.frame {
+			height: 220px;
+			width: 100%;
+		}
+
+		.table-header {
+			margin-top: 10%;
+		}
+
+		.item-desc {
+			margin-top: 25%;
+		}
+	}
+
+	<?php if ($pos) : ?>.ic-header-container,
+	#prev-button {
+		display: none;
+	}
+
+	.column {
+		position: relative;
+		margin-left: 30%;
+		height: 300px !important;
+	}
+
+	#icagenda-registration {
+		margin-top: -40px !important;
+	}
+
+	.custom-al-btn {
+		background-color: #F0C318;
+		border-color: #F0C318;
+		color: #000000;
+		font-size: 22px;
+	}
+
+	.custom-al-btn:hover {
+		background-color: #F0C318;
+		border-color: #F0C318;
+		color: #000000;
+	}
+
+	.update-day-txt {
+		text-transform: none;
+	}
+
+	<?php endif; ?>
+</style>
+
+
+<!--<div class="row">
+	<div class="col-md-6">
+		<label for="yt-link"><h3>Watch the expo here:</h3></label>
+		<iframe id="yt-link" width="555" height="393" src="https://www.youtube.com/embed/TYorKPd6f5k" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+	</div>
+
+	<div class="col-md-6">
+		<label for="yt-link"><h3>Say hi to us!</h3></label>
+		<?php
+		/*$document = JFactory::getDocument();
+		$renderer = $document->loadRenderer('module');
+		$module   = JModuleHelper::getModule('mod_smartshoutbox', 'Shoutbox - Virtual Expo 2021 November');
+
+		echo $renderer->render($module);*/
+		?>
+	</div>
+</div>
+<br/>-->
+
+<div class="row">
+	<form method="POST">
+		<div class="col-md-6 div-text">
+			<!--Choose your time zone, so that you can see when the presentations will air, according to your location.-->
+		</div>
+		<div class="col-md-4">
+			<!--<select name="timezone" style="width: auto">
+				<?php foreach ($this->timeZones as $key => $timeZone) : ?>
+					<?php if (!isset($_SESSION['timezone']) && $key == 324) : ?>
+						<option value="<?= $timeZone['id'] ?>" selected>
+							<?= $timeZone['zone'] ?> (<?= $timeZone['diff_from_GMT'] ?>)
+						</option>
+					<?php else : ?>
+						<option value="<?= $timeZone['id'] ?>" <?= $timeZone['id'] == $_SESSION['timezone'] ? 'selected' : '' ?>>
+							<?= $timeZone['zone'] ?> (<?= $timeZone['diff_from_GMT'] ?>)
+						</option>
+					<?php endif; ?>
+				<?php endforeach; ?>
+			</select>-->
+		</div>
+		<div class="col-md-1">
+			<!--<input type="submit" name="change_timezone" class="btn btn-default" value="Change my time zone" />-->
+		</div>
+	</form>
+</div>
+<br />
+
+<!--<img src="/images/2021/10/13/archlinexp_expo_win_live_1920_410px_04.png" alt="">
+<br/>-->
+
+<!--<?php if (count((array)$this->nextItem)) : ?>
+	<h2><b>Next show:</b></h2>
+
+	<div class="container nextShow">
+		<br/>
+
+		<div class="row">
+			<div class="col-md-6">
+					<iframe class="frame" src="<?= $this->nextItem->video_url ?>"></iframe>
+					<br/>
+
+					<p class="table-header"><b>Presenters:</b></p>
+
+					<p id="presenter-list">
+						<?php foreach ($presenters as $presenter) : ?>
+							<?= $presenter ?><br/>
+						<?php endforeach; ?>
+					</p>
+			</div>
+
+			<div class="col-md-6 left-div">
+				<p class="nextShow-date"><b><?= $this->nextItem->title ?></b></p>
+
+				<p class="nextShow-date"><b>Presentation starts at <?= $nextItemDate[0] ?> <?= $nextItemStart ?></b></p>
+				<br/>
+
+				<div class="item-desc">
+					<?= $this->nextItem->desc ?>
+				</div>
+
+				<a class="btn btn-primary btn-lg custom-btn" href="<?= $this->nextItem->url ?>">
+					SIGN UP
+				</a>
+				<br/>
+				<br/>
+
+				<p class="table-header" style="text-align: center;"><b>What you will learn about:</b></p>
+
+				<div id="table-div"></div>
+			</div>
+		</div>
+		<br/>
+	</div>
+<?php endif; ?>-->
+
+<div id="icagenda" class="ic-list-view<?php echo $this->pageclass_sfx; ?>">
+	<?php if ($this->params->get('show_page_heading', 1)) : ?>
+		<!--<h1 class="componentheading">
+		<?php echo $this->escape($this->params->get('page_heading')); ?>
+	</h1>-->
+	<?php endif; ?>
+
+	<?php // Content is generated by content plugin event "iCagendaOnListBeforeDisplay" 
+	?>
+	<?php echo $this->event->iCagendaOnListBeforeDisplay; ?>
+
+	<?php // Start List of events 
+	?>
+
+
+	<?php // Menu Item Link : not needed with form get method when SEF enabled, as processed by the router 
+	?>
+	<?php if (JFactory::getApplication()->getCfg('sef') != 1) : ?>
+		<input name="option" type="hidden" value="com_icagenda" />
+		<input name="view" type="hidden" value="list" />
+		<input name="Itemid" type="hidden" value="<?php echo JFactory::getApplication()->input->get('Itemid', 0); ?>" />
+	<?php endif; ?>
+
+	<?php // Search Filters 
+	?>
+	<?php if ($this->params->get('search_filters', '0')) : ?>
+		<?php echo $this->loadTemplate('filters'); ?>
+	<?php endif; ?>
+
+	<?php // Start Header 
+	?>
+	<div class="ic-clearfix">
+
+		<?php // Header - Title / Subtitle 
+		?>
+		<?php echo $this->header; ?>
+
+		<?php // Header - Categories Information 
+		?>
+		<?php echo $this->loadTemplate('categories'); ?>
+
+	</div>
+	<?php // End Header 
+	?>
+
+	<!--<h3 class="upcoming">Upcoming shows:</h3>-->
+
+	<?php // Header - Pagination 
+	?>
+	<?php if (in_array($this->params->get('navposition', 1), array('0', '2'))) : ?>
+		<div class="ic-clearfix">
+			<?php echo $this->pagination; ?>
+		</div>
+	<?php endif; ?>
+
+	<?php // List of events 
+	?>
+	<div class="ic-list-events ic-clearfix">
+		<?php echo '<!-- ' . $this->template . ' -->'; ?>
+
+		<form method="post" id="icagenda-registration" action="<?php echo JRoute::_('index.php?option=com_icagenda&task=registration.registerWithoutForm'); ?>">
+			<br />
+
+			<div class="row">
+				<?php
+				$i = 0;
+				$prevDate = '';
+
+				foreach ($this->items as $k => $item) :
+					$i++;
+
+					$enddate 	= substr($item->enddate, -8);
+					$enddate 	= substr($enddate, 0, 5);
+					$date 		= explode(' ', $item->next);
+					$rerunStart	= explode(' ', $item->rerun);
+					$rerunEnd 	= explode(' ', $item->rerunEnd);
+
+					if ($date[0] != $prevDate && $prevDate != '') : ?>
+						<div class="col-md-4 borderless-column"></div>
+					<?php endif; ?>
+
+					<?php $prevDate = $date[0]; ?>
+
+					<div class="col-md-4 column">
+						<p></p>
+						<!--<p class="header-date"><?= $date[0] ?></p>
+
+						<p class="time">Premier <?= substr($date[1], 0, 5) ?> <span class="lower"><?= $enddate ?></span></p>-->
+
+						<!--<?php if (!is_null($item->rerun)) : ?>
+							<p class="time">Rerun <?= substr($rerunStart[1], 0, 5) ?> <span class="lower"><?= substr($rerunEnd[1], 0, 5) ?></span></p>
+						<?php endif; ?>-->
+
+						<a href="<?= $item->url ?>"><img src="/<?= $item->image ?>" alt="<?= $item->title ?>"></a>
+
+						<p><b><?= $item->title ?></b></p>
+						<br />
+						<br />
+
+						<div class="border-top"></div>
+						<p class="short-desc"><?= $item->shortdesc ?></p>
+
+						<?php if ($item->lang != '') : ?>
+							<br />
+							<br />
+
+							<div class="border-top"></div>
+							<p><?= $item->lang ?></p>
+						<?php endif; ?>
+
+						<?php if ($item->id == '106') : ?>
+							<p>
+								<a class="sppb-btn  sppb-btn-custom sppb-btn-rounded custom-al-btn" href="<?= $item->url ?>">SIGN UP</a>
+							</p>
+						<?php else : ?>
+							<p>
+								<a class="sppb-btn  sppb-btn-custom sppb-btn-rounded" href="<?= $item->url ?>">WATCH</a>
+							</p>
+						<?php endif; ?>
+					</div>
+				<?php endforeach; ?>
+			</div>
+		</form>
+
+		<a href="/education/virtual-expo/virtual-expo-archives" id="prev-button" class="sppb-btn sppb-btn-custom sppb-btn-rounded">See our previous Expo</a>
+	</div>
+
+	<?php // AddThis buttons 
+	?>
+	<?php if ($this->params->get('atlist', 0) && $this->sharing) : ?>
+		<div class="share ic-clearfix">
+			<?php echo $this->sharing; ?>
+		</div>
+	<?php endif; ?>
+
+	<?php // Navigation & pagination 
+	?>
+	<?php if (in_array($this->params->get('navposition', 1), array('1', '2'))) : ?>
+		<div class="ic-clearfix">
+			<?php echo $this->pagination; ?>
+		</div>
+	<?php endif; ?>
+
+
+	<?php // End List of events 
+	?>
+
+	<?php // Content is generated by content plugin event "iCagendaOnListAfterDisplay" 
+	?>
+	<?php echo $this->event->iCagendaOnListAfterDisplay; ?>
+
+</div>
+
+<script type="text/javascript">
+	jQuery('#table-div').append(jQuery('table')[2]);
+</script>
\ No newline at end of file
diff --git a/deployed/icagenda/components/com_icagenda/views/list/tmpl/default.xml b/deployed/icagenda/components/com_icagenda/views/list/tmpl/default.xml
new file mode 100644
index 00000000..1300e4e2
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/views/list/tmpl/default.xml
@@ -0,0 +1,422 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+
+	<layout title="COM_ICAGENDA_LIST_VIEW_DEFAULT_TITLE">
+		<message>COM_ICAGENDA_LIST_VIEW_DEFAULT_DESC</message>
+	</layout>
+
+	<fields
+		name="params"
+		type="fields"
+		label="params"
+		id="params"
+		addfieldpath="/administrator/components/com_icagenda/models/fields"
+		>
+
+		<fieldset
+			name="ICAGENDA"
+			label="COM_ICAGENDA_MENU_OPTIONS"
+			addfieldpath="/administrator/components/com_icagenda/assets/elements"
+			>
+
+			<field type="Title" label="COM_ICAGENDA_LOGO" class="styleblanck" />
+
+			<field
+				name="template"
+				type="modal_template"
+				label="COM_ICAGENDA_THEME_PACK_LBL"
+				description="COM_ICAGENDA_THEME_PACK_DESC"
+				default="default"
+				class="inputbox"
+				size="40"
+			/>
+
+			<field type="Title" label="COM_MENUS_FILTER_FIELDSET_LABEL" class="stylebox lead input-xxlarge" />
+
+			<field
+				name="mcatid"
+				type="modal_multicat"
+				label="COM_ICAGENDA_LBL_CATEGORY"
+				description="COM_ICAGENDA_DESC_CATEGORY"
+				default="0"
+				class="inputbox"
+				multiple="multiple"
+			/>
+
+			<field
+				name="time"
+				type="list"
+				label="COM_ICAGENDA_TIME_LBL"
+				description="COM_ICAGENDA_TIME_DESC"
+				default=""
+				class="inputbox"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="2">COM_ICAGENDA_OPTION_PAST_EVENTS</option>
+				<option value="4">COM_ICAGENDA_OPTION_CURRENT_EVENTS_TODAY_EVENTS</option>
+				<option value="1">COM_ICAGENDA_OPTION_CURRENT_EVENTS_TODAY_AND_UPCOMING_EVENTS</option>
+				<option value="3">COM_ICAGENDA_OPTION_UPCOMING_EVENTS</option>
+				<option value="0">COM_ICAGENDA_OPTION_ALL_EVENTS</option>
+			</field>
+
+			<field
+				name="orderby"
+				type="list"
+				label="COM_ICAGENDA_LBL_DATE"
+				description="COM_ICAGENDA_DESC_DATE"
+				default=""
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="1">COM_ICAGENDA_DATE_DESC</option>
+				<option value="2">COM_ICAGENDA_DATE_ASC</option>
+			</field>
+
+			<field
+				name="datesDisplay"
+				type="radio"
+				label="COM_ICAGENDA_LIST_TYPE_LBL"
+				description="COM_ICAGENDA_LIST_TYPE_DESC"
+				default=""
+				class="btn-group"
+				onchange="icalert()"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="1">JYES</option>
+				<option value="2">JNO</option>
+			</field>
+
+			<field
+				name="eventsfile_error"
+				type="modal_icalert_msg"
+				label="COM_ICAGENDA_THEME_PACKS_COMPATIBILITY"
+				description="COM_ICAGENDA_ALERT_EVENTS_FILE_MISSING_DESC"
+			/>
+
+			<field
+				name="features_filter"
+				type="sql"
+				label="COM_ICAGENDA_FORM_LBL_EVENT_FEATURES"
+				description="COM_ICAGENDA_FORM_DESC_EVENT_FEATURES_FILTER"
+				class="inputbox"
+				query="SELECT id AS value, title AS features_filter FROM #__icagenda_feature WHERE state=1 AND show_filter=1 ORDER BY features_filter"
+				multiple="true"
+			/>
+
+			<field
+				name="features_incl_excl"
+				type="radio"
+				label="COM_ICAGENDA_MENU_EVENT_FEATURES_INCLUDE_EXCLUDE_LBL"
+				description="COM_ICAGENDA_MENU_EVENT_FEATURES_INCLUDE_EXCLUDE_DESC"
+				default="1"
+				class="btn-group"
+				>
+				<option value="1">COM_ICAGENDA_MENU_EVENT_FEATURES_INCLUDE</option>
+				<option value="0">COM_ICAGENDA_MENU_EVENT_FEATURES_EXCLUDE</option>
+			</field>
+
+			<field
+				name="features_any_all"
+				type="radio"
+				label="COM_ICAGENDA_MENU_EVENT_FEATURES_ALL_OR_ANY_LBL"
+				description="COM_ICAGENDA_MENU_EVENT_FEATURES_ALL_OR_ANY_DESC"
+				default="1"
+				class="btn-group"
+				>
+				<option value="1">COM_ICAGENDA_MENU_EVENT_FEATURES_ANY_ONE_FEATURE</option>
+				<option value="2">COM_ICAGENDA_MENU_EVENT_FEATURES_ALL_FEATURES_REQUIRED</option>
+			</field>
+
+			<field type="Title" label=" " class="stylenote" />
+
+			<field
+				type="TitleImg"
+				label="COM_ICAGENDA_LIST_SEARCH_FILTERS_FRONTEND"
+				class="stylebox lead input-xxlarge hidden-j25"
+				labelclass="hidden-j25"
+				icicon="bi-color-header"
+			/>
+
+			<field
+				name="search_filters"
+				type="radio"
+				label="COM_ICAGENDA_LIST_SEARCH_FILTERS_FRONTEND_LBL"
+				description="COM_ICAGENDA_LIST_SEARCH_FILTERS_FRONTEND_DESC"
+				default=""
+				class="btn-group hidden-j25"
+				labelclass="hidden-j25"
+				useglobal="true"
+				>
+				<option value="0">JDISABLED</option>
+				<option value="1">JENABLED</option>
+			</field>
+
+			<field
+				name="filters_mode"
+				type="list"
+				label="COM_ICAGENDA_LIST_SEARCH_FILTERS_MODE_LBL"
+				description="COM_ICAGENDA_LIST_SEARCH_FILTERS_MODE_DESC"
+				default=""
+				class="btn-group hidden-j25"
+				labelclass="hidden-j25"
+				useglobal="true"
+				showon="search_filters:1"
+				>
+				<option value="1">COM_ICAGENDA_LIST_SEARCH_FILTERS_MODE_CURRENT_LIST</option>
+				<option value="2">COM_ICAGENDA_LIST_SEARCH_FILTERS_MODE_GLOBAL_LIST</option>
+			</field>
+
+			<field
+				name="filters_display"
+				type="list"
+				label="COM_ICAGENDA_LIST_SEARCH_FILTERS_DISPLAY_LBL"
+				description="COM_ICAGENDA_LIST_SEARCH_FILTERS_DISPLAY_DESC"
+				default=""
+				class="btn-group hidden-j25"
+				labelclass="hidden-j25"
+				useglobal="true"
+				showon="search_filters:1"
+				>
+				<option value="2">COM_ICAGENDA_RESPONSIVE</option>
+				<option value="1">COM_ICAGENDA_FULL_WIDTH</option>
+			</field>
+
+			<field
+				name="filters_label"
+				type="radio"
+				label="COM_ICAGENDA_LIST_SEARCH_FILTERS_LABEL_LBL"
+				description="COM_ICAGENDA_LIST_SEARCH_FILTERS_LABEL_DESC"
+				default=""
+				class="btn-group hidden-j25"
+				labelclass="hidden-j25"
+				useglobal="true"
+				showon="search_filters:1"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="filter_search"
+				type="hidden"
+				rendertype="radio"
+				label="COM_ICAGENDA_LIST_SEARCH_FILTERS_SEARCH_LBL"
+				description=""
+				default=""
+				class="btn-group hidden-j25"
+				labelclass="control-label hidden-j25"
+				useglobal="true"
+				showon="search_filters:1"
+				>
+				<option value="0">JHIDE</option>
+				<option value="2">JSHOW</option>
+			</field>
+
+			<field
+				name="filter_from"
+				type="hidden"
+				rendertype="radio"
+				label="COM_ICAGENDA_LIST_SEARCH_FILTERS_FROM_LBL"
+				description=""
+				default=""
+				class="btn-group hidden-j25"
+				labelclass="control-label hidden-j25"
+				useglobal="true"
+				showon="search_filters:1"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="filter_to"
+				type="hidden"
+				rendertype="radio"
+				label="COM_ICAGENDA_LIST_SEARCH_FILTERS_TO_LBL"
+				description=""
+				default=""
+				class="btn-group hidden-j25"
+				labelclass="control-label hidden-j25"
+				useglobal="true"
+				showon="search_filters:1"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="filter_category"
+				type="hidden"
+				rendertype="radio"
+				label="COM_ICAGENDA_LIST_SEARCH_FILTERS_CATEGORY_LBL"
+				description=""
+				default=""
+				class="btn-group hidden-j25"
+				labelclass="control-label hidden-j25"
+				useglobal="true"
+				showon="search_filters:1"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="filter_month"
+				type="hidden"
+				rendertype="radio"
+				label="COM_ICAGENDA_LIST_SEARCH_FILTERS_MONTH_LBL"
+				description=""
+				default=""
+				class="btn-group hidden-j25"
+				labelclass="control-label hidden-j25"
+				useglobal="true"
+				showon="search_filters:1"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="filter_year"
+				type="hidden"
+				rendertype="radio"
+				label="COM_ICAGENDA_LIST_SEARCH_FILTERS_YEAR_LBL"
+				description=""
+				default=""
+				class="btn-group hidden-j25"
+				labelclass="control-label hidden-j25"
+				useglobal="true"
+				showon="search_filters:1"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="filter_ordering"
+				type="ic.sortablefields"
+				label="COM_ICAGENDA_LIST_SEARCH_FILTERS_LBL"
+				description="COM_ICAGENDA_LIST_SEARCH_FILTERS_DESC"
+				class="alert alert-info input-xxlarge hidden-j25"
+				default="filter_search,filter_from,filter_to,filter_category,filter_month,filter_year"
+				showon="search_filters:1"
+			/>
+
+			<field type="Title" label="COM_MENUS_VIEW_FIELDSET_LABEL" class="stylebox lead input-xxlarge" />
+
+			<field
+				name="displayCatDesc_menu"
+				type="modal_icmulti_opt"
+				label="COM_ICAGENDA_DISPLAY_CATINFOS_LABEL"
+				description="COM_ICAGENDA_DISPLAY_CATINFOS_DESC"
+				default=""
+			/>
+
+			<field
+				name="displayCatDesc_checkbox"
+				type="modal_icmulti_checkbox"
+				label=" "
+				class="checkbox"
+				labelclass="control-label"
+			/>
+
+			<field
+				name="number"
+				type="text"
+				label="COM_ICAGENDA_LBL_NUMERO"
+				description="COM_ICAGENDA_DESC_NUMERO"
+				default="5"
+				class="inputbox"
+				size="5"
+				filter="integer"
+				validate="ic.positiveinteger"
+			/>
+
+			<field type="Title" label="COM_ICAGENDA_LBL_FORMAT" class="styleblanck" />
+
+			<field
+				name="format"
+				type="iclist_globalization"
+				label="COM_ICAGENDA_LBL_FORMAT"
+				description="COM_ICAGENDA_LBL_FORMAT"
+				default=""
+				class="inputbox"
+			/>
+
+			<field
+				name="date_separator"
+				type="text"
+				label="COM_ICAGENDA_LBL_DATE_SEPARATOR"
+				description="COM_ICAGENDA_DESC_DATE_COMPONENTS_SEPARATOR"
+				default=""
+				class="inputbox"
+				size="5"
+			/>
+
+			<field
+				type="TitleImg"
+				label="COM_ICAGENDA_DATE_FORMAT_NOTE1"
+				class="stylenote alert alert-info input-xxlarge"
+				icimage="info.png"
+			/>
+
+			<field
+				type="TitleImg"
+				label="COM_ICAGENDA_DATE_FORMAT_NOTE2"
+				class="stylenotep alert alert-block input-xxlarge"
+				icimage="blanck.png"
+			/>
+
+			<field type="Title" label="IC_AUTO_INTROTEXT" class="styleblanck" />
+
+			<field
+				name="limitGlobal"
+				type="radio"
+				label="COM_ICAGENDA_LBL_LIMIT"
+				description="COM_ICAGENDA_DESC_LIMIT"
+				default="1"
+				class="btn-group"
+				>
+				<option value="1">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">COM_ICAGENDA_LBL_CUSTOM_VALUE</option>
+			</field>
+
+			<field
+				name="limit"
+				type="text"
+				label="COM_ICAGENDA_LBL_CUSTOM_VALUE"
+				description="COM_ICAGENDA_DESC_CUSTOM_VALUE"
+				default=""
+				class="inputbox input-mini"
+				size="5"
+				filter="integer"
+			/>
+
+			<field type="Title" label=" " class="stylenote" />
+
+			<field type="Title" label="COM_ICAGENDA_LEGEND_GOOGLE_MAPS" class="styleblanck" />
+
+			<field
+				name="m_width"
+				type="text"
+				label="COM_ICAGENDA_LBL_MWIDTH"
+				description="COM_ICAGENDA_DESC_MWIDTH"
+				default="100%"
+				class="inputbox"
+				size="5"
+			/>
+
+			<field
+				name="m_height"
+				type="text"
+				label="COM_ICAGENDA_LBL_MHEIGHT"
+				description="COM_ICAGENDA_DESC_MHEIGHT"
+				default="300px"
+				class="inputbox"
+				size="5"
+			/>
+
+			<field type="Title" label="COM_ICAGENDA_FOOTER" class="styleblanck input-xxlarge" />
+
+		</fieldset>
+	</fields>
+</metadata>
diff --git a/deployed/icagenda/components/com_icagenda/views/list/tmpl/default_categories.php b/deployed/icagenda/components/com_icagenda/views/list/tmpl/default_categories.php
new file mode 100644
index 00000000..b195cae4
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/views/list/tmpl/default_categories.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version		3.6.0 2016-05-23
+ * @since       3.4.1
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+$catid_array = array();
+$catinfos_array = array();
+
+if ($this->items && $this->cat_description && count($this->getAllDates) > 0
+	&& (in_array('1', $this->cat_options) || in_array('2', $this->cat_options))
+	)
+{
+	foreach ($this->items AS $cat)
+	{
+		$cat_id		= $cat->cat_id;
+		$cat_title	= $cat->cat_title;
+		$cat_color	= $cat->cat_color;
+		$cat_desc	= $cat->cat_desc ? $cat->cat_desc : ' ';
+		$fontColor	= (iCColor::getBrightness($cat_color) == 'bright') ? 'fontColor' : '';
+
+		array_push($catid_array, $cat_id);
+
+		$array				= array($cat_title, $cat_color, $cat_desc, $fontColor);
+		$comma_separated	= implode("::", $array);
+
+		if ( ! in_array($comma_separated, $catinfos_array))
+		{
+			array_push($catinfos_array, $comma_separated);
+		}
+	}
+
+//	$cat_result = array_unique($catid_array);
+
+	if (count($catinfos_array))
+	{
+		echo '<div class="ic-header-categories ic-clearfix">';
+
+		for ($i = 0; $i < count($catinfos_array); $i++)
+		{
+			$cat_getinfos = explode('::', $catinfos_array[$i]);
+
+			if (in_array('1', $this->cat_options))
+			{
+				echo '<div class="cat_header_title ' . $cat_getinfos['3'] . ' ic-clearfix"';
+				echo ' style="background: ' . $cat_getinfos['1'] . ';">' . $cat_getinfos['0'];
+				echo ' </div>';
+			}
+
+			if (in_array('2', $this->cat_options))
+			{
+				echo '<div class="cat_header_desc ic-clearfix">' . $cat_getinfos['2'] . '</div>';
+			}
+		}
+
+		echo '</div>';
+	}
+}
diff --git a/deployed/icagenda/components/com_icagenda/views/list/tmpl/default_filters.php b/deployed/icagenda/components/com_icagenda/views/list/tmpl/default_filters.php
new file mode 100644
index 00000000..759a4594
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/views/list/tmpl/default_filters.php
@@ -0,0 +1,319 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.14 2020-04-26
+ *
+ * @package     iCagenda.Site
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2020 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.6.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+$app        = JFactory::getApplication();
+$document   = JFactory::getDocument();
+$jinput     = $app->input;
+$menuParams = $app->getMenu()->getActive()->params;
+$iCparams   = JComponentHelper::getParams('com_icagenda');
+
+JFormHelper::addFieldPath(JPATH_COMPONENT . '/models/fields');
+
+// Get Category options
+$categories         = JFormHelper::loadFieldType('Categories', false);
+$categoryOptions    = $categories->getOptions();
+
+// Get Month options
+$month              = JFormHelper::loadFieldType('Month', false);
+$monthOptions       = $month->getOptions();
+
+// Get Year options
+$year               = JFormHelper::loadFieldType('Year', false);
+$yearOptions        = $year->getOptions();
+
+// Params
+$menuOptions        = ($menuParams->get('search_filters') == 1);
+$menuSuffix         = $menuOptions ? '_menu' : '';
+
+$icfilterDisplay    = $menuOptions
+					? $this->params->get('filters_display', '2')
+					: $iCparams->get('filters_display', '2');
+
+// Display option (responsive grid or full width)
+$icDisplayClass     = ($icfilterDisplay == '1') ? ' ic-col-full' : '';
+
+// Label "Search"
+$icfilterLabel      = $menuOptions
+					? $this->params->get('filters_label', '1')
+					: $iCparams->get('filters_label', '1');
+
+if ($icfilterLabel)
+{
+	$icfilterLabel  = ($icfilterDisplay == '1') ? '12' : '4'; // 4=columns, 12=full width
+}
+
+// Get config ordering for filters
+$default_ordering   = 'filter_search,filter_from,filter_to,filter_category,filter_month,filter_year';
+$filter_ordering    = $menuOptions
+					? $this->params->get('filter_ordering', $default_ordering)
+					: $iCparams->get('filter_ordering', $default_ordering);
+$icfilterList       = explode(',', $filter_ordering);
+
+// Get Filters
+$filter_search      = $menuOptions
+					? ($this->params->get('filter_search', 2) * 6)
+					: ($iCparams->get('filter_search', 2) * 6);
+$filter_from        = $menuOptions
+					? ($this->params->get('filter_from', 1) * 6)
+					: ($iCparams->get('filter_from', 1) * 6);
+$filter_to          = $menuOptions
+					? ($this->params->get('filter_to', 1) * 6)
+					: ($iCparams->get('filter_to', 1) * 6);
+$filter_category    = $menuOptions
+					? ($this->params->get('filter_category', 1) * 6)
+					: ($iCparams->get('filter_category', 1) * 6);
+$filter_month       = $menuOptions
+					? ($this->params->get('filter_month', 1) * 6)
+					: ($iCparams->get('filter_month', 1) * 6);
+$filter_year        = $menuOptions
+					? ($this->params->get('filter_year', 1) * 6)
+					: ($iCparams->get('filter_year', 1) * 6);
+
+$button_more        = 6;
+
+$filters = $fields = $total = $option1 = $lastMain = '0';
+
+foreach ($icfilterList as $filter)
+{
+	// Filter is disabled
+	if ( ! ${$filter})
+	{
+		$key = array_search($filter, $icfilterList);
+		unset($icfilterList[$key]);
+	}
+
+	// Filter is enabled
+	else
+	{
+		$total    = $total + (${$filter} / 6);
+
+		if ($total <= 6)
+		{
+			$filters  = $filters + 1;
+			$fields   = $fields + (${$filter} / 6);
+		}
+	}
+}
+
+$adjustTotal      = ($total > 6) ? ($fields - $filters) : '0';
+$countMainFilters = $filters - $adjustTotal;
+
+$mainFilters      = array_slice($icfilterList, 0, $countMainFilters);
+
+if ($total > 6)
+{
+	$mainFilters[]    = 'button_more';
+}
+
+$optionsFilters   = array_slice($icfilterList, $countMainFilters);
+
+
+// Full Width
+if ($icfilterDisplay == 1)
+{
+	$colList      = '12';
+	$rowLabel     = '1';
+	$rowSubmit    = '2';
+	$rowReset     = '1';
+
+	$colFilters   = '12';
+	$colMore      = '12';
+	$colControls  = '12';
+	$colSubmit    = '6';
+	$colReset     = '6';
+}
+
+// Responsive Extendable Grid of 12
+else
+{
+	$colList      = $icfilterLabel ? '8' : '12';
+	$rows         = round($total/2, 0, PHP_ROUND_HALF_UP);
+	$rowLabel     = ($rows <= 3) ? $rows : '3';
+	$rowSubmit    = ($total > 4) ? '2' : '1';
+	$rowReset     = '1';
+
+	$colFilters   = '9';
+	$colMore      = '16';
+	$colControls  = '3';
+	$colSubmit    = ($total <= 2) ? '8' : '12';
+	$colReset     = ($total <= 2) ? '4' : '12';
+}
+
+$script = array();
+
+// Add script declaration
+$script[] = '	jQuery(document).ready(function($){';
+$script[] = '		$("#ic-toggle-filters").click(function(){';
+$script[] = '			$("#ic-more-filters").toggle("500",';
+$script[] = '				function(){';
+$script[] = '					if ($(this).is(":visible")) {';
+$script[] = '						$(".ic-filter-more-btn").removeClass("ic-inactive").addClass("ic-active");';
+$script[] = '						$(".ic-filter-more-btn > span").removeClass("iCicon-arrow-down").addClass("iCicon-arrow-up");';
+$script[] = '					} else {';
+$script[] = '						$(".ic-filter-more-btn").removeClass("ic-active").addClass("ic-inactive");';
+$script[] = '						$(".ic-filter-more-btn > span").removeClass("iCicon-arrow-up").addClass("iCicon-arrow-down");';
+$script[] = '					}';
+$script[] = '				}';
+$script[] = '			);';
+$script[] = '		});';
+
+foreach ($optionsFilters as $filter)
+{
+	$script[] = '		if($("#' . $filter . '").val() !== ""){';
+	$script[] = '			$("#ic-more-filters").css("display", "block");';
+	$script[] = '			$(".ic-filter-more-btn > span").removeClass("iCicon-arrow-down").addClass("iCicon-arrow-up");';
+	$script[] = '			$(".ic-filter-more-btn").removeClass("ic-inactive").addClass("ic-active");';
+	$script[] = '		}';
+}
+
+$script[] = '	});';
+
+
+$script[] = 'jQuery(document).ready(function($){';
+
+$script[] = '  $("#icagenda-list").submit(function() {';
+$script[] = '    $(this).find(":input:not([type=hidden])").filter(function(){ return !this.value; }).attr("disabled", "disabled");';
+$script[] = '    return true;';
+$script[] = '  });';
+
+$script[] = '  $("#icagenda-list").find(":input:not([type=hidden])").attr("disabled", false);';
+
+$script[] = '  $(".ic-filter-reset-btn").click(function(){';
+$script[] = '    $("#icagenda-list").find(":input:not([type=hidden])").val("");';
+$script[] = '    $("#icagenda-list").submit();';
+$script[] = '  });';
+
+$script[] = '});';
+
+
+$document->addScriptDeclaration(implode("\n", $script));
+
+
+// Filters HTML rendering
+$html_filter_search     = '<input id="filter_search" name="filter_search" type="text"'
+						. ' value="' . htmlspecialchars($jinput->getString('filter_search'), ENT_COMPAT, 'UTF-8') . '"'
+						. ' title="' . htmlspecialchars(JText::_('COM_ICAGENDA_FILTERS_SEARCH_PLACEHOLDER'), ENT_COMPAT, 'UTF-8') . '"'
+						. ' placeholder="' . htmlspecialchars(JText::_('COM_ICAGENDA_FILTERS_SEARCH_PLACEHOLDER'), ENT_COMPAT, 'UTF-8') . '" />';
+
+$html_filter_from       = $filter_from
+						? JHtml::_('calendar', $jinput->get('filter_from'), 'filter_from', 'filter_from', '%Y-%m-%d',
+						array('placeholder' => JText::_('COM_ICAGENDA_FILTERS_PERIOD_FROM'), 'class' => ''))
+						: '';
+
+$html_filter_to         = $filter_to
+						? JHtml::_('calendar', $jinput->get('filter_to'), 'filter_to', 'filter_to', '%Y-%m-%d',
+						array('placeholder' => JText::_('COM_ICAGENDA_FILTERS_PERIOD_TO'), 'class' => ''))
+						: '';
+
+$html_filter_category   = '<select class="ic-input-small" id="filter_category" name="filter_category">
+						<option value="">' . JText::_('COM_ICAGENDA_FILTERS_SELECT_CATEGORY') . '</option>
+						' . JHtml::_('select.options', $categoryOptions, 'catid', 'cattitle',
+						$jinput->getInt('filter_category')) . '</select>';
+
+$html_filter_month      = '<select class="ic-input-small" id="filter_month" name="filter_month">
+						<option value="">' . JText::_('COM_ICAGENDA_FILTERS_SELECT_MONTH') . '</option>
+						' . JHtml::_('select.options', $monthOptions, 'value', 'label',
+						$jinput->getInt('filter_month')) . '</select>';
+
+$html_filter_year       = '<select class="ic-input-small" id="filter_year" name="filter_year">
+						<option value="">' . JText::_('COM_ICAGENDA_FILTERS_SELECT_YEAR') . '</option>
+						' . JHtml::_('select.options', $yearOptions, 'value', 'label',
+						$jinput->getInt('filter_year')) . '</select>';
+
+$html_button_more       = '<div class="ic-filter-more-btn" id="ic-toggle-filters">'
+						. JText::_('COM_ICAGENDA_FILTERS_MORE_OPTIONS')
+						. ' <span class="iCicon iCicon-arrow-down"></span></div>';
+?>
+
+<div class="ic-filters ic-clearfix">
+	<div class="ic-col-<?php echo $colFilters; ?>">
+
+		<?php // Label ?>
+		<?php if ($icfilterLabel) : ?>
+		<div class="ic-col-<?php echo $icfilterLabel; ?>">
+			<div class="ic-filters-label ic-cell">
+				<div class="ic-filters-label-title-<?php echo $rowLabel; ?>"><?php echo JText::_('COM_ICAGENDA_FILTERS'); ?></div>
+			</div>
+		</div>
+		<?php endif; ?>
+
+		<?php // Filters ?>
+		<div class="ic-col-<?php echo $colList . $icDisplayClass; ?>">
+
+			<?php foreach ($mainFilters as $filter) : ?>
+			<div class="ic-col-<?php echo ${$filter} . $icDisplayClass; ?>">
+				<div class="ic-<?php echo str_replace('_', '-', $filter); ?> ic-cell">
+					<div class="ic-row1">
+						<?php echo ${"html_" . $filter}; ?>
+					</div>
+				</div>
+			</div>
+			<?php endforeach; ?>
+
+		</div>
+
+		<?php // More Options ?>
+		<?php if ($total >= 6) : ?>
+		<div id="ic-more-filters" class="ic-col-<?php echo $colMore . $icDisplayClass; ?>" style="display: none;">
+
+			<?php foreach ($optionsFilters as $filter) : ?>
+			<div class="ic-col-<?php echo (${$filter} / 2) . $icDisplayClass; ?>">
+				<div class="ic-<?php echo str_replace('_', '-', $filter); ?> ic-cell">
+					<div class="ic-row1">
+						<?php echo ${"html_" . $filter}; ?>
+					</div>
+				</div>
+			</div>
+			<?php endforeach; ?>
+
+		</div>
+		<?php endif; ?>
+
+	</div>
+	<div class="ic-col-<?php echo $colControls; ?> ic-fluid">
+
+		<?php // Buttons ?>
+		<div class="ic-search-submit ic-col-<?php echo $colSubmit . $icDisplayClass; ?>">
+			<div class="ic-filters-controls ic-control-submit ic-cell">
+				<button class="ic-filter-submit-btn ic-filters-btn-<?php echo $rowSubmit; ?>"
+					name="<?php echo JText::_('COM_ICAGENDA_FILTERS_SUBMIT'); ?>"
+					type="submit">
+					<span class="iCicon iCicon-search"></span>
+					<?php if ($total > 2 || $icfilterDisplay == 1) : ?>
+						<?php echo JText::_('COM_ICAGENDA_FILTERS_SUBMIT'); ?>
+					<?php endif; ?>
+				</button>
+			</div>
+		</div>
+		<div class="ic-search-reset ic-col-<?php echo $colReset . $icDisplayClass; ?>">
+			<div class="ic-filters-controls ic-control-reset ic-cell">
+				<button class="ic-filter-reset-btn ic-filters-btn-<?php echo $rowReset; ?>"
+					name="<?php echo JText::_('COM_ICAGENDA_FILTERS_RESET'); ?>"
+					type="reset">
+					<span class="iCicon iCicon-reset"> </span>
+					<?php if ($total > 2 || $icfilterDisplay == 1) : ?>
+						<?php echo JText::_('COM_ICAGENDA_FILTERS_RESET'); ?>
+					<?php endif; ?>
+				</button>
+			</div>
+		</div>
+
+	</div>
+</div>
diff --git a/deployed/icagenda/components/com_icagenda/views/list/tmpl/index.html b/deployed/icagenda/components/com_icagenda/views/list/tmpl/index.html
new file mode 100644
index 00000000..fa6d84e8
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/views/list/tmpl/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/components/com_icagenda/views/list/view.feed.php b/deployed/icagenda/components/com_icagenda/views/list/view.feed.php
new file mode 100644
index 00000000..7fb0636a
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/views/list/view.feed.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.3 2018-07-27
+ *
+ * @package     iCagenda.Site
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.6.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * HTML View class - iCagenda - RSS Feeds.
+ */
+class icagendaViewList extends JViewLegacy
+{
+	public function display($cachable = false, $urlparams = false)
+	{
+		$app      = JFactory::getApplication();
+		$document = JFactory::getDocument();
+		$params   = $app->getParams();
+		$Itemid   = $app->input->getInt('Itemid');
+		$items    = $this->get('Items');
+
+		$mcatid          = $params->get('mcatid', '');
+		$filter_category = ! is_array($mcatid) ? array($mcatid) : $mcatid;
+
+		// Set events for the current page
+		$getAllDates = icagendaEventsData::getAllDates();
+		$new_items   = array();
+		$evt         = array();
+
+		if (count($getAllDates) > 0)
+		{
+			$number = JFactory::getConfig()->get('feed_limit', $params->get('number', 5));
+
+			// Set number of events to be displayed per page
+			$currentPageDates = array_slice($getAllDates, '0', $number, true);
+
+			foreach ($currentPageDates as $date_id)
+			{
+				// Get id and date for each event to be displayed
+				$ex_date_id = explode('_', $date_id);
+				$evt[]      = $ex_date_id['0'];
+				$evt_id     = $ex_date_id['1'];
+
+				foreach ($items as $item)
+				{
+					if ($evt_id == $item->id)
+					{
+						$new_items[] = $item;
+					}
+				}
+			}
+		}
+
+		$items  = $new_items;
+
+		foreach ($items as $k => $item)
+		{
+			if ( ! in_array('', $filter_category) && ! in_array('0', $filter_category)
+				&& in_array($item->catid, $filter_category)
+				|| in_array('', $filter_category)
+				|| in_array('0', $filter_category)
+				)
+			{
+				$EVENT_TIME = ($item->displaytime == 1)
+							? ' ' . icagendaEvents::dateToTimeFormat($evt[$k])
+							: '';
+
+				// Load individual item creator class.
+				$feeditem               = new JFeedItem;
+				$feeditem->title        = $item->title . ' (' . $item->cat_title . ')';
+				$feeditem->link         = JROUTE::_('index.php?option=com_icagenda&view=event&Itemid='
+											. (int) $Itemid . '&id=' . (int) $item->id . ':' . $item->alias);
+				$feeditem->image        = icagendaThumb::sizeMedium($item->image);
+				$feeditem->description  = icagendaRender::dateToFormat($evt[$k]) . $EVENT_TIME . '<br /><img src="' . $feeditem->image . '" alt="" style="margin: 5px; float: left;">' . $item->description;
+
+				// Set date
+				$timezone = self::getTimeZone();
+				$date     = new JDate($evt[$k], $timezone);
+				$date     = $date->format('Y-m-d H:i:s', false, false);
+
+				$feeditem->date         = $date;
+				$feeditem->category     = $item->cat_title;
+
+				// Loads item information into RSS array
+				$document->addItem($feeditem);
+			}
+		}
+	}
+
+	/**
+	 * Returns the userTime zone if the user has set one, or the global config one
+	 * @return mixed
+	 */
+	public function getTimeZone()
+	{
+		$userTz   = JFactory::getUser()->get('timezone');
+		$timeZone = JFactory::getConfig()->get('offset');
+
+		if ($userTz)
+		{
+			$timeZone = $userTz;
+		}
+
+		return new DateTimeZone($timeZone);
+	}
+}
diff --git a/deployed/icagenda/components/com_icagenda/views/list/view.html.php b/deployed/icagenda/components/com_icagenda/views/list/view.html.php
new file mode 100644
index 00000000..d10a3c92
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/views/list/view.html.php
@@ -0,0 +1,305 @@
+<?php
+
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.14 2018-05-01
+ *
+ * @package     iCagenda.Site
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.6.0
+ *----------------------------------------------------------------------------
+ */
+
+defined('_JEXEC') or die();
+
+jimport('joomla.application.component.helper');
+
+/**
+ * HTML View class - iCagenda List of Events.
+ */
+class icagendaViewList extends JViewLegacy
+{
+	protected $params;
+
+	protected $items;
+
+	protected $getAllDates;
+
+	protected $state;
+
+	protected $template;
+
+	protected $themeList;
+
+	protected $header;
+
+	protected $pagination;
+
+	protected $sharing;
+
+	protected $iclist_vars = 'components/com_icagenda/add/elements/iclist_vars.php';
+
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 * @return  mixed         A string if successful, otherwise a Error object.
+	 *
+	 * @since   3.6.0
+	 */
+	public function display($tpl = null)
+	{
+		$app        = JFactory::getApplication();
+		$document   = JFactory::getDocument();
+		$jinput     = $app->input;
+
+		// Loading data
+		$items              = $this->getModel()->getItems();
+		$this->state        = $this->get('State');
+		$this->params       = $this->state->get('params');
+		$this->getAllDates  = icagendaEventsData::getAllDates();
+		//$this->nextItem 	= $this->getModel()->getNextItem();
+		$this->timeZones 	= icagendaEventsData::getAllTimeZone(2);
+
+		if (isset($_GET['success']) && $_GET['success'] == 'success') {
+			JFactory::getApplication()->enqueueMessage('Thank you for taking time to register. <br/>
+				An email with further details has been sent to the email address you provided. <br/>
+				We hope you will enjoy the presentations.');
+		}
+
+		if (isset($_POST['change_timezone'])) $_SESSION['timezone'] = $_POST['timezone'];
+
+		$offset = substr($_SESSION['timezone'], 0, strpos($_SESSION['timezone'], "_"));
+
+		// icagendaEventsData::changeDate($offset, $this->nextItem->next, $this->nextItem->enddate);
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors'))) {
+			throw new Exception(implode("\n", $errors), 500);
+
+			return false;
+		}
+
+		// Shortcut for params
+		$params = $this->params;
+
+		// For Dev.
+		$time_loading = $params->get('time_loading', '');
+
+		if ($time_loading) {
+			$starttime_list = iCLibrary::getMicrotime();
+		}
+
+		$getAllDates = $this->getAllDates;
+		$number      = $params->get('number', 5);
+
+		// Process the content plugins.
+		if (version_compare(JVERSION, '3.0', 'lt')) {
+			$this->dispatcher = JDispatcher::getInstance();
+		} else {
+			$this->dispatcher = JEventDispatcher::getInstance();
+		}
+
+		JPluginHelper::importPlugin('content');
+
+		$this->dispatcher->trigger('iCagendaOnListPrepare', array('com_icagenda.list', &$items, &$params, &$getAllDates));
+
+		// Set events for the current page
+		$new_items = array();
+		$evt       = array();
+
+		if (count($getAllDates) > 0) {
+			$limit   = $jinput->get('limit', '');
+			$getpage = $jinput->get('page', 1);
+
+			if ($limit != '' && $limit >= 0) {
+				$number = ($limit == 0) ? count($getAllDates) : (int) $limit;
+			}
+
+			// Set number of events to be displayed per page
+			$index            = $number * ($getpage - 1);
+			$currentPageDates = array_slice($getAllDates, $index, $number, true);
+
+			foreach ($currentPageDates as $date_id) {
+				// Get id and date for each event to be displayed
+				$ex_date_id = explode('_', $date_id);
+				$evt[]      = $ex_date_id['0'];
+				$evt_id     = $ex_date_id['1'];
+
+				foreach ($items as $item) {
+					if ($evt_id == $item->id) {
+						$new_items[] = $item;
+					}
+				}
+			}
+		}
+
+		$this->items = $new_items;
+		$this->evt   = $evt;
+
+		foreach ($this->items as $item) {
+			icagendaEventsData::changeDate($offset, $item->next, $item->enddate);
+			icagendaEventsData::changeDate($offset, $item->rerun, $item->rerunEnd);
+		}
+
+		// Load Theme pack layout for list
+		$this->template = $params->get('template', 'default');
+		$themeList      = icagendaTheme::getThemeLayout($this->template, 'list');
+
+		// Check if errors (file missing)
+		if ($themeList[1]) {
+			$msg = ($themeList[1] !== 'deprecated')
+				? 'iCagenda ' . JText::_('PHPMAILER_FILE_OPEN') . ' <strong>' . $this->template . '_list.php</strong>'
+				: JText::_('COM_ICAGENDA_ERROR_THEME_PACK_OUTDATED') . '<br/>'
+				. JText::sprintf('COM_ICAGENDA_ERROR_THEME_PACK_EDIT_OR_CHANGE', '<strong>'
+					. $this->template . '_list.php</strong>');
+
+			$app->enqueueMessage($msg, 'warning');
+
+			if ($themeList[1] !== 'alert') {
+				return false;
+			}
+		}
+
+		$this->themeList = $themeList[0];
+
+		// Component Options
+		$this->cat_description  = ($params->get('displayCatDesc_menu', 'global') == 'global')
+			? $params->get('CatDesc_global', '0')
+			: $params->get('displayCatDesc_menu', '');
+
+		$cat_options            = ($params->get('displayCatDesc_menu', 'global') == 'global')
+			? $params->get('CatDesc_checkbox', '')
+			: $params->get('displayCatDesc_checkbox', '');
+
+		$this->cat_options      = is_array($cat_options) ? $cat_options : array();
+		$this->pageclass_sfx    = htmlspecialchars($params->get('pageclass_sfx'));
+
+		// Set Header and pagination
+		$countAll               = count($getAllDates);
+		$arrowText              = $params->get('arrowtext', 1);
+		$pagination             = $params->get('pagination', 1);
+		$filters_active         = $jinput->get('filter_search')
+			|| $jinput->get('filter_from')
+			|| $jinput->get('filter_to')
+			|| $jinput->get('filter_category')
+			|| $jinput->get('filter_month')
+			|| $jinput->get('filter_year')
+			? true
+			: false;
+
+		$this->header           = icagendaList::header($countAll, $number, $filters_active);
+		$this->pagination       = icagendaList::pagination($countAll, $arrowText, $number, $pagination);
+		$this->sharing          = icagendaAddthis::share();
+
+
+		// Define plugin events.
+		$this->event = new stdClass;
+
+		$results = $this->dispatcher->trigger('iCagendaOnListBeforeDisplay', array('com_icagenda.list', &$this->items, &$this->params));
+		$this->event->iCagendaOnListBeforeDisplay = trim(implode("\n", $results));
+
+		$results = $this->dispatcher->trigger('iCagendaOnListAfterDisplay', array('com_icagenda.list', &$this->items, &$this->params));
+		$this->event->iCagendaOnListAfterDisplay = trim(implode("\n", $results));
+
+		icagendaInfo::commentVersion();
+
+		$this->_prepareDocument();
+
+		$this->iclist_vars = 'components/com_icagenda/add/elements/iclist_vars.php'; // icagendaEvent::setVar($evt, $item);
+
+		parent::display($tpl);
+
+		$this->dispatcher->trigger('onListAfterDisplay', array('com_icagenda.list', &$this->items, &$this->params)); // @deprecated. Kept for B/C
+
+		// Loads jQuery Library
+		if (version_compare(JVERSION, '3.0', 'lt')) {
+			icagendaThemeJoomla25::loadjQuery();
+		}
+		// Joomla 3
+		else {
+			JHtml::_('bootstrap.framework');
+			JHtml::_('jquery.framework');
+		}
+
+		// Add CSS
+		icagendaTheme::loadComponentCSS($this->template);
+		icagendaThemeStyle::addMediaCss($this->template, 'component');
+
+		// Loading Script tipTip used for iCtips
+		JHtml::script('com_icagenda/jquery.tipTip.js', false, true);
+
+		// Add RSS Feeds
+		$menu = $app->getMenu()->getActive()->id;
+
+		$feed   = 'index.php?option=com_icagenda&amp;view=list&amp;Itemid=' . (int) $menu . '&amp;format=feed';
+		$rss    = array(
+			'type'   =>  'application/rss+xml',
+			'title'  =>  'RSS 2.0',
+		);
+
+		$document->addHeadLink(JRoute::_($feed . '&amp;type=rss'), 'alternate', 'rel', $rss);
+
+		// For Dev.
+		if ($time_loading) {
+			$endtime_list = iCLibrary::getMicrotime();
+
+			echo '<center style="font-size:8px;">Time to create page: ' . round($endtime_list - $starttime_list, 3) . ' seconds</center>';
+		}
+	}
+
+	/**
+	 * Prepares the document
+	 *
+	 * @since   3.6.0
+	 */
+	protected function _prepareDocument()
+	{
+		$app     = JFactory::getApplication();
+		$menus   = $app->getMenu();
+		$pathway = $app->getPathway();
+		$title   = null;
+		$menu    = $menus->getActive();
+
+		if ($menu) {
+			$this->params->def('page_heading', $this->params->get('page_title', $menu->title));
+		} else {
+			$this->params->def('page_heading', JText::_('JGLOBAL_ARTICLES'));
+		}
+
+		$title = $this->params->get('page_title', '');
+
+		if (empty($title)) {
+			$title = $app->getCfg('sitename');
+		} elseif ($app->getCfg('sitename_pagetitles', 0) == 1) {
+			$title = JText::sprintf('JPAGETITLE', $app->getCfg('sitename'), $title);
+		} elseif ($app->getCfg('sitename_pagetitles', 0) == 2) {
+			$title = JText::sprintf('JPAGETITLE', $title, $app->getCfg('sitename'));
+		}
+
+		$this->document->setTitle($title);
+
+		if ($this->params->get('menu-meta_description', '')) {
+			$this->document->setDescription($this->params->get('menu-meta_description', ''));
+		}
+
+		if ($this->params->get('menu-meta_keywords', '')) {
+			$this->document->setMetadata('keywords', $this->params->get('menu-meta_keywords', ''));
+		}
+
+		if (
+			$app->getCfg('MetaTitle') == '1'
+			&& $this->params->get('menupage_title', '')
+		) {
+			$this->document->setMetaData('title', $this->params->get('page_title', ''));
+		}
+	}
+}
diff --git a/deployed/icagenda/components/com_icagenda/views/registration/index.html b/deployed/icagenda/components/com_icagenda/views/registration/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/views/registration/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/components/com_icagenda/views/registration/tmpl/actions.php b/deployed/icagenda/components/com_icagenda/views/registration/tmpl/actions.php
new file mode 100644
index 00000000..481d259a
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/views/registration/tmpl/actions.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.13 2017-11-20
+ *
+ * @package     iCagenda.Site
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.6.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+$app = JFactory::getApplication();
+
+$actions = $app->getUserState('com_icagenda.registration.actions', '');
+
+if ($actions)
+{
+	$layout = new JLayoutFile($actions, $basePath = JPATH_PLUGINS . '/icagenda/' . $actions . '/layouts');
+	$displayData = array('item' => $this->item, 'actions' => $this->actions, 'params' => $this->params);
+	$actionsHTML = $layout->render($displayData);
+}
+else
+{
+	$actionsHTML = 'No Action';
+}
+
+?>
+<div id="icagenda" class="ic-actions-view<?php echo $this->pageclass_sfx; ?>">
+	<?php echo $actionsHTML; ?>
+	<div>
+		<a href="index.php" class="btn btn-small btn-info button">
+		<?php if(version_compare(JVERSION, '3.0', 'ge')) : ?>
+			<i class="icon-home icon-white"></i>&nbsp;<?php echo JTEXT::_('JERROR_LAYOUT_HOME_PAGE'); ?>
+		<?php else : ?>
+			<span style="color:#FFF"><?php echo JTEXT::_('JERROR_LAYOUT_HOME_PAGE'); ?></span>
+		<?php endif; ?>
+		</a>
+	</div>
+	<br />
+</div>
+<?php
+if (version_compare(JVERSION, '3.0', 'lt'))
+{
+	JHtml::_('stylesheet', 'icagenda-front.j25.css', 'components/com_icagenda/add/css/');
+}
diff --git a/deployed/icagenda/components/com_icagenda/views/registration/tmpl/cancel.php b/deployed/icagenda/components/com_icagenda/views/registration/tmpl/cancel.php
new file mode 100644
index 00000000..faa2983b
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/views/registration/tmpl/cancel.php
@@ -0,0 +1,198 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.13 2018-03-30
+ *
+ * @package     iCagenda.Site
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.6.13
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.keepalive');
+
+if (version_compare(JVERSION, '3.4.0', 'lt'))
+{
+	JHtml::_('behavior.formvalidation');
+}
+else
+{
+	JHtml::_('behavior.formvalidator');
+}
+
+JHtml::_('formbehavior.chosen', 'select');
+
+$app    = JFactory::getApplication();
+$input  = $app->input;
+
+$date_time_separator = ' - '; // @todo: create custom/globalized option
+$start_end_separator = ' &#x279c; '; // @todo: create custom/globalized option
+
+$iCclass_btn_info = 'ic-btn ic-btn-info button';
+
+$eventURL = icagendaEvent::eventURL($this->item);
+$listURL  = JRoute::_('index.php?option=com_icagenda&view=list&id=' . $input->getInt('id') . '&Itemid=' . $input->getInt('Itemid'));
+?>
+<div id="icagenda" class="ic-registration-cancel<?php echo $this->pageclass_sfx; ?>">
+
+	<!--h1>
+		<?php echo $this->escape(JText::_('COM_ICAGENDA_REGISTRATION_CANCEL_LABEL')); ?>
+	</h1-->
+
+	<?php if ($input->get('dates_cancelled') && ! $this->participantEventRegistrations) : ?>
+
+		<div class="ic-registration-cancel-content">
+			<?php echo JText::sprintf('COM_ICAGENDA_REGISTRATION_CANCEL_CONFIRMED', $this->item->title); ?>
+		</div>
+		<br />
+		<div class="ic-registration-cancel-buttons">
+			<a href="<?php echo JRoute::_(''); ?>" class="btn button">
+				<span class="icon-home icon-white"></span>&nbsp;<?php echo JTEXT::_('JERROR_LAYOUT_HOME_PAGE'); ?>
+			</a>
+			&nbsp;
+			<a href="<?php echo $listURL; ?>" class="btn btn-primary button">
+				<span class="icon-eye icon-white"></span>&nbsp;<?php echo JTEXT::_('COM_ICAGENDA_BUTTON_VIEW_LIST'); ?>
+			</a>
+			&nbsp;
+			<a href="<?php echo $eventURL; ?>" class="btn btn-info button">
+				<span class="icon-eye icon-white"></span>&nbsp;<?php echo JTEXT::_('COM_ICAGENDA_REGISTRATION_EVENT_LINK'); ?>
+			</a>
+		</div>
+		<br />
+
+	<?php elseif ($input->get('dates_cancelled') && $this->participantEventRegistrations) : ?>
+		<div class="ic-registration-cancel-content">
+			<p>
+				<?php echo JText::sprintf('COM_ICAGENDA_REGISTRATION_CANCEL_CONFIRMED', $this->item->title); ?>
+			</p>
+		</div>
+		<br />
+		<div class="ic-registration-cancel-buttons">
+<!--
+			<p>
+				<?php echo JText::_('COM_ICAGENDA_REGISTRATION_CANCEL_OTHER_DATES_FOR_THIS_EVENT'); ?>
+			</p>
+-->
+			<a href="<?php echo $listURL; ?>" class="btn btn-primary">
+				<?php echo JTEXT::_('COM_ICAGENDA_BUTTON_VIEW_LIST'); ?>
+			</a>
+			<a href="<?php echo $eventURL; ?>" class="btn btn-info">
+				<?php echo JTEXT::_('COM_ICAGENDA_REGISTRATION_EVENT_LINK'); ?>
+			</a>
+			<a class="btn btn-default" href="<?php echo JRoute::_('index.php?option=com_icagenda&view=registration&layout=cancel&id=' . $input->getInt('id') . '&Itemid=' . $input->getInt('Itemid')); ?>">
+				<?php echo JTEXT::_('COM_ICAGENDA_REGISTRATION_CANCEL_OTHER_DATES_BUTTON'); ?>
+			</a>
+<!--
+			<a class="btn btn-info button" href="<?php echo JRoute::_('index.php?option=com_icagenda&view=registration&layout=cancel&id=' . $input->getInt('id') . '&Itemid=' . $input->getInt('Itemid')); ?>">
+				<?php echo JTEXT::_('JYES'); ?>
+			</a>
+			&nbsp;
+			<a class="btn btn-default button" href="<?php echo $eventURL; ?>">
+				<?php echo JTEXT::_('JNO'); ?>
+			</a>
+-->
+		</div>
+		<br />
+
+
+	<?php elseif ($this->participantEventRegistrations) : ?>
+
+		<?php // START FORM ?>
+		<form class="form-validate form-horizontal well"
+			id="icagenda-registration-cancel"
+			action="<?php echo JRoute::_('index.php?option=com_icagenda&task=registration.cancel'); ?>"
+			method="post"
+			enctype="multipart/form-data"
+			>
+			<fieldset>
+				<legend><?php echo JText::_('COM_ICAGENDA_REGISTRATION_CANCEL_LEGEND'); ?></legend>
+				<div class="control-group">
+					<label id="dates_cancelled-lbl" for="dates_cancelled">
+						<?php echo JText::_('COM_ICAGENDA_REGISTRATION_CANCEL_SELECT_DATES'); ?>
+					</label>
+					<select id="dates_cancelled" name="dates_cancelled[]" multiple required aria-required="true" message="missing dates">
+						<?php foreach ($this->participantEventRegistrations as $key => $value) : ?>
+							<?php if (iCDate::isDate($value->date)) : ?>
+								<option value="<?php echo $value->id; ?>">
+									<?php echo icagendaRender::dateToFormat($value->date); ?>
+									<?php echo $date_time_separator; ?>
+									<?php echo icagendaRender::dateToTime($value->date); ?>
+								</option>
+							<?php elseif ( ! $value->date && $value->period == 0) : ?>
+								<option value="<?php echo $value->id; ?>">
+									<?php echo strip_tags(icagendaRender::dateToFormat($this->item->startdate)); ?>
+									<?php echo $start_end_separator; ?>
+									<?php echo strip_tags(icagendaRender::dateToFormat($this->item->enddate)); ?>
+								</option>
+							<?php elseif ( ! $value->date && $value->period == 1) : ?>
+								<option value="<?php echo $value->id; ?>">
+									<?php echo Jtext::_('COM_ICAGENDA_REGISTRATION_CANCEL_ALL_DATES'); ?>
+								</option>
+							<?php endif; ?>
+						<?php endforeach; ?>
+					</select>
+				</div>
+				<div class="control-group">
+					<p>
+						<?php echo JText::sprintf('COM_ICAGENDA_REGISTRATION_CANCEL_CONFIRM_WARNING', $this->item->title); ?>
+					</p>
+					<button type="submit" class="btn btn-danger validate">
+						<?php echo JText::_('COM_ICAGENDA_REGISTRATION_CANCEL_CONFIRM_BUTTON'); ?>
+					</button>
+					<a class="btn" href="<?php echo $eventURL; ?>">
+						<?php echo JTEXT::_('COM_ICAGENDA_REGISTRATION_CANCEL_DENY_BUTTON'); ?>
+					</a>
+					<input type="hidden" name="eventID" value="<?php echo $input->getInt('id'); ?>" />
+					<input type="hidden" name="reg_id" value="<?php echo $input->getInt('reg_id'); ?>" />
+					<input type="hidden" name="option" value="com_icagenda" />
+					<input type="hidden" name="task" value="registration.cancel" />
+				</div>
+			</fieldset>
+			<?php echo JHtml::_('form.token'); ?>
+		</form>
+
+	<?php elseif (isset($this->cancelled)) : ?>
+
+		<div class="ic-registration-cancel-content">
+			<?php echo JText::sprintf('COM_ICAGENDA_REGISTRATION_CANCEL_CONFIRMED', $this->item->title); ?>
+		</div>
+		<br />
+		<div class="ic-registration-cancel-buttons">
+			<a href="<?php echo JRoute::_(''); ?>" class="<?php echo $iCclass_btn_info; ?>">
+			<?php if(version_compare(JVERSION, '3.0', 'ge')) : ?>
+				<i class="icon-home icon-white"></i>&nbsp;<?php echo JTEXT::_('JERROR_LAYOUT_HOME_PAGE'); ?>
+			<?php else : ?>
+				<span style="color:#FFF"><?php echo JTEXT::_('JERROR_LAYOUT_HOME_PAGE'); ?></span>
+			<?php endif; ?>
+			</a>
+		</div>
+		<br />
+
+	<?php else : ?>
+
+		<div class="ic-registration-cancel-content">
+			<p class="alert alert-info"><?php echo JTEXT::_('COM_ICAGENDA_REGISTRATION_CANCEL_NONE'); ?></p>
+		</div>
+		<div class="ic-registration-cancel-buttons">
+			<a href="<?php echo JRoute::_(''); ?>" class="<?php echo $iCclass_btn_info; ?>">
+				<span class="icon-home icon-white"></span>&nbsp;<?php echo JTEXT::_('JERROR_LAYOUT_HOME_PAGE'); ?>
+			</a>
+		</div>
+
+	<?php endif; ?>
+
+</div>
+<?php
+if (version_compare(JVERSION, '3.0', 'lt'))
+{
+	JHtml::_('stylesheet', 'icagenda-front.j25.css', 'components/com_icagenda/add/css/');
+}
diff --git a/deployed/icagenda/components/com_icagenda/views/registration/tmpl/complete.php b/deployed/icagenda/components/com_icagenda/views/registration/tmpl/complete.php
new file mode 100644
index 00000000..72debd27
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/views/registration/tmpl/complete.php
@@ -0,0 +1,155 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.6.13 2017-11-10
+ *
+ * @package     iCagenda.Site
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.6.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+$app     = JFactory::getApplication();
+$isSef   = $app->getCfg('sef');
+$eventId = $app->input->getInt('id');
+$menu    = $app->getMenu();
+
+$lang    = JFactory::getLanguage();
+
+// Look for the home menu
+if (JLanguageMultilang::isEnabled())
+{
+	$home = $menu->getDefault($lang->getTag());
+}
+else
+{
+	$home  = $menu->getDefault();
+}
+
+//$regid = $app->input->get('reg');
+
+$startDate      = icagendaRender::dateToFormat($this->item->startdate);
+$startTime      = icagendaRender::dateToTime($this->item->startdate);
+$endDate        = icagendaRender::dateToFormat($this->item->enddate);
+$endTime        = icagendaRender::dateToTime($this->item->enddate);
+
+if ( ! $this->registration)
+{
+	$app->redirect(JRoute::_('index.php?option=com_icagenda&view=event&id=' . $app->input->getInt('id'), false));
+}
+
+$regDateTime    = icagendaRender::dateToFormat($this->registration->date)
+				. ' - ' . icagendaRender::dateToTime($this->registration->date);
+
+
+$period_set     = substr($this->item->startdate, 0, 4);
+
+$urlDateVar     = '';
+
+// Registration Type is 'all dates of the event' (single dates + period)
+if ($this->registration->period == 1)
+{
+	$registrationDates  = '';
+}
+
+// Registration Type is 'select list of dates'
+// Is a Period (no date, and period = 0)
+elseif ($this->registration->date == '' && ! $this->registration->period)
+{
+	$registrationDates  = (iCDate::isDate($this->item->startdate) && iCDate::isDate($this->item->enddate))
+//						? JText::sprintf( 'COM_ICAGENDA_REGISTERED_EVENT_PERIOD', $startDate, $startTime, $endDate, $endTime )
+						? '<div class="ic-label">' . JText::_('COM_ICAGENDA_REGISTRATION_DATES') . ': </div>'
+							. '<div class="ic-value">' . JText::_('COM_ICAGENDA_PERIOD_FROM') . ' ' . $startDate . ' ' . $startTime
+							. ' ' . JText::_('COM_ICAGENDA_PERIOD_TO') . ' ' . $endDate . ' ' . $endTime . '</div>'
+						: '';
+}
+
+// Registration Type is 'select list of dates' (single dates + period)
+// Is a Single date
+else
+{
+//	$registrationDates  = JText::sprintf( 'COM_ICAGENDA_REGISTERED_EVENT_DATE', $regDateTime, '' );
+	$registrationDates  = '<div class="ic-label">' . JText::_('COM_ICAGENDA_REGISTRATION_DATE') . '</div>'
+						. '<div class="ic-value">' . $regDateTime . '</div>';
+
+	$date_var           = ($isSef == '1') ? '?date=' : '&amp;date=';
+	$urlDateVar         = $date_var . icagendaEvent::urlDateVar($this->registration->date);
+}
+
+$eventURL = JRoute::_('index.php?option=com_icagenda&view=event&id=' . $eventId) . $urlDateVar;
+
+// Complete Page Content
+$content =  '<p>' . JText::_('COM_ICAGENDA_REGISTRATION_TY') . ' ' . $this->registration->name . ',</p>'; // @TODO: name used in sprintf %s
+$content.=  '<p>' . JText::sprintf('COM_ICAGENDA_REGISTRATION_COMPLETE_CONFIRMED', $this->item->title) . '</p>';
+
+$content.=  '<div class="ic-divTable ic-align-left ic-clearfix">';
+
+// Currently, only 'Simple Registration' system (in roadmap: 'Paiement' and 'Attend/Not Attend' systems)
+$simpleRegSystem = JText::_('COM_ICAGENDA_REGISTRATION_SUMMARY_REGISTRATION');
+
+$content.=  '<legend>' . JText::sprintf('COM_ICAGENDA_REGISTRATION_SUMMARY_LEGEND', $simpleRegSystem) . '</legend>';
+
+
+// Event
+$content.=  '<div class="ic-divRow">';
+$content.=  '<div class="ic-label">' . JText::_('IC_EVENT') . '</div>'
+			. '<div class="ic-value">' . $this->item->title . '</div>';
+$content.=  '</div>';
+
+// Date(s) booked
+$content.=  '<div class="ic-divRow">';
+$content.=  $registrationDates;
+$content.=  '</div>';
+
+// Number of tickets booked
+$content.=  '<div class="ic-divRow">';
+$content.=  '<div class="ic-label">' . JText::_('ICAGENDA_REGISTRATION_FORM_PEOPLE') . '</div>'
+			. '<div class="ic-value">' . $this->registration->people . '</div>';
+$content.=  '</div>';
+
+$content.=  $this->iCagendaOnRegistrationCompleteDataDisplay;
+
+$content.=  '</div>';
+
+?>
+<div id="icagenda" class="ic-registration-complete<?php echo $this->pageclass_sfx; ?>">
+	<h1>
+		<?php echo $this->escape(JText::_('COM_ICAGENDA_REGISTRATION_TITLE')); ?>
+	</h1>
+	<div class="ic-registration-complete-content">
+		<?php echo $content; ?>
+	</div>
+	<br />
+	<div class="ic-registration-complete-buttons">
+		<a href="<?php echo JRoute::_('index.php?Itemid=' . $home->id); ?>" class="ic-btn ic-btn-info button">
+		<?php if(version_compare(JVERSION, '3.0', 'ge')) : ?>
+			<i class="icon-home icon-white"></i>&nbsp;<?php echo JTEXT::_('JERROR_LAYOUT_HOME_PAGE'); ?>
+		<?php else : ?>
+			<span style="color:#FFF"><?php echo JTEXT::_('JERROR_LAYOUT_HOME_PAGE'); ?></span>
+		<?php endif; ?>
+		</a>
+		&nbsp;
+		<a href="<?php echo $eventURL; ?>" class="ic-btn ic-btn-success button">
+		<?php if(version_compare(JVERSION, '3.0', 'ge')) : ?>
+			<i class="icon-eye icon-white"></i>&nbsp;<?php echo JTEXT::_('COM_ICAGENDA_REGISTRATION_EVENT_LINK'); ?>
+		<?php else : ?>
+			<span style="color:#FFF"><?php echo JTEXT::_('COM_ICAGENDA_REGISTRATION_EVENT_LINK'); ?></span>
+		<?php endif; ?>
+		</a>
+	</div>
+	<br />
+</div>
+<?php
+if (version_compare(JVERSION, '3.0', 'lt'))
+{
+	JHtml::_('stylesheet', 'icagenda-front.j25.css', 'components/com_icagenda/add/css/');
+}
diff --git a/deployed/icagenda/components/com_icagenda/views/registration/tmpl/default.php b/deployed/icagenda/components/com_icagenda/views/registration/tmpl/default.php
new file mode 100644
index 00000000..1f9f7db9
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/views/registration/tmpl/default.php
@@ -0,0 +1,333 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.7 2019-01-06
+ *
+ * @package     iCagenda.Site
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.6.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.keepalive');
+
+if (version_compare(JVERSION, '3.3.6', 'le'))
+{
+	// For versions from 2.5 to 3.3.6
+	JHtml::_('behavior.formvalidation');
+}
+else
+{
+	// For versions from 3.4
+	JHtml::_('behavior.formvalidator');
+}
+
+// Get the core Joomla objects
+$app			= JFactory::getApplication();
+$document		= JFactory::getDocument();
+
+// Shortcut for item
+$item			= $this->item;
+
+// Form Validation (Only Server side validation (1), or Client & Server validation (default))
+$form_validate	= ($this->reg_form_validation == 1) ? '' : ' form-validate';
+$novalidate		= ($this->reg_form_validation == 1) ? ' novalidate' : '';
+
+// Load custom fields
+$customFields	= icagendaCustomfields::getCustomFields(1, $item->params->get('custom_form', ''));
+$listSlugs		= icagendaCustomfields::listSlugs($customFields);
+
+// Terms
+$terms			= $this->params->get('terms', 0);
+$session		= JFactory::getSession();
+$ic_submit_tos	= $session->get('ic_submit_tos', '');
+?>
+
+<div id="icagenda" class="ic-registration-view<?php echo $this->pageclass_sfx; ?>">
+
+	<?php echo "<!-- " . $this->template . " -->"; ?>
+
+	<?php // iCagenda Vars ?>
+	<?php require_once $this->icevent_vars; ?>
+
+	<?php // Content is generated by content plugin event "iCagendaOnRegistrationBeforeDisplay" ?>
+	<?php echo $item->event->iCagendaOnRegistrationBeforeDisplay; ?>
+
+	<?php // Theme Pack layout (Header) ?>
+	<?php require_once $this->themeRegistration; ?>
+
+	<?php // START CONTENT ?>
+
+	<?php // TITLE REGISTRATION ?>
+	<div class="ic-form-title">
+		<h1><?php echo JText::_('COM_ICAGENDA_REGISTRATION_TITLE'); ?></h1>
+	</div>
+
+	<?php // FIELDS REQUIRED INFO ?>
+	<div class="ic-required-info">
+		<?php echo JText::_('COM_ICAGENDA_FORM_REQUIRED_INFO'); ?>
+	</div>
+
+	<?php // START FORM ?>
+	<form class="<?php echo $form_validate; ?> form-horizontal well"
+		id="icagenda-registration"
+		action="<?php echo JRoute::_('index.php?option=com_icagenda&task=registration.register'); ?>"
+		method="post"
+		enctype="multipart/form-data"<?php echo $novalidate; ?>
+		>
+
+		<legend><?php echo JText::_('COM_ICAGENDA_REGISTRATION_YOUR_INFORMATION_LEGEND'); ?></legend>
+
+		<fieldset>
+
+		<?php // CORE FIELDS (fieldset 'default') ?>
+		<?php $fields = $this->form->getFieldset('default'); ?>
+		<?php if (count($fields)) : ?>
+			<?php // Iterate through the fields in the set and display them. ?>
+			<?php foreach ($fields as $field) : ?>
+				<?php $name = str_replace(array('[', ']', 'jform'), '', $field->name); ?>
+				<?php // If display this core field, and not overrided in custom fields. ?>
+				<?php if (isset($this->coreFields[$name]) && $this->coreFields[$name] && ! in_array('core_' . $name, $listSlugs)) : ?>
+					<?php // If field date OR field is readonly, no infotip and label tooltip. ?>
+					<?php if (($name == 'date') || $field->readonly) : ?>
+						<?php $infoTip = ''; ?>
+						<?php //if (version_compare(JVERSION, '3.0', 'ge')) $field->description = ''; ?>
+						<?php $this->form->setFieldAttribute($name, 'description', ''); ?>
+					<?php // Set the infotip and remove label tooltip. ?>
+					<?php elseif ($field->description) : ?>
+						<?php $infoTip = '<span class="iCFormTip iCicon iCicon-info-circle" title="'; ?>
+						<?php $infoTip.= htmlspecialchars('<strong>' . JText::_($field->title) . '</strong><br />' . JText::_($field->description)); ?>
+						<?php $infoTip.= '"></span>'; ?>
+						<?php $this->form->setFieldAttribute($name, 'description', ''); ?>
+					<?php else : ?>
+						<?php $infoTip = ''; ?>
+					<?php endif; ?>
+					<?php // If the field is hidden or only one ticket per registration, just display the hidden input. ?>
+					<?php if ($field->hidden || ($name == 'people' && $item->tickets == 1)) : ?>
+						<?php echo $this->form->getInput($name); ?>
+					<?php else : ?>
+						<div class="control-group">
+							<div class="control-label">
+								<?php echo $this->form->getLabel($name); ?>
+							</div>
+							<div class="controls">
+								<?php echo $this->form->getInput($name); ?>
+								<?php echo $infoTip; ?>
+							</div>
+						</div>
+					<?php endif; ?>
+				<?php endif; ?>
+			<?php endforeach; ?>
+		<?php endif; ?>
+
+
+		<?php // CUSTOM FIELDS ?>
+		<?php if ($customFields && count($customFields)) : ?>
+			<?php // Load Custom fields - Registration form (1); ?>
+			<?php icagendaCustomfields::loader(1, $item->params->get('custom_form', ''), $customFields); ?>
+			<?php // Iterate through the fields in the set and display them. ?>
+			<?php foreach ($customFields as $field) : ?>
+				<?php $infoTip = ''; ?>
+				<?php if ($field->description) : ?>
+					<?php $infoTip.= '<span class="iCFormTip iCicon iCicon-info-circle" title="'; ?>
+					<?php $infoTip.= htmlspecialchars('<strong>' . JText::_($field->title) . '</strong><br />' . JText::_($field->description)); ?>
+					<?php $infoTip.= '"></span>'; ?>
+					<?php $this->form->setFieldAttribute($field->slug, 'description', ''); ?>
+				<?php endif; ?>
+				<?php // If the field is hidden, just display the input. ?>
+				<?php if ($field->type == 'hidden') : ?>
+					<?php echo $this->form->getInput($field->slug); ?>
+				<?php else : ?>
+					<div class="control-group">
+						<div class="control-label">
+							<?php echo $this->form->getLabel($field->slug); ?>
+						</div>
+						<div class="controls">
+							<?php echo $this->form->getInput($field->slug); ?>
+							<?php echo $infoTip; ?>
+						</div>
+					</div>
+					<?php // If Override Email, add the email2 field (if enabled in global options). ?>
+					<?php if ($field->slug == 'email' && $this->params->get('emailConfirm', 1)) : ?>
+						<div class="control-group">
+							<div class="control-label">
+								<?php echo $this->form->getLabel('email2'); ?>
+							</div>
+							<div class="controls">
+								<?php echo $this->form->getInput('email2'); ?>
+								<?php echo $infoTip; ?>
+							</div>
+						</div>
+					<?php endif; ?>
+				<?php endif; ?>
+			<?php endforeach; ?>
+		<?php endif; ?>
+
+
+		<?php // Temporary FIELDS (fieldset 'temporary', to be migrated soon to core/override) ?>
+		<?php $fields = $this->form->getFieldset('temporary'); ?>
+		<?php if (count($fields)) : ?>
+			<?php // Iterate through the fields in the set and display them. ?>
+			<?php foreach ($fields as $field) : ?>
+				<?php $name = str_replace(array('[', ']', 'jform'), '', $field->name); ?>
+				<?php if (isset($this->extraFields[$name]) && $this->extraFields[$name]) : ?>
+					<?php // If the field is hidden, just display the input. ?>
+					<?php if ($field->hidden) : ?>
+						<?php echo $this->form->getInput($name); ?>
+					<?php else : ?>
+						<?php echo $field->renderField(); ?>
+					<?php endif; ?>
+				<?php endif; ?>
+			<?php endforeach; ?>
+		<?php endif; ?>
+
+		</fieldset>
+
+
+		<?php // PRIVACY ?>
+		<?php $name_visibility      = $this->params->get('participant_name_visibility', ''); ?>
+		<?php $name_consent         = $this->params->get('participant_name_consent', ''); // '0' means Force Name Consent (no consent request in form) ?>
+		<?php $gravatar_consent     = $this->params->get('participant_gravatar_consent', ''); ?>
+		<?php $gravatar_checkbox    = ($this->params->get('participantDisplay') != '3' || $gravatar_consent == '1')
+									? $gravatar_consent
+									: '0'; ?>
+
+		<?php if (($this->params->get('participantList', 0) && (($name_visibility && $name_consent != '0') || $gravatar_checkbox != '0'))
+					|| $this->params->get('privacy_organiser', 0)
+					|| ($name_visibility && $name_consent == '1')
+					|| $gravatar_checkbox == '1'): ?>
+			<legend><?php echo JText::_('COM_ICAGENDA_REGISTRATION_CONSENT_PERSONAL_DATA_LEGEND'); ?></legend>
+
+			<fieldset>
+
+				<?php // Privacy: Participant name ?>
+				<?php if ($name_visibility && $name_consent != '0') : ?>
+					<?php $consent_access = ($name_visibility == 1) ? '_public' : '_users'; ?>
+					<?php echo $this->form->renderField('consent_name' . $consent_access, 'consent'); ?>
+				<?php endif; ?>
+
+				<?php // Privacy: Gravatar ?>
+				<?php if ($gravatar_checkbox == '1' || ($gravatar_checkbox == '' && $this->params->get('participantList', 0))) : ?>
+					<?php echo $this->form->renderField('consent_gravatar', 'consent'); ?>
+				<?php endif; ?>
+
+				<?php // Privacy: Sharing information with Event Organiser ?>
+				<?php if ($this->params->get('privacy_organiser', 0)) : ?>
+					<?php echo $this->form->renderField('consent_organiser', 'consent'); ?>
+				<?php endif; ?>
+
+			</fieldset>
+		<?php endif; ?>
+
+
+		<?php // Terms & Conditions ?>
+		<?php if ($this->params->get('terms', 1)) : ?>
+			<?php echo $this->form->renderField('consent_terms', 'consent'); ?>
+		<?php endif; ?>
+
+
+		<?php // EXTRA FIELDS (fieldset 'extra', not enabled by default) ?>
+		<?php $fields = $this->form->getFieldset('extra'); ?>
+		<?php if (count($fields)) : ?>
+			<fieldset>
+			<?php // Iterate through the fields in the set and display them. ?>
+			<?php foreach ($fields as $field) : ?>
+				<?php $name = str_replace(array('[', ']', 'jform'), '', $field->name); ?>
+				<?php if (isset($this->extraFields[$name]) && $this->extraFields[$name]) : ?>
+					<?php // If the field is hidden, just display the input. ?>
+					<?php if ($field->hidden) : ?>
+						<?php echo $this->form->getInput($name); ?>
+					<?php else : ?>
+						<?php echo $field->renderField(); ?>
+					<?php endif; ?>
+				<?php endif; ?>
+			<?php endforeach; ?>
+			</fieldset>
+		<?php endif; ?>
+
+
+		<?php // HIDDEN FIELDS (fieldset 'hidden') ?>
+		<?php $eventid = $app->input->getInt('id'); ?>
+		<?php $menuid  = $app->input->getInt('Itemid'); ?>
+		<?php $fields  = $this->form->getFieldset('hidden'); ?>
+		<?php if (count($fields)) : ?>
+			<fieldset>
+			<?php // Iterate through the fields in the set and display them. ?>
+			<?php foreach ($fields as $field) : ?>
+				<?php $name = str_replace(array('[', ']', 'jform'), '', $field->name); ?>
+				<?php if ($field->hidden) : ?>
+					<?php echo $this->form->getInput($name, null, ${$name}); ?>
+				<?php endif; ?>
+			<?php endforeach; ?>
+			</fieldset>
+		<?php endif; ?>
+
+		<?php // Input to process registration function, not saved in database ?>
+		<input name="jform[type_registration]" type="hidden" value="<?php echo $item->params->get('typeReg', '1'); ?>" />
+		<input name="jform[current_url]" type="hidden" value="<?php echo JUri::getInstance()->toString(); ?>" />
+		<input name="jform[max_nb_of_tickets]" type="hidden" value="<?php echo $item->params->get('maxReg', '1000000'); ?>" />
+
+<?php
+if ($this->actions
+	&& $item->params->get('registration_actions', 0))
+{
+	$registerButton = JText::_('JNEXT');
+}
+else
+{
+	$registerButton = JText::_('COM_ICAGENDA_REGISTRATION_REGISTER_BTN');
+	$registerButton = ($registerButton == 'Register') ? JText::_('JREGISTER') : $registerButton; // B/C before 3.6.13
+}
+?>
+
+		<?php // Form Submit or Cancel ?>
+		<div class="control-group" id="submit">
+			<div class="controls">
+				<button class="btn btn-primary validate" type="submit"><?php echo $registerButton; ?></button>
+				<input name="eventID" type="hidden" value="<?php echo $eventid; ?>" />
+				<input name="option" type="hidden" value="com_icagenda" />
+				<input name="task" type="hidden" value="registration.register" />
+				<?php echo JHtml::_('form.token'); ?>
+				<a class="btn" href="<?php echo icagendaEvent::url($item->id, $item->alias); ?>" title="<?php echo JTEXT::_('COM_ICAGENDA_CANCEL'); ?>">
+					<?php echo JTEXT::_('COM_ICAGENDA_CANCEL'); ?>
+				</a>
+			</div>
+		</div>
+	</form>
+
+	<?php // Content is generated by content plugin event "iCagendaOnRegistrationAfterDisplay" ?>
+	<?php echo $item->event->iCagendaOnRegistrationAfterDisplay; ?>
+</div>
+
+<?php
+// Add iCtip declaration
+$document->addScriptDeclaration('
+	jQuery(document).ready(function(){
+		jQuery(".iCFormTip").tipTip({maxWidth: "250px", defaultPosition: "right", edgeOffset: 10});
+	});
+');
+
+// Disable submit button after first click (TODO : check and simplify)
+$document->addScriptDeclaration('
+	jQuery(function($) {
+		$("#icagenda-registration").one("submit", function() {
+			$(this).find(\'button[type="submit"]\')
+				.attr("disabled","disabled")
+				.css({
+					"background-color": "transparent",
+					"color": "grey"
+				});
+			$("#submit").addClass("ic-loader");
+			$(".buttonx").css("display", "none");
+		});
+	});
+');
diff --git a/deployed/icagenda/components/com_icagenda/views/registration/tmpl/index.html b/deployed/icagenda/components/com_icagenda/views/registration/tmpl/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/views/registration/tmpl/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/components/com_icagenda/views/registration/view.html.php b/deployed/icagenda/components/com_icagenda/views/registration/view.html.php
new file mode 100644
index 00000000..08e3cdda
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/views/registration/view.html.php
@@ -0,0 +1,405 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.13 2020-04-02
+ *
+ * @package     iCagenda.Site
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2020 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.6.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * Registration view class for iCagenda
+ */
+class iCagendaViewRegistration extends JViewLegacy
+{
+	protected $data;
+
+	protected $form;
+
+	protected $state;
+
+	protected $params;
+
+	protected $item;
+
+	public $document;
+
+	/**
+	 * Method to display the view.
+	 *
+	 * @param   string  $tpl  The template file to include
+	 *
+	 * @return  mixed
+	 *
+	 * @since   3.6.0
+	 */
+	public function display($tpl = null)
+	{
+		$app  = JFactory::getApplication();
+		$user = JFactory::getUser();
+
+		// Get the view data.
+		$this->data         = $this->get('Data');
+		$this->form         = $this->get('Form');
+		$this->state        = $this->get('State');
+		$this->item         = $this->get('Item');
+		$this->registration = $this->get('Registration');
+
+		$this->participantEventRegistrations = $this->get('ParticipantEventRegistrations');
+
+		$this->params = $this->state->get('params');
+
+		$this->coreFields   = array(
+								'uid'    => true,
+								'name'   => true,
+								'email'  => true,
+								'email2' => true,
+								'phone'  => $this->params->get('phoneDisplay', 1) ? true : false,
+								'date'   => true,
+								'people' => true,
+							);
+
+		$this->extraFields  = array(
+								'notes'   => $this->params->get('notesDisplay', 0) ? true : false,
+								'terms'   => $this->params->get('terms', 0) ? true : false,
+								'captcha' => $this->params->get('reg_captcha', 0) ? true : false,
+							);
+
+		// Shortcuts
+		$params = $this->params;
+		$item   = $this->item;
+
+		// For Dev.
+		$time_loading = $params->get('time_loading', '');
+
+		if ($time_loading)
+		{
+			$starttime_reg = iCLibrary::getMicrotime();
+		}
+
+		// Get Options
+		$this->reg_captcha         = $params->get('reg_captcha', 0);
+		$this->reg_form_validation = $params->get('reg_form_validation', '');
+
+		// Check Access
+		$userLevels = $user->getAuthorisedViewLevels();
+		$userGroups = $user->getAuthorisedGroups();
+
+		$groupid = JComponentHelper::getParams('com_icagenda')->get('approvalGroups', array("8"));
+		$groupid = is_array($groupid) ? $groupid : array($groupid);
+
+		$uri    = JFactory::getUri();
+		$return = base64_encode($uri); // Encode Return URL
+		$rlink  = JRoute::_("index.php?option=com_users&view=login&return=$return", false);
+
+		$eventURL = icagendaEvent::eventURL($this->item);
+
+		if ($item == NULL
+			|| $item->state != 1
+			|| $item->approval == 1
+			|| $item->params->get('event_cancelled') == 1
+			)
+		{
+			$app->enqueueMessage(JTEXT::_('JERROR_LAYOUT_PAGE_NOT_FOUND'), 'error');
+
+			return false;
+		}
+
+		// Warning 'Registration closed' if no ticket available for the current form
+		// @TODO: set this as a content message, replacing the form, and keeping the event info header.
+		elseif ($app->input->get('layout', 'default') == 'default'
+			&& (
+				$item->ticketsBookable <= 0
+				|| ! icagendaRegistration::upcomingDatesBooking($item)
+				)
+			)
+		{
+			$app->enqueueMessage(JTEXT::_('COM_ICAGENDA_REGISTRATION_CLOSED'), 'warning');
+
+			$app->redirect($eventURL);
+
+			return false;
+		}
+
+		// Layout Cancel: not for "actions" plugin yet. // @todo: action cancel request system
+		elseif ($this->item->params->get('registration_actions')
+			&& $app->input->get('layout', 'default') == 'cancel'
+			)
+		{
+			$app->enqueueMessage(JTEXT::_('JERROR_LAYOUT_PAGE_NOT_FOUND'), 'error');
+
+			return false;
+		}
+
+		// Layout Cancel: logged-in user access only
+		elseif ( ! $user->id
+			&& $app->input->get('layout', 'default') == 'cancel'
+			)
+		{
+			$msg = '';
+
+			// Redirect to login page if user not logged-in to be able to cancel registration.
+			$msg.= '<h4 class="alert-heading">' . JText::_('IC_AUTH_REQUIRED') . '</h4>';
+			$msg.= '<p>' . JText::_('COM_ICAGENDA_LOGIN_TO_ACCESS_REGISTRATION_CANCELLATION') . '</p>';
+
+			$app->enqueueMessage($msg, '');
+
+			$app->redirect($rlink);
+		}
+
+		elseif ( ! in_array('8', $userGroups)
+			&& ! in_array(icagendaRegistration::accessReg($item), $userLevels)
+			)
+		{
+			if ($user->id)
+			{
+				$app->enqueueMessage(JText::_( 'JERROR_LOGIN_DENIED' ), 'warning');
+			}
+			else
+			{
+//				$app->enqueueMessage(JText::_( 'JGLOBAL_YOU_MUST_LOGIN_FIRST' ), 'info');
+
+				// Redirect to login page if no access to registration form.
+				$msg = '<div>';
+				$msg.= '<h2>';
+				$msg.= JText::_('IC_AUTH_REQUIRED');
+				$msg.= '</h2>';
+				$msg.= '<div>';
+				$msg.= JText::_("COM_ICAGENDA_LOGIN_TO_ACCESS_REGISTRATION_FORM");
+				$msg.= '</div>';
+				$msg.= '<br />';
+				$msg.= '<div>';
+				$msg.= '<a href="' . icagendaEvent::eventURL($item) . '" class="btn btn-default btn-small button">';
+				$msg.= '<i class="iCicon iCicon-backic icon-white"></i>&nbsp;' . JTEXT::_('COM_ICAGENDA_BACK') . '';
+				$msg.= '</a>';
+				$msg.= '&nbsp;';
+				$msg.= '<a href="index.php" class="btn btn-info btn-small button">';
+				$msg.= '<i class="icon-home icon-white"></i>&nbsp;' . JTEXT::_('JERROR_LAYOUT_HOME_PAGE') . '';
+				$msg.= '</a>';
+				$msg.= '</div>';
+				$msg.= '</div>';
+
+				// if not login, and registration form not "public".
+				$app->enqueueMessage($msg);
+			}
+
+			$app->redirect($rlink);
+		}
+
+
+		// Load Theme Pack layout for event details view.
+		$this->template    = $params->get('template', 'default');
+		$themeRegistration = icagendaTheme::getThemeLayout($this->template, 'registration');
+
+		// Check for Theme Pack errors (layout file missing).
+		if ($themeRegistration[1])
+		{
+			$msg = ($themeRegistration[1] !== 'deprecated')
+					? 'iCagenda ' . JText::_('PHPMAILER_FILE_OPEN') . ' <strong>' . $this->template . '_registration.php</strong>'
+					: JText::_('COM_ICAGENDA_ERROR_THEME_PACK_OUTDATED') . '<br/>' .
+						JText::sprintf('COM_ICAGENDA_ERROR_THEME_PACK_EDIT_OR_CHANGE', '<strong>' . $this->template . '_registration.php</strong>');
+			$app->enqueueMessage($msg, 'warning');
+
+			if ($themeRegistration[1] !== 'alert')
+			{
+				return false;
+			}
+		}
+
+		$this->themeRegistration = $themeRegistration[0];
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+
+			return false;
+		}
+
+		// Check for layout override
+		$active = JFactory::getApplication()->getMenu()->getActive();
+
+		if (isset($active->query['layout']))
+		{
+			$this->setLayout($active->query['layout']);
+		}
+
+		// Process the content plugins.
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			$this->dispatcher = JDispatcher::getInstance();
+		}
+		else
+		{
+			$this->dispatcher = JEventDispatcher::getInstance();
+		}
+
+		//JPluginHelper::importPlugin('content');
+		JPluginHelper::importPlugin('icagenda');
+
+		$this->actions = $this->dispatcher->trigger('iCagendaOnRegistrationActions', array('com_icagenda.actions', &$item, &$this->params));
+
+		$this->dispatcher->trigger('iCagendaOnRegistrationPrepare', array('com_icagenda.registration', &$item, &$this->params));
+
+		$item->event = new stdClass;
+
+		$results = $this->dispatcher->trigger('iCagendaOnRegistrationBeforeDisplay', array('com_icagenda.registration', &$item, &$this->params));
+		$item->event->iCagendaOnRegistrationBeforeDisplay = trim(implode("\n", $results));
+
+		$results = $this->dispatcher->trigger('iCagendaOnRegistrationAfterDisplay', array('com_icagenda.registration', &$item, &$this->params));
+		$item->event->iCagendaOnRegistrationAfterDisplay = trim(implode("\n", $results));
+
+		$results = $this->dispatcher->trigger('iCagendaOnRegistrationCompleteDataDisplay', array('com_icagenda.registration', &$item, &$this->params));
+		$this->iCagendaOnRegistrationCompleteDataDisplay = trim(implode("\n", $results));
+
+
+		// Escape strings for HTML output
+		$this->pageclass_sfx = htmlspecialchars($this->params->get('pageclass_sfx'));
+
+		icagendaInfo::commentVersion();
+
+		$this->icevent_vars = 'components/com_icagenda/add/elements/icevent_vars.php';
+
+		// Common fields
+		JFormHelper::addFieldPath(JPATH_ADMINISTRATOR . '/components/com_icagenda/utilities/form/field');
+
+		$this->prepareDocument();
+
+		parent::display($tpl);
+
+
+		// Loads Scripts and CSS
+		$document = JFactory::getDocument();
+
+		// Loads jQuery Library
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			icagendaThemeJoomla25::loadjQuery();
+		}
+		// Joomla 3
+		else
+		{
+			JHtml::_('bootstrap.framework');
+			JHtml::_('jquery.framework');
+		}
+
+		// iCagenda scripts (radio buttons...)
+		JHtml::script('com_icagenda/icagenda.js', false, true);
+
+		// Loading tipTip Library used for iCtips
+		JHtml::script('com_icagenda/jquery.tipTip.js', false, true);
+
+		// iCagenda Script validation for Registration form (1)
+//		if ( ! $this->reg_form_validation)
+//		{
+//			$iCheckForm = icagendaForm::submit(1);
+//			$document->addScriptDeclaration($iCheckForm);
+//		}
+
+		// Add custom handler to check both the emails (Email and Confirm Email) are same
+//		$document->addScriptDeclaration('jQuery(document).ready(function(){
+//			document.formvalidator.setHandler("emailverify", function (value) {
+//				var email = document.getElementById("reg_email");
+//				var email2 = document.getElementById("reg_email2");
+//				return (email.value === email2.value);
+//			});
+//		});');
+
+		// Add CSS
+		icagendaTheme::loadComponentCSS($this->template);
+		icagendaThemeStyle::addMediaCss($this->template, 'component');
+
+		// For Dev.
+		if ($time_loading)
+		{
+			$endtime_reg = iCLibrary::getMicrotime();
+
+			echo '<center style="font-size:8px;">Time to create page: ' . round($endtime_reg-$starttime_reg, 3) . ' seconds</center>';
+		}
+	}
+
+	/**
+	 * Prepares the document.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.6.0
+	 */
+	protected function prepareDocument()
+	{
+		$app     = JFactory::getApplication();
+		$menus   = $app->getMenu();
+		$pathway = $app->getPathway();
+		$title   = null;
+
+		// Because the application sets a default page title,
+		// we need to get it from the menu item itself
+		$menu = $menus->getActive();
+
+		if ($menu)
+		{
+			$this->params->def('page_heading', $this->params->get('page_title', $menu->title));
+		}
+		else
+		{
+			$this->params->def('page_heading', JText::_('COM_ICAGENDA_REGISTRATION_TITLE'));
+		}
+
+		$title = $this->params->get('page_title', '');
+
+		$id = (int) @$menu->query['id'];
+
+		// If the menu item does not concern this event
+		if ($menu && ($menu->query['option'] != 'com_icagenda' || $menu->query['view'] != 'registration' || $id != $this->item->id))
+		{
+			// If this is not a single event menu item, set the page title to the event title
+			if ($this->item->title)
+			{
+				$title = $this->item->title;
+			}
+
+			$pathway->addItem($this->item->title . ' (' . JText::_('COM_ICAGENDA_REGISTRATION_TITLE') . ')', '');
+		}
+
+		if (empty($title))
+		{
+			$title = $app->get('sitename');
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 1)
+		{
+			$title = JText::sprintf('JPAGETITLE', $app->get('sitename'), $title);
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 2)
+		{
+			$title = JText::sprintf('JPAGETITLE', $title, $app->get('sitename'));
+		}
+
+		$this->document->setTitle($title . ' - ' . JText::_('COM_ICAGENDA_REGISTRATION_TITLE'));
+
+		if ($this->params->get('menu-meta_description'))
+		{
+			$this->document->setDescription($this->params->get('menu-meta_description'));
+		}
+
+		if ($this->params->get('menu-meta_keywords'))
+		{
+			$this->document->setMetadata('keywords', $this->params->get('menu-meta_keywords'));
+		}
+
+		if ($this->params->get('robots'))
+		{
+			$this->document->setMetadata('robots', $this->params->get('robots'));
+		}
+	}
+}
diff --git a/deployed/icagenda/components/com_icagenda/views/submit/index.html b/deployed/icagenda/components/com_icagenda/views/submit/index.html
new file mode 100644
index 00000000..fa6d84e8
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/views/submit/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/components/com_icagenda/views/submit/tmpl/default.php b/deployed/icagenda/components/com_icagenda/views/submit/tmpl/default.php
new file mode 100644
index 00000000..2bd311ee
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/views/submit/tmpl/default.php
@@ -0,0 +1,1372 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.3 2018-07-18
+ *
+ * @package     iCagenda.Site
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.2.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.keepalive');
+
+if (version_compare(JVERSION, '3.3.6', 'le'))
+{
+	// For versions from 2.5 to 3.3.6
+	JHtml::_('behavior.formvalidation');
+}
+else
+{
+	// For versions from 3.4
+	JHtml::_('behavior.formvalidator');
+}
+
+// JFactory
+$app      = JFactory::getApplication();
+$document = JFactory::getDocument();
+$lang     = JFactory::getLanguage();
+$user     = JFactory::getUser();
+
+// Global Options
+//$iCparams = JComponentHelper::getParams('com_icagenda');
+$iCparams     = $app->getParams();
+$maps_service = $iCparams->get('maps_service', '');
+
+// Get User Info (Access Levels, id, email)
+$userLevels	= $user->getAuthorisedViewLevels();
+$u_id		= $user->get('id');
+$u_mail		= $user->get('email');
+
+// Get Access Levels to the form
+$accessDefault = array('2');
+$submitAccess = $iCparams->get('submitAccess', $accessDefault);
+
+// Get Content of the page for not logged-in users
+$NotLoginDefault = JText::_( 'COM_ICAGENDA_EVENT_SUBMISSION_ACCESS' ).'<br />';
+$submitNotLogin = $iCparams->get('submitNotLogin', '');
+
+if ($submitNotLogin == 2)
+{
+	$submitNotLogin_Content = $iCparams->get('submitNotLogin_Content', $NotLoginDefault);
+}
+else
+{
+	$submitNotLogin_Content = $NotLoginDefault;
+}
+
+// Get Content of the page for not authorised logged-in users
+$NoRightsDefault = JText::_( 'COM_ICAGENDA_EVENT_SUBMISSION_NO_RIGHTS' ).'<br />';
+$submitNoRights = $iCparams->get('submitNoRights', '');
+if ($submitNoRights == 2)
+{
+	$submitNoRights_Content = $iCparams->get('submitNoRights_Content', $NoRightsDefault);
+}
+else
+{
+	$submitNoRights_Content = $NoRightsDefault;
+}
+
+// Control: if access level, set true to display form
+$AccessForm = false;
+
+foreach ($submitAccess AS $ac)
+{
+	if ( in_array($ac, $userLevels ))
+	{
+		$AccessForm = true;
+	}
+}
+
+// Set Return Page
+$uri    = JFactory::getURI();
+$return = base64_encode($uri); // Encode Return URL
+$rlink  = JRoute::_("index.php?option=com_users&view=login&return=$return", false);
+
+// Loading Submission Page
+if ( !$u_id && !in_array('1', $submitAccess ))
+{
+	// if not login, and submission form not "public"
+	$app->enqueueMessage($submitNotLogin_Content, 'info');
+	$app->redirect($rlink);
+
+}
+elseif (!$AccessForm)
+{
+	// if No Access Permissions
+	$app->enqueueMessage($submitNoRights_Content, 'info');
+	$app->redirect($rlink);
+
+}
+else
+{
+	// Display Form
+
+	// Set name or username for logged-in user
+	$nameJoomlaUser = $iCparams->get('nameJoomlaUser', 1);
+	if ($nameJoomlaUser == 1)
+	{
+		$u_name=$user->get('name');
+	}
+	else
+	{
+		$u_name=$user->get('username');
+	}
+
+	// Autofill name and email if registered user log in
+	$autofilluser = $iCparams->get('autofilluser', 1);
+	if ($autofilluser != 1)
+	{
+		$u_name='';
+		$u_mail='';
+	}
+
+	$theme = $this->template;
+//	$infoimg = JURI::root().'components/com_icagenda/themes/packs/default/images/info.png';
+
+	JText::script('COM_ICAGENDA_TERMS_OF_SERVICE_NOT_CHECKED_SUBMIT_EVENT');
+	JText::script('COM_ICAGENDA_FORM_NO_DATES_ALERT');
+
+	$period_display			= $this->submit_periodDisplay;
+	$weekdays_display		= $this->submit_weekdaysDisplay;
+	$dates_display			= $this->submit_datesDisplay;
+	$displaytime_display	= $this->submit_displaytimeDisplay;
+	$displaytime_default	= $iCparams->get('displaytime', '1');
+
+	$tos = $iCparams->get('tos', 1);
+
+	// Set Tooltips
+	$icTip_name			= htmlspecialchars('<strong>' . JText::_( 'COM_ICAGENDA_SUBMIT_FORM_USER_NAME' ) . '</strong><br />' . JText::_( 'COM_ICAGENDA_SUBMIT_FORM_USER_NAME_DESC' ) . '');
+	$icTip_Uemail		= htmlspecialchars('<strong>' . JText::_( 'COM_ICAGENDA_SUBMIT_FORM_USER_EMAIL' ) . '</strong><br />' . JText::_( 'COM_ICAGENDA_SUBMIT_FORM_USER_EMAIL_DESC' ) . '');
+	$icTip_title		= htmlspecialchars('<strong>' . JText::_( 'COM_ICAGENDA_FORM_LBL_EVENT_TITLE' ) . '</strong><br />' . JText::_( 'COM_ICAGENDA_FORM_DESC_EVENT_TITLE' ) . '');
+	$icTip_category		= htmlspecialchars('<strong>' . JText::_( 'COM_ICAGENDA_FORM_LBL_EVENT_CATID' ) . '</strong><br />' . JText::_( 'COM_ICAGENDA_FORM_DESC_EVENT_CATID' ) . '');
+	$icTip_image		= htmlspecialchars('<strong>' . JText::_( 'COM_ICAGENDA_FORM_LBL_EVENT_IMAGE' ) . '</strong><br />' . JText::_( 'COM_ICAGENDA_FORM_DESC_EVENT_IMAGE' ) . '');
+	$icTip_startD		= htmlspecialchars('<strong>' . JText::_( 'COM_ICAGENDA_FORM_LBL_EVENTPERIOD_START' ) . '</strong><br />' . JText::_( 'COM_ICAGENDA_FORM_DESC_EVENTPERIOD_START' ) . '');
+	$icTip_endD			= htmlspecialchars('<strong>' . JText::_( 'COM_ICAGENDA_FORM_LBL_EVENTPERIOD_END' ) . '</strong><br />' . JText::_( 'COM_ICAGENDA_FORM_DESC_EVENTPERIOD_END' ) . '');
+	$icTip_weekDays		= htmlspecialchars('<strong>' . JText::_( 'COM_ICAGENDA_FORM_WEEK_DAYS_INFO_TITLE' ) . '</strong><br />' . JText::_( 'COM_ICAGENDA_FORM_WEEK_DAYS_INFO_DESC' ) . '');
+	$icTip_displayTime	= htmlspecialchars('<strong>' . JText::_( 'COM_ICAGENDA_DISPLAY_TIME_LABEL' ) . '</strong><br />' . JText::_( 'COM_ICAGENDA_DISPLAY_TIME_DESC' ) . '');
+	$icTip_venue		= htmlspecialchars('<strong>' . JText::_( 'COM_ICAGENDA_FORM_LBL_EVENT_VENUE' ) . '</strong><br />' . JText::_( 'COM_ICAGENDA_FORM_DESC_EVENT_VENUE' ) . '');
+	$icTip_email		= htmlspecialchars('<strong>' . JText::_( 'COM_ICAGENDA_FORM_LBL_EVENT_EMAIL' ) . '</strong><br />' . JText::_( 'COM_ICAGENDA_FORM_DESC_EVENT_EMAIL' ) . '');
+	$icTip_phone		= htmlspecialchars('<strong>' . JText::_( 'COM_ICAGENDA_FORM_LBL_EVENT_PHONE' ) . '</strong><br />' . JText::_( 'COM_ICAGENDA_FORM_DESC_EVENT_PHONE' ) . '');
+	$icTip_website		= htmlspecialchars('<strong>' . JText::_( 'COM_ICAGENDA_FORM_LBL_EVENT_WEBSITE' ) . '</strong><br />' . JText::_( 'COM_ICAGENDA_FORM_DESC_EVENT_WEBSITE' ) . '');
+	$icTip_file			= htmlspecialchars('<strong>' . JText::_( 'COM_ICAGENDA_FORM_LBL_EVENT_FILE' ) . '</strong><br />' . JText::_( 'COM_ICAGENDA_FORM_DESC_EVENT_FILE' ) . '');
+	$icTip_reg			= htmlspecialchars('<strong>' . JText::_( 'COM_ICAGENDA_REGISTRATION_LABEL' ) . '</strong><br />' . JText::_( 'COM_ICAGENDA_REGISTRATION_DESC' ) . '');
+	$icTip_tickets		= htmlspecialchars('<strong>' . JText::_( 'COM_ICAGENDA_MAX_REGISTRATIONS_LABEL' ) . '</strong><br />' . JText::_( 'COM_ICAGENDA_MAX_REGISTRATIONS_DESC' ) . '');
+
+	$session			= JFactory::getSession();
+	$address_session	= $session->get('ic_submit_address', '');
+	$ic_submit_tos		= $session->get('ic_submit_tos', '');
+	$post				= $session->get('ic_submit', '');
+
+	$post_username			= $post ? $post->username : '';
+	$post_created_by_email	= $post ? $post->created_by_email : '';
+	$post_title				= $post ? $post->title : '';
+	$post_image				= $post ? $post->image : '';
+	$post_startdate			= $post ? $post->startdate : '0000-00-00 00:00:00';
+	$post_enddate			= $post ? $post->enddate : '0000-00-00 00:00:00';
+	$post_weekdays			= $post ? explode(',', $post->weekdays) : array();
+	$post_displaytime		= $post ? $post->displaytime : '1';
+	$post_desc				= $post ? $post->desc : '';
+	$post_venue				= $post ? $post->place : '';
+	$post_email				= $post ? $post->email : '';
+	$post_phone				= $post ? $post->phone : '';
+	$post_website			= $post ? $post->website : '';
+	$post_file				= $post ? $post->file : '';
+	$post_address			= $post ? $post->address : '';
+	$post_lat				= $post ? $post->lat : '0';
+	$post_lng				= $post ? $post->lng : '0';
+	$post_params			= $post ? $post->params : '';
+
+	if ($post_params)
+	{
+//		foreach ($post_image as $key => $value)
+//		{
+//			$post_img[$key] = $value;
+//		}
+
+		$post_params = json_decode( $post_params, true );
+
+		foreach ($post_params as $key => $value)
+		{
+			$post_param[$key] = $value;
+		}
+	}
+
+	$params = $this->form->getFieldsets('params');
+
+
+	// Set default values for Google Maps
+	// ZOOM
+	$zoom = '16';
+	// HYBRID, ROADMAP, SATELLITE, TERRAIN
+	$mapTypeId = 'ROADMAP';
+
+	$coords = $post_lat . ', ' . $post_lng;
+	$lat = '0';
+	$lng = '0';
+	$zoom = $post ? '16' : '1';
+
+	// Form Validation
+	$novalidate			= ($this->submit_form_validation == 1) ? ' novalidate' : '';
+	$form_validate		= ($this->submit_form_validation == 1) ? '' : ' form-validate';
+	$iCheckForm			= ($this->submit_form_validation == 1) ? '' : ' onsubmit="return iCheckForm();"';
+	?>
+
+	<?php // ERROR ALERT ?>
+	<div id="form_errors" class="alert alert-danger" style="display:none">
+		<strong><?php echo JText::_('JGLOBAL_VALIDATION_FORM_FAILED'); ?></strong>
+		<div id="message_error">
+		</div>
+	</div>
+
+	<div id="icagenda" class="ic-submit-view<?php echo $this->pageclass_sfx; ?>">
+		<?php if ($this->params->get('show_page_heading', 1)) : ?>
+		<h1 class="componentheading">
+			<?php echo $this->escape($this->params->get('page_heading')); ?>
+		</h1>
+		<?php endif; ?>
+
+		<?php // Content is generated by content plugin event "iCagendaOnSubmitBeforeDisplay" ?>
+		<?php echo $this->pluginEvent->iCagendaOnSubmitBeforeDisplay; ?>
+
+		<form id="submitevent" action="<?php echo JRoute::_('index.php?option=com_icagenda&view=submit'); ?>" method="post" class="icagenda_form<?php echo $form_validate; ?>" enctype="multipart/form-data"<?php echo $iCheckForm . $novalidate; ?>>
+			<div>
+			<legend><?php echo JText::_('COM_ICAGENDA_LEGEND_USERINFOS'); ?></legend>
+			<div class="fieldset">
+				<div class="ic-control-group ic-clearfix">
+					<div class="ic-control-label">
+						<label id="submit_username-lbl" for="submit_username"><?php echo JText::_( 'COM_ICAGENDA_SUBMIT_FORM_USER_NAME' ); ?> *</label>
+					</div>
+					<div class="ic-controls">
+						<?php
+						if ($u_name)
+						{
+							echo '<input type="text" id="submit_username" name="username" value="'.$this->escape($u_name).'" size="40" class="input-large required" aria-required="true" readonly="true" />';
+						}
+						else
+						{
+							echo '<input type="text" id="submit_username" name="username" value="' . $post_username . '" size="40" class="input-large required" aria-required="true" required="true" />';
+						}
+						?>
+						<?php echo '<span class="iCFormTip iCicon iCicon-info-circle" title="' . $icTip_name . '"></span>'; ?>
+					</div>
+				</div>
+				<div class="ic-control-group ic-clearfix">
+					<div class="ic-control-label">
+						<label id="submit_created_by_email-lbl" for="submit_created_by_email"><?php echo JText::_( 'COM_ICAGENDA_SUBMIT_FORM_USER_EMAIL' ); ?> *</label>
+					</div>
+					<div class="ic-controls">
+						<?php
+						if ($u_mail)
+						{
+							echo '<input type="text" id="submit_created_by_email" name="created_by_email" value="' . $this->escape($u_mail) . '" size="40" class="input-large required" aria-required="true" readonly="true" />';
+						}
+						else
+						{
+							echo '<input type="text" id="submit_created_by_email" name="created_by_email" value="' . $post_created_by_email . '" size="40" class="input-large required" aria-required="true" required="true" />';
+						}
+						?>
+						<?php echo '<span class="iCFormTip iCicon iCicon-info-circle" title="' . $icTip_Uemail . '"></span>'; ?>
+					</div>
+				</div>
+			</div>
+			<div>&nbsp;</div>
+
+			<legend id="ic-event-fieldset"><?php echo JText::_('COM_ICAGENDA_LEGEND_NEW_EVENT'); ?></legend>
+
+			<div class="fieldset">
+				<div class="ic-control-group ic-clearfix">
+					<div class="ic-control-label">
+						<label id="title-lbl" for="title"><?php echo JText::_( 'COM_ICAGENDA_FORM_LBL_EVENT_TITLE' ); ?> *</label>
+					</div>
+					<div class="ic-controls">
+						<input id="title" type="text" name="title" size="60" value="<?php echo $post_title; ?>" class="input-xlarge required" aria-required="true" required="true"/>
+						<?php echo '<span class="iCFormTip iCicon iCicon-info-circle" title="' . $icTip_title . '"></span>'; ?>
+					</div>
+				</div>
+				<div class="ic-control-group ic-clearfix">
+					<div class="ic-control-label">
+						<label id="catid-lbl" for="catid"><?php echo JText::_( 'COM_ICAGENDA_FORM_LBL_EVENT_CATID' ); ?> *</label>
+					</div>
+					<div class="ic-controls ic-select">
+						<?php echo $this->form->getInput('catid'); ?>
+						<?php echo '<span class="iCFormTip iCicon iCicon-info-circle" title="' . $icTip_category . '"></span>'; ?>
+					</div>
+				</div>
+				<?php if ($this->submit_imageDisplay) : ?>
+				<div class="ic-control-group ic-clearfix">
+					<div class="ic-control-label">
+						<label><?php echo JText::_( 'COM_ICAGENDA_FORM_LBL_EVENT_IMAGE' ); ?></label>
+					</div>
+					<div class="ic-controls ic-select">
+						<?php if (!$post_image) : ?>
+							<?php echo $this->form->getInput('image'); ?>
+							<?php echo '<span class="iCFormTip iCicon iCicon-info-circle" title="' . $icTip_image . '"></span>'; ?>
+						<?php else : ?>
+							<?php echo '<input type="hidden" name="image_session" value="' . $post_image . '" />'; ?>
+							<?php echo '<img src="' . $post_image .'" alt="" />'; ?>
+						<?php endif; ?>
+					</div>
+				</div>
+				<div id="ic-upload-preview"></div>
+				<?php endif; ?>
+			</div>
+			<div>&nbsp;</div>
+
+			<legend id="ic-dates-fieldset"><?php echo JText::_('COM_ICAGENDA_LEGEND_DATES'); ?></legend>
+
+			<div class="fieldset">
+				<?php if ($period_display == '1') : ?>
+				<h3><?php echo JText::_('COM_ICAGENDA_LEGEND_PERIOD_DATES'); ?></h3>
+				<div class="ic-control-group ic-clearfix">
+					<div class="ic-control-label">
+						<label><?php echo JText::_( 'COM_ICAGENDA_FORM_LBL_EVENTPERIOD_START' ); ?></label>
+					</div>
+					<div class="ic-controls">
+						<?php if ($lang->getTag() == 'fa-IR') : ?>
+							<?php echo JHtml::_('calendar', $post_startdate, 'startdate', 'startdate_jalali', '%Y-%m-%d %H:%M:%S', ''); ?>
+						<?php else : ?>
+							<input type="text" name="startdate" id="startdate" class="ic-date-input" value="<?php echo $post_startdate; ?>">
+						<?php endif; ?>
+						<?php echo '<span class="iCFormTip iCicon iCicon-info-circle" title="' . $icTip_startD . '"></span>'; ?>
+					</div>
+				</div>
+				<div class="ic-control-group ic-clearfix">
+					<div class="ic-control-label">
+						<label><?php echo JText::_( 'COM_ICAGENDA_FORM_LBL_EVENTPERIOD_END' ); ?></label>
+					</div>
+					<div class="ic-controls">
+						<?php if ($lang->getTag() == 'fa-IR') : ?>
+							<?php echo JHtml::_('calendar', $post_enddate, 'enddate', 'enddate_jalali', '%Y-%m-%d %H:%M:%S', ''); ?>
+						<?php else : ?>
+							<input type="text" name="enddate" id="enddate" class="ic-date-input" value="<?php echo $post_enddate; ?>">
+						<?php endif; ?>
+						<?php echo '<span class="iCFormTip iCicon iCicon-info-circle" title="' . $icTip_endD . '"></span>'; ?>
+					</div>
+				</div>
+				<?php if ($weekdays_display == '1') : ?>
+				<div class="ic-control-group ic-clearfix">
+					<div class="ic-control-label">
+						<?php echo $this->form->getLabel('weekdays'); ?>
+					</div>
+					<div class="ic-controls ic-select">
+						<?php if (!$post_weekdays) : ?>
+							<?php echo $this->form->getInput('weekdays'); ?>
+						<?php else : ?>
+							<select
+								name="weekdays[]"
+								type="list"
+								label="COM_ICAGENDA_FORM_LBL_WEEK_DAYS"
+								description="COM_ICAGENDA_FORM_DESC_WEEK_DAYS"
+								multiple="true"
+								labelclass="control-label"
+								>
+								<option value="0" <?php if (in_array('0', $post_weekdays)) { echo "selected"; } ?>>
+									<?php echo JText::_('SUNDAY') ?></option>
+								<option value="1" <?php if (in_array('1', $post_weekdays)) { echo "selected"; } ?>>
+									<?php echo JText::_('MONDAY') ?></option>
+								<option value="2" <?php if (in_array('2', $post_weekdays)) { echo "selected"; } ?>>
+									<?php echo JText::_('TUESDAY') ?></option>
+								<option value="3" <?php if (in_array('3', $post_weekdays)) { echo "selected"; } ?>>
+									<?php echo JText::_('WEDNESDAY') ?></option>
+								<option value="4" <?php if (in_array('4', $post_weekdays)) { echo "selected"; } ?>>
+									<?php echo JText::_('THURSDAY') ?></option>
+								<option value="5" <?php if (in_array('5', $post_weekdays)) { echo "selected"; } ?>>
+									<?php echo JText::_('FRIDAY') ?></option>
+								<option value="6" <?php if (in_array('6', $post_weekdays)) { echo "selected"; } ?>>
+									<?php echo JText::_('SATURDAY') ?></option>
+							</select>
+						<?php endif; ?>
+						<?php echo '<span class="iCFormTip iCicon iCicon-info-circle" title="' . $icTip_weekDays . '"></span>'; ?>
+					</div>
+				</div>
+				<?php endif; ?>
+				<?php endif; ?>
+
+				<?php if ($dates_display == '1') : ?>
+				<h3><?php echo JText::_('COM_ICAGENDA_LEGEND_SINGLE_DATES'); ?></h3>
+				<div class="ic-control-group ic-clearfix">
+					<?php echo $this->form->getInput('dates'); ?>
+				</div>
+				<?php endif; ?>
+
+				<?php if ($displaytime_display == '1' && ($period_display == '1' || $dates_display == '1')) : ?>
+				<h3><?php echo JText::_('COM_ICAGENDA_DISPLAY_TIME_LABEL'); ?></h3>
+				<?php
+				if ($post)
+				{
+					$time_checked_0			= empty($post_displaytime) ? ' checked="checked"' : '';
+					$time_checked_1			= ! empty($post_displaytime) ? ' checked="checked"' : '';
+				}
+				else
+				{
+					$time_checked_0			= ($displaytime_default == '0') ? ' checked="checked"' : '';
+					$time_checked_1			= ($displaytime_default == '1') ? ' checked="checked"' : '';;
+				}
+				?>
+				<div class="ic-control-group ic-clearfix">
+					<fieldset id="displaytime" class="ic-radio ic-btn-group">
+						<?php echo '<input id="displaytime0" class="ic-btn" type="radio" value="0"' . $time_checked_0 . ' name="displaytime"></input>'; ?>
+						<?php echo '<label class="ic-btn" for="displaytime0">' . JText::_('JHIDE') . '</label>'; ?>
+						<?php echo '<input id="displaytime1" class="ic-btn" type="radio" value="1"' . $time_checked_1 . ' name="displaytime"></input>'; ?>
+						<?php echo '<label class="ic-btn" for="displaytime1">' . JText::_('JSHOW') . '</label>'; ?>
+					</fieldset>
+					<?php echo '<span class="iCFormTip iCicon iCicon-info-circle" title="' . $icTip_displayTime . '"></span>'; ?>
+				</div>
+				<?php else : ?>
+				<?php echo '<input type="hidden" value="' . $displaytime_default . '" name="displaytime" />'; ?>
+				<?php endif; ?>
+
+				<?php echo $this->form->getInput('next'); ?>
+			</div>
+			<div>&nbsp;</div>
+
+			<?php // Description Field Set ?>
+			<?php if ($this->submit_descDisplay
+				|| $this->submit_shortdescDisplay
+				|| $this->submit_metadescDisplay) : ?>
+				<legend><?php echo JText::_('COM_ICAGENDA_LEGEND_DESC'); ?></legend>
+				<div class="fieldset">
+
+					<?php // Short Description ?>
+					<?php if ($this->submit_shortdescDisplay) : ?>
+					<div class="ic-control-group ic-clearfix">
+						<h3><?php echo JText::_('COM_ICAGENDA_SUBMIT_AN_EVENT_SHORT_DESCRIPTION_LBL') . ' <small class="iCFormTip iCicon iCicon-info-circle" title="' . JText::_('COM_ICAGENDA_SUBMIT_AN_EVENT_SHORT_DESCRIPTION_DESC') . '"></small>'; ?></h3>
+						<?php echo $this->form->getInput('shortdesc'); ?>
+					</div>
+					<?php endif; ?>
+
+					<?php // Description ?>
+					<?php if ($this->submit_descDisplay) : ?>
+					<div class="ic-control-group ic-clearfix">
+						<h3><?php echo JText::_('COM_ICAGENDA_FORM_LBL_EVENT_DESC') . ' <small class="iCFormTip iCicon iCicon-info-circle" title="' . JText::_('COM_ICAGENDA_SUBMIT_AN_EVENT_DESCRIPTION_DESC') . '"></small>'; ?></h3>
+						<div>
+							<?php
+							if ($post_desc)
+							{
+								$editor = JFactory::getEditor();
+								echo '<div id="tos_custom">';
+								echo $editor->display("desc", $post_desc, "100%", "300", "300", "20", 1, null, null, null, array('mode' => 'advanced'));
+								echo '</div>';
+							}
+							else
+							{
+								echo $this->form->getInput('desc');
+							}
+							?>
+						</div>
+						<div>&nbsp;</div>
+					</div>
+					<?php endif; ?>
+
+					<?php // Meta-description ?>
+					<?php if ($this->submit_metadescDisplay) : ?>
+					<div class="ic-control-group ic-clearfix">
+						<h3><?php echo JText::_('COM_ICAGENDA_FORM_EVENT_METADESC_LBL') . ' <small class="iCFormTip iCicon iCicon-info-circle" title="' . JText::_('COM_ICAGENDA_SUBMIT_AN_EVENT_METADESC_DESC') . '"></small>'; ?></h3>
+						<?php echo $this->form->getInput('metadesc'); ?>
+					</div>
+					<?php endif; ?>
+      <!--textarea name="taMessage2" cols="50" rows="3" class="textarea" id="taMessage2" onMouseOut="CheckFieldLength(taMessage2, 'charcount2', 'remaining2', 140);" onKeyDown="CheckFieldLength(taMessage2, 'charcount2', 'remaining2', 140);" window.onmousemove="CheckFieldLength(taMessage2, 'charcount2', 'remaining2', 140);"></textarea-->
+      <!--h2><span id="charcount2">0</span> characters entered | <span id="remaining2">140</span> characters remaining</h2>
+		<script type="text/javascript">
+		window.onmousemove = iCuseractions;
+		window.onscroll = iCuseractions;
+		function iCuseractions()
+		{
+			CheckFieldLength(taMessage2, 'charcount2', 'remaining2', 140);
+		}
+		</script-->
+				</div>
+				<div>&nbsp;</div>
+			<?php endif; ?>
+
+			<?php // Information Field Set ?>
+			<?php if ($this->submit_venueDisplay
+				OR $this->submit_emailDisplay
+				OR $this->submit_phoneDisplay
+				OR $this->submit_websiteDisplay
+				OR $this->submit_fileDisplay
+				OR $this->submit_customfieldsDisplay) : ?>
+				<legend><?php echo JText::_('COM_ICAGENDA_LEGEND_INFORMATION'); ?></legend>
+				<div class="fieldset">
+
+					<?php // Venue ?>
+					<?php if ($this->submit_venueDisplay) : ?>
+						<h3><?php echo JText::_('COM_ICAGENDA_LEGEND_VENUE'); ?></h3>
+						<div class="ic-control-group ic-clearfix">
+							<div class="ic-control-label">
+								<label><?php echo JText::_( 'COM_ICAGENDA_FORM_LBL_EVENT_VENUE' ); ?></label>
+							</div>
+							<div class="ic-controls">
+								<?php
+								if ($post_venue)
+								{
+									echo '<input type="text" name="place" value="' . $post_venue . '" size="40" class="input-large" />';
+								}
+								else
+								{
+									echo $this->form->getInput('place');
+								}
+								?>
+								<?php echo '<span class="iCFormTip iCicon iCicon-info-circle" title="' . $icTip_venue . '"></span>'; ?>
+							</div>
+						</div>
+					<?php endif; ?>
+
+					<?php // Contact ?>
+					<?php if ($this->submit_emailDisplay
+						OR $this->submit_phoneDisplay
+						OR $this->submit_websiteDisplay) : ?>
+						<h3><?php echo JText::_('COM_ICAGENDA_LEGEND_CONTACT'); ?></h3>
+
+						<?php // Email ?>
+						<?php if ($this->submit_emailDisplay) : ?>
+						<div class="ic-control-group ic-clearfix">
+							<div class="ic-control-label">
+								<label><?php echo JText::_( 'COM_ICAGENDA_FORM_LBL_EVENT_EMAIL' ); ?></label>
+							</div>
+							<div class="ic-controls">
+								<?php
+								if ($post_email)
+								{
+									echo '<input type="text" name="email" value="' . $post_email . '" size="40" class="input-xlarge" />';
+								}
+								else
+								{
+									echo $this->form->getInput('email');
+								}
+								?>
+								<?php echo '<span class="iCFormTip iCicon iCicon-info-circle" title="' . $icTip_email . '"></span>'; ?>
+							</div>
+						</div>
+						<?php endif; ?>
+
+						<?php // Phone ?>
+						<?php if ($this->submit_phoneDisplay) : ?>
+						<div class="ic-control-group ic-clearfix">
+							<div class="ic-control-label">
+								<label><?php echo JText::_( 'COM_ICAGENDA_FORM_LBL_EVENT_PHONE' ); ?></label>
+							</div>
+							<div class="ic-controls">
+								<?php
+								if ($post_phone)
+								{
+									echo '<input type="text" name="phone" value="' . $post_phone . '" size="40" class="input-large" />';
+								}
+								else
+								{
+									echo $this->form->getInput('phone');
+								}
+								?>
+								<?php echo '<span class="iCFormTip iCicon iCicon-info-circle" title="' . $icTip_phone . '"></span>'; ?>
+							</div>
+						</div>
+						<?php endif; ?>
+
+						<?php // Website ?>
+						<?php if ($this->submit_websiteDisplay) : ?>
+						<div class="ic-control-group ic-clearfix">
+							<div class="ic-control-label">
+								<label><?php echo JText::_( 'COM_ICAGENDA_FORM_LBL_EVENT_WEBSITE' ); ?></label>
+							</div>
+							<div class="ic-controls">
+								<?php
+								if ($post_website)
+								{
+									echo '<input type="text" name="website" value="' . $post_website . '" size="40" class="input-large" />';
+								}
+								else
+								{
+									echo $this->form->getInput('website');
+								}
+								?>
+								<?php echo '<span class="iCFormTip iCicon iCicon-info-circle" title="' . $icTip_website . '"></span>'; ?>
+							</div>
+						</div>
+						<?php endif; ?>
+
+					<?php endif; ?>
+
+					<?php // Load Custom fields - Event form (2) ?>
+					<?php if ($this->submit_customfieldsDisplay) : ?>
+						<?php $customFields = icagendaCustomfields::getCustomfields(2); ?>
+						<?php //if (icagendaCustomfields::loader(2)) : ?>
+							<?php //echo icagendaCustomfields::loader(2); ?>
+							<!--br /-->
+						<?php //endif; ?>
+		<?php // CUSTOM FIELDS ?>
+		<?php if ($customFields && count($customFields)) : ?>
+			<h3><?php echo JText::_('COM_ICAGENDA_LEGEND_OTHER_INFORMATION'); ?></h3>
+			<?php // Load Custom fields - Registration form (1); ?>
+			<?php icagendaCustomfields::loader(2, '', $customFields); ?>
+			<fieldset>
+			<?php // Iterate through the fields in the set and display them. ?>
+			<?php foreach ($customFields as $field) : ?>
+				<?php $infoTip = ''; ?>
+				<?php if ($field->description) : ?>
+					<?php $infoTip.= '<span class="iCFormTip iCicon iCicon-info-circle" title="'; ?>
+					<?php $infoTip.= htmlspecialchars('<strong>' . JText::_($field->title) . '</strong><br />' . JText::_($field->description)); ?>
+					<?php $infoTip.= '"></span>'; ?>
+					<?php $this->form->setFieldAttribute($field->slug, 'description', ''); ?>
+				<?php endif; ?>
+				<?php // If the field is hidden, just display the input. ?>
+				<?php if ($field->type == 'hidden') : ?>
+					<?php echo $field->input;?>
+				<?php else : ?>
+					<div class="control-group">
+						<div class="control-label">
+							<?php echo $this->form->getLabel($field->slug); ?>
+						</div>
+						<div class="controls">
+							<?php echo $this->form->getInput($field->slug);?>
+							<?php echo $infoTip;?>
+						</div>
+					</div>
+				<?php endif;?>
+			<?php endforeach;?>
+			</fieldset>
+		<?php endif;?>
+					<?php endif; ?>
+
+					<?php // Attachment ?>
+					<?php if ($this->submit_fileDisplay) : ?>
+						<h3><?php echo JText::_('COM_ICAGENDA_LEGEND_ALLEG'); ?></h3>
+						<div class="ic-control-group ic-clearfix">
+							<div class="ic-control-label">
+								<label><?php echo JText::_( 'COM_ICAGENDA_FORM_LBL_EVENT_FILE' ); ?></label>
+							</div>
+							<div class="ic-controls">
+								<?php if ($post_file) : ?>
+									<?php echo '<input type="hidden" name="file_session" value="' . $post_file . '" />'; ?>
+									<?php
+									$path_parts = pathinfo($post_file);
+									echo $path_parts['basename'];
+									?>
+								<?php else : ?>
+									<?php echo $this->form->getInput('file'); ?>
+									<?php echo '<span class="iCFormTip iCicon iCicon-info-circle" title="' . $icTip_file . '"></span>'; ?>
+								<?php endif; ?>
+							</div>
+						</div>
+					<?php endif; ?>
+				</div>
+				<div>&nbsp;</div>
+			<?php endif; ?>
+
+			<?php // Google Maps Field Set ?>
+			<?php if ($this->submit_gmapDisplay) : ?>
+				<legend><?php echo JText::_('COM_ICAGENDA_LEGEND_GOOGLE_MAPS'); ?></legend>
+				<div class="fieldset">
+					<div id="googlemap">
+						<div class="row-fluid">
+							<?php if ( ! $maps_service) : ?>
+							<div class="span12">
+								<div class="icmap-address">
+									<div class="control-group">
+										<div class="control-label">
+											<?php echo $this->form->getLabel('address'); ?>
+										</div>
+										<div class="controls">
+										<?php
+										if ($address_session)
+										{
+											echo '<input type="hidden" name="address_session" value="' . $address_session . '" size="40" class="input-xlarge" readonly="true" />';
+										}
+										?>
+											<?php echo $this->form->getInput('address'); ?>
+										</div>
+									</div>
+								</div>
+								<?php echo JText::_('COM_ICAGENDA_MAPS_SERVICE_NOT_AVAILABLE'); ?>
+								<script>
+									document.getElementById('address').setAttribute('class', 'input-xxlarge');
+									var addressSession = "<?php echo $address_session; ?>";
+									if (addressSession) {
+										document.getElementById('address').value = addressSession;
+									}
+								</script>
+							</div>
+							<?php endif; ?>
+							<?php if ($maps_service == '2') : ?>
+							<div class="span12">
+								<div class="icmap-address">
+									<div class="control-group">
+										<div class="control-label">
+											<?php echo $this->form->getLabel('address'); ?>
+										</div>
+										<div class="controls">
+											<?php
+											if ($address_session)
+											{
+												echo '<input type="hidden" name="address_session" value="' . $address_session . '" size="40" class="input-xlarge" readonly="true" />';
+											}
+											?>
+											<div class="input-append">
+												<?php echo $this->form->getInput('address'); ?>
+												<span class="btn btn-default" onclick="myFunction(document.getElementById('address').value)"><?php echo JText::_('IC_CHECK'); ?></span>
+											</div>
+										</div>
+									</div>
+								</div>
+								<div id="embed_map">
+									<?php if ($address_session) : ?>
+										<?php echo '<iframe width="100%" height="300" frameborder="0" style="border:0;" class="icagenda_map" src="https://www.google.com/maps/embed/v1/place?key=' . $iCparams->get('googlemaps_embed_key', '') . '&q=' . urlencode(strip_tags($address_session)) . '" allowfullscreen></iframe>'; ?>
+									<?php endif; ?>
+								</div>
+								<script>
+									document.getElementById('address').setAttribute('class', 'input-xxlarge');
+									var addressSession = "<?php echo $address_session; ?>";
+									if (addressSession) {
+										document.getElementById('address').value = addressSession;
+									}
+									function myFunction(address) {
+										var embedKey = "<?php echo $iCparams->get('googlemaps_embed_key', ''); ?>";
+										if (address){ 
+											html = '<iframe width="100%" height="300" frameborder="0" style="border:0;" class="icagenda_map" src="https://www.google.com/maps/embed/v1/place?key=' + embedKey + '&q=' + encodeURI(address) + '" allowfullscreen></iframe>';
+										} else {
+											html = '<div class="alert alert-warning"><?php echo addslashes(JText::_("COM_ICAGENDA_MAPS_FILL_IN_ADDRESS_ALERT")); ?></div>';
+										}
+										document.getElementById('embed_map').innerHTML = html;
+									}
+								</script>
+							</div>
+							<?php endif; ?>
+							<?php if ($maps_service == '3') : ?>
+							<div class="span6 ic-align-left">
+								<h3><?php echo JText::_('COM_ICAGENDA_GOOGLE_MAPS_SUBTITLE_LBL'); ?></h3>
+								<div>
+									<?php echo JText::_('COM_ICAGENDA_GOOGLE_MAPS_NOTE1'); ?>
+									<br/>
+									<?php echo JText::_('COM_ICAGENDA_GOOGLE_MAPS_NOTE2'); ?>
+									<br/>
+								</div>
+								<div style="clear:both"></div>
+								<div>
+									<div class="icmap-address">
+										<?php
+										if ($address_session)
+										{
+											echo '<input type="hidden" name="address_session" value="' . $address_session . '" size="40" class="input-xlarge" readonly="true" />';
+										}
+										?>
+										<div class="icmap-label">
+											<?php echo $this->form->getLabel('address'); ?>
+										</div>
+										<?php echo $this->form->getInput('address'); ?>
+									</div>
+									<div class="icmap-field">
+										<?php echo $this->form->getInput('city'); ?>
+									</div>
+									<div class="icmap-field">
+										<?php echo $this->form->getInput('country'); ?>
+									</div>
+									<div class="icmap-field">
+										<?php echo $this->form->getInput('lat'); ?>
+									</div>
+									<div class="icmap-field">
+										<?php echo $this->form->getInput('lng'); ?>
+									</div>
+								</div>
+							</div>
+							<div class="span6 ic-align-left">
+								<div class='map-wrapper'>
+									<h3>Map</h3>
+									<label id="geo_label" for="reverseGeocode"><?php echo JText::_('COM_ICAGENDA_GOOGLE_MAPS_REVERSE'); ?></label>
+									<select id="reverseGeocode">
+										<option value="false" selected><?php echo JText::_('JNO'); ?></option>
+										<option value="true"><?php echo JText::_('JYES'); ?></option>
+									</select><br/>
+									<div id="map"></div>
+									<div id="legend"><?php echo JText::_('COM_ICAGENDA_GOOGLE_MAPS_LEGEND'); ?></div>
+								</div>
+							</div>
+<?php endif; ?>
+						</div>
+					</div>
+					<div style="clear:both"></div>
+				</div>
+				<div>&nbsp;</div>
+			<?php endif; ?>
+
+			<?php // Registration Field Set ?>
+			<?php if ($this->submit_regoptionsDisplay) : ?>
+				<legend><?php echo JText::_('COM_ICAGENDA_REGISTRATION_OPTIONS'); ?></legend>
+				<div class="fieldset">
+
+					<?php
+					if ($post && $post_param)
+					{
+						$statutReg	= $post_param['statutReg'];
+						$checked_0	= empty($statutReg) ? ' checked="checked"' : '';
+						$checked_1	= ! empty($statutReg) ? ' checked="checked"' : '';
+						$maxReg		= $post_param['maxReg'];
+					}
+					else
+					{
+						$statutReg	= $iCparams->get('statutReg', '0');
+						$checked_0	= ($statutReg == '0') ? ' checked="checked"' : '';
+						$checked_1	= ($statutReg == '1') ? ' checked="checked"' : '';;
+						$maxReg		= '';
+					}
+					?>
+
+					<?php // Registration Activation ?>
+					<div class="ic-control-group ic-clearfix">
+						<div class="ic-control-label">
+							<label><?php echo JText::_( 'COM_ICAGENDA_REGISTRATION_LABEL' ); ?></label>
+						</div>
+						<div class="ic-controls">
+							<fieldset id="params_statutReg" class="ic-radio ic-btn-group">
+								<?php echo '<input id="params_statutReg0" class="ic-btn" type="radio"' . $checked_0 . ' value="0" name="params[statutReg]"></input>'; ?>
+								<?php echo '<label class="ic-btn" for="params_statutReg0">' . JText::_('JOFF') . '</label>'; ?>
+								<?php echo '<input id="params_statutReg1" class="ic-btn" type="radio"' . $checked_1 . ' value="1" name="params[statutReg]"></input>'; ?>
+								<?php echo '<label class="ic-btn" for="params_statutReg1">' . JText::_('JON') . '</label>'; ?>
+							</fieldset>
+							<?php echo '<span class="iCFormTip iCicon iCicon-info-circle" title="' . $icTip_reg . '"></span>'; ?>
+						</div>
+					</div>
+
+					<?php // Nb of Tickets ?>
+					<div class="ic-control-group ic-clearfix">
+						<div class="ic-control-label">
+							<label><?php echo JText::_( 'COM_ICAGENDA_MAX_REGISTRATIONS_LABEL' ); ?></label>
+						</div>
+						<div class="ic-controls">
+							<?php echo '<input type="text" class="input-small" name="params[maxReg]" value="' . $maxReg . '" />'; ?>
+							<?php echo '<span class="iCFormTip iCicon iCicon-info-circle" title="' . $icTip_tickets . '"></span>'; ?>
+						</div>
+					</div>
+
+					<?php foreach ($params as $name => $fieldSet) : ?>
+						<?php if ($fieldSet->name == 'registrations') : ?>
+							<?php if (isset($fieldSet->description) && trim($fieldSet->description)) : ?>
+								<p class="tip"><?php echo $this->escape(JText::_($fieldSet->description));?></p>
+							<?php endif; ?>
+							<!--h3><?php echo $this->escape(JText::_($fieldSet->label)); ?></h3-->
+
+							<?php if (version_compare(JVERSION, '3.2', 'lt')) : ?>
+								<?php foreach ($this->form->getFieldset($name) as $field) : ?>
+									<?php $nameshort = str_replace(array('params', '[', ']', 'jform'), '', $field->name); ?>
+									<?php if (isset($post_params[$nameshort])) : ?>
+										<?php $this->form->setValue($nameshort, 'params', $post_params[$nameshort]); ?>
+									<?php endif; ?>
+								<?php endforeach; ?>
+							<?php endif; ?>
+
+							<?php foreach ($this->form->getFieldset($name) as $field) : ?>
+								<?php $nameshort = str_replace(array('params', '[', ']', 'jform'), '', $field->name); ?>
+								<div class="ic-control-group ic-clearfix">
+									<div class="ic-control-label">
+										<?php echo $field->label; ?>
+									</div>
+									<div class="ic-controls">
+										<?php
+										if (isset($post_params[$nameshort]) && version_compare(JVERSION, '3.2', 'ge'))
+										{
+											$field->value = $post_param[$nameshort];
+										}
+										?>
+										<?php echo $field->input; ?>
+									</div>
+								</div>
+							<?php endforeach; ?>
+						<?php endif; ?>
+					<?php endforeach; ?>
+				</div>
+				<div>&nbsp;</div>
+			<?php endif; ?>
+
+			<?php // Hidden Fields ?>
+			<div style="display:none">
+				<?php echo $this->form->getInput('alias'); ?>
+				<?php echo $this->form->getInput('id'); ?>
+				<?php echo $this->form->getInput('created_by'); ?>
+				<?php echo $this->form->getInput('created_by_alias'); ?>
+				<?php echo $this->form->getInput('created'); ?>
+				<?php echo $this->form->getInput('checked_out'); ?>
+				<?php echo $this->form->getInput('checked_out_time'); ?>
+				<?php
+				$current_url	= JURI::getInstance()->toString();
+				$menu			= JFactory::getApplication()->getMenu();
+				$current_menu	= $menu->getActive();
+				?>
+				<!--input type="hidden" name="menuID" value="<?php echo $menuID; ?>" /-->
+				<input type="hidden" name="current_url" value="<?php echo $current_url; ?>" />
+				<input type="hidden" name="site_itemid" value="<?php echo $current_menu->id; ?>" />
+				<input type="hidden" name="site_menu_title" value="<?php echo $current_menu->title; ?>" />
+				<input type="hidden" id="tos" name="submit_tos" value="<?php echo $ic_submit_tos; ?>" /> <?php // TODO: check if still used... ?>
+			</div>
+
+				<?php
+				/**
+				 * Terms of Service Display
+				 */
+				if ($tos == 0) // No Terms of Service
+				{
+					// Terms of Service not displayed
+					$tokenHTML = str_replace('type="hidden"','id="formAgree" name="tos" value="checked" class="required" required="true" type="checkbox" checked style="display:none"',JHTML::_( 'form.token' ));
+					echo $tokenHTML;
+					?>
+					<div class="bgButton">
+
+						<?php // RECAPTCHA ?>
+						<?php if ($this->submit_captcha != '0') : ?>
+						<div class="ic-control-group ic-clearfix">
+							<div class="ic-control-label">
+								<label> </label>
+							</div>
+							<div class="ic-controls">
+								<?php echo $this->form->getInput('captcha'); ?>
+							</div>
+						</div>
+						<br />
+						<?php endif; ?>
+
+						<span>
+							<!--input type="submit" value="<?php echo JText::_( 'COM_ICAGENDA_EVENT_FORM_SUBMIT' ); ?>" class="button" name="submit"/-->
+							<button type="submit" class="button validate"><?php echo JText::_('COM_ICAGENDA_EVENT_FORM_SUBMIT');?></button>
+							<input type="hidden" name="task" value="" />
+							<input type="hidden" name="return" value="index.php" />
+							<?php if (false) echo JHtml::_( 'form.token' ); ?>
+						</span>
+						<!--span class="buttonx">
+							<a href="javascript:history.go(-1)" title="<?php echo JTEXT::_('COM_ICAGENDA_CANCEL'); ?>">
+								<?php echo JTEXT::_('COM_ICAGENDA_CANCEL'); ?>
+							</a>
+						</span-->
+					</div><?php // End Div bgButton ?>
+					<?php
+				}
+				elseif ($tos == 1) // Terms of Service Required
+				{
+					// Terms of Service
+					$checked = ($ic_submit_tos == 'checked') ? ' checked' : '';
+
+					$tokenHTML = str_replace('type="hidden"', 'id="formAgree" name="tos" value="checked" class="required" required="true" type="checkbox"' . $checked, JHtml::_( 'form.token' ));
+
+					// Get the site name
+					$config = JFactory::getConfig();
+					if (version_compare(JVERSION, '3.0', 'ge')) {
+						$sitename = $config->get('sitename');
+					} else {
+						$sitename = $config->getValue('config.sitename');
+					}
+
+					// Tos Type
+					$iCparams	= JComponentHelper::getParams('com_icagenda');
+					$tos_Type	= $iCparams->get('tos_Type', '');
+					$tosArticle	= $iCparams->get('tosArticle', '');
+					$tosContent	= $iCparams->get('tosContent', '');
+
+					$tosDEFAULT	= JText::sprintf( 'COM_ICAGENDA_TOS', $sitename, $sitename);
+					$tosARTICLE	= 'index.php?option=com_content&view=article&id=' . $tosArticle . '&tmpl=component';
+					$tosCUSTOM	= $tosContent;
+
+					?>
+					<div class="ic-tos-content bgButton">
+						<div>
+							<b><big><?php echo JText::_( 'COM_ICAGENDA_TERMS_OF_SERVICE'); ?></big></b>
+						</div>
+						<?php
+						if ($tos_Type == 1)
+						{
+							echo '<iframe src="'.htmlentities($tosARTICLE).'" width="98%" height="150"></iframe>';
+						}
+						elseif ($tos_Type == 2)
+						{
+							echo '<div class="ic-tos-text">';
+							echo $tosCUSTOM;
+							echo '</div>';
+						}
+						else
+						{
+							echo '<div class="ic-tos-text">';
+							echo $tosDEFAULT;
+							echo '</div>';
+						}
+						?>
+						<!--iframe src="<?php echo htmlentities($tosURL); ?>" width="98%" height="150"></iframe-->
+						<div class="ic-tos-agree agreeToS">
+							<p>
+							<span><?php echo $tokenHTML; ?></span>
+							<span id="formAgree-lbl" for="formAgree"><?php echo JText::_( 'COM_ICAGENDA_TERMS_OF_SERVICE_AGREE'); ?> *<label style="display:none" id="formAgree-lbl" for="formAgree"><?php echo JText::_( 'COM_ICAGENDA_TERMS_AND_CONDITIONS'); ?></label></span>
+							</p>
+						</div>
+
+						<?php // RECAPTCHA ?>
+						<?php if ($this->submit_captcha != '0') : ?>
+						<div class="ic-control-group ic-clearfix">
+							<div class="ic-control-label ic-captcha-label">
+								<label> </label>
+							</div>
+							<div class="ic-controls">
+								<?php echo $this->form->getInput('captcha'); ?>
+							</div>
+						</div>
+						<br />
+						<?php endif; ?>
+
+						<div id="submit">
+							<!--input id="submit" type="submit" value="<?php echo JText::_( 'COM_ICAGENDA_EVENT_FORM_SUBMIT' ); ?>" class="button" name="Submit" /--><!--  onclick="javascript:Recaptcha.reload()" -->
+							<button type="submit" class="button validate">
+								<?php echo JText::_('COM_ICAGENDA_EVENT_FORM_SUBMIT');?>
+							</button>
+							<input type="hidden" name="task" value="" />
+							<input type="hidden" name="return" value="index.php" />
+							<?php if (false) echo JHtml::_( 'form.token' ); ?>
+						</div>
+						<!--span class="buttonx">
+							<a href="javascript:history.go(-1)" title="<?php echo JTEXT::_('COM_ICAGENDA_CANCEL'); ?>">
+								<?php echo JTEXT::_('COM_ICAGENDA_CANCEL'); ?>
+							</a>
+						</span-->
+					</div><?php // End Div bgButton ?>
+					<?php
+				}
+				?>
+			</div><?php // End Form Fields ?>
+			<div style="clear:both"></div>
+		</form>
+
+		<?php // Content is generated by content plugin event "iCagendaOnSubmitAfterDisplay" ?>
+		<?php echo $this->pluginEvent->iCagendaOnSubmitAfterDisplay; ?>
+	</div>
+
+	<?php // Set AM/PM and first day of the week options for datetime picker ?>
+	<?php
+		$iCparams = JComponentHelper::getParams('com_icagenda');
+		$ampm     = ($iCparams->get('timeformat', 1) == 2) ? 'true' : '';
+		$firstDay = $iCparams->get('firstday_week_global', 1);
+	?>
+	<script type="text/javascript">
+		jQuery(function($){
+			$("#startdate").datetimepicker({
+				ampm: '<?php echo $ampm; ?>',	
+				dateFormat: 'yy-mm-dd',
+				firstDay: '<?php echo $firstDay; ?>',
+				hourGrid: 4,
+				minuteGrid: 10
+			});
+			$("#enddate").datetimepicker({
+				ampm: '<?php echo $ampm; ?>',	
+				dateFormat: 'yy-mm-dd',
+				firstDay: '<?php echo $firstDay; ?>',
+				hourGrid: 4,
+				minuteGrid: 10
+			});
+			$(".ic-date-input").datetimepicker({
+				ampm: '<?php echo $ampm; ?>',	
+				dateFormat: 'yy-mm-dd',
+				firstDay: '<?php echo $firstDay; ?>',
+				hourGrid: 4,
+				minuteGrid: 10
+			});
+			$('#add').live('click', function(e){
+				$(".ic-date-input").datetimepicker({
+					ampm: '<?php echo $ampm; ?>',	
+					dateFormat: 'yy-mm-dd',
+					firstDay: '<?php echo $firstDay; ?>',
+					hourGrid: 4,
+					minuteGrid: 10
+				});
+			});
+		});
+	</script>
+
+	<?php
+	$limitSize = $this->submit_imageMaxSize;
+
+	// Script to test Text Counter limit on mouse move and on scroll
+	$ic_max_com_shortdesc	= JComponentHelper::getParams('com_icagenda')->get('char_limit_short_description', '100');
+	$ic_max_shortdesc		= $this->params->get('char_limit_short_description', '100');
+	$ic_max_shortdesc		= ($ic_max_com_shortdesc >= $ic_max_shortdesc) ? $ic_max_shortdesc : $ic_max_com_shortdesc;
+
+	$ic_max_com_metadesc	= JComponentHelper::getParams('com_icagenda')->get('char_limit_meta_description', '320');
+	$ic_max_metadesc		= $this->params->get('char_limit_meta_description', '320');
+	$ic_max_metadesc		= ($ic_max_com_metadesc >= $ic_max_metadesc) ? $ic_max_metadesc : $ic_max_com_metadesc;
+
+	$script = '<script type="text/javascript">';
+	$script.= 'window.onmousemove = useractions;';
+	$script.= 'window.onscroll = useractions;';
+	$script.= 'function useractions()';
+	$script.= '{';
+
+	if ($this->submit_shortdescDisplay)
+	{
+		$script.= '	var shortdesc_control = document.getElementById("shortdesc");';
+		$script.= '	var counter_shortdesc = document.getElementById("shortdesc-counter");';
+		$script.= '	if (shortdesc_control.value.length > ' . $ic_max_shortdesc . ')';
+		$script.= '	{';
+		$script.= '		shortdesc_control.value = shortdesc_control.value.substring(0,' . $ic_max_shortdesc . ');';
+		$script.= '		counter_shortdesc.value = 0;';
+		$script.= '		shortdesc_control.addClass("ic-counter-limit");';
+		$script.= '		counter_shortdesc.addClass("ic-counter-limit");';
+		$script.= '		alert(Joomla.JText._("COM_ICAGENDA_ALERT_TEXT_EXCEEDS_CHARACTER_LIMIT"));';
+		$script.= '		shortdesc_control.scrollIntoView();';
+		$script.= '	}';
+	}
+
+	if ($this->submit_metadescDisplay)
+	{
+		$script.= '	var metadesc_control = document.getElementById("metadesc");';
+		$script.= '	var counter_metadesc = document.getElementById("metadesc-counter");';
+		$script.= '	if (metadesc_control.value.length > ' . $ic_max_metadesc . ')';
+		$script.= '	{';
+		$script.= '		metadesc_control.value = metadesc_control.value.substring(0,' . $ic_max_metadesc . ');';
+		$script.= '		counter_metadesc.value = 0;';
+		$script.= '		metadesc_control.addClass("ic-counter-limit");';
+		$script.= '		counter_metadesc.addClass("ic-counter-limit");';
+		$script.= '		alert(Joomla.JText._("COM_ICAGENDA_ALERT_TEXT_EXCEEDS_CHARACTER_LIMIT"));';
+		$script.= '		metadesc_control.scrollIntoView();';
+		$script.= '	}';
+	}
+
+	$script.= '}';
+	$script.= '</script>';
+
+	echo $script;
+	?>
+
+	<script type="text/javascript">
+	jQuery(function($) {
+
+		// var url = window.URL || window.webkitURL; // alternate use
+
+		function readImage(file, accept, mimetype, limitSize) {
+
+			var reader = new FileReader();
+			var image  = new Image();
+
+			reader.readAsDataURL(file);
+			reader.onload = function(_file) {
+				image.src    = _file.target.result;              // url.createObjectURL(file);
+				image.onload = function() {
+					var w = file.width,
+						h = file.height,
+						t = file.type,                           // ext only: // file.type.split('/')[1],
+						n = file.name,
+						size = ~~(file.size/1024),
+						s = ~~(file.size/1024) +' <?php echo JText::_("IC_LIBRARY_KILO_BYTES"); ?>';
+
+					if ( inArray(t, mimetype) )
+					{
+						if (size < limitSize)
+						{
+							$('#ic-upload-preview').empty();
+							$('#ic-upload-preview').append('<center><img src="'+ image.src +'"><br />'+w+'x'+h+' - '+s+' - '+t+' - '+n+'</center><br />');
+						}
+						else
+						{
+							var uploadInvalidSize_string = "<?php echo JText::sprintf('IC_LIBRARY_UPLOAD_INVALID_SIZE', '<strong>"+ n +"</strong>', '"+ size +"', '"+ limitSize +"'); ?>";
+							$('#ic-upload-preview').empty();
+							$('#ic-upload-preview').append('<div class="alert alert-error">'+uploadInvalidSize_string+'</div>');
+							$('input[name=image]').val('');
+						}
+					}
+					else
+					{
+						$('#ic-upload-preview').empty();
+						$('#ic-upload-preview').append('<div class="alert alert-error"><?php echo JText::sprintf("IC_LIBRARY_UPLOAD_INVALID_FILE_TYPE", "<strong>'+ n +'</strong>", "'+accept+'"); ?></div>');
+						$('input[name=image]').val('');
+					}
+				};
+				image.onerror= function() {
+					alert('<?php echo JText::_("IC_LIBRARY_UPLOAD_INVALID_FILE_TYPE_ALERT"); ?> '+ file.type);
+				};
+			};
+
+		}
+
+		$("#image").change(function (e){
+			if(this.disabled) return alert('<?php echo JText::_("IC_LIBRARY_UPLOAD_NOT_SUPPORTED"); ?>');
+			var F = this.files;
+			if(F && F[0]) for(var i=0; i<F.length; i++) readImage( F[i], "jpg, jpeg, png, gif", ['image/jpg','image/jpeg','image/png','image/gif'], "<?php echo $limitSize; ?>" );
+		});
+	});
+
+	</script>
+
+	<?php if ($this->submit_gmapDisplay && $maps_service == '3') : ?>
+	<script type="text/javascript">
+		//<![CDATA[
+		jQuery(function($) {
+			var address_session = '<?php echo $address_session; ?>';
+
+			if (address_session)
+			{
+				$('#address').val(address_session);
+			}
+
+			var addresspicker = $( "#addresspicker" ).addresspicker();
+			var addresspickerMap = $( '#address' ).addresspicker({
+				regionBias: "fr",
+				updateCallback: showCallback,
+				mapOptions: {
+					zoom: <?php echo $zoom; ?>,
+					center: new google.maps.LatLng(<?php echo $coords; ?>),
+					scrollwheel: false,
+					mapTypeId: google.maps.MapTypeId.<?php echo $mapTypeId; ?>,
+					streetViewControl: false
+				},
+				elements: {
+					map:      "#map",
+					lat:      "#lat",
+					lng:      "#lng",
+					street_number: '#street_number',
+					route: '#route',
+					locality: '#locality',
+					administrative_area_level_2: '#administrative_area_level_2',
+					administrative_area_level_1: '#administrative_area_level_1',
+					country:  '#country',
+					postal_code: '#postal_code',
+					type:    '#type',
+				}
+			});
+
+			var gmarker = addresspickerMap.addresspicker( "marker");
+			gmarker.setVisible(true);
+			addresspickerMap.addresspicker( "updatePosition");
+
+			$('#reverseGeocode').change(function(){
+				$("#address").addresspicker("option", "reverseGeocode", ($(this).val() === 'true'));
+			});
+
+			function showCallback(geocodeResult, parsedGeocodeResult){
+				$('#callback_result').text(JSON.stringify(parsedGeocodeResult, null, 4));
+			}
+  		});
+		//]]>
+	</script>
+	<?php endif; ?>
+
+	<?php
+	// clear the data so we don't process it again
+	$session->clear('ic_submit');
+	$session->clear('custom_fields');
+	$session->clear('ic_submit_dates');
+	$session->clear('ic_submit_catid');
+	$session->clear('ic_submit_shortdesc');
+	$session->clear('ic_submit_metadesc');
+	$session->clear('ic_submit_city');
+	$session->clear('ic_submit_country');
+	$session->clear('ic_submit_lat');
+	$session->clear('ic_submit_lat');
+	$session->clear('ic_submit_address');
+	$session->clear('ic_submit_tos');
+	$session->clear('email2');
+
+	// Script validation for Submit Event form (2)
+	if (!$this->submit_form_validation)
+	{
+		$iCheckForm = icagendaForm::submit(2);
+		JFactory::getDocument()->addScriptDeclaration($iCheckForm);
+	}
+
+	// RTL css if site language is RTL
+	$lang = JFactory::getLanguage();
+
+	if ( $lang->isRTL()
+		&& file_exists( JPATH_SITE . $css_com_rtl) )
+	{
+		$document->addStyleSheet( JURI::base( true ) . $css_com_rtl );
+	}
+
+	// Joomla 2.5
+	if (version_compare(JVERSION, '3.0', 'lt'))
+	{
+		JHtml::stylesheet( 'com_icagenda/icagenda-front.j25.css', false, true );
+
+		JHtml::_('behavior.framework');
+
+		// load jQuery, if not loaded before (NEW VERSION IN 1.2.6)
+		$scripts = array_keys($document->_scripts);
+		$scriptFound = false;
+		$scriptuiFound = false;
+		$mapsgooglescriptFound = false;
+
+		for ($i = 0; $i < count($scripts); $i++)
+		{
+			if (stripos($scripts[$i], 'jquery.min.js') !== false)
+			{
+					$scriptFound = true;
+			}
+			// load jQuery, if not loaded before as jquery - added in 1.2.7
+			if (stripos($scripts[$i], 'jquery.js') !== false)
+			{
+				$scriptFound = true;
+			}
+			if (stripos($scripts[$i], 'jquery-ui.min.js') !== false)
+			{
+				$scriptuiFound = true;
+			}
+			if (stripos($scripts[$i], 'maps.google') !== false)
+			{
+				$mapsgooglescriptFound = true;
+			}
+		}
+
+		// jQuery Library Loader
+		if (!$scriptFound)
+		{
+			// load jQuery, if not loaded before
+			if (!JFactory::getApplication()->get('jquery'))
+			{
+				JFactory::getApplication()->set('jquery', true);
+				// add jQuery
+				$document->addScript('https://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js');
+				JHtml::script('com_icagenda/jquery.noconflict.js', false, true);
+			}
+		}
+
+		if (!$scriptuiFound)
+		{
+			$document->addScript('https://ajax.googleapis.com/ajax/libs/jqueryui/1.9.2/jquery-ui.min.js');
+		}
+	}
+	// Joomla 3
+	else
+	{
+		JHtml::_('bootstrap.framework');
+		JHtml::_('jquery.framework');
+
+		/**
+		 * Change jQuery UI version from 1.9.2 to 1.8.23 (joomla version, but not complete)
+		 * to prevent a conflict in tooltip that appeared since Joomla 3.1.4
+		 */
+//		$document->addScript('https://ajax.googleapis.com/ajax/libs/jqueryui/1.9.2/jquery-ui.min.js');
+		$document->addScript( 'https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.23/jquery-ui.min.js' );
+	}
+
+	// Google Maps api V3
+	if ($this->submit_gmapDisplay && $maps_service == '3')
+	{
+		icagendaGooglemaps::loadGMapScripts('edit');
+	}
+
+	/**
+	 * Script files which could be overridden into your site template.
+	 * (eg. /templates/my_template/js/com_icagenda/FILE_NAME.js)
+	 */
+	JHtml::script( 'com_icagenda/timepicker.js', false, true );
+	JHtml::script( 'com_icagenda/icdates.js', false, true );
+	JHtml::script( 'com_icagenda/jquery.tipTip.js', false, true );
+	JHtml::script( 'com_icagenda/icagenda.js', false, true );
+	JHtml::script( 'com_icagenda/icform.js', false, true );
+
+	$iCtip	 = array();
+	$iCtip[] = '	jQuery(document).ready(function(){';
+	$iCtip[] = '		jQuery(".iCFormTip").tipTip({maxWidth: "280px", defaultPosition: "right", edgeOffset: 5});';
+	$iCtip[] = '	});';
+
+	// Add the script to the document head.
+	JFactory::getDocument()->addScriptDeclaration(implode("\n", $iCtip));
+}
diff --git a/deployed/icagenda/components/com_icagenda/views/submit/tmpl/default.xml b/deployed/icagenda/components/com_icagenda/views/submit/tmpl/default.xml
new file mode 100644
index 00000000..661bd780
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/views/submit/tmpl/default.xml
@@ -0,0 +1,326 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_ICAGENDA_SUBMIT_VIEW_DEFAULT_TITLE">
+		<message>COM_ICAGENDA_SUBMIT_VIEW_DEFAULT_DESC</message>
+	</layout>
+
+	<fields id="params" name="params" type="fields" label="params" addfieldpath="/administrator/components/com_icagenda/models/fields">
+
+		<fieldset name="ICAGENDA" label="COM_ICAGENDA_MENU_OPTIONS" addfieldpath="/administrator/components/com_icagenda/assets/elements">
+
+			<field type="Title" label="COM_ICAGENDA_LOGO" class="styleblanck" />
+
+			<field
+				name="template"
+				type="modal_template"
+				label="COM_ICAGENDA_LBL_TEMPLATE"
+				description="COM_ICAGENDA_DESC_TEMPLATE"
+				size="40"
+				class="inputbox"
+				default="default"
+			/>
+
+			<field name="Title2" type="TitleImg" label="COM_ICAGENDA_FORM_LABEL"
+				class="stylebox lead input-xxlarge" icimage="iconicagenda16.png"/>
+
+			<field
+				name="orderby_catlist"
+				type="list"
+				label="COM_ICAGENDA_CATEGORY_ORDER_LABEL"
+				description="COM_ICAGENDA_CATEGORY_SELECT_LIST_ORDER_DESC"
+				default="alpha"
+				>
+				<option
+					value="none">JGLOBAL_NO_ORDER</option>
+				<option
+					value="alpha">JGLOBAL_TITLE_ALPHABETICAL</option>
+				<option
+					value="ralpha">JGLOBAL_TITLE_REVERSE_ALPHABETICAL</option>
+				<option
+					value="order">JGLOBAL_CATEGORY_MANAGER_ORDER</option>
+			</field>
+			<field
+				name="default_catlist"
+				type="modal_cat"
+				label="COM_ICAGENDA_CATEGORY_SELECT_LIST_DEFAULT_LABEL"
+				description="COM_ICAGENDA_CATEGORY_SELECT_LIST_DEFAULT_DESC"
+				class="inputbox"
+				/>
+			<field
+				name="submit_imageDisplay"
+				type="radio"
+				label="COM_ICAGENDA_SUBMIT_EVENT_IMAGE_DISPLAY_LABEL"
+				description="COM_ICAGENDA_SUBMIT_EVENT_IMAGE_DISPLAY_DESC"
+				class="btn-group"
+				labelclass="control-label"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+			<field
+				name="submit_imageMaxSize"
+				type="text"
+				label="COM_ICAGENDA_SUBMIT_EVENT_IMAGE_MAX_SIZE_LABEL"
+				description="COM_ICAGENDA_SUBMIT_EVENT_IMAGE_MAX_SIZE_MENU_DESC"
+				class="inputbox input-mini"
+				default=""
+				/>
+			<field
+				name="submit_periodDisplay"
+				type="radio"
+				label="COM_ICAGENDA_SUBMIT_PERIOD_DISPLAY_LABEL"
+				description="COM_ICAGENDA_SUBMIT_PERIOD_DISPLAY_DESC"
+				class="btn-group"
+				labelclass="control-label"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+			<field
+				name="submit_weekdaysDisplay"
+				type="radio"
+				label="COM_ICAGENDA_SUBMIT_WEEKDAYS_DISPLAY_LABEL"
+				description="COM_ICAGENDA_SUBMIT_WEEKDAYS_DISPLAY_DESC"
+				class="btn-group"
+				labelclass="control-label"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+			<field
+				name="submit_datesDisplay"
+				type="radio"
+				label="COM_ICAGENDA_SUBMIT_DATES_DISPLAY_LABEL"
+				description="COM_ICAGENDA_SUBMIT_DATES_DISPLAY_DESC"
+				class="btn-group"
+				labelclass="control-label"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+			<field
+				name="submit_displaytimeDisplay"
+				type="radio"
+				label="COM_ICAGENDA_SUBMIT_DISPLAYTIME_DISPLAY_LABEL"
+				description="COM_ICAGENDA_SUBMIT_DISPLAYTIME_DISPLAY_DESC"
+				class="btn-group"
+				labelclass="control-label"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+			<field
+				name="submit_shortdescDisplay"
+				type="radio"
+				label="COM_ICAGENDA_SUBMIT_SHORTDESC_DISPLAY_LABEL"
+				description="COM_ICAGENDA_SUBMIT_SHORTDESC_DISPLAY_DESC"
+				class="btn-group"
+				labelclass="control-label"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+			<field
+				name="submit_descDisplay"
+				type="radio"
+				label="COM_ICAGENDA_SUBMIT_DESCRIPTION_DISPLAY_LABEL"
+				description="COM_ICAGENDA_SUBMIT_DESCRIPTION_DISPLAY_DESC"
+				class="btn-group"
+				labelclass="control-label"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+			<field
+				name="submit_metadescDisplay"
+				type="radio"
+				label="COM_ICAGENDA_SUBMIT_METADESCRIPTION_DISPLAY_LABEL"
+				description="COM_ICAGENDA_SUBMIT_METADESCRIPTION_DISPLAY_DESC"
+				class="btn-group"
+				labelclass="control-label"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+			<field
+				name="submit_venueDisplay"
+				type="radio"
+				label="COM_ICAGENDA_SUBMIT_VENUE_DISPLAY_LABEL"
+				description="COM_ICAGENDA_SUBMIT_VENUE_DISPLAY_DESC"
+				class="btn-group"
+				labelclass="control-label"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+			<field
+				name="submit_emailDisplay"
+				type="radio"
+				label="COM_ICAGENDA_SUBMIT_EMAIL_DISPLAY_LABEL"
+				description="COM_ICAGENDA_SUBMIT_EMAIL_DISPLAY_DESC"
+				class="btn-group"
+				labelclass="control-label"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+			<field
+				name="submit_phoneDisplay"
+				type="radio"
+				label="COM_ICAGENDA_SUBMIT_PHONE_DISPLAY_LABEL"
+				description="COM_ICAGENDA_SUBMIT_PHONE_DISPLAY_DESC"
+				class="btn-group"
+				labelclass="control-label"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+			<field
+				name="submit_websiteDisplay"
+				type="radio"
+				label="COM_ICAGENDA_SUBMIT_WEBSITE_DISPLAY_LABEL"
+				description="COM_ICAGENDA_SUBMIT_WEBSITE_DISPLAY_DESC"
+				class="btn-group"
+				labelclass="control-label"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+			<field
+				name="submit_customfieldsDisplay"
+				type="radio"
+				label="COM_ICAGENDA_CUSTOMFIELDS"
+				description="COM_ICAGENDA_SUBMIT_CUSTOMFIELDS_DISPLAY_DESC"
+				class="btn-group"
+				labelclass="control-label"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+			<field
+				name="submit_fileDisplay"
+				type="radio"
+				label="COM_ICAGENDA_SUBMIT_ATTACHMENT_DISPLAY_LABEL"
+				description="COM_ICAGENDA_SUBMIT_ATTACHMENT_DISPLAY_DESC"
+				class="btn-group"
+				labelclass="control-label"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+			<field
+				name="submit_gmapDisplay"
+				type="radio"
+				label="COM_ICAGENDA_SUBMIT_GMAP_DISPLAY_LABEL"
+				description="COM_ICAGENDA_SUBMIT_GMAP_DISPLAY_DESC"
+				class="btn-group"
+				labelclass="control-label"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+			<field
+				name="submit_regoptionsDisplay"
+				type="radio"
+				label="COM_ICAGENDA_SUBMIT_REGISTRATION_OPTIONS_DISPLAY_LABEL"
+				description="COM_ICAGENDA_SUBMIT_REGISTRATION_OPTIONS_DISPLAY_DESC"
+				class="btn-group"
+				labelclass="control-label"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+			<!--field
+				name="submit_captcha"
+				type="plugins"
+				folder="captcha"
+				default=""
+				label="COM_ICAGENDA_CAPTCHA_LABEL"
+				description="COM_ICAGENDA_MENU_SUBMIT_CAPTCHA_DESC"
+				filter="cmd" >
+				<option
+					value="">JGLOBAL_USE_GLOBAL</option>
+				<option
+					value="0">COM_ICAGENDA_NONE_SELECTED</option>
+			</field-->
+			<field
+				name="submit_captcha"
+				type="radio"
+				label="COM_ICAGENDA_CAPTCHA"
+				description="COM_ICAGENDA_SUBMIT_CAPTCHA_DESC"
+				class="btn-group"
+				labelclass="control-label"
+				default=""
+				>
+				<option
+					value="">JGLOBAL_USE_GLOBAL</option>
+				<option
+					value="0">JHIDE</option>
+				<option
+					value="1">JSHOW</option>
+			</field>
+			<field
+				name="submitReturn"
+				type="modal_iclink_type"
+				label="COM_ICAGENDA_SUBMIT_RETURN_LBL"
+				description="COM_ICAGENDA_SUBMIT_RETURN_DESC"
+				labelclass="control-label"
+				default=""
+				/>
+			<field
+				name="submitReturn_Article"
+				type="modal_iclink_article"
+				label=" "
+				class="inputbox"
+				/>
+			<field
+				name="submitReturn_Url"
+				type="modal_iclink_url"
+				label=" "
+				class="inputbox"
+				hint="http://www.example.com"
+				/>
+
+			<!--field type="TitleImg" label="COM_ICAGENDA_DATE_FORMAT_NOTE1"
+				class="stylenote alert alert-info input-xxlarge" icimage="info.png"
+			/-->
+			<field type="Title" label="COM_ICAGENDA_SHORT_DESCRIPTION_LBL" class="stylesub" />
+			<field
+				name="char_limit_short_description"
+				type="text"
+				label="COM_ICAGENDA_LBL_LIMIT"
+				description="COM_ICAGENDA_SHORT_DESCRIPTION_LIMIT_DESC"
+				class="inputbox input-mini"
+				size="5"
+				/>
+			<field type="Title" label="COM_ICAGENDA_META_DESCRIPTION_LBL" class="stylesub" />
+			<field
+				name="char_limit_meta_description"
+				type="text"
+				label="COM_ICAGENDA_LBL_LIMIT"
+				description="COM_ICAGENDA_META_DESCRIPTION_LIMIT_DESC"
+				class="inputbox input-mini"
+				size="5"
+				/>
+
+			<field type="Title" label="COM_ICAGENDA_FOOTER" class="styleblanck input-xxlarge" />
+		</fieldset>
+	</fields>
+
+</metadata>
diff --git a/deployed/icagenda/components/com_icagenda/views/submit/tmpl/index.html b/deployed/icagenda/components/com_icagenda/views/submit/tmpl/index.html
new file mode 100644
index 00000000..fa6d84e8
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/views/submit/tmpl/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/components/com_icagenda/views/submit/tmpl/send.php b/deployed/icagenda/components/com_icagenda/views/submit/tmpl/send.php
new file mode 100644
index 00000000..5136a4d4
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/views/submit/tmpl/send.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.6.7 2017-02-28
+ * @since       3.2.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+$app  = JFactory::getApplication();
+$menu = $app->getMenu();
+
+$lang = JFactory::getLanguage();
+
+// Look for the home menu
+if (JLanguageMultilang::isEnabled())
+{
+	$home = $menu->getDefault($lang->getTag());
+}
+else
+{
+	$home  = $menu->getDefault();
+}
+
+// Get the site name
+$sitename = $app->getCfg('sitename');
+
+// Get Component Global Options
+$iCparams = JComponentHelper::getParams('com_icagenda');
+
+// Get Authorized user groups (approval managers)
+$approvalGroups = $iCparams->get('approvalGroups', array("8"));
+
+// Get User
+$user = JFactory::getUser();
+$u_id = $user->get('id');
+
+// Control: if Manager
+jimport( 'joomla.access.access' );
+$adminUsersArray = array();
+
+foreach ($approvalGroups AS $ag)
+{
+	$adminUsers = JAccess::getUsersByGroup($ag, False);
+	$adminUsersArray = array_merge($adminUsersArray, $adminUsers);
+}
+
+$isManager = in_array($u_id, $adminUsersArray) ? true : false;
+
+//$urllink = JURI::getInstance()->toString();
+//$urllink = preg_replace('/&view=[^&]*/', '', $urllink);
+//$urlNewEvent = preg_replace('/&layout=[^&]*/', '', $urllink);
+$urlNewEvent = str_replace('&amp;', '&', JRoute::_('index.php?option=com_icagenda&view=submit'));
+
+// clear the data so we don't process it again
+$session = JFactory::getSession();
+$session->clear('ic_submit');
+$session->clear('custom_fields');
+$session->clear('ic_submit_dates');
+$session->clear('ic_submit_catid');
+$session->clear('ic_submit_shortdesc');
+$session->clear('ic_submit_metadesc');
+$session->clear('ic_submit_city');
+$session->clear('ic_submit_country');
+$session->clear('ic_submit_lat');
+$session->clear('ic_submit_lat');
+$session->clear('ic_submit_address');
+$session->clear('ic_submit_tos');
+$session->clear('email2');
+?>
+
+<div id="icagenda" class="ic-send<?php echo $this->pageclass_sfx; ?>">
+<?php if ( ! $isManager) : ?>
+	<div><?php echo JText::_( 'COM_ICAGENDA_EVENT_SUBMISSION_EDITOR_REVIEW' ); ?></div>
+	<div><?php echo JText::_( 'COM_ICAGENDA_EVENT_SUBMISSION_CONFIRMATION_EMAIL' ); ?></div>
+	<div><?php echo JText::sprintf( 'COM_ICAGENDA_EVENT_SUBMISSION_THANK_YOU', $sitename ); ?></div>
+<?php endif; ?>
+	<br />
+	<div>
+		<a href="<?php echo JRoute::_('index.php?Itemid=' . $home->id); ?>" class="btn btn-small btn-info button">
+		<?php if(version_compare(JVERSION, '3.0', 'ge')) : ?>
+			<i class="icon-home icon-white"></i>&nbsp;<?php echo JTEXT::_('JERROR_LAYOUT_HOME_PAGE'); ?>
+		<?php else : ?>
+			<span style="color:#FFF"><?php echo JTEXT::_('JERROR_LAYOUT_HOME_PAGE'); ?></span>
+		<?php endif; ?>
+		</a>
+		&nbsp;
+		<a href="<?php echo JRoute::_($urlNewEvent); ?>" class="btn btn-small btn-success button">
+		<?php if(version_compare(JVERSION, '3.0', 'ge')) : ?>
+			<i class="icon-plus icon-white"></i>&nbsp;<?php echo JTEXT::_('COM_ICAGENDA_EVENT_SUBMISSION_SUBMIT_NEW_EVENT'); ?>
+		<?php else : ?>
+			<span style="color:#FFF"><?php echo JTEXT::_('COM_ICAGENDA_EVENT_SUBMISSION_SUBMIT_NEW_EVENT'); ?></span>
+		<?php endif; ?>
+		</a>
+	</div>
+	<br />
+</div>
+<?php
+if (version_compare(JVERSION, '3.0', 'lt'))
+{
+	JHtml::_('stylesheet', 'icagenda-front.j25.css', 'components/com_icagenda/add/css/');
+}
diff --git a/deployed/icagenda/components/com_icagenda/views/submit/view.html.php b/deployed/icagenda/components/com_icagenda/views/submit/view.html.php
new file mode 100644
index 00000000..eb6087a3
--- /dev/null
+++ b/deployed/icagenda/components/com_icagenda/views/submit/view.html.php
@@ -0,0 +1,202 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.3 2018-07-17
+ *
+ * @package     iCagenda.Site
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.2.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die();
+
+jimport('joomla.application.component.helper');
+
+/**
+ * View class Site - Add an Event - iCagenda
+ */
+class iCagendaViewSubmit extends JViewLegacy
+{
+	// TODO: check and remove
+	protected $return_page;
+
+	protected $state;
+	protected $item;
+	protected $form;
+
+	protected $params;
+
+	/**
+	 * Display the view
+	 */
+	public function display($tpl = null)
+	{
+		$app    = JFactory::getApplication();
+		$jinput = $app->input;
+
+		// Initialiase variables.
+		$this->state = $this->get('State');
+		$this->item  = $this->get('Item');
+		$this->form  = $this->get('Form');
+
+		if (version_compare(JVERSION, '3.2', 'lt'))
+		{
+			if (JRequest::get('POST')) $this->get('data');
+		}
+		else
+		{
+			if ($jinput->post->getArray()) $this->get('data');
+		}
+
+		// loading params
+		$params = $app->getParams();
+
+		// Shortcuts
+		$item = $this->item;
+
+		$this->template = $params->get('template');
+		$this->title    = $params->get('title');
+		$this->format   = $params->get('format');
+		$this->copy     = $params->get('copy');
+
+		$this->submit_imageDisplay        = $params->get('submit_imageDisplay', 1);
+		$this->submit_periodDisplay       = $params->get('submit_periodDisplay', 1);
+		$this->submit_weekdaysDisplay     = $params->get('submit_weekdaysDisplay', 1);
+		$this->submit_datesDisplay        = $params->get('submit_datesDisplay', 1);
+		$this->submit_displaytimeDisplay  = $params->get('submit_displaytimeDisplay', 0);
+		$this->submit_shortdescDisplay    = $params->get('submit_shortdescDisplay', 1);
+		$this->submit_descDisplay         = $params->get('submit_descDisplay', 1);
+		$this->submit_metadescDisplay     = $params->get('submit_metadescDisplay', 0);
+		$this->submit_venueDisplay        = $params->get('submit_venueDisplay', 1);
+		$this->submit_emailDisplay        = $params->get('submit_emailDisplay', 1);
+		$this->submit_phoneDisplay        = $params->get('submit_phoneDisplay', 1);
+		$this->submit_websiteDisplay      = $params->get('submit_websiteDisplay', 1);
+		$this->submit_customfieldsDisplay = $params->get('submit_customfieldsDisplay', 1);
+		$this->submit_fileDisplay         = $params->get('submit_fileDisplay', 1);
+		$this->submit_gmapDisplay         = $params->get('submit_gmapDisplay', 1);
+		$this->submit_regoptionsDisplay   = $params->get('submit_regoptionsDisplay', 1);
+		$this->statutReg                  = $params->get('statutReg', 0);
+		$this->ShortDescLimit             = $params->get('ShortDescLimit', '160');
+		$this->submit_imageMaxSize        = $params->get('submit_imageMaxSize', '800');
+		$this->submit_captcha             = $params->get('submit_captcha', 0);
+		$this->submit_form_validation     = $params->get('submit_form_validation', '');
+
+		$this->params   = $this->state->get('params');
+		$this->iCparams = $this->params;
+
+		// Process the content plugins.
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			$this->dispatcher = JDispatcher::getInstance();
+		}
+		else
+		{
+			$this->dispatcher = JEventDispatcher::getInstance();
+		}
+
+		JPluginHelper::importPlugin('content');
+		$this->dispatcher->trigger('iCagendaOnSubmitPrepare', array ('com_icagenda.submit', &$item, &$this->params));
+
+		$this->pluginEvent = new stdClass;
+
+		$results = $this->dispatcher->trigger('iCagendaOnSubmitBeforeDisplay', array('com_icagenda.submit', &$item, &$this->params));
+		$this->pluginEvent->iCagendaOnSubmitBeforeDisplay = trim(implode("\n", $results));
+
+		$results = $this->dispatcher->trigger('iCagendaOnSubmitAfterDisplay', array('com_icagenda.submit', &$item, &$this->params));
+		$this->pluginEvent->iCagendaOnSubmitAfterDisplay = trim(implode("\n", $results));
+
+
+		$this->pageclass_sfx = htmlspecialchars($params->get('pageclass_sfx'));
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+
+			return false;
+		}
+
+		$this->_prepareDocument();
+
+		icagendaInfo::commentVersion();
+
+		parent::display($tpl);
+
+		// Add CSS
+		icagendaTheme::loadComponentCSS($this->template);
+		icagendaThemeStyle::addMediaCss($this->template, 'component');
+
+		icagendaForm::loadDateTimePickerJSLanguage();
+
+		$jlayout       = $jinput->get('layout', '');
+		$layouts_array = array('event', 'registration');
+		$layout        = in_array($jlayout, $layouts_array) ? $jlayout : '';
+
+		if ( ! $layout || $layout == 'submit')
+		{
+			JHtml::stylesheet('com_icagenda/icagenda.css', false, true);
+			JHtml::stylesheet('com_icagenda/jquery-ui-1.8.17.custom.css', false, true);
+		}
+	}
+
+
+	protected function _prepareDocument()
+	{
+		$app     = JFactory::getApplication();
+		$menus   = $app->getMenu();
+		$pathway = $app->getPathway();
+
+		$title = null;
+		$menu  = $menus->getActive();
+
+		if ($menu)
+		{
+			$this->params->def('page_heading', $this->params->get('page_title', $menu->title));
+		}
+		else
+		{
+			$this->params->def('page_heading', JText::_('JGLOBAL_ARTICLES'));
+		}
+
+		$title = $this->params->get('page_title', '');
+
+		if (empty($title))
+		{
+			$title = $app->getCfg('sitename');
+		}
+		elseif ($app->getCfg('sitename_pagetitles', 0) == 1)
+		{
+			$title = JText::sprintf('JPAGETITLE', $app->getCfg('sitename'), $title);
+		}
+		elseif ($app->getCfg('sitename_pagetitles', 0) == 2)
+		{
+			$title = JText::sprintf('JPAGETITLE', $title, $app->getCfg('sitename'));
+		}
+
+		$this->document->setTitle($title);
+
+		if ($this->params->get('menu-meta_description', ''))
+		{
+			$this->document->setDescription($this->params->get('menu-meta_description', ''));
+		}
+
+		if ($this->params->get('menu-meta_keywords', ''))
+		{
+			$this->document->setMetadata('keywords', $this->params->get('menu-meta_keywords', ''));
+		}
+
+		if ($app->getCfg('MetaTitle') == '1'
+			&& $this->params->get('menupage_title', ''))
+		{
+			$this->document->setMetaData('title', $this->params->get('page_title', ''));
+		}
+	}
+}
diff --git a/deployed/icagenda/libraries/ic_library/LICENSE.txt b/deployed/icagenda/libraries/ic_library/LICENSE.txt
new file mode 100644
index 00000000..94a9ed02
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/LICENSE.txt
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/deployed/icagenda/libraries/ic_library/color/color.php b/deployed/icagenda/libraries/ic_library/color/color.php
new file mode 100644
index 00000000..315e943b
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/color/color.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iC Library   Library by Jooml!C, for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     1.4.7 2018-08-23
+ *
+ * @package     iC Library
+ * @subpackage  Color
+ * @link        https://www.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * class iCColor
+ */
+abstract class iCColor
+{
+	/**
+	 * Function to convert color : hexadecimal to RGB
+	 *
+	 * @param   color to be converted in hexadecimal ('#xxxxxx')
+	 * 
+	 * @return  converted color in RGB ('xxx,xxx,xxx')
+	 *
+	 * @since   1.0.0
+	 */
+	public static function hex_to_rgb($color)
+	{
+		if ( ! is_array($color)
+			&& preg_match("/^[#]([0-9a-fA-F]{6})$/", $color))
+		{
+			$hex_R = substr($color, 1, 2);
+			$hex_G = substr($color, 3, 2);
+			$hex_B = substr($color, 5, 2);
+			$RGB  = hexdec($hex_R) . ',' . hexdec($hex_G) . ',' . hexdec($hex_B);
+
+			return $RGB;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Function to convert color : RGB to hexadecimal
+	 *
+	 * @param   color to be converted in RGB ('xxx,xxx,xxx' or 'array(xxx,xxx,xxx)')
+	 * 
+	 * @return  converted color in hexadecimal ('#xxxxxx')
+	 *
+	 * @since   1.0.0
+	 */
+	public static function rgb_to_hex($color)
+	{
+		if ( ! is_array($color))
+		{
+			$color_array = explode(",", $color);
+		}
+
+		if (is_array($color_array) && count($color_array) === 3)
+		{
+			$hex_RGB = '';
+
+			foreach ($color_array as $value)
+			{
+				$hex_value = dechex($value);
+
+				if (strlen($hex_value) < 2)
+				{
+					$hex_value = '0' . $hex_value;
+				}
+
+				$hex_RGB.= $hex_value;
+			}
+
+			return '#' . $hex_RGB;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Function to get brightness of hexadecimal color
+	 * https://www.w3.org/TR/AERT/#color-contrast
+	 *
+	 * @param   color in hexadecimal ('#xxxxxx')
+	 * 
+	 * @return  string ('dark' or 'bright')
+	 *
+	 * @since   1.0.0
+	 */
+	public static function getBrightness($color)
+	{
+		if ( ! is_array($color)
+			&& preg_match("/^[#]([0-9a-fA-F]{6})$/", $color)
+			&& strlen($color) == 7)
+		{
+			$get_RGB = iCColor::hex_to_rgb($color);
+			$RGB     = explode(',', $get_RGB);
+
+			$brightness = ((($RGB[0] * '299') + ($RGB[1] * '587') + ($RGB[2] * '114')) / '1000'); 
+
+			return ($brightness > '125') ? 'bright' : 'dark';
+		}
+		else
+		{
+			return false;
+		}
+	}
+}
diff --git a/deployed/icagenda/libraries/ic_library/color/index.html b/deployed/icagenda/libraries/ic_library/color/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/color/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/libraries/ic_library/date/date.php b/deployed/icagenda/libraries/ic_library/date/date.php
new file mode 100644
index 00000000..753b5698
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/date/date.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iC Library - Library by Jooml!C, for Joomla!
+ *------------------------------------------------------------------------------
+ * @package     iC Library
+ * @subpackage  date
+ * @copyright   Copyright (c)2013-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     1.4.5 2017-07-06
+ * @since       1.0.3
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+/**
+ * class iCDate
+ */
+class iCDate
+{
+	/**
+	 * Function to test if date is a valid Datetime
+	 *
+	 * @access	public static
+	 * @param	$date : date to be tested (1993-04-30 14:33:00)
+	 * @return	alias
+	 *
+	 * @since   1.1.0
+	 */
+	static public function isDate($date)
+	{
+		if ($date == '-0001-11-30 00:00') return false;
+
+		$stamp = strtotime($date);
+
+		$date_numeric = iCDate::dateToNumeric($date);
+
+		$date_valid = str_replace('0', '', $date_numeric);
+
+		if ( ! is_numeric($stamp)
+			|| ! $date_valid)
+		{
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Function to convert datetime to numeric
+	 *
+	 * @access	public static
+	 * @param	$date: date to convert (1993-04-30 14:33:00 -> 19930430143300)
+	 * @return	alias
+	 *
+	 * @since   1.1.0
+	 */
+	static public function dateToNumeric($date)
+	{
+		$date = preg_replace("/[^0-9]/","", $date);
+
+		return $date;
+	}
+
+	/**
+	 * Function to convert datetime to alias
+	 *
+	 * @access	public static
+	 * @param	$date: date to convert (1993-04-30 14:33:00 -> 1993-04-30-14-33-00)
+	 * 			$format: format of the date before convertion (eg. Y-m-d if only date)
+	 * 			default format: use parent format
+	 * @return	alias
+	 *
+	 * @since   1.0.3
+	 */
+	static public function dateToAlias($date, $format = null)
+	{
+		if ($format)
+		{
+			$date = date($format, strtotime($date));
+		}
+
+		if (self::isDate($date))
+		{
+			$replace = array(' ', ':');
+			$date = str_replace($replace, '-', $date);
+
+			return $date;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Format Month Short Core - From Joomla language file xx-XX.ini (eg. Apr)
+	 *
+	 * @access	public static
+	 * @param	$date: date to convert (1993-04-30 14:33:00 -> Apr)
+	 * @return	translation string for MONTH_SHORT
+	 *
+	 * @since   1.2.0
+	 */
+	static public function monthShortJoomla($date)
+	{
+		$month            = date('F', strtotime($date));
+		$monthShortJoomla = JText::_($month . '_SHORT');
+
+		return $monthShortJoomla;
+	}
+
+	/**
+	 * Format Month Core - From Joomla language file xx-XX.ini (eg. April)
+	 *
+	 * @access	public static
+	 * @param	$date: date to convert (1993-04-30 14:33:00 -> April)
+	 * @return	translation string for MONTH
+	 *
+	 * @since   1.4.0
+	 */
+	static public function monthJoomla($date)
+	{
+		$month       = date('F', strtotime($date));
+		$monthJoomla = JText::_($month);
+
+		return $monthJoomla;
+	}
+}
diff --git a/deployed/icagenda/libraries/ic_library/date/index.html b/deployed/icagenda/libraries/ic_library/date/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/date/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/libraries/ic_library/date/period.php b/deployed/icagenda/libraries/ic_library/date/period.php
new file mode 100644
index 00000000..98048375
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/date/period.php
@@ -0,0 +1,156 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iC Library - Library by Jooml!C, for Joomla!
+ *------------------------------------------------------------------------------
+ * @package     iC Library
+ * @subpackage  date
+ * @copyright   Copyright (c)2013-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     1.2.2 2015-03-06
+ * @since       1.1.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+/**
+ * class iCDate
+ */
+class iCDatePeriod
+{
+	/**
+	 * Function to return all dates of a period (from ... to ...)
+	 *
+	 * @access	public static
+	 * @param	$startdate : start datetime of the period (0000-00-00 00:00:00)
+	 * 			$enddate : end datetime of the period (0000-00-00 00:00:00)
+	 * 			$timezone : Time zone to be used for the date.
+	 *						Special cases: boolean true for user setting, boolean false for server setting.
+	 *						Default: null, no timezone.
+	 * @return	array of all dates of the period
+	 *
+	 * @since	1.1.0
+	 */
+	static public function listDates($startdate, $enddate, $timezone = null)
+	{
+		$test_startdate	= iCDate::isDate($startdate);
+		$test_enddate	= iCDate::isDate($enddate);
+
+		$out = array();
+
+		if ($test_startdate && $test_enddate)
+		{
+			$timestartdate	= date('H:i', strtotime($startdate));
+			$timeenddate	= date('H:i', strtotime($enddate));
+
+			if (class_exists('DateInterval'))
+			{
+				// Create array with all dates of the period - PHP 5.3+
+				$start = new DateTime($startdate);
+
+				$interval = '+1 days';
+				$date_interval = DateInterval::createFromDateString($interval);
+
+				if ($timeenddate <= $timestartdate)
+				{
+					$end = new DateTime("$enddate +1 days");
+				}
+				else
+				{
+					$end = new DateTime($enddate);
+				}
+
+				// Return all dates.
+				$perioddates = new DatePeriod($start, $date_interval, $end);
+
+				foreach($perioddates as $date)
+				{
+					$out[] = (
+						$date->format('Y-m-d H:i')
+					);
+				}
+			}
+			else
+			{
+				// TO BE REMOVED : when Joomla 2.5 and php 5.2 support will end
+				// Create array with all dates of the period - PHP 5.2
+				$nodate = '0000-00-00 00:00:00';
+
+				if (($startdate != $nodate) && ($enddate != $nodate))
+				{
+					$start = new DateTime($startdate);
+
+					if ($timeenddate <= $timestartdate)
+					{
+						$end = new DateTime("$enddate +1 days");
+					}
+					else
+					{
+						$end = new DateTime($enddate);
+					}
+
+					while($start < $end)
+					{
+						$out[] = $start->format('Y-m-d H:i');
+						$start->modify('+1 day');
+					}
+				}
+			}
+
+			return $out;
+		}
+		else
+		{
+			return array();
+		}
+	}
+
+	/**
+	 * Return weekdays data to array of days of the week selected
+	 *
+	 * @access	public static
+	 * @param	$weekdays : weekdays saved in database (x,x,x)
+	 * @return	array of all weekdays of the period
+	 *
+	 * @since	1.2.0
+	 */
+	static public function weekdaysToArray($i_weekdays)
+	{
+		$allWeekDays	= array(0,1,2,3,4,5,6);
+
+		$weekdays		= isset($i_weekdays) ? $i_weekdays : array();
+		$weekdays		= explode (',', $weekdays);
+
+		$weekdaysarray	= array();
+
+		foreach ($weekdays as $day)
+		{
+			array_push($weekdaysarray, $day);
+		}
+
+		if (in_array('', $weekdaysarray)) // Joomla 2.5 multiple select
+		{
+			$arrayWeekDays = $allWeekDays;
+		}
+		elseif ($i_weekdays)
+		{
+			$arrayWeekDays = $weekdaysarray;
+		}
+		elseif (in_array('0', $weekdaysarray)) // Sunday only selected
+		{
+			$arrayWeekDays = $weekdaysarray;
+		}
+		else
+		{
+			$arrayWeekDays = $allWeekDays;
+		}
+
+		return $arrayWeekDays;
+	}
+}
diff --git a/deployed/icagenda/libraries/ic_library/file/file.php b/deployed/icagenda/libraries/ic_library/file/file.php
new file mode 100644
index 00000000..cc53e21e
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/file/file.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iC Library - Library by Jooml!C, for Joomla!
+ *------------------------------------------------------------------------------
+ * @package     iC Library
+ * @subpackage  url
+ * @copyright   Copyright (c)2013-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     1.0.1 2014-07-13
+ * @since       1.0.1
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+/**
+ * class iCUrl
+ */
+class iCFile
+{
+	/**
+	 * Function to check if a string is defined inside a file.
+	 *
+	 * @param	$string			string to be checked
+	 * 			$file_location	path or url to the file to be tested
+	 * @return	true/false.
+	 *
+	 * @since	1.0.1
+	 */
+	static public function hasString($string, $file_location)
+	{
+		if (ini_get('allow_url_fopen') && is_file($file_location))
+		{
+			$file_to_test = file_get_contents($file_location);
+
+			$has_string = strpos($file_to_test, $string) ? true : false;
+
+			return $has_string;
+		}
+	}
+}
diff --git a/deployed/icagenda/libraries/ic_library/file/index.html b/deployed/icagenda/libraries/ic_library/file/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/file/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/libraries/ic_library/filter/index.html b/deployed/icagenda/libraries/ic_library/filter/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/filter/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/libraries/ic_library/filter/output.php b/deployed/icagenda/libraries/ic_library/filter/output.php
new file mode 100644
index 00000000..8f85828b
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/filter/output.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iC Library - Library by Jooml!C, for Joomla!
+ *------------------------------------------------------------------------------
+ * @package     iC Library
+ * @subpackage  filter
+ * @copyright   Copyright (c)2013-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     1.3.5 2015-12-22
+ * @since       1.0.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+/**
+ * class iCUrl
+ */
+class iCFilterOutput
+{
+	/**
+	 * Process a string in a JOOMLA_TRANSLATION_STRING standard.
+	 * This method processes a string and replaces all accented UTF-8 characters by unaccented
+	 * ASCII-7 "equivalents" and the string is uppercase. Spaces replaced by underscore.
+	 *
+	 * @param   string  $string  String to process
+	 *
+	 * @return  string  Processed string
+	 *
+	 * @since   1.0.0
+	 */
+	public static function stringToJText($string)
+	{
+		// Remove any '_' from the string since they will be used as concatenaters
+		$str = str_replace('_', ' ', $string);
+
+		$lang = JFactory::getLanguage();
+		$str = $lang->transliterate($str);
+
+		// Trim white spaces at beginning and end of translation string and make uppercase
+		$str = trim(JString::strtoupper($str));
+
+		// Remove any duplicate whitespace, and ensure all characters are alphanumeric
+		$str = preg_replace('/(\s|[^A-Za-z0-9\-])+/', '_', $str);
+
+		// Trim underscores at beginning and end of translation string
+		$str = trim($str, '_');
+
+		return $str;
+	}
+
+	/**
+	 * Process a string in slug format.
+	 * This method processes a string and replaces all accented UTF-8 characters by unaccented
+	 * ASCII-7 "equivalents" and the string is lowercase. Spaces replaced by underscore.
+	 *
+	 * @param   string      $string         String to process
+	 *          string(1)   $concatenater   Concatener (default underscore - data slug)
+	 *
+	 * @return  string  Processed string
+	 *
+	 * @since   1.0.0
+	 */
+	public static function stringToSlug($string, $concatenater = '_')
+	{
+		// Remove any '$concatenater' from the string since they will be used as concatenaters
+		$concatenater = (strlen($concatenater) == 1) ? $concatenater : '_';
+		$str = str_replace($concatenater, ' ', $string);
+
+		// Replaces all accented UTF-8 characters by unaccented ASCII-7 "equivalents"
+		$lang = JFactory::getLanguage();
+		$str = $lang->transliterate($str);
+
+		// Trim white spaces at beginning and end of translation string and make lowercase
+		$str = trim(JString::strtolower($str));
+
+		// Remove any duplicate whitespace, and ensure all characters are alphanumeric
+		$str = preg_replace('/(\s|[^A-Za-z0-9])+/', $concatenater, $str);
+
+		// Trim '$concatenater' at beginning and end of translation string
+		$str = trim($str, $concatenater);
+
+		return $str;
+	}
+
+	/**
+	 * Convert a HTML string in a text single line.
+	 * This method processes a string, cleans all HTML tags and converts special characters to HTML entities.
+	 * The string is lowercase. Spaces replaced by underscore.
+	 *
+	 * @param   string  $string  String to process
+	 *
+	 * @return  string  Processed string
+	 *
+	 * @since   1.0.0
+	 */
+	static public function fullCleanHTML($string)
+	{
+		// Clean text of all formatting and scripting code
+		$str = preg_replace("'<script[^>]*>.*?</script>'si", '', $string);
+		$str = preg_replace('/<a\s+.*?href="([^"]+)"[^>]*>([^<]+)<\/a>/is', '\2 (\1)', $str);
+		$str = preg_replace('/<!--.+?-->/', '', $str);
+		$str = preg_replace('/{.+?}/', '', $str);
+
+		// Strip HTML and PHP tags
+		$str = strip_tags($str);
+
+		// Replace all sequences of two or more spaces, tabs, and/or line breaks with a single space
+		$str = preg_replace('/[\p{Z}\s]{2,}/u', ' ', $str);
+
+		// Convert special characters to HTML entities
+		$str = htmlspecialchars($str, ENT_QUOTES, 'UTF-8');
+
+		// Trim spaces at beginning and end of translation string
+		$str = trim($str);
+
+		return $str;
+	}
+}
diff --git a/deployed/icagenda/libraries/ic_library/form/field/index.html b/deployed/icagenda/libraries/ic_library/form/field/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/form/field/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/libraries/ic_library/form/field/sortablefields.php b/deployed/icagenda/libraries/ic_library/form/field/sortablefields.php
new file mode 100644
index 00000000..aadf744c
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/form/field/sortablefields.php
@@ -0,0 +1,348 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iC Library - Library by Jooml!C, for Joomla!
+ *------------------------------------------------------------------------------
+ * @package     iC Library
+ * @subpackage  Fields
+ * @copyright   Copyright (c)2013-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     1.4.4 2017-07-02
+ * @since       1.4.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+// Joomla 2.5
+if (version_compare(JVERSION, '3.0', 'lt'))
+{
+	jimport('joomla.form.formfield');
+}
+
+JFormHelper::loadFieldClass('list');
+
+
+/**
+ * Sortable fields form field
+ */
+class iCFormFieldSortableFields extends JFormFieldList
+{
+	public $type = 'sortablefields';
+
+	public function getLabel()
+	{
+		$app        = JFactory::getApplication();
+		$document   = JFactory::getDocument();
+
+		$isMenu     = ($app->input->get('option') == 'com_menus');
+		$menuParams = $isMenu ? 'params_' : '';
+
+		// Joomla 2.5
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			$level = E_ALL & ~E_NOTICE & ~E_DEPRECATED;
+
+			// Remove not-error message (only needed for Joomla 2.5) :
+			// Strict Standards: Only variables should be assigned by reference in .../libraries/joomla/form/form.php
+			if (version_compare(PHP_VERSION, '5.4.0-dev', '>='))
+			{
+				if ( ! defined('E_STRICT'))
+				{
+					define('E_STRICT', 2048);
+				}
+
+				$level &= ~E_STRICT;
+			}
+
+			error_reporting($level);
+
+			if ($isMenu)
+			{
+				return false;
+			}
+		}
+
+		if (empty($this->element['label']) && empty($this->element['description']))
+		{
+			return '';
+		}
+
+		$title			= $this->element['label']
+						? (string) $this->element['label']
+						: ($this->element['title'] ? (string) $this->element['title'] : '');
+		$heading		= $this->element['heading'] ? (string) $this->element['heading'] : 'h4';
+		$description	= (string) $this->element['description'];
+		$class			= ! empty($this->class)
+						? ' class="' . $this->class . '"'
+						: ' class="alert alert-info input-xxlarge" style="display:block;clear:both;"';
+		$close			= (string) $this->element['close'];
+
+		$html = array();
+
+		if ($close)
+		{
+			$close = $close == 'true' ? 'alert' : $close;
+			$html[] = '<button type="button" class="close" data-dismiss="' . $close . '">&times;</button>';
+		}
+
+		$html[] = '<div class="ic-clearfix"></div>';
+		$html[] = '<div' . $class . '>';
+//		$html[] = !empty($title) ? '<' . $heading . '>' . JText::_($title) . '</' . $heading . '>' : '';
+		$html[] = ! empty($description) ? JText::_($description) : '';
+		$html[] = '</div>';
+
+		$html[] = '<div id="ic-sortable" class="span6" style="margin-bottom: 24px">';
+
+		$fieldnames = isset($this->value) ? $this->value : (string) $this->element['default'];
+		$fieldnames = explode(',', $fieldnames);
+
+		$group      = $isMenu ? 'params' : '';
+
+		foreach ($fieldnames AS $k => $fieldname)
+		{
+			$fieldname = trim($fieldname);
+			$field  = $this->form->getField($fieldname, $group);
+
+			// Make sure the selected field is hidden
+			if ( ! isset($field->element['type']) || $field->element['type'] !== 'hidden')
+			{
+				$this->form->setFieldAttribute($fieldname, 'type', 'hidden');
+			}
+
+			// Settings attributes
+			$name = isset($field->element['name']) ? $field->element['name'] : false;
+
+			if ($name)
+			{
+				$rendertype		= isset($field->element['rendertype'])	? $field->element['rendertype']		: 'text';
+				$label			= isset($field->element['label'])		? $field->element['label']			: '';
+				$description	= isset($field->element['description'])	? $field->element['description']	: '';
+				$class			= isset($field->element['class'])		? $field->element['class']			: '';
+				$labelclass		= isset($field->element['labelclass'])	? $field->element['labelclass']		: '';
+				$default		= isset($field->element['default'])		? $field->element['default']		: '';
+
+				// Add new field to the sortable list
+				$type_field = new SimpleXMLElement('<field />');
+				$type_field->addAttribute('name', $fieldname);
+				$type_field->addAttribute('type', $rendertype);
+				$type_field->addAttribute('label', $label);
+				$type_field->addAttribute('description', $description);
+				$type_field->addAttribute('class', $class);
+				$type_field->addAttribute('labelclass', $labelclass);
+				$type_field->addAttribute('default', $default);
+//				$type_field->addAttribute('fieldset', 'list');
+
+				if (isset($field->element->option))
+				{
+					$values = (array) $field->element->xpath('option');
+					$options = (array) $field->element->option;
+					unset($values['@attributes']);
+					unset($options['@attributes']);
+
+
+					// Add 'Use Global' with value
+					if ($field->element['useglobal'])
+					{
+						$tmp        = new stdClass;
+						$tmp->value = '';
+						$tmp->text  = JText::_('JGLOBAL_USE_GLOBAL');
+						$component  = JFactory::getApplication()->input->getCmd('option');
+
+						// Get correct component for menu items
+						if ($component == 'com_menus')
+						{
+							$link      = $this->form->getData()->get('link');
+							$uri       = new JUri($link);
+							$component = $uri->getVar('option', 'com_menus');
+						}
+
+						$params = JComponentHelper::getParams($component);
+						$value  = $params->get($fieldname);
+
+						// Try with global configuration
+						if (is_null($value))
+						{
+							$value = JFactory::getConfig()->get($fieldname);
+						}
+
+						// Try with menu configuration
+						if (is_null($value) && JFactory::getApplication()->input->getCmd('option') == 'com_menus')
+						{
+							$value = JComponentHelper::getParams('com_menus')->get($fieldname);
+						}
+
+						if (!is_null($value))
+						{
+							$value = (string) $value;
+
+							foreach ($values as $key => $option)
+							{
+								if ((string) $values[$key]['value'] === $value)
+								{
+									$value = JText::_($option);
+
+									break;
+								}
+							}
+
+							$tmp->text  = (version_compare(JVERSION, '3.7', 'lt'))
+										? JText::_('JGLOBAL_USE_GLOBAL') . ' (' . $value . ')'
+										: JText::sprintf('JGLOBAL_USE_GLOBAL_VALUE', $value);
+						}
+
+						$child = $type_field->addChild('option', $tmp->text);
+						$child->addAttribute('value', $tmp->value);
+					}
+
+
+					// Add Options
+					foreach ($values as $key => $option)
+					{
+						$child = $type_field->addChild('option', $option);
+						$child->addAttribute('value', $values[$key]['value']);
+					}
+				}
+
+				$this->form->setField($type_field, $group);
+
+				$label = $this->form->getLabel($fieldname, $group);
+				$input = $this->form->getInput($fieldname, $group);
+
+				$html[] = '<div id="' . $fieldname . '" class="ui-state-default">';
+
+				// Switch Joomla 2.5 / 3
+				if (version_compare(JVERSION, '3.0', 'lt'))
+				{
+					$html[] = '<span style="line-height: 36px">&nbsp;' . $label . $input . '</span>';
+				}
+				else
+				{
+					$html[] = '<span class="icon-move" style="line-height: 36px; float: left"> </span>';
+					$html[] = JLayoutHelper::render('joomla.form.renderfield',
+								array('input' => $input, 'label' => $label, 'options' => array('rel' => ''))); // 'rel' kept for older J3 version (3.2.5...)
+				}
+
+				$html[] = '</div>';
+
+				$label_suffix = '';
+
+				if ($fieldname == 'filter_search')
+				{
+					$label_suffix = Jtext::_('IC_FIELD_TYPE_TEXT');
+				}
+				elseif (in_array($fieldname, array('filter_from', 'filter_to')))
+				{
+					$label_suffix = Jtext::_('IC_FIELD_TYPE_CALENDAR');
+				}
+				elseif (in_array($fieldname, array('filter_category', 'filter_month', 'filter_year')))
+				{
+					$label_suffix = Jtext::_('IC_FIELD_TYPE_LIST');
+				}
+
+				$document->addScriptDeclaration('
+					jQuery(document).ready(function($) {
+						var label = $("#jform_' . $menuParams . $fieldname . '-lbl").text();
+						$("#jform_' . $menuParams . $fieldname . '-lbl").html("<strong>"+label+"</strong> <small>(' . $label_suffix . ')</small>");
+					});
+				');
+			}
+		}
+
+		$html[] = '</div>';
+
+		$document->addScriptDeclaration('
+			jQuery(document).ready(function($) {
+				$( "#ic-sortable" ).sortable({
+					placeholder: "ui-state-highlight",
+					cursor: "crosshair",
+					update: function(event, ui) {
+						var order = $("#ic-sortable").sortable("toArray");
+						$("#' . $this->id . '").val(order.join(","));
+					}
+				});
+				$( "#ic-sortable" ).disableSelection();
+
+				// Will hide control-group field, if input type is hidden
+//				$("input[type=hidden]").parents(".control-group").css("margin-bottom", "0");
+			});
+		');
+
+		$document->addStyleDeclaration('
+			.ui-state-default {
+				background: #f7f7f9;
+				border: 1px solid #e1e1e8;
+				padding: 3px 5px;
+				margin-bottom: 3px;
+			}
+			.ui-sortable-helper{
+				/*
+				background: #449d44;
+				background: rgba(68, 157, 68, 0.5);
+				*/
+				/* @brand-info BT3 */
+				background; #5bc0de;
+				background: rgba(91, 192, 222, 0.5);
+
+				border: none;
+				color: #fff;
+				padding: 3px 5px;
+				margin-bottom: 3px;
+			}
+			.ui-state-default .control-group {
+				margin-bottom: 5px;
+			}
+			.icon-move:hover,
+			.ui-state-default:hover {
+				cursor: move;
+			}
+			.ui-state-default .control-label:hover {
+				cursor: move;
+			}
+			.ui-state-highlight {
+				/*
+				background: #449d44;
+				background: rgba(68, 157, 68, 0.7);
+				border: 1px dotted #398439;
+				*/
+				/* @brand-info BT3 */
+				background; #5bc0de;
+				background: rgba(91, 192, 222, 0.5);
+				border: 1px dotted #2aa8ce;
+
+				height: 44px;
+				margin-bottom: 3px;
+			}
+		');
+//		JHtml::_('bootstrap.framework');
+//		JHtml::_('jquery.framework');
+
+		// Change jQuery UI version from 1.9.2 to 1.8.23 to prevent a conflict in tooltip that appeared since Joomla 3.1.4
+//		$document->addScript('https://ajax.googleapis.com/ajax/libs/jqueryui/1.9.2/jquery-ui.min.js');
+//		JHtml::stylesheet( 'com_icagenda/jquery-ui-1.8.17.custom.css', false, true );
+
+		// Joomla 2.5
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			JHtml::stylesheet( 'com_icagenda/jquery-ui-1.8.17.custom.css', false, true );
+			$document->addScript('//code.jquery.com/ui/1.11.4/jquery-ui.js');
+		}
+		else
+		{
+			JHtml::_('jquery.ui', array('core', 'sortable'));
+		}
+
+		return '</div><div>' . implode('', $html);
+	}
+
+	public function getInput()
+	{
+//		return '';
+		return '<input type="hidden" id="' . $this->id . '" name="' . $this->name . '" value="' . $this->value . '" />';
+	}
+}
diff --git a/deployed/icagenda/libraries/ic_library/form/index.html b/deployed/icagenda/libraries/ic_library/form/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/form/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/libraries/ic_library/form/rule/positiveinteger.php b/deployed/icagenda/libraries/ic_library/form/rule/positiveinteger.php
new file mode 100644
index 00000000..17ee5a28
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/form/rule/positiveinteger.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iC Library - Library by Jooml!C, for Joomla!
+ *------------------------------------------------------------------------------
+ * @package     iC Library
+ * @subpackage  Form Rules
+ * @copyright   Copyright (c)2013-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     1.4.4 2017-06-06
+ * @since       1.4.2
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+if (version_compare(JVERSION, '3.0', 'lt'))
+{
+	jimport('joomla.registry.registry');
+}
+
+use Joomla\Registry\Registry;
+
+/**
+ * Form Rule class for iCagenda.
+ *
+ * Positive integer validation.
+ */
+class iCFormRulePositiveinteger extends JFormRule
+{
+	/**
+	 * The regular expression to use in testing a form field value.
+	 *
+	 * @var     string
+	 * @since   1.4.2
+	 */
+	protected $regex = '^[1-9][0-9]*$';
+}
diff --git a/deployed/icagenda/libraries/ic_library/form/rule/tel.php b/deployed/icagenda/libraries/ic_library/form/rule/tel.php
new file mode 100644
index 00000000..26d0cd7e
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/form/rule/tel.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iC Library - Library by Jooml!C, for Joomla!
+ *------------------------------------------------------------------------------
+ * @package     iC Library
+ * @subpackage  Form Rules
+ * @copyright   Copyright (c)2013-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        https://www.joomlic.com
+ *
+ * @version     1.4.4 2017-06-06
+ * @since       1.4.4
+ *------------------------------------------------------------------------------
+*/
+
+defined('JPATH_PLATFORM') or die;
+
+if (version_compare(JVERSION, '3.0', 'lt'))
+{
+	jimport('joomla.registry.registry');
+}
+
+use Joomla\Registry\Registry;
+
+/**
+ * Form Rule class for iCagenda.
+ *
+ * Phone number validation (allows 6 digits as minimum against 7 of Joomla api).
+ */
+class iCFormRuleTel extends JFormRule
+{
+	/**
+	 * Method to test the url for a valid parts.
+	 *
+	 * @param   SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed             $value    The form field value to validate.
+	 * @param   string            $group    The field name group control value. This acts as as an array container for the field.
+	 *                                      For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                      full field name would end up being "bar[foo]".
+	 * @param   Registry          $input    An optional Registry object with the entire data set to validate against the entire form.
+	 * @param   JForm             $form     The form object for which the field is being tested.
+	 *
+	 * @return  boolean  True if the value is valid, false otherwise.
+	 *
+	 * @since   11.1
+	 */
+	public function test(SimpleXMLElement $element, $value, $group = null, Registry $input = null, JForm $form = null)
+	{
+		// If the field is empty and not required, the field is valid.
+		$required = ((string) $element['required'] == 'true' || (string) $element['required'] == 'required');
+
+		if (!$required && empty($value))
+		{
+			return true;
+		}
+
+		/*
+		 * @see http://www.nanpa.com/
+		 * @see http://tools.ietf.org/html/rfc4933
+		 * @see http://www.itu.int/rec/T-REC-E.164/en
+		 *
+		 * Regex by Steve Levithan
+		 * @see http://blog.stevenlevithan.com/archives/validate-phone-number
+		 * @note that valid ITU-T and EPP must begin with +.
+		 */
+		$regexarray = array(
+			'NANP' => '/^(?:\+?1[-. ]?)?\(?([2-9][0-8][0-9])\)?[-. ]?([2-9][0-9]{2})[-. ]?([0-9]{4})$/',
+			'ITU-T' => '/^\+(?:[0-9] ?){6,14}[0-9]$/',
+			'EPP' => '/^\+[0-9]{1,3}\.[0-9]{4,14}(?:x.+)?$/',
+		);
+
+		if (isset($element['plan']))
+		{
+			$plan = (string) $element['plan'];
+
+			if ($plan == 'northamerica' || $plan == 'us')
+			{
+				$plan = 'NANP';
+			}
+			elseif ($plan == 'International' || $plan == 'int' || $plan == 'missdn' || !$plan)
+			{
+				$plan = 'ITU-T';
+			}
+			elseif ($plan == 'IETF')
+			{
+				$plan = 'EPP';
+			}
+
+			$regex = $regexarray[$plan];
+
+			// Test the value against the regular expression.
+			if (preg_match($regex, $value) == false)
+			{
+				return false;
+			}
+		}
+		else
+		{
+			/*
+			 * If the rule is set but no plan is selected just check that there are between
+			 * 7 and 15 digits inclusive and no illegal characters (but common number separators
+			 * are allowed).
+			 */
+			$cleanvalue = preg_replace('/[+. \-(\)]/', '', $value);
+			$regex = '/^[0-9]{6,15}?$/';
+
+			if (preg_match($regex, $cleanvalue) == true)
+			{
+				return true;
+			}
+			else
+			{
+				return false;
+			}
+		}
+
+		return true;
+	}
+}
diff --git a/deployed/icagenda/libraries/ic_library/globalize/convert.php b/deployed/icagenda/libraries/ic_library/globalize/convert.php
new file mode 100644
index 00000000..74ab9043
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/globalize/convert.php
@@ -0,0 +1,183 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iC Library   Library by Jooml!C, for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     1.4.7 2018-04-19
+ *
+ * @package     iC Library
+ * @subpackage  Globalize
+ * @link        https://www.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2013-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.3.2
+ *----------------------------------------------------------------------------
+ * Based on Original Jalali to Gregorian (and vice versa) convertor:
+ * Primary developed by Roozbeh Pournader and Mohammad Toossi
+ * https://github.com/roozbeh360/Gregorian-Jalali-Date-Convertor
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * class iCGlobalizeConvert
+ */
+class iCGlobalizeConvert
+{
+	/**
+	 * Function to process division
+	 *
+	 * @since   1.3.2
+	 */
+	static public function div($a, $b)
+	{
+		return (int) ($a / $b);
+	}
+
+
+	/**
+	 * Gregorian to Jalali Conversion
+	 * Copyright (C) 2000  Roozbeh Pournader and Mohammad Toossi
+	 *
+	 * @since 1.3.2
+	 */
+	static public function gregorianToJalali($g_y, $g_m, $g_d, $str)
+	{
+		$g_days_in_month = array(31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
+		$j_days_in_month = array(31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, 29);
+
+		$gy = $g_y-1600;
+		$gm = $g_m-1;
+		$gd = $g_d-1;
+
+		$g_day_no = 365*$gy+self::div($gy+3,4)-self::div($gy+99,100)+self::div($gy+399,400);
+
+		for ($i=0; $i < $gm; ++$i)
+			$g_day_no += $g_days_in_month[$i];
+		if ($gm>1 && (($gy%4==0 && $gy%100!=0) || ($gy%400==0)))
+		/* leap and after Feb */
+		$g_day_no++;
+		$g_day_no += $gd;
+
+		$j_day_no = $g_day_no-79;
+
+		$j_np = self::div($j_day_no, 12053); /* 12053 = 365*33 + 32/4 */
+		$j_day_no = $j_day_no % 12053;
+
+		$jy = 979+33*$j_np+4*self::div($j_day_no,1461); /* 1461 = 365*4 + 4/4 */
+
+		$j_day_no %= 1461;
+
+		if ($j_day_no >= 366)
+		{
+			$jy += self::div($j_day_no-1, 365);
+			$j_day_no = ($j_day_no-1)%365;
+		}
+
+		for ($i = 0; $i < 11 && $j_day_no >= $j_days_in_month[$i]; ++$i)
+			$j_day_no -= $j_days_in_month[$i];
+		$jm = $i+1;
+		$jd = $j_day_no+1;
+
+		if ($str)
+		{
+			return $jy . '-' . $jm . '-' . $jd;
+		}
+
+		return array($jy, $jm, $jd);
+	}
+
+	/**
+	 * Jalali to Gregorian Conversion
+	 * Copyright (C) 2000  Roozbeh Pournader and Mohammad Toossi
+	 *
+	 * @since 1.3.2
+	 */
+	static public function jalaliToGregorian($j_y, $j_m, $j_d, $str)
+	{
+		$g_days_in_month = array(31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
+		$j_days_in_month = array(31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, 29);
+
+		$jy = (int)($j_y)-979;
+		$jm = (int)($j_m)-1;
+		$jd = (int)($j_d)-1;
+
+		$j_day_no = 365*$jy + self::div($jy, 33)*8 + self::div($jy%33+3, 4);
+
+		for ($i=0; $i < $jm; ++$i)
+			$j_day_no += $j_days_in_month[$i];
+
+		$j_day_no += $jd;
+
+		$g_day_no = $j_day_no+79;
+
+		$gy = 1600 + 400*self::div($g_day_no, 146097); /* 146097 = 365*400 + 400/4 - 400/100 + 400/400 */
+		$g_day_no = $g_day_no % 146097;
+
+		$leap = true;
+
+		if ($g_day_no >= 36525) /* 36525 = 365*100 + 100/4 */
+		{
+			$g_day_no--;
+			$gy += 100*self::div($g_day_no,  36524); /* 36524 = 365*100 + 100/4 - 100/100 */
+			$g_day_no = $g_day_no % 36524;
+
+			if ($g_day_no >= 365)
+				$g_day_no++;
+			else
+				$leap = false;
+		}
+
+		$gy += 4*self::div($g_day_no, 1461); /* 1461 = 365*4 + 4/4 */
+		$g_day_no %= 1461;
+
+		if ($g_day_no >= 366)
+		{
+			$leap = false;
+
+			$g_day_no--;
+			$gy += self::div($g_day_no, 365);
+			$g_day_no = $g_day_no % 365;
+		}
+
+		for ($i = 0; $g_day_no >= $g_days_in_month[$i] + ($i == 1 && $leap); $i++)
+			$g_day_no -= $g_days_in_month[$i] + ($i == 1 && $leap);
+		$gm = $i+1;
+		$gd = $g_day_no+1;
+
+		if ($str)
+		{
+			return $gy . '-' . $gm . '-' . $gd;
+		}
+
+		return array($gy, $gm, $gd);
+	}
+
+
+	function comparedate($_date_mix_jalaly, $_date_mix_gregorian)
+	{
+		$_date_arr_jalaly = explode('/', $_date_mix_jalaly);
+		$_date_arr_gregorian = explode('/', $_date_mix_gregorian);
+
+		$arr_jtg = self::jalali_to_gregorian($_date_arr_jalaly[0],$_date_arr_jalaly[1],$_date_arr_jalaly[2]);
+
+		if ($_date_arr_gregorian[0]> $arr_jtg[0])
+		{
+			return  false;
+		}
+		elseif ($_date_arr_gregorian[0]== $arr_jtg[0] && $_date_arr_gregorian[1]>$arr_jtg[1])
+		{
+			return false;
+		}
+		elseif ($_date_arr_gregorian[0]== $arr_jtg[0] && $_date_arr_gregorian[1]==$arr_jtg[1] && $_date_arr_gregorian[2]>$arr_jtg[2])
+		{
+			return false;
+		}
+
+		return true ;
+	}
+}
diff --git a/deployed/icagenda/libraries/ic_library/globalize/culture/cs-CZ.php b/deployed/icagenda/libraries/ic_library/globalize/culture/cs-CZ.php
new file mode 100644
index 00000000..0519dcb6
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/globalize/culture/cs-CZ.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iC Library   Library by Jooml!C, for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     1.4.7 2018-04-24
+ *
+ * @package     iC Library
+ * @subpackage  Globalize
+ * @link        https://www.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2013-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * Globalization: Date formats cs-CZ | Czech (Czech Republic)
+ *
+ * Reference date : birth of a free, open web to all!
+ * On 30 April 1993, CERN put the World Wide Web software in the public domain.
+ */
+
+$dateglobalize_1  = '30.04.1993';
+$dateformat_1     = 'j . n . Y';
+
+$dateglobalize_2  = '30. duben 1993';
+$dateformat_2     = 'j . _ F _ Y';
+
+$dateglobalize_3  = '30. dub 1993';
+$dateformat_3     = 'j . _ M _ Y';
+
+$dateglobalize_4  = '30 duben';
+$dateformat_4     = 'd _ F';
+
+$dateglobalize_6  = 'duben 1993';
+$dateformat_6     = 'F _ Y';
+
+$dateglobalize_7  = 'pátek, 30. duben 1993';
+$dateformat_7     = 'l , _ j . _ F _ Y';
+
+$dateglobalize_8  = 'pátek, 30 duben';
+$dateformat_8     = 'l , _ d _ F';
+
+$dateglobalize_11 = 'pá, 30. dub 1993';
+$dateformat_11    = 'D , _ j . _ M _ Y';
+
+$dateglobalize_12 = 'pá, 30 dub';
+$dateformat_12    = 'D , _ d _ M';
+
+
+$dmy_text_5 = '30␣duben␣1993';
+$dmy_text_6 = '30␣dub␣1993';
+
+$mdy_text_5 = 'duben␣30␣1993';
+$mdy_text_6 = 'dub␣30␣1993';
+
+$ymd_text_5 = '1993␣duben␣30';
+$ymd_text_6 = '1993␣dub␣30';
diff --git a/deployed/icagenda/libraries/ic_library/globalize/culture/de-CH.php b/deployed/icagenda/libraries/ic_library/globalize/culture/de-CH.php
new file mode 100644
index 00000000..53e7d48c
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/globalize/culture/de-CH.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iC Library   Library by Jooml!C, for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     1.4.9 2019-03-20
+ *
+ * @package     iC Library
+ * @subpackage  Globalize
+ * @link        https://www.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2013-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * Globalization: Date formats de-CH | German (Switzerland)
+ *
+ * Reference date : birth of a free, open web to all!
+ * On 30 April 1993, CERN put the World Wide Web software in the public domain.
+ */
+
+$dateglobalize_1  = '30.04.1993';
+$dateformat_1     = 'd . m . Y';
+
+$dateglobalize_2  = '30. April 1993';
+$dateformat_2     = 'j . _ F _ Y';
+
+$dateglobalize_3  = '30. Apr 1993';
+$dateformat_3     = 'j . _ M _ Y';
+
+$dateglobalize_4  = '30. April';
+$dateformat_4     = 'j . _ F';
+
+$dateglobalize_6  = 'April 1993';
+$dateformat_6     = 'F _ Y';
+
+$dateglobalize_7  = 'Freitag, 30. April 1993';
+$dateformat_7     = 'l , _ j . _ F _ Y';
+
+$dateglobalize_8  = 'Freitag, 30. April';
+$dateformat_8     = 'l , _ j . _ F';
+
+$dateglobalize_11 = 'Fr, 30. Apr 1993';
+$dateformat_11    = 'D , _ j . _ M _ Y';
+
+$dateglobalize_12 = 'Fr, 30. Apr';
+$dateformat_12    = 'D , _ j .  _ M';
+
+
+$dmy_text_5 = '30␣April␣1993';
+$dmy_text_6 = '30␣Apr␣1993';
+
+$mdy_text_5 = 'April␣30␣1993';
+$mdy_text_6 = 'Apr␣30␣1993';
+
+$ymd_text_5 = '1993␣April␣30';
+$ymd_text_6 = '1993␣Apr␣30';
diff --git a/deployed/icagenda/libraries/ic_library/globalize/culture/de-DE.php b/deployed/icagenda/libraries/ic_library/globalize/culture/de-DE.php
new file mode 100644
index 00000000..f5612282
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/globalize/culture/de-DE.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iC Library   Library by Jooml!C, for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     1.4.8 2018-10-30
+ *
+ * @package     iC Library
+ * @subpackage  Globalize
+ * @link        https://www.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2013-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * Globalization: Date formats de-DE | German (Germany)
+ *
+ * Reference date : birth of a free, open web to all!
+ * On 30 April 1993, CERN put the World Wide Web software in the public domain.
+ */
+
+$dateglobalize_1  = '30.04.1993';
+$dateformat_1     = 'd . m . Y';
+
+$dateglobalize_2  = '30. April 1993';
+$dateformat_2     = 'j . _ F _ Y';
+
+$dateglobalize_3  = '30. Apr 1993';
+$dateformat_3     = 'j . _ M _ Y';
+
+$dateglobalize_4  = '30. April';
+$dateformat_4     = 'j . _ F';
+
+$dateglobalize_6  = 'April 1993';
+$dateformat_6     = 'F _ Y';
+
+$dateglobalize_7  = 'Freitag, 30. April 1993';
+$dateformat_7     = 'l , _ j . _ F _ Y';
+
+$dateglobalize_8  = 'Freitag, 30. April';
+$dateformat_8     = 'l , _ j . _ F';
+
+$dateglobalize_11 = 'Fr, 30. Apr 1993';
+$dateformat_11    = 'D , _ j . _ M _ Y';
+
+$dateglobalize_12 = 'Fr, 30. Apr';
+$dateformat_12    = 'D , _ j .  _ M';
+
+
+$dmy_text_5 = '30␣April␣1993';
+$dmy_text_6 = '30␣Apr␣1993';
+
+$mdy_text_5 = 'April␣30␣1993';
+$mdy_text_6 = 'Apr␣30␣1993';
+
+$ymd_text_5 = '1993␣April␣30';
+$ymd_text_6 = '1993␣Apr␣30';
diff --git a/deployed/icagenda/libraries/ic_library/globalize/culture/el-GR.php b/deployed/icagenda/libraries/ic_library/globalize/culture/el-GR.php
new file mode 100644
index 00000000..c82a0e02
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/globalize/culture/el-GR.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iC Library   Library by Jooml!C, for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     1.4.7 2018-04-24
+ *
+ * @package     iC Library
+ * @subpackage  Globalize
+ * @link        https://www.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2013-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * Globalization: Date formats el-GR | Greek (Greece)
+ *
+ * Reference date : birth of a free, open web to all!
+ * On 30 April 1993, CERN put the World Wide Web software in the public domain.
+ */
+
+$dateglobalize_1  = '30/04/1993';
+$dateformat_1     = 'j / n / Y';
+
+$dateglobalize_2  = '30 Απρίλιος 1993';
+$dateformat_2     = 'j _ F _ Y';
+
+$dateglobalize_3  = '30 Απρ 1993';
+$dateformat_3     = 'j _ M _ Y';
+
+$dateglobalize_4  = '30 Απρίλιος';
+$dateformat_4     = 'j _ F';
+
+$dateglobalize_6  = 'Απρίλιος 1993';
+$dateformat_6     = 'F _ Y';
+
+$dateglobalize_7  = 'Παρασκευή, 30 Απρίλιος 1993';
+$dateformat_7     = 'l , _ j _ F _ Y';
+
+$dateglobalize_8  = 'Παρασκευή, 30 Απρίλιος';
+$dateformat_8     = 'l , _ j _ F';
+
+$dateglobalize_11 = 'Παρ, 30 Απρ 1993';
+$dateformat_11    = 'D , _ j _ M _ Y';
+
+$dateglobalize_12 = 'Παρ, 30 Απρ';
+$dateformat_12    = 'D , _ j _ M';
+
+
+$dmy_text_5 = '30␣Απρίλιος␣1993';
+$dmy_text_6 = '30␣Απρ␣1993';
+
+$mdy_text_5 = 'Απρίλιος␣30␣1993';
+$mdy_text_6 = 'Απρ␣30␣1993';
+
+$ymd_text_5 = '1993␣Απρίλιος␣30';
+$ymd_text_6 = '1993␣Απρ␣30';
diff --git a/deployed/icagenda/libraries/ic_library/globalize/culture/en-GB.php b/deployed/icagenda/libraries/ic_library/globalize/culture/en-GB.php
new file mode 100644
index 00000000..8e72303b
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/globalize/culture/en-GB.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iC Library   Library by Jooml!C, for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     1.4.7 2018-04-24
+ *
+ * @package     iC Library
+ * @subpackage  Globalize
+ * @link        https://www.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2013-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * Globalization: Date formats en-GB | English (United Kingdom)
+ *
+ * Reference date : birth of a free, open web to all!
+ * On 30 April 1993, CERN put the World Wide Web software in the public domain.
+ */
+
+$dateglobalize_1  = '30/04/1993';
+$dateformat_1     = 'd / m / Y';
+
+$dateglobalize_2  = '30 April 1993';
+$dateformat_2     = 'd _ F _ Y';
+
+$dateglobalize_3  = '30 Apr 1993';
+$dateformat_3     = 'd _ M _ Y';
+
+$dateglobalize_4  = '30 April';
+$dateformat_4     = 'd _ F';
+
+	// Optional English Language
+	$dateglobalize_5  = '30th April';
+	$dateformat_5     = 'jS _ F';
+
+$dateglobalize_6  = 'April 1993';
+$dateformat_6     = 'F _ Y';
+
+$dateglobalize_7  = 'Friday, 30 April 1993';
+$dateformat_7     = 'l , _ d _ F _ Y';
+
+$dateglobalize_8  = 'Friday, 30 April';
+$dateformat_8     = 'l , _ d _ F';
+
+	// Optional English en-GB Language
+	$dateglobalize_9  = 'Friday, 30th April 1993';
+	$dateformat_9     = 'l , _ jS _ F _ Y';
+
+	// Optional English en-GB Language
+	$dateglobalize_10 = 'Friday, 30th April';
+	$dateformat_10    = 'l , _ jS _ F';
+
+$dateglobalize_11 = 'Fri, 30 Apr 1993';
+$dateformat_11    = 'D , _ d _ M _ Y';
+
+$dateglobalize_12 = 'Fri, 30 Apr';
+$dateformat_12    = 'D , _ d _ M';
+
+
+$dmy_text_5 = '30␣April␣1993';
+$dmy_text_6 = '30␣Apr␣1993';
+
+$mdy_text_5 = 'April␣30␣1993';
+$mdy_text_6 = 'Apr␣30␣1993';
+
+$ymd_text_5 = '1993␣April␣30';
+$ymd_text_6 = '1993␣Apr␣30';
+
+
+	// Extra en-US
+	$extra_1      = 'April 30, 1993';
+	$extravalue_1 = 'F _ d , _ Y';
+
+	$extra_2      = 'April 30';
+	$extravalue_2 = 'F _ d';
+
+	$extra_3      = '1993 April';
+	$extravalue_3 = 'Y _ F';
+
+	$extra_4      = 'Friday, April 30, 1993';
+	$extravalue_4 = 'l , _ F _ d , _ Y';
+
+	$extra_5      = 'Friday, April 30';
+	$extravalue_5 = 'l , _ F _ d';
+
+	// Extra en-CA
+	$extra_6      = 'April-30-93';
+	$extravalue_6 = 'F - d - y';
+
+	// Extra en-SG
+	$extra_7      = 'Friday, 30 April, 1993';
+	$extravalue_7 = 'l , _ j _ F , _ Y';
diff --git a/deployed/icagenda/libraries/ic_library/globalize/culture/en-US.php b/deployed/icagenda/libraries/ic_library/globalize/culture/en-US.php
new file mode 100644
index 00000000..b98d80c3
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/globalize/culture/en-US.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iC Library   Library by Jooml!C, for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     1.4.7 2018-04-24
+ *
+ * @package     iC Library
+ * @subpackage  Globalize
+ * @link        https://www.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2013-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * Globalization: Date formats en-US | English (USA)
+ *
+ * Reference date : birth of a free, open web to all!
+ * On 30 April 1993, CERN put the World Wide Web software in the public domain.
+ */
+
+$dateglobalize_1  = '4/30/1993';
+$dateformat_1     = 'n / j / Y';
+
+$dateglobalize_2  = 'April 30, 1993';
+$dateformat_2     = 'F _ j , _ Y';
+
+$dateglobalize_3  = 'Apr 30, 1993';
+$dateformat_3     = 'M _ j , _ Y';
+
+$dateglobalize_4  = 'April 30';
+$dateformat_4     = 'F _ j';
+
+	// Optional English Language
+	$dateglobalize_5  = '30th April';
+	$dateformat_5     = 'jS _ F';
+
+$dateglobalize_6  = '1993 April';
+$dateformat_6     = 'Y _ F';
+
+$dateglobalize_7  = 'Friday, April 30, 1993';
+$dateformat_7     = 'l , _ F _ j , _ Y';
+
+$dateglobalize_8  = 'Friday, April 30';
+$dateformat_8     = 'l , _ F _ j';
+
+	// Optional English en-GB Language // TO BE CHECKED
+	$dateglobalize_9  = 'Friday, 30th April 1993';
+	$dateformat_9     = 'l , _ jS _ F _ Y';
+
+	// Optional English en-GB Language // TO BE CHECKED
+	$dateglobalize_10 = 'Friday, 30th April';
+	$dateformat_10    = 'l , _ jS _ F';
+
+$dateglobalize_11 = 'Fri, Apr 30 1993';
+$dateformat_11    = 'D , _ M _ j _ Y';
+
+$dateglobalize_12 = 'Fri, Apr 30';
+$dateformat_12    = 'D , _ M _ j';
+
+
+$dmy_text_5 = '30␣April␣1993';
+$dmy_text_6 = '30␣Apr␣1993';
+
+$mdy_text_5 = 'April␣30␣1993';
+$mdy_text_6 = 'Apr␣30␣1993';
+
+$ymd_text_5 = '1993␣April␣30';
+$ymd_text_6 = '1993␣Apr␣30';
diff --git a/deployed/icagenda/libraries/ic_library/globalize/culture/es-ES.php b/deployed/icagenda/libraries/ic_library/globalize/culture/es-ES.php
new file mode 100644
index 00000000..52e5ba5b
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/globalize/culture/es-ES.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iC Library   Library by Jooml!C, for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     1.4.7 2018-04-24
+ *
+ * @package     iC Library
+ * @subpackage  Globalize
+ * @link        https://www.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2013-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * Globalization: Date formats es-ES | Spanish (Spain)
+ *
+ * Reference date : birth of a free, open web to all!
+ * On 30 April 1993, CERN put the World Wide Web software in the public domain.
+ */
+
+$dateglobalize_1  = '30/04/1993';
+$dateformat_1     = 'd / m / Y';
+
+$dateglobalize_2  = '30 de Abril de 1993';
+$dateformat_2     = 'd _ de _ F _ de _ Y';
+
+$dateglobalize_3  = '30 de Abr de 1993';
+$dateformat_3     = 'd _ de _ M _ de _ Y';
+
+$dateglobalize_4  = '30 Abril';
+$dateformat_4     = 'd _ F';
+
+$dateglobalize_6  = 'Abril de 1993';
+$dateformat_6     = 'F _ de _ Y';
+
+$dateglobalize_7  = 'Viernes, 30 de Abril de 1993';
+$dateformat_7     = 'l , _ d _ de _ F _ de _ Y';
+
+$dateglobalize_8  = 'Viernes, 30 de Abril';
+$dateformat_8     = 'l , _ d _ de _ F';
+
+$dateglobalize_11 = 'Vie, 30 de Abr de 1993';
+$dateformat_11    = 'D , _ d _ de _ M _ de _ Y';
+
+$dateglobalize_12 = 'Vie, 30 de Abr';
+$dateformat_12    = 'D , _ d _ de _ M';
+
+
+$dmy_text_5 = '30␣Abril␣1993';
+$dmy_text_6 = '30␣Abr␣1993';
+
+$mdy_text_5 = 'Abril␣30␣1993';
+$mdy_text_6 = 'Abr␣30␣1993';
+
+$ymd_text_5 = '1993␣Abril␣30';
+$ymd_text_6 = '1993␣Abr␣30';
diff --git a/deployed/icagenda/libraries/ic_library/globalize/culture/fa-IR.php b/deployed/icagenda/libraries/ic_library/globalize/culture/fa-IR.php
new file mode 100644
index 00000000..645434a3
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/globalize/culture/fa-IR.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iC Library   Library by Jooml!C, for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     1.4.7 2018-04-24
+ *
+ * @package     iC Library
+ * @subpackage  Globalize
+ * @link        https://www.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2013-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.3.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * Globalization: Date formats fa-IR - Persian (Iran)
+ *
+ * Reference date : birth of a free, open web to all!
+ * On 30 April 1993, CERN put the World Wide Web software in the public domain.
+ */
+
+// TODO : Remove Short month (not available in Persian, and could return errors)
+
+$dateglobalize_1 = '1372/02/10';
+$dateformat_1    = 'Y / m / d';
+
+$dateglobalize_2 = JText::_('FEBRUARY') . ' 10, 1372';
+$dateformat_2    = 'F _ d , _ Y';
+
+$dateglobalize_4 = JText::_('FEBRUARY') . ' 10';
+$dateformat_4    = 'F _ d';
+
+$dateglobalize_6 = JText::_('FEBRUARY') . ' 1372';
+$dateformat_6    = 'F _ Y';
+
+$dateglobalize_7 = JText::_('FRIDAY') . ' , _ ' . JText::_('FEBRUARY'). ' 10, 1372';
+$dateformat_7    = 'l , _ F _ d , _ Y';
+
+$dateglobalize_8 = JText::_('FRIDAY') . ' , _ ' . JText::_('FEBRUARY'). ' 10';
+$dateformat_8    = 'l , _ F _ d';
+
+
+$dmy_text_5 = '10␣' . JText::_('FEBRUARY') . '␣1372';
+$dmy_text_6 = '10␣' . JText::_('FEBRUARY_SHORT') . '␣1372';
+
+$mdy_text_5 = JText::_('FEBRUARY') . '␣10␣1372';
+$mdy_text_6 = JText::_('FEBRUARY_SHORT') . '␣10␣1372';
+
+$ymd_text_5 = '1372␣' . JText::_('FEBRUARY') . '␣10';
+$ymd_text_6 = '1372␣' . JText::_('FEBRUARY_SHORT') . '␣10';
diff --git a/deployed/icagenda/libraries/ic_library/globalize/culture/fi-FI.php b/deployed/icagenda/libraries/ic_library/globalize/culture/fi-FI.php
new file mode 100644
index 00000000..54e818ec
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/globalize/culture/fi-FI.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iC Library   Library by Jooml!C, for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     1.4.7 2018-04-24
+ *
+ * @package     iC Library
+ * @subpackage  Globalize
+ * @link        https://www.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2013-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * Globalization: Date formats fi-FI - Finnish (Finland)
+ *
+ * Reference date : birth of a free, open web to all!
+ * On 30 April 1993, CERN put the World Wide Web software in the public domain.
+ */
+
+$dateglobalize_1  = '30.4.1993';
+$dateformat_1     = 'j . n . Y';
+
+$dateglobalize_2  = '30. huhtikuu 1993';
+$dateformat_2     = 'j . _ F _ Y';
+
+$dateglobalize_3  = '30. huhti 1993';
+$dateformat_3     = 'j . _ M _ Y';
+
+$dateglobalize_4  = '30. huhtikuu';
+$dateformat_4     = 'j . _ F';
+
+$dateglobalize_6  = 'huhtikuu 1993';
+$dateformat_6     = 'F _ Y';
+
+$dateglobalize_7  = 'perjantai, 30. huhtikuu 1993';
+$dateformat_7     = 'l , _ j . _ F _ Y';
+
+$dateglobalize_8  = 'perjantai, 30. huhtikuu';
+$dateformat_8     = 'l , _ j . _ F';
+
+$dateglobalize_11 = 'pe, 30. huhti 1993';
+$dateformat_11    = 'D , _ j . _ M _ Y';
+
+$dateglobalize_12 = 'pe, 30. huhti';
+$dateformat_12    = 'D , _ j . _ M';
+
+
+$dmy_text_5 = '30␣huhtikuu␣1993';
+$dmy_text_6 = '30␣huhti␣1993';
+
+$mdy_text_5 = 'huhtikuu␣30␣1993';
+$mdy_text_6 = 'huhti␣30␣1993';
+
+$ymd_text_5 = '1993␣huhtikuu␣30';
+$ymd_text_6 = '1993␣huhti␣30';
diff --git a/deployed/icagenda/libraries/ic_library/globalize/culture/fo-FO.php b/deployed/icagenda/libraries/ic_library/globalize/culture/fo-FO.php
new file mode 100644
index 00000000..2563a457
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/globalize/culture/fo-FO.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iC Library   Library by Jooml!C, for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     1.4.7 2018-04-25
+ *
+ * @package     iC Library
+ * @subpackage  Globalize
+ * @link        https://www.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2013-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.3.5
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * Globalization: Date formats fo-FO | Faroese (Faroe Islands)
+ *
+ * Reference date : birth of a free, open web to all!
+ * On 30 April 1993, CERN put the World Wide Web software in the public domain.
+ */
+
+$dateglobalize_1  = '30-04-1993';
+$dateformat_1     = 'd - n - Y';
+
+$dateglobalize_2  = '30. apríl 1993';
+$dateformat_2     = 'j . _ F _ Y';
+
+$dateglobalize_3  = '30. Apr 1993';
+$dateformat_3     = 'j . _ M _ Y';
+
+$dateglobalize_4  = '30. apríl';
+$dateformat_4     = 'j . _ F';
+
+$dateglobalize_6  = 'apríl 1993';
+$dateformat_6     = 'F _ Y';
+
+$dateglobalize_7  = 'fríggjadag 30. apríl 1993';
+$dateformat_7     = 'l _ j . _ F _ Y';
+
+$dateglobalize_8  = 'fríggjadag 30. apríl';
+$dateformat_8     = 'l _ j . _ F';
+
+$dateglobalize_11 = 'frí 30. Apr 1993';
+$dateformat_11    = 'D _ j . _ M _ Y';
+
+$dateglobalize_12 = 'frí 30. Apr';
+$dateformat_12    = 'D _ j . _ M';
+
+
+$dmy_text_5 = '30␣apríl␣1993';
+$dmy_text_6 = '30␣Apr␣1993';
+
+$mdy_text_5 = 'apríl␣30␣1993';
+$mdy_text_6 = 'Apr␣30␣1993';
+
+$ymd_text_5 = '1993␣apríl␣30';
+$ymd_text_6 = '1993␣Apr␣30';
diff --git a/deployed/icagenda/libraries/ic_library/globalize/culture/fr-FR.php b/deployed/icagenda/libraries/ic_library/globalize/culture/fr-FR.php
new file mode 100644
index 00000000..bd49d3f2
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/globalize/culture/fr-FR.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iC Library   Library by Jooml!C, for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     1.4.7 2018-04-25
+ *
+ * @package     iC Library
+ * @subpackage  Globalize
+ * @link        https://www.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2013-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * Globalization: Date formats fr-FR | French (France)
+ *
+ * Reference date : birth of a free, open web to all!
+ * On 30 April 1993, CERN put the World Wide Web software in the public domain.
+ */
+
+$dateglobalize_1  = '30/04/1993';
+$dateformat_1     = 'd / m / Y';
+
+$dateglobalize_2  = '30 avril 1993';
+$dateformat_2     = 'j _ F _ Y';
+
+$dateglobalize_3  = '30 Avr 1993';
+$dateformat_3     = 'j _ M _ Y';
+
+$dateglobalize_4  = '30 avril';
+$dateformat_4     = 'j _ F';
+
+$dateglobalize_6  = 'avril 1993';
+$dateformat_6     = 'F _ Y';
+
+$dateglobalize_7  = 'vendredi 30 avril 1993';
+$dateformat_7     = 'l _ j _ F _ Y';
+
+$dateglobalize_8  = 'vendredi 30 avril';
+$dateformat_8     = 'l _ j _ F';
+
+$dateglobalize_11 = 'Ven 30 Avr 1993';
+$dateformat_11    = 'D _ j _ M _ Y';
+
+$dateglobalize_12 = 'Ven 30 Avr';
+$dateformat_12    = 'D _ j _ M';
+
+
+$dmy_text_5 = '30␣avril␣1993';
+$dmy_text_6 = '30␣Avr␣1993';
+
+$mdy_text_5 = 'avril␣30␣1993';
+$mdy_text_6 = 'Avr␣30␣1993';
+
+$ymd_text_5 = '1993␣avril␣30';
+$ymd_text_6 = '1993␣Avr␣30';
diff --git a/deployed/icagenda/libraries/ic_library/globalize/culture/hr-HR.php b/deployed/icagenda/libraries/ic_library/globalize/culture/hr-HR.php
new file mode 100644
index 00000000..3bb4f1e9
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/globalize/culture/hr-HR.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iC Library   Library by Jooml!C, for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     1.4.7 2018-04-25
+ *
+ * @package     iC Library
+ * @subpackage  Globalize
+ * @link        https://www.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2013-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * Globalization: Date formats hr-HR | Croatian (Croatia)
+ *
+ * Reference date : birth of a free, open web to all!
+ * On 30 April 1993, CERN put the World Wide Web software in the public domain.
+ */
+
+$dateglobalize_1  = '30.04.1993.';
+$dateformat_1     = 'j . m . Y .';
+
+$dateglobalize_2  = '30. Travanj 1993.';
+$dateformat_2     = 'j . _ F _ Y .';
+
+$dateglobalize_3  = '30. Tra 1993.';
+$dateformat_3     = 'j . _ M _ Y .';
+
+$dateglobalize_4  = '30. Travanj';
+$dateformat_4     = 'j . _ F';
+
+$dateglobalize_6  = 'Travanj 1993.';
+$dateformat_6     = 'F _ Y .';
+
+$dateglobalize_7  = 'Petak, 30. Travanj 1993.';
+$dateformat_7     = 'l , _ j . _ F _ Y .';
+
+$dateglobalize_8  = 'Petak, 30. Travanj';
+$dateformat_8     = 'l , _ j . _ F';
+
+$dateglobalize_11 = 'Pet, 30. Tra 1993.';
+$dateformat_11    = 'D , _ j . _ M _ Y .';
+
+$dateglobalize_12 = 'Pet, 30. Tra';
+$dateformat_12    = 'D , _ j . _ M';
+
+
+$dmy_text_5 = '30␣Travanj␣1993';
+$dmy_text_6 = '30␣Tra␣1993';
+
+$mdy_text_5 = 'Travanj␣30␣1993';
+$mdy_text_6 = 'Tra␣30␣1993';
+
+$ymd_text_5 = '1993␣Travanj␣30';
+$ymd_text_6 = '1993␣Tra␣30';
diff --git a/deployed/icagenda/libraries/ic_library/globalize/culture/hu-HU.php b/deployed/icagenda/libraries/ic_library/globalize/culture/hu-HU.php
new file mode 100644
index 00000000..c26e4d9d
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/globalize/culture/hu-HU.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iC Library   Library by Jooml!C, for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     1.4.7 2018-04-25
+ *
+ * @package     iC Library
+ * @subpackage  Globalize
+ * @link        https://www.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2013-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * Globalization: Date formats hu-HU | Hungarian (Hungary)
+ *
+ * Reference date : birth of a free, open web to all!
+ * On 30 April 1993, CERN put the World Wide Web software in the public domain.
+ */
+
+$dateglobalize_1  = '1993.04.30.';
+$dateformat_1     = 'Y . m . d .';
+
+$dateglobalize_2  = '1993. Április 30.';
+$dateformat_2     = 'Y . _ F _ j .';
+
+$dateglobalize_3  = '1993. Ápr. 30.';
+$dateformat_3     = 'Y . _ M _ j .';
+
+$dateglobalize_4  = 'Április 30.';
+$dateformat_4     = 'F _ j .';
+
+$dateglobalize_6  = '1993. Április';
+$dateformat_6     = 'Y . _ F';
+
+$dateglobalize_7  = '1993. Április 30., Péntek';
+$dateformat_7     = 'Y . _ F _ j . , _ l';
+
+$dateglobalize_8  = 'Április 30., Péntek';
+$dateformat_8     = 'F _ j . , _ l';
+
+$dateglobalize_11 = '1993. Ápr. 30., P';
+$dateformat_11    = 'Y . _ M _ j . , _ D';
+
+$dateglobalize_12 = 'Ápr. 30., P';
+$dateformat_12    = 'M _ j . , _ D';
+
+
+$dmy_text_5 = '30␣Április␣1993';
+$dmy_text_6 = '30␣Ápr.␣1993';
+
+$mdy_text_5 = 'Április␣30␣1993';
+$mdy_text_6 = 'Ápr.␣30␣1993';
+
+$ymd_text_5 = '1993␣Április␣30';
+$ymd_text_6 = '1993␣Ápr.␣30';
diff --git a/deployed/icagenda/libraries/ic_library/globalize/culture/index.html b/deployed/icagenda/libraries/ic_library/globalize/culture/index.html
new file mode 100644
index 00000000..42682b47
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/globalize/culture/index.html
@@ -0,0 +1 @@
+<html><body></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/libraries/ic_library/globalize/culture/iso.php b/deployed/icagenda/libraries/ic_library/globalize/culture/iso.php
new file mode 100644
index 00000000..4bd3c66c
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/globalize/culture/iso.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iC Library   Library by Jooml!C, for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     1.4.7 2018-04-25
+ *
+ * @package     iC Library
+ * @subpackage  Globalize
+ * @link        https://www.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2013-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * Globalization: International Date Formats
+ */
+
+// International Date Format (ISO)
+$iso = 'Y - m - d';
+
+// DMY Little-endian (day, month, year), e.g. 30.04.93 or 30/04/93
+$dmy_1 = 'd * m * Y';
+$dmy_2 = 'd * m * y';
+$dmy_3 = 'd * m';
+$dmy_4 = 'm * y';
+$dmy_5 = 'd * F * Y';
+$dmy_6 = 'd * M * Y';
+
+// MDY Middle-endian (month, day, year), e.g. 04/30/93
+$mdy_1 = 'm * d * Y';
+$mdy_2 = 'm * d * y';
+$mdy_3 = 'm * d';
+$mdy_4 = 'm * y';
+$mdy_5 = 'F * d * Y';
+$mdy_6 = 'M * d * Y';
+
+// YMD Big-endian (year, month, day), e.g. 1993-04-30
+$ymd_1 = 'Y * m * d';
+$ymd_2 = 'y * m * d';
+$ymd_3 = 'm * d';
+$ymd_4 = 'y * m';
+$ymd_5 = 'Y * F * d';
+$ymd_6 = 'Y * M * d';
diff --git a/deployed/icagenda/libraries/ic_library/globalize/culture/it-IT.php b/deployed/icagenda/libraries/ic_library/globalize/culture/it-IT.php
new file mode 100644
index 00000000..d45cd02d
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/globalize/culture/it-IT.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iC Library   Library by Jooml!C, for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     1.4.7 2018-04-25
+ *
+ * @package     iC Library
+ * @subpackage  Globalize
+ * @link        https://www.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2013-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * Globalization: Date formats it-IT | Italian (Italy)
+ *
+ * Reference date : birth of a free, open web to all!
+ * On 30 April 1993, CERN put the World Wide Web software in the public domain.
+ */
+
+$dateglobalize_1  = '30/04/1993';
+$dateformat_1     = 'd / m / Y';
+
+$dateglobalize_2  = '30 Aprile 1993';
+$dateformat_2     = 'j _ F _ Y';
+
+$dateglobalize_3  = '30 Apr 1993';
+$dateformat_3     = 'j _ M _ Y';
+
+$dateglobalize_4  = '30 Aprile';
+$dateformat_4     = 'd _ F';
+
+$dateglobalize_6  = 'Aprile 1993';
+$dateformat_6     = 'F _ Y';
+
+$dateglobalize_7  = 'Venerdì 30 Aprile 1993';
+$dateformat_7     = 'l _ j _ F _ Y';
+
+$dateglobalize_8  = 'Venerdì 30 Aprile';
+$dateformat_8     = 'l _ j _ F';
+
+$dateglobalize_11 = 'Ven 30 Apr 1993';
+$dateformat_11    = 'D _ j _ M _ Y';
+
+$dateglobalize_12 = 'Ven 30 Apr';
+$dateformat_12    = 'D _ j _ M';
+
+
+$dmy_text_5 = '30␣Aprile␣1993';
+$dmy_text_6 = '30␣Apr␣1993';
+
+$mdy_text_5 = 'Aprile␣30␣1993';
+$mdy_text_6 = 'Apr␣30␣1993';
+
+$ymd_text_5 = '1993␣Aprile␣30';
+$ymd_text_6 = '1993␣Apr␣30';
diff --git a/deployed/icagenda/libraries/ic_library/globalize/culture/lv-LV.php b/deployed/icagenda/libraries/ic_library/globalize/culture/lv-LV.php
new file mode 100644
index 00000000..1ccca816
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/globalize/culture/lv-LV.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iC Library   Library by Jooml!C, for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     1.4.7 2018-04-25
+ *
+ * @package     iC Library
+ * @subpackage  Globalize
+ * @link        https://www.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2013-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * Globalization: Date formats lv-LV | Latvian (Latvia)
+ *
+ * Reference date : birth of a free, open web to all!
+ * On 30 April 1993, CERN put the World Wide Web software in the public domain.
+ */
+
+$dateglobalize_1  = '1993.04.30.';
+$dateformat_1     = 'Y . m . d .';
+
+$dateglobalize_2  = '1993. gada 30. aprīlis';
+$dateformat_2     = 'Y . _ gada _ j . _ F';
+
+$dateglobalize_3  = '1993. gada 30. Apr';
+$dateformat_3     = 'Y . _ gada _ j . _ M';
+
+$dateglobalize_4  = '30. aprīlis';
+$dateformat_4     = 'j . _ F';
+
+$dateglobalize_6  = '1993. aprīlis';
+$dateformat_6     = 'Y . _ F';
+
+$dateglobalize_7  = 'Piektdiena, 1993. gada 30. aprīlis';
+$dateformat_7     = 'l , _ Y . _ gada _ j . _ F';
+
+$dateglobalize_8  = 'Piektdiena, 30. aprīlis';
+$dateformat_8     = 'l , _ j . _ F';
+
+$dateglobalize_11 = 'Pie, 1993. gada 30. Apr';
+$dateformat_11    = 'D , _ Y . _ gada _ j . _ M';
+
+$dateglobalize_12 = 'Pie, 30. Apr';
+$dateformat_12    = 'D , _ j . _ M';
+
+
+$dmy_text_5 = '30␣aprīlis␣1993';
+$dmy_text_6 = '30␣Apr␣1993';
+
+$mdy_text_5 = 'aprīlis␣30␣1993';
+$mdy_text_6 = 'Apr␣30␣1993';
+
+$ymd_text_5 = '1993␣aprīlis␣30';
+$ymd_text_6 = '1993␣Apr␣30';
diff --git a/deployed/icagenda/libraries/ic_library/globalize/culture/nb-NO.php b/deployed/icagenda/libraries/ic_library/globalize/culture/nb-NO.php
new file mode 100644
index 00000000..eb762b56
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/globalize/culture/nb-NO.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iC Library   Library by Jooml!C, for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     1.4.7 2018-04-25
+ *
+ * @package     iC Library
+ * @subpackage  Globalize
+ * @link        https://www.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2013-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * Globalization: Date formats nb-NO | Norwegian Bokmål (Norway)
+ *
+ * Reference date : birth of a free, open web to all!
+ * On 30 April 1993, CERN put the World Wide Web software in the public domain.
+ */
+
+$dateglobalize_1  = '30.04.1993';
+$dateformat_1     = 'd . m . Y';
+
+$dateglobalize_2  = '30. april 1993';
+$dateformat_2     = 'j . _ F _ Y';
+
+$dateglobalize_3  = '30. apr 1993';
+$dateformat_3     = 'j . _ M _ Y';
+
+$dateglobalize_4  = '30. april';
+$dateformat_4     = 'j . _ F';
+
+$dateglobalize_6  = 'april 1993';
+$dateformat_6     = 'F _ Y';
+
+$dateglobalize_7  = 'fredag, 30. april 1993';
+$dateformat_7     = 'l , _ j . _ F _ Y';
+
+$dateglobalize_8  = 'fredag, 30. april';
+$dateformat_8     = 'l , _ j . _ F';
+
+$dateglobalize_11 = 'fre, 30. apr 1993';
+$dateformat_11    = 'D , _ j . _ M _ Y';
+
+$dateglobalize_12 = 'fre, 30. apr';
+$dateformat_12    = 'D , _ j . _ M';
+
+
+$dmy_text_5 = '30␣april␣1993';
+$dmy_text_6 = '30␣apr␣1993';
+
+$mdy_text_5 = 'april␣30␣1993';
+$mdy_text_6 = 'apr␣30␣1993';
+
+$ymd_text_5 = '1993␣april␣30';
+$ymd_text_6 = '1993␣apr␣30';
diff --git a/deployed/icagenda/libraries/ic_library/globalize/culture/nl-NL.php b/deployed/icagenda/libraries/ic_library/globalize/culture/nl-NL.php
new file mode 100644
index 00000000..a1d47da0
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/globalize/culture/nl-NL.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iC Library   Library by Jooml!C, for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     1.4.7 2018-04-25
+ *
+ * @package     iC Library
+ * @subpackage  Globalize
+ * @link        https://www.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2013-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * Globalization: Date formats nl-NL | Dutch (Netherlands)
+ *
+ * Reference date : birth of a free, open web to all!
+ * On 30 April 1993, CERN put the World Wide Web software in the public domain.
+ */
+
+$dateglobalize_1  = '30-04-1993';
+$dateformat_1     = 'j - m - Y';
+
+$dateglobalize_2  = '30 april 1993';
+$dateformat_2     = 'j _ F _ Y';
+
+$dateglobalize_3  = '30 apr 1993';
+$dateformat_3     = 'j _ M _ Y';
+
+$dateglobalize_4  = '30 april';
+$dateformat_4     = 'j _ F';
+
+$dateglobalize_6  = 'april 1993';
+$dateformat_6     = 'F _ Y';
+
+$dateglobalize_7  = 'vrijdag 30 april 1993';
+$dateformat_7     = 'l _ j _ F _ Y';
+
+$dateglobalize_8  = 'vrijdag 30 april';
+$dateformat_8     = 'l _ j _ F';
+
+$dateglobalize_11 = 'vr 30 apr 1993';
+$dateformat_11    = 'D _ j _ M _ Y';
+
+$dateglobalize_12 = 'vr 30 apr';
+$dateformat_12    = 'D _ j _ M';
+
+
+$dmy_text_5 = '30␣april␣1993';
+$dmy_text_6 = '30␣apr␣1993';
+
+$mdy_text_5 = 'april␣30␣1993';
+$mdy_text_6 = 'apr␣30␣1993';
+
+$ymd_text_5 = '1993␣april␣30';
+$ymd_text_6 = '1993␣apr␣30';
diff --git a/deployed/icagenda/libraries/ic_library/globalize/culture/pl-PL.php b/deployed/icagenda/libraries/ic_library/globalize/culture/pl-PL.php
new file mode 100644
index 00000000..7db992b0
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/globalize/culture/pl-PL.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iC Library   Library by Jooml!C, for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     1.4.7 2018-04-25
+ *
+ * @package     iC Library
+ * @subpackage  Globalize
+ * @link        https://www.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2013-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * Globalization: Date formats pl-PL | Polish (Poland)
+ *
+ * Reference date : birth of a free, open web to all!
+ * On 30 April 1993, CERN put the World Wide Web software in the public domain.
+ */
+
+$dateglobalize_1  = '1993-04-30';
+$dateformat_1     = 'Y - m - d';
+
+$dateglobalize_2  = '30 kwiecień 1993';
+$dateformat_2     = 'j _ F _ Y';
+
+$dateglobalize_3  = '30 Kwi 1993';
+$dateformat_3     = 'j _ M _ Y';
+
+$dateglobalize_4  = '30 kwiecień';
+$dateformat_4     = 'j _ F';
+
+$dateglobalize_6  = 'kwiecień 1993';
+$dateformat_6     = 'F _ Y';
+
+$dateglobalize_7  = 'Piątek, 30 kwiecień 1993';
+$dateformat_7     = 'l , _ j _ F _ Y';
+
+$dateglobalize_8  = 'Piątek, 30 kwiecień';
+$dateformat_8     = 'l , _ j _ F';
+
+$dateglobalize_11 = 'Pt, 30 Kwi 1993';
+$dateformat_11    = 'D , _ j _ M _ Y';
+
+$dateglobalize_12 = 'Pt, 30 Kwi';
+$dateformat_12    = 'D , _ j _ M';
+
+
+$dmy_text_5 = '30␣kwiecień␣1993';
+$dmy_text_6 = '30␣Kwi␣1993';
+
+$mdy_text_5 = 'kwiecień␣30␣1993';
+$mdy_text_6 = 'Kwi␣30␣1993';
+
+$ymd_text_5 = '1993␣kwiecień␣30';
+$ymd_text_6 = '1993␣Kwi␣30';
diff --git a/deployed/icagenda/libraries/ic_library/globalize/culture/pt-BR.php b/deployed/icagenda/libraries/ic_library/globalize/culture/pt-BR.php
new file mode 100644
index 00000000..daf9300f
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/globalize/culture/pt-BR.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iC Library   Library by Jooml!C, for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     1.4.7 2018-04-25
+ *
+ * @package     iC Library
+ * @subpackage  Globalize
+ * @link        https://www.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2013-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * Globalization: Date formats pt-BR | Portuguese (Brazil)
+ *
+ * Reference date : birth of a free, open web to all!
+ * On 30 April 1993, CERN put the World Wide Web software in the public domain.
+ */
+
+$dateglobalize_1  = '30/04/1993';
+$dateformat_1     = 'd / m / Y';
+
+$dateglobalize_2  = '30 de Abril de 1993';
+$dateformat_2     = 'j _ de _ F _ de _ Y';
+
+$dateglobalize_3  = '30 de Abr de 1993';
+$dateformat_3     = 'j _ de _ M _ de _ Y';
+
+$dateglobalize_4  = '30 de Abril';
+$dateformat_4     = 'j _ de _ F';
+
+$dateglobalize_6  = 'Abril de 1993';
+$dateformat_6     = 'F _ de _ Y';
+
+$dateglobalize_7  = 'Sexta, 30 de Abril de 1993';
+$dateformat_7     = 'l , _ j _ de _ F _ de _ Y';
+
+$dateglobalize_8  = 'Sexta, 30 de Abril';
+$dateformat_8     = 'l , _ j _ de _ F';
+
+$dateglobalize_11 = 'Sex, 30 de Abr de 1993';
+$dateformat_11    = 'D , _ j _ de _ M _ de _ Y';
+
+$dateglobalize_12 = 'Sex, 30 de Abr';
+$dateformat_12    = 'D , _ j _ de _ M';
+
+
+$dmy_text_5 = '30␣Abril␣1993';
+$dmy_text_6 = '30␣Abr␣1993';
+
+$mdy_text_5 = 'Abril␣30␣1993';
+$mdy_text_6 = 'Abr␣30␣1993';
+
+$ymd_text_5 = '1993␣Abril␣30';
+$ymd_text_6 = '1993␣Abr␣30';
diff --git a/deployed/icagenda/libraries/ic_library/globalize/culture/pt-PT.php b/deployed/icagenda/libraries/ic_library/globalize/culture/pt-PT.php
new file mode 100644
index 00000000..3630c27c
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/globalize/culture/pt-PT.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iC Library   Library by Jooml!C, for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     1.4.7 2018-04-25
+ *
+ * @package     iC Library
+ * @subpackage  Globalize
+ * @link        https://www.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2013-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * Globalization: Date formats pt-BR | Portuguese (Portugal)
+ *
+ * Reference date : birth of a free, open web to all!
+ * On 30 April 1993, CERN put the World Wide Web software in the public domain.
+ */
+
+$dateglobalize_1  = '30-04-1993';
+$dateformat_1     = 'd - m - Y';
+
+$dateglobalize_2  = '30 de abril de 1993';
+$dateformat_2     = 'j _ de _ F _ de _ Y';
+
+$dateglobalize_3  = '30 de Abr. de 1993';
+$dateformat_3     = 'j _ de _ M _ de _ Y';
+
+$dateglobalize_4  = '30 de abril';
+$dateformat_4     = 'j _ de _ F';
+
+$dateglobalize_6  = 'abril de 1993';
+$dateformat_6     = 'F _ de _ Y';
+
+$dateglobalize_7  = 'sexta, 30 de abril de 1993';
+$dateformat_7     = 'l , _ j _ de _ F _ de _ Y';
+
+$dateglobalize_8  = 'sexta, 30 de abril';
+$dateformat_8     = 'l , _ j _ de _ F';
+
+$dateglobalize_11 = 'Sex., 30 de Abr. de 1993';
+$dateformat_11    = 'D , _ j _ de _ M _ de _ Y';
+
+$dateglobalize_12 = 'Sex., 30 de Abr.';
+$dateformat_12    = 'D , _ j _ de _ M';
+
+
+$dmy_text_5 = '30␣abril␣1993';
+$dmy_text_6 = '30␣Abr.␣1993';
+
+$mdy_text_5 = 'abril␣30␣1993';
+$mdy_text_6 = 'Abr.␣30␣1993';
+
+$ymd_text_5 = '1993␣abril␣30';
+$ymd_text_6 = '1993␣Abr.␣30';
diff --git a/deployed/icagenda/libraries/ic_library/globalize/culture/ru-RU.php b/deployed/icagenda/libraries/ic_library/globalize/culture/ru-RU.php
new file mode 100644
index 00000000..cf93d9ca
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/globalize/culture/ru-RU.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iC Library   Library by Jooml!C, for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     1.4.7 2018-04-25
+ *
+ * @package     iC Library
+ * @subpackage  Globalize
+ * @link        https://www.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2013-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * Globalization: Date formats ru-RU | Russian (Russia)
+ *
+ * Reference date : birth of a free, open web to all!
+ * On 30 April 1993, CERN put the World Wide Web software in the public domain.
+ */
+
+$dateglobalize_1  = '30.04.1993';
+$dateformat_1     = 'd . m . Y';
+
+$dateglobalize_2  = '30 апреля 1993 г.';
+$dateformat_2     = 'j _ F _ Y _ г.';
+
+$dateglobalize_3  = '30 апр 1993 г.';
+$dateformat_3     = 'j _ M _ Y _ г.';
+
+$dateglobalize_4  = '30 апреля';
+$dateformat_4     = 'j _ F';
+
+$dateglobalize_6  = 'апреля 1993';
+$dateformat_6     = 'F _ Y';
+
+$dateglobalize_7  = 'Пятница, 30 апреля 1993 г.';
+$dateformat_7     = 'l , _ j _ F _ Y _ г.';
+
+$dateglobalize_8  = 'Пятница, 30 апреля';
+$dateformat_8     = 'l , _ j _ F';
+
+$dateglobalize_11 = 'Пт, 30 апр 1993 г.';
+$dateformat_11    = 'D , _ j _ M _ Y _ г.';
+
+$dateglobalize_12 = 'Пт, 30 апр';
+$dateformat_12    = 'D , _ j _ M';
+
+
+$dmy_text_5 = '30␣апреля␣1993';
+$dmy_text_6 = '30␣апр␣1993';
+
+$mdy_text_5 = 'апреля␣30␣1993';
+$mdy_text_6 = 'апр␣30␣1993';
+
+$ymd_text_5 = '1993␣апреля␣30';
+$ymd_text_6 = '1993␣апр␣30';
diff --git a/deployed/icagenda/libraries/ic_library/globalize/culture/sk-SK.php b/deployed/icagenda/libraries/ic_library/globalize/culture/sk-SK.php
new file mode 100644
index 00000000..c804b8ce
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/globalize/culture/sk-SK.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iC Library   Library by Jooml!C, for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     1.4.7 2018-04-25
+ *
+ * @package     iC Library
+ * @subpackage  Globalize
+ * @link        https://www.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2013-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * Globalization: Date formats sk-SK | Slovak (Slovakia)
+ *
+ * Reference date : birth of a free, open web to all!
+ * On 30 April 1993, CERN put the World Wide Web software in the public domain.
+ */
+
+$dateglobalize_1  = '30.4.1993';
+$dateformat_1     = 'j . n . Y';
+
+$dateglobalize_2  = '30. apríl 1993';
+$dateformat_2     = 'j . _ F _ Y';
+
+$dateglobalize_3  = '30. apr 1993';
+$dateformat_3     = 'j . _ M _ Y';
+
+$dateglobalize_4  = '30 apríl';
+$dateformat_4     = 'd _ F';
+
+$dateglobalize_6  = 'apríl 1993';
+$dateformat_6     = 'F _ Y';
+
+$dateglobalize_7  = 'piatok, 30. apríl 1993';
+$dateformat_7     = 'l , _ j . _ F _ Y';
+
+$dateglobalize_8  = 'piatok, 30 apríl';
+$dateformat_8     = 'l , _ j _ F';
+
+$dateglobalize_11 = 'pia, 30. apr 1993';
+$dateformat_11    = 'D , _ j . _ M _ Y';
+
+$dateglobalize_12 = 'pia, 30 apr';
+$dateformat_12    = 'D , _ j _ M';
+
+
+$dmy_text_5 = '30␣apríl␣1993';
+$dmy_text_6 = '30␣apr␣1993';
+
+$mdy_text_5 = 'apríl␣30␣1993';
+$mdy_text_6 = 'apr␣30␣1993';
+
+$ymd_text_5 = '1993␣apríl␣30';
+$ymd_text_6 = '1993␣apr␣30';
diff --git a/deployed/icagenda/libraries/ic_library/globalize/culture/sv-SE.php b/deployed/icagenda/libraries/ic_library/globalize/culture/sv-SE.php
new file mode 100644
index 00000000..a1a302d9
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/globalize/culture/sv-SE.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iC Library   Library by Jooml!C, for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     1.4.7 2018-04-25
+ *
+ * @package     iC Library
+ * @subpackage  Globalize
+ * @link        https://www.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2013-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * Globalization: Date formats sv-SE | Swedish (Sweden)
+ *
+ * Reference date : birth of a free, open web to all!
+ * On 30 April 1993, CERN put the World Wide Web software in the public domain.
+ */
+
+$dateglobalize_1  = '1993-04-30';
+$dateformat_1     = 'Y - m - d';
+
+$dateglobalize_2  = 'den 30 April 1993';
+$dateformat_2     = 'den _ j _ F _ Y';
+
+$dateglobalize_3  = '30 Apr 1993';
+$dateformat_3     = 'j _ M _ Y';
+
+$dateglobalize_4  = 'den 30 April';
+$dateformat_4     = 'den _ j _ F';
+
+$dateglobalize_6  = 'April 1993';
+$dateformat_6     = 'F _ Y';
+
+$dateglobalize_7  = 'fredag, den 30 April 1993';
+$dateformat_7     = 'l , _ den _ j _ F _ Y';
+
+$dateglobalize_8  = 'fredag, den 30 April';
+$dateformat_8     = 'l , _ den _ j _ F';
+
+$dateglobalize_11 = 'fr, 30 Apr 1993';
+$dateformat_11    = 'D , _ j _ M _ Y';
+
+$dateglobalize_12 = 'fr, 30 Apr';
+$dateformat_12    = 'D , _ j _ M';
+
+
+$dmy_text_5 = '30␣April␣1993';
+$dmy_text_6 = '30␣Apr␣1993';
+
+$mdy_text_5 = 'April␣30␣1993';
+$mdy_text_6 = 'Apr␣30␣1993';
+
+$ymd_text_5 = '1993␣April␣30';
+$ymd_text_6 = '1993␣Apr␣30';
diff --git a/deployed/icagenda/libraries/ic_library/globalize/culture/tr-TR.php b/deployed/icagenda/libraries/ic_library/globalize/culture/tr-TR.php
new file mode 100644
index 00000000..5fdcd8db
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/globalize/culture/tr-TR.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iC Library   Library by Jooml!C, for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     1.4.7 2018-04-25
+ *
+ * @package     iC Library
+ * @subpackage  Globalize
+ * @link        https://www.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2013-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * Globalization: Date formats tr-TR | Turkish (Turkey)
+ *
+ * Reference date : birth of a free, open web to all!
+ * On 30 April 1993, CERN put the World Wide Web software in the public domain.
+ */
+
+$dateglobalize_1  = '30.04.1993';
+$dateformat_1     = 'd . m . Y';
+
+$dateglobalize_2  = '30 Nisan 1993';
+$dateformat_2     = 'd _ F _ Y';
+
+$dateglobalize_3  = '30 Nis 1993';
+$dateformat_3     = 'd _ M _ Y';
+
+$dateglobalize_4  = '30 Nisan';
+$dateformat_4     = 'd _ F';
+
+$dateglobalize_6  = 'Nisan 1993';
+$dateformat_6     = 'F _ Y';
+
+$dateglobalize_7  = '30 Nisan 1993 Cuma';
+$dateformat_7     = 'd _ F _ Y _ l';
+
+$dateglobalize_8  = '30 Nisan Cuma';
+$dateformat_8     = 'd _ F _ l';
+
+$dateglobalize_11 = '30 Nis 1993 Cu';
+$dateformat_11    = 'd _ M _ Y _ D';
+
+$dateglobalize_12 = '30 Nis Cu';
+$dateformat_12    = 'd _ M _ D';
+
+
+$dmy_text_5 = '30␣Nisan␣1993';
+$dmy_text_6 = '30␣Nis␣1993';
+
+$mdy_text_5 = 'Nisan␣30␣1993';
+$mdy_text_6 = 'Nis␣30␣1993';
+
+$ymd_text_5 = '1993␣Nisan␣30';
+$ymd_text_6 = '1993␣Nis␣30';
diff --git a/deployed/icagenda/libraries/ic_library/globalize/culture/uk-UA.php b/deployed/icagenda/libraries/ic_library/globalize/culture/uk-UA.php
new file mode 100644
index 00000000..1c775a64
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/globalize/culture/uk-UA.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iC Library   Library by Jooml!C, for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     1.4.7 2018-04-25
+ *
+ * @package     iC Library
+ * @subpackage  Globalize
+ * @link        https://www.joomlic.com
+ *
+ * @author      SLV
+ * @copyright   (c) 2013-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * Globalization: Date formats uk-UA | Ukrainian (Ukraine)
+ *
+ * Reference date : birth of a free, open web to all!
+ * On 30 April 1993, CERN put the World Wide Web software in the public domain.
+ */
+
+$dateglobalize_1  = '30.04.1993 р.';
+$dateformat_1     = 'd . m . Y _ &#1088;.';
+
+$dateglobalize_2  = '30 квітня 1993 р.';
+$dateformat_2     = 'j _ F _ Y _ &#1088;.';
+
+$dateglobalize_3  = '30 квіт. 1993 р.';
+$dateformat_3     = 'j _ M _ Y _ &#1088;.';
+
+$dateglobalize_4  = '30 Квітень';
+$dateformat_4     = 'j _ F';
+
+$dateglobalize_6  = 'Квітень 1993 р.';
+$dateformat_6     = 'F _ Y _ &#1088;.';
+
+$dateglobalize_7  = "П'ятниця, 30 квітня 1993 р.";
+$dateformat_7     = 'l , _ j _ F _ Y _ &#1088;.';
+
+$dateglobalize_8  = "П'ятниця, 30 квітня";
+$dateformat_8     = 'l , _ j _ F';
+
+$dateglobalize_11 = 'Пт, 30 Квіт. 1993 р.';
+$dateformat_11    = 'D , _ j _ M _ Y _ &#1088;.';
+
+$dateglobalize_12 = 'Пт, 30 Квіт.';
+$dateformat_12    = 'D , _ j _ M';
+
+
+$dmy_text_5 = '30␣Квітень␣1993';
+$dmy_text_6 = '30␣Квіт␣1993';
+
+$mdy_text_5 = 'Квітень␣30␣1993';
+$mdy_text_6 = 'Квіт␣30␣1993';
+
+$ymd_text_5 = '1993␣Квітень␣30';
+$ymd_text_6 = '1993␣Квіт␣30';
diff --git a/deployed/icagenda/libraries/ic_library/globalize/culture/zh-CN.php b/deployed/icagenda/libraries/ic_library/globalize/culture/zh-CN.php
new file mode 100644
index 00000000..b17af4b0
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/globalize/culture/zh-CN.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iC Library   Library by Jooml!C, for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     1.4.10 2019-08-19
+ *
+ * @package     iC Library
+ * @subpackage  Globalize
+ * @link        https://www.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2013-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.4.10
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * Globalization: Date formats zh-CN | Chinese (Simplified)
+ *
+ * Reference date : birth of a free, open web to all!
+ * On 30 April 1993, CERN put the World Wide Web software in the public domain.
+ */
+
+$dateglobalize_1 = '1993/04/30';
+$dateformat_1    = 'Y / m / j';
+
+$dateglobalize_2 = '1993四30';
+$dateformat_2    = 'Y F j';
+
+$dateglobalize_4 = '四30';
+$dateformat_4    = 'F j';
+
+$dateglobalize_6 = '1993四';
+$dateformat_6    = 'Y F';
+
+$dateglobalize_7 = '五, 1993四30';
+$dateformat_7    = 'l , Y F j';
+
+$dateglobalize_8 = '五, 四30';
+$dateformat_8    = 'l , _ F j';
+
+
+$dmy_text_5 = '30␣四␣1993';
+
+$mdy_text_5 = '四␣30␣1993';
+
+$ymd_text_5 = '1993␣四␣30';
diff --git a/deployed/icagenda/libraries/ic_library/globalize/culture/zh-TW.php b/deployed/icagenda/libraries/ic_library/globalize/culture/zh-TW.php
new file mode 100644
index 00000000..f487a27d
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/globalize/culture/zh-TW.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iC Library   Library by Jooml!C, for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     1.4.7 2018-04-25
+ *
+ * @package     iC Library
+ * @subpackage  Globalize
+ * @link        https://www.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2013-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * Globalization: Date formats zh-TW | Chinese (Traditional) (Taiwan)
+ *
+ * Reference date : birth of a free, open web to all!
+ * On 30 April 1993, CERN put the World Wide Web software in the public domain.
+ */
+
+$dateglobalize_1 = '1993/04/30';
+$dateformat_1    = 'Y / m / j';
+
+$dateglobalize_2 = '1993四30';
+$dateformat_2    = 'Y F j';
+
+$dateglobalize_4 = '四30';
+$dateformat_4    = 'F j';
+
+$dateglobalize_6 = '1993四';
+$dateformat_6    = 'Y F';
+
+$dateglobalize_7 = '五, 1993四30';
+$dateformat_7    = 'l , Y F j';
+
+$dateglobalize_8 = '五, 四30';
+$dateformat_8    = 'l , _ F j';
+
+
+$dmy_text_5 = '30␣四␣1993';
+
+$mdy_text_5 = '四␣30␣1993';
+
+$ymd_text_5 = '1993␣四␣30';
diff --git a/deployed/icagenda/libraries/ic_library/globalize/globalize.php b/deployed/icagenda/libraries/ic_library/globalize/globalize.php
new file mode 100644
index 00000000..c17e4e15
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/globalize/globalize.php
@@ -0,0 +1,214 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iC Library   Library by Jooml!C, for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     1.4.7 2018-04-24
+ *
+ * @package     iC Library
+ * @subpackage  Globalize
+ * @link        https://www.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2013-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.3.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * iC Globalize
+ */
+class iCGlobalize
+{
+	/**
+	 * Function to get Format Date (using option format, and translation)
+	 *
+	 * @access	public static
+	 * @param	$date : date to be formatted (1993-04-30 14:33:00)
+	 * 			$option : date format selected
+	 * @return	formatted date
+	 *
+	 * @since   1.3.0
+	 */
+	static public function dateFormat($date, $option, $separator, $tz = false)
+	{
+		$eventTimeZone = $tz ? $tz : null;
+
+		$lang     = JFactory::getLanguage();
+		$langTag  = $lang->getTag();
+		$langName = $lang->getName();
+
+		if ( ! file_exists(JPATH_LIBRARIES . '/ic_library/globalize/culture/' . $langTag . '.php'))
+		{
+			$langTag = 'en-GB';
+		}
+
+		$globalize = JPATH_LIBRARIES . '/ic_library/globalize/culture/' . $langTag . '.php';
+		$iso       = JPATH_LIBRARIES . '/ic_library/globalize/culture/iso.php';
+
+		// Languages with English ordinal suffix for the day of the month, 2 characters
+		$en_langs = array('en-GB', 'en-US');
+
+		// Set iso format if format is equal to zero (Y-m-d)
+		$option = ($option == '0') ? 'Y - m - d' : $option;
+
+		if (is_numeric($option))
+		{
+			require $globalize;
+
+			// Format with "th" only for english languages
+			if ( ! in_array($langTag, $en_langs))
+			{
+				if ($option == '5') $option = '4';
+				if ($option == '9') $option = '7';
+				if ($option == '10') $option = '8';
+			}
+
+			// No Short month for Persian language
+			elseif ($langTag == 'fa-IR')
+			{
+				if ($option == '3') $option = '2';
+				if ($option == '11') $option = '7';
+				if ($option == '12') $option = '8';
+			}
+
+			$format = ${"dateformat_" . $option};
+		}
+		else
+		{
+			require $iso;
+
+			$format = $option;
+		}
+
+		// Load Globalization Date Format if selected
+
+		// Explode components of the date
+		$exformat = explode (' ', $format);
+
+		// Set datetime format
+		$thisDate = date('Y-m-d H:i:s', strtotime($date));
+//		$month_n	= JHtml::date($thisDate, 'n', $eventTimeZone); // 1 through 12
+//		$day_w		= JHtml::date($thisDate, 'w', $eventTimeZone); // 0 (for Sunday) through 6 (for Saturday)
+
+		// Strings of translation for convertion
+//		$array_days	= array(
+//			'SUNDAY', 'MONDAY', 'TUESDAY', 'WEDNESDAY', 'THURSDAY', 'FRIDAY', 'SATURDAY'
+//		);
+
+//		$array_days_short = array(
+//			'SUN', 'MON', 'TUE', 'WED', 'THU', 'FRI', 'SAT'
+//		);
+
+//		$array_months = array(
+//			'JANUARY', 'FEBRUARY', 'MARCH', 'APRIL', 'MAY', 'JUNE',
+//			'JULY', 'AUGUST', 'SEPTEMBER', 'OCTOBER', 'NOVEMBER', 'DECEMBER'
+//		);
+
+		$dateFormatted	= '';
+
+		// Creates date formatted
+		foreach ($exformat as $k => $val)
+		{
+			switch($val)
+			{
+				// Day
+				case 'd':
+					$val = JHtml::date($thisDate, 'd', $eventTimeZone);
+					break;
+
+				case 'j':
+					$val = JHtml::date($thisDate, 'j', $eventTimeZone);
+					break;
+
+				case 'D':
+					// A textual representation of day of the week, three letters (use Joomla Translation string)
+//					$val = JText::_($array_days_short[$day_w]);
+					$val = JHtml::date($thisDate, 'D', $eventTimeZone);
+					break;
+
+				case 'l':
+					// A full textual representation of the day of the week (use Joomla Translation string)
+//					$val = JText::_($array_days[$day_w]);
+					$val = JHtml::date($thisDate, 'l', $eventTimeZone);
+					break;
+
+				case 'S':
+					$val = '<sup>' . JHtml::date($thisDate, 'S', $eventTimeZone) . '</sup>';
+					break;
+
+				case 'jS':
+					$val = JHtml::date($thisDate, 'j', $eventTimeZone) . '<sup>' . JHtml::date($thisDate, 'S', $eventTimeZone) . '</sup>';
+					break;
+
+				// Month
+				case 'm':
+					$val = JHtml::date($thisDate, 'm', $eventTimeZone);
+					break;
+
+				case 'F':
+					// A full textual representation of a month (use Joomla Translation string)
+//					$val = JText::_($array_months[($month_n-1)]);
+					$val = JHtml::date($thisDate, 'F', $eventTimeZone);
+					break;
+
+				case 'M':
+					// A short textual representation of a month (use Joomla Translation string)
+//					$val = JText::_($array_months[($month_n-1)] . '_SHORT');
+					$val = JHtml::date($thisDate, 'M', $eventTimeZone);
+					break;
+
+				case 'n':
+					$val = JHtml::date($thisDate, 'n', $eventTimeZone);
+					break;
+
+				// year (v3)
+				case 'Y':
+					$val = JHtml::date($thisDate, 'Y', $eventTimeZone);
+					break;
+
+				case 'y':
+					$val = JHtml::date($thisDate, 'y', $eventTimeZone);
+					break;
+
+				// Separator of the components
+				case '*':
+					$val = $separator;
+					break;
+				case '_':
+					$val = '&nbsp;';
+//					$val = '&#160;';
+					break;
+
+				// day
+				case 'N':
+					$val = strftime("%u", strtotime("$thisDate"));
+					break;
+				case 'w':
+					$val = strftime("%w", strtotime("$thisDate"));
+					break;
+				case 'z':
+					$val = strftime("%j", strtotime("$thisDate"));
+					break;
+
+				// week
+				case 'W':
+					$val = JHtml::date($thisDate, 'W', $eventTimeZone);
+					break;
+
+				// Default
+				default:
+					$val;
+					break;
+			}
+
+			$dateFormatted.= ($k !== 0) ? '' . $val : $val;
+		}
+
+		return $dateFormatted;
+	}
+}
diff --git a/deployed/icagenda/libraries/ic_library/globalize/index.html b/deployed/icagenda/libraries/ic_library/globalize/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/globalize/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/libraries/ic_library/iCalcreator/iCalcreator.class.php b/deployed/icagenda/libraries/ic_library/iCalcreator/iCalcreator.class.php
new file mode 100644
index 00000000..1d20abeb
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/iCalcreator/iCalcreator.class.php
@@ -0,0 +1,10569 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iC Library - Library by Jooml!C, for Joomla!
+ *------------------------------------------------------------------------------
+ * @package     iC Library
+ * @subpackage  string
+ * @copyright   Copyright (c)2013-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     1.4.6 2017-07-14
+ * @since       1.4.0
+ *------------------------------------------------------------------------------
+*/
+
+/**
+ * iCagenda Changes
+ *
+ * 1.4.6 2017-07-14
+ * - rename constructor to __construct
+ *   (class name for the constructor is deprecated as of PHP7)
+ * 
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+/*********************************************************************************/
+/**
+ * iCalcreator v2.18
+ * copyright (c) 2007-2013 Kjell-Inge Gustafsson, kigkonsult, All rights reserved
+ * kigkonsult.se/iCalcreator/index.php
+ * ical@kigkonsult.se
+ *
+ * Description:
+ * This file is a PHP implementation of rfc2445/rfc5545.
+ *
+ * This library 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 library 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 library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+/*********************************************************************************/
+/*********************************************************************************/
+/*         A little setup                                                        */
+/*********************************************************************************/
+            /* your local language code */
+// define( 'ICAL_LANG', 'sv' );
+            // alt. autosetting
+/*
+$langstr     = $_SERVER['HTTP_ACCEPT_LANGUAGE'];
+$pos         = strpos( $langstr, ';' );
+if ($pos   !== false) {
+  $langstr   = substr( $langstr, 0, $pos );
+  $pos       = strpos( $langstr, ',' );
+  if ($pos !== false) {
+    $pos     = strpos( $langstr, ',' );
+    $langstr = substr( $langstr, 0, $pos );
+  }
+  define( 'ICAL_LANG', $langstr );
+}
+*/
+/*********************************************************************************/
+/*         version, do NOT remove!!                                              */
+define( 'ICALCREATOR_VERSION', 'iCalcreator 2.18' );
+/*********************************************************************************/
+/*********************************************************************************/
+/**
+ * vcalendar class
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.9.6 - 2011-05-14
+ */
+class vcalendar {
+            //  calendar property variables
+  var $calscale;
+  var $method;
+  var $prodid;
+  var $version;
+  var $xprop;
+            //  container for calendar components
+  var $components;
+            //  component config variables
+  var $allowEmpty;
+  var $unique_id;
+  var $language;
+  var $directory;
+  var $filename;
+  var $url;
+  var $delimiter;
+  var $nl;
+  var $format;
+  var $dtzid;
+            //  component internal variables
+  var $attributeDelimiter;
+  var $valueInit;
+            //  component xCal declaration container
+  var $xcaldecl;
+/**
+ * constructor for calendar object
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.9.6 - 2011-05-14
+ * @param array $config
+ * @return void
+ */
+  function __construct ( $config = array()) {
+    $this->_makeVersion();
+    $this->calscale   = null;
+    $this->method     = null;
+    $this->_makeUnique_id();
+    $this->prodid     = null;
+    $this->xprop      = array();
+    $this->language   = null;
+    $this->directory  = null;
+    $this->filename   = null;
+    $this->url        = null;
+    $this->dtzid      = null;
+/**
+ *   language = <Text identifying a language, as defined in [RFC 1766]>
+ */
+    if( defined( 'ICAL_LANG' ) && !isset( $config['language'] ))
+                                          $config['language']   = ICAL_LANG;
+    if( !isset( $config['allowEmpty'] ))  $config['allowEmpty'] = TRUE;
+    if( !isset( $config['nl'] ))          $config['nl']         = "\r\n";
+    if( !isset( $config['format'] ))      $config['format']     = 'iCal';
+    if( !isset( $config['delimiter'] ))   $config['delimiter']  = DIRECTORY_SEPARATOR;
+    $this->setConfig( $config );
+
+    $this->xcaldecl   = array();
+    $this->components = array();
+  }
+/*********************************************************************************/
+/**
+ * Property Name: CALSCALE
+ */
+/**
+ * creates formatted output for calendar property calscale
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.10.16 - 2011-10-28
+ * @return string
+ */
+  function createCalscale() {
+    if( empty( $this->calscale )) return FALSE;
+    switch( $this->format ) {
+      case 'xcal':
+        return $this->nl.' calscale="'.$this->calscale.'"';
+        break;
+      default:
+        return 'CALSCALE:'.$this->calscale.$this->nl;
+        break;
+    }
+  }
+/**
+ * set calendar property calscale
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.4.8 - 2008-10-21
+ * @param string $value
+ * @return void
+ */
+  function setCalscale( $value ) {
+    if( empty( $value )) return FALSE;
+    $this->calscale = $value;
+  }
+/*********************************************************************************/
+/**
+ * Property Name: METHOD
+ */
+/**
+ * creates formatted output for calendar property method
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.10.16 - 2011-10-28
+ * @return string
+ */
+  function createMethod() {
+    if( empty( $this->method )) return FALSE;
+    switch( $this->format ) {
+      case 'xcal':
+        return $this->nl.' method="'.$this->method.'"';
+        break;
+      default:
+        return 'METHOD:'.$this->method.$this->nl;
+        break;
+    }
+  }
+/**
+ * set calendar property method
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.4.8 - 2008-20-23
+ * @param string $value
+ * @return bool
+ */
+  function setMethod( $value ) {
+    if( empty( $value )) return FALSE;
+    $this->method = $value;
+    return TRUE;
+  }
+/*********************************************************************************/
+/**
+ * Property Name: PRODID
+ *
+ *  The identifier is RECOMMENDED to be the identical syntax to the
+ * [RFC 822] addr-spec. A good method to assure uniqueness is to put the
+ * domain name or a domain literal IP address of the host on which.. .
+ */
+/**
+ * creates formatted output for calendar property prodid
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.12.11 - 2012-05-13
+ * @return string
+ */
+  function createProdid() {
+    if( !isset( $this->prodid ))
+      $this->_makeProdid();
+    switch( $this->format ) {
+      case 'xcal':
+        return $this->nl.' prodid="'.$this->prodid.'"';
+        break;
+      default:
+        $toolbox = new calendarComponent();
+        $toolbox->setConfig( $this->getConfig());
+        return $toolbox->_createElement( 'PRODID', '', $this->prodid );
+        break;
+    }
+  }
+/**
+ * make default value for calendar prodid
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.6.8 - 2009-12-30
+ * @return void
+ */
+  function _makeProdid() {
+    $this->prodid  = '-//'.$this->unique_id.'//NONSGML kigkonsult.se '.ICALCREATOR_VERSION.'//'.strtoupper( $this->language );
+  }
+/**
+ * Conformance: The property MUST be specified once in an iCalendar object.
+ * Description: The vendor of the implementation SHOULD assure that this
+ * is a globally unique identifier; using some technique such as an FPI
+ * value, as defined in [ISO 9070].
+ */
+/**
+ * make default unique_id for calendar prodid
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 0.3.0 - 2006-08-10
+ * @return void
+ */
+  function _makeUnique_id() {
+    $this->unique_id  = ( isset( $_SERVER['SERVER_NAME'] )) ? gethostbyname( $_SERVER['SERVER_NAME'] ) : 'localhost';
+  }
+/*********************************************************************************/
+/**
+ * Property Name: VERSION
+ *
+ * Description: A value of "2.0" corresponds to this memo.
+ */
+/**
+ * creates formatted output for calendar property version
+
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.10.16 - 2011-10-28
+ * @return string
+ */
+  function createVersion() {
+    if( empty( $this->version ))
+      $this->_makeVersion();
+    switch( $this->format ) {
+      case 'xcal':
+        return $this->nl.' version="'.$this->version.'"';
+        break;
+      default:
+        return 'VERSION:'.$this->version.$this->nl;
+        break;
+    }
+  }
+/**
+ * set default calendar version
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 0.3.0 - 2006-08-10
+ * @return void
+ */
+  function _makeVersion() {
+    $this->version = '2.0';
+  }
+/**
+ * set calendar version
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.4.8 - 2008-10-23
+ * @param string $value
+ * @return void
+ */
+  function setVersion( $value ) {
+    if( empty( $value )) return FALSE;
+    $this->version = $value;
+    return TRUE;
+  }
+/*********************************************************************************/
+/**
+ * Property Name: x-prop
+ */
+/**
+ * creates formatted output for calendar property x-prop, iCal format only
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.21 - 2013-05-25
+ * @return string
+ */
+  function createXprop() {
+    if( empty( $this->xprop ) || !is_array( $this->xprop )) return FALSE;
+    $output        = null;
+    $toolbox       = new calendarComponent();
+    $toolbox->setConfig( $this->getConfig());
+    foreach( $this->xprop as $label => $xpropPart ) {
+      if( !isset($xpropPart['value']) || ( empty( $xpropPart['value'] ) && !is_numeric( $xpropPart['value'] ))) {
+        if( $this->getConfig( 'allowEmpty' ))
+          $output .= $toolbox->_createElement( $label );
+        continue;
+      }
+      $attributes  = $toolbox->_createParams( $xpropPart['params'], array( 'LANGUAGE' ));
+      if( is_array( $xpropPart['value'] )) {
+        foreach( $xpropPart['value'] as $pix => $theXpart )
+          $xpropPart['value'][$pix] = iCalUtilityFunctions::_strrep( $theXpart, $this->format, $this->nl );
+        $xpropPart['value']  = implode( ',', $xpropPart['value'] );
+      }
+      else
+        $xpropPart['value'] = iCalUtilityFunctions::_strrep( $xpropPart['value'], $this->format, $this->nl );
+      $output     .= $toolbox->_createElement( $label, $attributes, $xpropPart['value'] );
+      if( is_array( $toolbox->xcaldecl ) && ( 0 < count( $toolbox->xcaldecl ))) {
+        foreach( $toolbox->xcaldecl as $localxcaldecl )
+          $this->xcaldecl[] = $localxcaldecl;
+      }
+    }
+    return $output;
+  }
+/**
+ * set calendar property x-prop
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.21 - 2013-06-23
+ * @param string $label
+ * @param string $value
+ * @param array $params optional
+ * @return bool
+ */
+  function setXprop( $label, $value, $params=FALSE ) {
+    if( empty( $label ))
+      return FALSE;
+    if( 'X-' != strtoupper( substr( $label, 0, 2 )))
+      return FALSE;
+    if( empty( $value ) && !is_numeric( $value )) if( $this->getConfig( 'allowEmpty' )) $value = ''; else return FALSE;
+    $xprop           = array( 'value' => $value );
+    $xprop['params'] = iCalUtilityFunctions::_setParams( $params );
+    if( !is_array( $this->xprop )) $this->xprop = array();
+    $this->xprop[strtoupper( $label )] = $xprop;
+    return TRUE;
+  }
+/*********************************************************************************/
+/**
+ * delete calendar property value
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.8.8 - 2011-03-15
+ * @param mixed $propName, bool FALSE => X-property
+ * @param int $propix, optional, if specific property is wanted in case of multiply occurences
+ * @return bool, if successfull delete
+ */
+  function deleteProperty( $propName=FALSE, $propix=FALSE ) {
+    $propName = ( $propName ) ? strtoupper( $propName ) : 'X-PROP';
+    if( !$propix )
+      $propix = ( isset( $this->propdelix[$propName] ) && ( 'X-PROP' != $propName )) ? $this->propdelix[$propName] + 2 : 1;
+    $this->propdelix[$propName] = --$propix;
+    $return = FALSE;
+    switch( $propName ) {
+      case 'CALSCALE':
+        if( isset( $this->calscale )) {
+          $this->calscale = null;
+          $return = TRUE;
+        }
+        break;
+      case 'METHOD':
+        if( isset( $this->method )) {
+          $this->method   = null;
+          $return = TRUE;
+        }
+        break;
+      default:
+        $reduced = array();
+        if( $propName != 'X-PROP' ) {
+          if( !isset( $this->xprop[$propName] )) { unset( $this->propdelix[$propName] ); return FALSE; }
+          foreach( $this->xprop as $k => $a ) {
+            if(( $k != $propName ) && !empty( $a ))
+              $reduced[$k] = $a;
+          }
+        }
+        else {
+          if( count( $this->xprop ) <= $propix )  return FALSE;
+          $xpropno = 0;
+          foreach( $this->xprop as $xpropkey => $xpropvalue ) {
+            if( $propix != $xpropno )
+              $reduced[$xpropkey] = $xpropvalue;
+            $xpropno++;
+          }
+        }
+        $this->xprop = $reduced;
+        if( empty( $this->xprop )) {
+          unset( $this->propdelix[$propName] );
+          return FALSE;
+        }
+        return TRUE;
+    }
+    return $return;
+  }
+/**
+ * get calendar property value/params
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.13.4 - 2012-08-08
+ * @param string $propName, optional
+ * @param int $propix, optional, if specific property is wanted in case of multiply occurences
+ * @param bool $inclParam=FALSE
+ * @return mixed
+ */
+  function getProperty( $propName=FALSE, $propix=FALSE, $inclParam=FALSE ) {
+    $propName = ( $propName ) ? strtoupper( $propName ) : 'X-PROP';
+    if( 'X-PROP' == $propName ) {
+      if( !$propix )
+        $propix  = ( isset( $this->propix[$propName] )) ? $this->propix[$propName] + 2 : 1;
+      $this->propix[$propName] = --$propix;
+    }
+    else
+      $mProps    = array( 'ATTENDEE', 'CATEGORIES', 'CONTACT', 'RELATED-TO', 'RESOURCES' );
+    switch( $propName ) {
+      case 'ATTENDEE':
+      case 'CATEGORIES':
+      case 'CONTACT':
+      case 'DTSTART':
+      case 'GEOLOCATION':
+      case 'LOCATION':
+      case 'ORGANIZER':
+      case 'PRIORITY':
+      case 'RESOURCES':
+      case 'STATUS':
+      case 'SUMMARY':
+      case 'RECURRENCE-ID-UID':
+      case 'RELATED-TO':
+      case 'R-UID':
+      case 'UID':
+      case 'URL':
+        $output  = array();
+        foreach ( $this->components as $cix => $component) {
+          if( !in_array( $component->objName, array('vevent', 'vtodo', 'vjournal', 'vfreebusy' )))
+            continue;
+          if( in_array( strtoupper( $propName ), $mProps )) {
+            $component->_getProperties( $propName, $output );
+            continue;
+          }
+          elseif(( 3 < strlen( $propName )) && ( 'UID' == substr( $propName, -3 ))) {
+            if( FALSE !== ( $content = $component->getProperty( 'RECURRENCE-ID' )))
+              $content = $component->getProperty( 'UID' );
+          }
+          elseif( 'GEOLOCATION' == $propName ) {
+            $content = $component->getProperty( 'LOCATION' );
+            $content = ( !empty( $content )) ? $content.' ' : '';
+            if(( FALSE === ( $geo     = $component->getProperty( 'GEO' ))) || empty( $geo ))
+              continue;
+            if( 0.0 < $geo['latitude'] )
+              $sign   = '+';
+            else
+              $sign   = ( 0.0 > $geo['latitude'] ) ? '-' : '';
+            $content .= ' '.$sign.sprintf( "%09.6f", abs( $geo['latitude'] ));
+            $content  = rtrim( rtrim( $content, '0' ), '.' );
+            if( 0.0 < $geo['longitude'] )
+              $sign   = '+';
+            else
+              $sign   = ( 0.0 > $geo['longitude'] ) ? '-' : '';
+            $content .= $sign.sprintf( '%8.6f', abs( $geo['longitude'] )).'/';
+          }
+          elseif( FALSE === ( $content = $component->getProperty( $propName )))
+            continue;
+          if(( FALSE === $content ) || empty( $content ))
+            continue;
+          elseif( is_array( $content )) {
+            if( isset( $content['year'] )) {
+              $key  = sprintf( '%04d%02d%02d', $content['year'], $content['month'], $content['day'] );
+              if( !isset( $output[$key] ))
+                $output[$key] = 1;
+              else
+                $output[$key] += 1;
+            }
+            else {
+              foreach( $content as $partValue => $partCount ) {
+                if( !isset( $output[$partValue] ))
+                  $output[$partValue] = $partCount;
+                else
+                  $output[$partValue] += $partCount;
+              }
+            }
+          } // end elseif( is_array( $content )) {
+          elseif( !isset( $output[$content] ))
+            $output[$content] = 1;
+          else
+            $output[$content] += 1;
+        } // end foreach ( $this->components as $cix => $component)
+        if( !empty( $output ))
+          ksort( $output );
+        return $output;
+        break;
+      case 'CALSCALE':
+        return ( !empty( $this->calscale )) ? $this->calscale : FALSE;
+        break;
+      case 'METHOD':
+        return ( !empty( $this->method )) ? $this->method : FALSE;
+        break;
+      case 'PRODID':
+        if( empty( $this->prodid ))
+          $this->_makeProdid();
+        return $this->prodid;
+        break;
+      case 'VERSION':
+        return ( !empty( $this->version )) ? $this->version : FALSE;
+        break;
+      default:
+        if( $propName != 'X-PROP' ) {
+          if( !isset( $this->xprop[$propName] )) return FALSE;
+          return ( $inclParam ) ? array( $propName, $this->xprop[$propName] )
+                                : array( $propName, $this->xprop[$propName]['value'] );
+        }
+        else {
+          if( empty( $this->xprop )) return FALSE;
+          $xpropno = 0;
+          foreach( $this->xprop as $xpropkey => $xpropvalue ) {
+            if( $propix == $xpropno )
+              return ( $inclParam ) ? array( $xpropkey, $this->xprop[$xpropkey] )
+                                    : array( $xpropkey, $this->xprop[$xpropkey]['value'] );
+            else
+              $xpropno++;
+          }
+          unset( $this->propix[$propName] );
+          return FALSE; // not found ??
+        }
+    }
+    return FALSE;
+  }
+/**
+ * general vcalendar property setting
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.2.13 - 2007-11-04
+ * @param mixed $args variable number of function arguments,
+ *                    first argument is ALWAYS component name,
+ *                    second ALWAYS component value!
+ * @return bool
+ */
+  function setProperty () {
+    $numargs    = func_num_args();
+    if( 1 > $numargs )
+      return FALSE;
+    $arglist    = func_get_args();
+    $arglist[0] = strtoupper( $arglist[0] );
+    switch( $arglist[0] ) {
+      case 'CALSCALE':
+        return $this->setCalscale( $arglist[1] );
+      case 'METHOD':
+        return $this->setMethod( $arglist[1] );
+      case 'VERSION':
+        return $this->setVersion( $arglist[1] );
+      default:
+        if( !isset( $arglist[1] )) $arglist[1] = null;
+        if( !isset( $arglist[2] )) $arglist[2] = null;
+        return $this->setXprop( $arglist[0], $arglist[1], $arglist[2] );
+    }
+    return FALSE;
+  }
+/*********************************************************************************/
+/**
+ * get vcalendar config values or * calendar components
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.11.7 - 2012-01-12
+ * @param mixed $config
+ * @return value
+ */
+  function getConfig( $config = FALSE ) {
+    if( !$config ) {
+      $return = array();
+      $return['ALLOWEMPTY']  = $this->getConfig( 'ALLOWEMPTY' );
+      $return['DELIMITER']   = $this->getConfig( 'DELIMITER' );
+      $return['DIRECTORY']   = $this->getConfig( 'DIRECTORY' );
+      $return['FILENAME']    = $this->getConfig( 'FILENAME' );
+      $return['DIRFILE']     = $this->getConfig( 'DIRFILE' );
+      $return['FILESIZE']    = $this->getConfig( 'FILESIZE' );
+      $return['FORMAT']      = $this->getConfig( 'FORMAT' );
+      if( FALSE !== ( $lang  = $this->getConfig( 'LANGUAGE' )))
+        $return['LANGUAGE']  = $lang;
+      $return['NEWLINECHAR'] = $this->getConfig( 'NEWLINECHAR' );
+      $return['UNIQUE_ID']   = $this->getConfig( 'UNIQUE_ID' );
+      if( FALSE !== ( $url   = $this->getConfig( 'URL' )))
+        $return['URL']       = $url;
+      $return['TZID']        = $this->getConfig( 'TZID' );
+      return $return;
+    }
+    switch( strtoupper( $config )) {
+      case 'ALLOWEMPTY':
+        return $this->allowEmpty;
+        break;
+      case 'COMPSINFO':
+        unset( $this->compix );
+        $info = array();
+        foreach( $this->components as $cix => $component ) {
+          if( empty( $component )) continue;
+          $info[$cix]['ordno'] = $cix + 1;
+          $info[$cix]['type']  = $component->objName;
+          $info[$cix]['uid']   = $component->getProperty( 'uid' );
+          $info[$cix]['props'] = $component->getConfig( 'propinfo' );
+          $info[$cix]['sub']   = $component->getConfig( 'compsinfo' );
+        }
+        return $info;
+        break;
+      case 'DELIMITER':
+        return $this->delimiter;
+        break;
+      case 'DIRECTORY':
+        if( empty( $this->directory ) && ( '0' != $this->directory ))
+          $this->directory = '.';
+        return $this->directory;
+        break;
+      case 'DIRFILE':
+        return $this->getConfig( 'directory' ).$this->getConfig( 'delimiter' ).$this->getConfig( 'filename' );
+        break;
+      case 'FILEINFO':
+        return array( $this->getConfig( 'directory' )
+                    , $this->getConfig( 'filename' )
+                    , $this->getConfig( 'filesize' ));
+        break;
+      case 'FILENAME':
+        if( empty( $this->filename ) && ( '0' != $this->filename )) {
+          if( 'xcal' == $this->format )
+            $this->filename = date( 'YmdHis' ).'.xml'; // recommended xcs.. .
+          else
+            $this->filename = date( 'YmdHis' ).'.ics';
+        }
+        return $this->filename;
+        break;
+      case 'FILESIZE':
+        $size    = 0;
+        if( empty( $this->url )) {
+          $dirfile = $this->getConfig( 'dirfile' );
+          if( !is_file( $dirfile ) || ( FALSE === ( $size = filesize( $dirfile ))))
+            $size = 0;
+          clearstatcache();
+        }
+        return $size;
+        break;
+      case 'FORMAT':
+        return ( $this->format == 'xcal' ) ? 'xCal' : 'iCal';
+        break;
+      case 'LANGUAGE':
+         /* get language for calendar component as defined in [RFC 1766] */
+        return $this->language;
+        break;
+      case 'NL':
+      case 'NEWLINECHAR':
+        return $this->nl;
+        break;
+      case 'TZID':
+        return $this->dtzid;
+        break;
+      case 'UNIQUE_ID':
+        return $this->unique_id;
+        break;
+      case 'URL':
+        if( !empty( $this->url ))
+          return $this->url;
+        else
+          return FALSE;
+        break;
+    }
+  }
+/**
+ * general vcalendar config setting
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.7 - 2013-01-11
+ * @param mixed  $config
+ * @param string $value
+ * @return void
+ */
+  function setConfig( $config, $value = FALSE) {
+    if( is_array( $config )) {
+      $ak = array_keys( $config );
+      foreach( $ak as $k ) {
+        if( 'DIRECTORY' == strtoupper( $k )) {
+          if( FALSE === $this->setConfig( 'DIRECTORY', $config[$k] ))
+            return FALSE;
+          unset( $config[$k] );
+        }
+        elseif( 'NEWLINECHAR' == strtoupper( $k )) {
+          if( FALSE === $this->setConfig( 'NEWLINECHAR', $config[$k] ))
+            return FALSE;
+          unset( $config[$k] );
+        }
+      }
+      foreach( $config as $cKey => $cValue ) {
+        if( FALSE === $this->setConfig( $cKey, $cValue ))
+          return FALSE;
+      }
+      return TRUE;
+    }
+    $res = FALSE;
+    switch( strtoupper( $config )) {
+      case 'ALLOWEMPTY':
+        $this->allowEmpty = $value;
+        $subcfg  = array( 'ALLOWEMPTY' => $value );
+        $res = TRUE;
+        break;
+      case 'DELIMITER':
+        $this->delimiter = $value;
+        return TRUE;
+        break;
+      case 'DIRECTORY':
+        $value   = trim( $value );
+        $del     = $this->getConfig('delimiter');
+        if( $del == substr( $value, ( 0 - strlen( $del ))))
+          $value = substr( $value, 0, ( strlen( $value ) - strlen( $del )));
+        if( is_dir( $value )) {
+            /* local directory */
+          clearstatcache();
+          $this->directory = $value;
+          $this->url       = null;
+          return TRUE;
+        }
+        else
+          return FALSE;
+        break;
+      case 'FILENAME':
+        $value   = trim( $value );
+        if( !empty( $this->url )) {
+            /* remote directory+file -> URL */
+          $this->filename = $value;
+          return TRUE;
+        }
+        $dirfile = $this->getConfig( 'directory' ).$this->getConfig( 'delimiter' ).$value;
+        if( file_exists( $dirfile )) {
+            /* local file exists */
+          if( is_readable( $dirfile ) || is_writable( $dirfile )) {
+            clearstatcache();
+            $this->filename = $value;
+            return TRUE;
+          }
+          else
+            return FALSE;
+        }
+        elseif( is_readable($this->getConfig( 'directory' ) ) || is_writable( $this->getConfig( 'directory' ) )) {
+            /* read- or writable directory */
+          $this->filename = $value;
+          return TRUE;
+        }
+        else
+          return FALSE;
+        break;
+      case 'FORMAT':
+        $value   = trim( strtolower( $value ));
+        if( 'xcal' == $value ) {
+          $this->format             = 'xcal';
+          $this->attributeDelimiter = $this->nl;
+          $this->valueInit          = null;
+        }
+        else {
+          $this->format             = null;
+          $this->attributeDelimiter = ';';
+          $this->valueInit          = ':';
+        }
+        $subcfg  = array( 'FORMAT' => $value );
+        $res = TRUE;
+        break;
+      case 'LANGUAGE': // set language for calendar component as defined in [RFC 1766]
+        $value   = trim( $value );
+        $this->language = $value;
+        $this->_makeProdid();
+        $subcfg  = array( 'LANGUAGE' => $value );
+        $res = TRUE;
+        break;
+      case 'NL':
+      case 'NEWLINECHAR':
+        $this->nl = $value;
+        if( 'xcal' == $value ) {
+          $this->attributeDelimiter = $this->nl;
+          $this->valueInit          = null;
+        }
+        else {
+          $this->attributeDelimiter = ';';
+          $this->valueInit          = ':';
+        }
+        $subcfg  = array( 'NL' => $value );
+        $res = TRUE;
+        break;
+      case 'TZID':
+        $this->dtzid = $value;
+        $subcfg  = array( 'TZID' => $value );
+        $res = TRUE;
+        break;
+      case 'UNIQUE_ID':
+        $value   = trim( $value );
+        $this->unique_id = $value;
+        $this->_makeProdid();
+        $subcfg  = array( 'UNIQUE_ID' => $value );
+        $res = TRUE;
+        break;
+      case 'URL':
+            /* remote file - URL */
+        $value     = str_replace( array( 'HTTP://', 'WEBCAL://', 'webcal://' ), 'http://', trim( $value ));
+        if( 'http://' != substr( $value, 0, 7 ))
+          return FALSE;
+        $s1        = $this->url;
+        $this->url = $value;
+        $s2        = $this->directory;
+        $this->directory = null;
+        $parts     = pathinfo( $value );
+        if( FALSE === $this->setConfig( 'filename',  $parts['basename'] )) {
+          $this->url       = $s1;
+          $this->directory = $s2;
+          return FALSE;
+        }
+        else
+          return TRUE;
+        break;
+      default:  // any unvalid config key.. .
+        return TRUE;
+    }
+    if( !$res ) return FALSE;
+    if( isset( $subcfg ) && !empty( $this->components )) {
+      foreach( $subcfg as $cfgkey => $cfgvalue ) {
+        foreach( $this->components as $cix => $component ) {
+          $res = $component->setConfig( $cfgkey, $cfgvalue, TRUE );
+          if( !$res )
+            break 2;
+          $this->components[$cix] = $component->copy(); // PHP4 compliant
+        }
+      }
+    }
+    return $res;
+  }
+/*********************************************************************************/
+/**
+ * add calendar component to container
+ *
+ * alias to setComponent
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 1.x.x - 2007-04-24
+ * @param object $component calendar component
+ * @return void
+ */
+  function addComponent( $component ) {
+    $this->setComponent( $component );
+  }
+/**
+ * delete calendar component from container
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.8.8 - 2011-03-15
+ * @param mixed $arg1 ordno / component type / component uid
+ * @param mixed $arg2 optional, ordno if arg1 = component type
+ * @return void
+ */
+  function deleteComponent( $arg1, $arg2=FALSE  ) {
+    $argType = $index = null;
+    if ( ctype_digit( (string) $arg1 )) {
+      $argType = 'INDEX';
+      $index   = (int) $arg1 - 1;
+    }
+    elseif(( strlen( $arg1 ) <= strlen( 'vfreebusy' )) && ( FALSE === strpos( $arg1, '@' ))) {
+      $argType = strtolower( $arg1 );
+      $index   = ( !empty( $arg2 ) && ctype_digit( (string) $arg2 )) ? (( int ) $arg2 - 1 ) : 0;
+    }
+    $cix1dC = 0;
+    foreach ( $this->components as $cix => $component) {
+      if( empty( $component )) continue;
+      if(( 'INDEX' == $argType ) && ( $index == $cix )) {
+        unset( $this->components[$cix] );
+        return TRUE;
+      }
+      elseif( $argType == $component->objName ) {
+        if( $index == $cix1dC ) {
+          unset( $this->components[$cix] );
+          return TRUE;
+        }
+        $cix1dC++;
+      }
+      elseif( !$argType && ($arg1 == $component->getProperty( 'uid' ))) {
+        unset( $this->components[$cix] );
+        return TRUE;
+      }
+    }
+    return FALSE;
+  }
+/**
+ * get calendar component from container
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.15 - 2013-04-25
+ * @param mixed $arg1 optional, ordno/component type/ component uid
+ * @param mixed $arg2 optional, ordno if arg1 = component type
+ * @return object
+ */
+  function getComponent( $arg1=FALSE, $arg2=FALSE ) {
+    $index = $argType = null;
+    if ( !$arg1 ) { // first or next in component chain
+      $argType = 'INDEX';
+      $index   = $this->compix['INDEX'] = ( isset( $this->compix['INDEX'] )) ? $this->compix['INDEX'] + 1 : 1;
+    }
+    elseif( is_array( $arg1 )) { // array( *[propertyName => propertyValue] )
+      $arg2  = implode( '-', array_keys( $arg1 ));
+      $index = $this->compix[$arg2] = ( isset( $this->compix[$arg2] )) ? $this->compix[$arg2] + 1 : 1;
+      $dateProps  = array( 'DTSTART', 'DTEND', 'DUE', 'CREATED', 'COMPLETED', 'DTSTAMP', 'LAST-MODIFIED', 'RECURRENCE-ID' );
+      $otherProps = array( 'ATTENDEE', 'CATEGORIES', 'CONTACT', 'LOCATION', 'ORGANIZER', 'PRIORITY', 'RELATED-TO', 'RESOURCES', 'STATUS', 'SUMMARY', 'UID', 'URL' );
+      $mProps     = array( 'ATTENDEE', 'CATEGORIES', 'CONTACT', 'RELATED-TO', 'RESOURCES' );
+    }
+    elseif ( ctype_digit( (string) $arg1 )) { // specific component in chain
+      $argType = 'INDEX';
+      $index   = (int) $arg1;
+      unset( $this->compix );
+    }
+    elseif(( strlen( $arg1 ) <= strlen( 'vfreebusy' )) && ( FALSE === strpos( $arg1, '@' ))) { // object class name
+      unset( $this->compix['INDEX'] );
+      $argType = strtolower( $arg1 );
+      if( !$arg2 )
+        $index = $this->compix[$argType] = ( isset( $this->compix[$argType] )) ? $this->compix[$argType] + 1 : 1;
+      elseif( isset( $arg2 ) && ctype_digit( (string) $arg2 ))
+        $index = (int) $arg2;
+    }
+    elseif(( strlen( $arg1 ) > strlen( 'vfreebusy' )) && ( FALSE !== strpos( $arg1, '@' ))) { // UID as 1st argument
+      if( !$arg2 )
+        $index = $this->compix[$arg1] = ( isset( $this->compix[$arg1] )) ? $this->compix[$arg1] + 1 : 1;
+      elseif( isset( $arg2 ) && ctype_digit( (string) $arg2 ))
+        $index = (int) $arg2;
+    }
+    if( isset( $index ))
+      $index  -= 1;
+    $ckeys = array_keys( $this->components );
+    if( !empty( $index) && ( $index > end(  $ckeys )))
+      return FALSE;
+    $cix1gC = 0;
+    foreach ( $this->components as $cix => $component) {
+      if( empty( $component )) continue;
+      if(( 'INDEX' == $argType ) && ( $index == $cix ))
+        return $component->copy();
+      elseif( $argType == $component->objName ) {
+        if( $index == $cix1gC )
+          return $component->copy();
+        $cix1gC++;
+      }
+      elseif( is_array( $arg1 )) { // array( *[propertyName => propertyValue] )
+        $hit = array();
+        foreach( $arg1 as $pName => $pValue ) {
+          $pName = strtoupper( $pName );
+          if( !in_array( $pName, $dateProps ) && !in_array( $pName, $otherProps ))
+            continue;
+          if( in_array( $pName, $mProps )) { // multiple occurrence
+            $propValues = array();
+            $component->_getProperties( $pName, $propValues );
+            $propValues = array_keys( $propValues );
+            $hit[] = ( in_array( $pValue, $propValues )) ? TRUE : FALSE;
+            continue;
+          } // end   if(.. .// multiple occurrence
+          if( FALSE === ( $value = $component->getProperty( $pName ))) { // single occurrence
+            $hit[] = FALSE; // missing property
+            continue;
+          }
+          if( 'SUMMARY' == $pName ) { // exists within (any case)
+            $hit[] = ( FALSE !== stripos( $value, $pValue )) ? TRUE : FALSE;
+            continue;
+          }
+          if( in_array( strtoupper( $pName ), $dateProps )) {
+            $valuedate = sprintf( '%04d%02d%02d', $value['year'], $value['month'], $value['day'] );
+            if( 8 < strlen( $pValue )) {
+              if( isset( $value['hour'] )) {
+                if( 'T' == substr( $pValue, 8, 1 ))
+                  $pValue = str_replace( 'T', '', $pValue );
+                $valuedate .= sprintf( '%02d%02d%02d', $value['hour'], $value['min'], $value['sec'] );
+              }
+              else
+                $pValue = substr( $pValue, 0, 8 );
+            }
+            $hit[] = ( $pValue == $valuedate ) ? TRUE : FALSE;
+            continue;
+          }
+          elseif( !is_array( $value ))
+            $value = array( $value );
+          foreach( $value as $part ) {
+            $part = ( FALSE !== strpos( $part, ',' )) ? explode( ',', $part ) : array( $part );
+            foreach( $part as $subPart ) {
+              if( $pValue == $subPart ) {
+                $hit[] = TRUE;
+                continue 3;
+              }
+            }
+          } // end foreach( $value as $part )
+          $hit[] = FALSE; // no hit in property
+        } // end  foreach( $arg1 as $pName => $pValue )
+        if( in_array( TRUE, $hit )) {
+          if( $index == $cix1gC )
+            return $component->copy();
+          $cix1gC++;
+        }
+      } // end elseif( is_array( $arg1 )) { // array( *[propertyName => propertyValue] )
+      elseif( !$argType && ($arg1 == $component->getProperty( 'uid' ))) { // UID
+        if( $index == $cix1gC )
+          return $component->copy();
+        $cix1gC++;
+      }
+    } // end foreach ( $this->components.. .
+            /* not found.. . */
+    unset( $this->compix );
+    return FALSE;
+  }
+/**
+ * create new calendar component, already included within calendar
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.6.33 - 2011-01-03
+ * @param string $compType component type
+ * @return object (reference)
+ */
+  function & newComponent( $compType ) {
+    $config = $this->getConfig();
+    $keys   = array_keys( $this->components );
+    $ix     = end( $keys) + 1;
+    switch( strtoupper( $compType )) {
+      case 'EVENT':
+      case 'VEVENT':
+        $this->components[$ix] = new vevent( $config );
+        break;
+      case 'TODO':
+      case 'VTODO':
+        $this->components[$ix] = new vtodo( $config );
+        break;
+      case 'JOURNAL':
+      case 'VJOURNAL':
+        $this->components[$ix] = new vjournal( $config );
+        break;
+      case 'FREEBUSY':
+      case 'VFREEBUSY':
+        $this->components[$ix] = new vfreebusy( $config );
+        break;
+      case 'TIMEZONE':
+      case 'VTIMEZONE':
+        array_unshift( $this->components, new vtimezone( $config ));
+        $ix = 0;
+        break;
+      default:
+        return FALSE;
+    }
+    return $this->components[$ix];
+  }
+/**
+ * select components from calendar on date or selectOption basis
+ *
+ * Ensure DTSTART is set for every component.
+ * No date controls occurs.
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.13 - 2013-03-16
+ * @param mixed $startY optional, start Year,  default current Year ALT. array selecOptions ( *[ <propName> => <uniqueValue> ] )
+ * @param int   $startM optional, start Month, default current Month
+ * @param int   $startD optional, start Day,   default current Day
+ * @param int   $endY   optional, end   Year,  default $startY
+ * @param int   $endY   optional, end   Month, default $startM
+ * @param int   $endY   optional, end   Day,   default $startD
+ * @param mixed $cType  optional, calendar component type(-s), default FALSE=all else string/array type(-s)
+ * @param bool  $flat   optional, FALSE (default) => output : array[Year][Month][Day][]
+ *                                TRUE            => output : array[] (ignores split)
+ * @param bool  $any    optional, TRUE (default) - select component(-s) that occurs within period
+ *                                FALSE          - only component(-s) that starts within period
+ * @param bool  $split  optional, TRUE (default) - one component copy every DAY it occurs during the
+ *                                                 period (implies flat=FALSE)
+ *                                FALSE          - one occurance of component only in output array
+ * @return array or FALSE
+ */
+  function selectComponents( $startY=FALSE, $startM=FALSE, $startD=FALSE, $endY=FALSE, $endM=FALSE, $endD=FALSE, $cType=FALSE, $flat=FALSE, $any=TRUE, $split=TRUE ) {
+            /* check  if empty calendar */
+    if( 0 >= count( $this->components )) return FALSE;
+    if( is_array( $startY ))
+      return $this->selectComponents2( $startY );
+            /* check default dates */
+    if( !$startY ) $startY = date( 'Y' );
+    if( !$startM ) $startM = date( 'm' );
+    if( !$startD ) $startD = date( 'd' );
+    $startDate = mktime( 0, 0, 0, $startM, $startD, $startY );
+    if( !$endY )   $endY   = $startY;
+    if( !$endM )   $endM   = $startM;
+    if( !$endD )   $endD   = $startD;
+    $endDate   = mktime( 23, 59, 59, $endM, $endD, $endY );
+// echo 'selectComp arg='.date( 'Y-m-d H:i:s', $startDate).' -- '.date( 'Y-m-d H:i:s', $endDate)."<br>\n"; $tcnt = 0;// test ###
+            /* check component types */
+    $validTypes = array('vevent', 'vtodo', 'vjournal', 'vfreebusy' );
+    if( is_array( $cType )) {
+      foreach( $cType as $cix => $theType ) {
+        $cType[$cix] = $theType = strtolower( $theType );
+        if( !in_array( $theType, $validTypes ))
+          $cType[$cix] = 'vevent';
+      }
+      $cType = array_unique( $cType );
+    }
+    elseif( !empty( $cType )) {
+      $cType = strtolower( $cType );
+      if( !in_array( $cType, $validTypes ))
+        $cType = array( 'vevent' );
+      else
+        $cType = array( $cType );
+    }
+    else
+      $cType = $validTypes;
+    if( 0 >= count( $cType ))
+      $cType = $validTypes;
+    if(( FALSE === $flat ) && ( FALSE === $any )) // invalid combination
+      $split = FALSE;
+    if(( TRUE === $flat ) && ( TRUE === $split )) // invalid combination
+      $split = FALSE;
+            /* iterate components */
+    $result       = array();
+    $this->sort( 'UID' );
+    $compUIDcmp   = null;
+    $recurridList = array();
+    foreach ( $this->components as $cix => $component ) {
+      if( empty( $component )) continue;
+      unset( $start );
+            /* deselect unvalid type components */
+      if( !in_array( $component->objName, $cType ))
+        continue;
+      $start = $component->getProperty( 'dtstart' );
+            /* select due when dtstart is missing */
+      if( empty( $start ) && ( $component->objName == 'vtodo' ) && ( FALSE === ( $start = $component->getProperty( 'due' ))))
+        continue;
+      if( empty( $start ))
+        continue;
+      $compUID      = $component->getProperty( 'UID' );
+      if( $compUIDcmp != $compUID ) {
+        $compUIDcmp = $compUID;
+        unset( $exdatelist, $recurridList );
+      }
+      $dtendExist = $dueExist = $durationExist = $endAllDayEvent = $recurrid = FALSE;
+      unset( $end, $startWdate, $endWdate, $rdurWsecs, $rdur, $workstart, $workend, $endDateFormat ); // clean up
+      $startWdate = iCalUtilityFunctions::_date2timestamp( $start );
+      $startDateFormat = ( isset( $start['hour'] )) ? 'Y-m-d H:i:s' : 'Y-m-d';
+            /* get end date from dtend/due/duration properties */
+      $end = $component->getProperty( 'dtend' );
+      if( !empty( $end )) {
+        $dtendExist = TRUE;
+        $endDateFormat = ( isset( $end['hour'] )) ? 'Y-m-d H:i:s' : 'Y-m-d';
+      }
+      if( empty( $end ) && ( $component->objName == 'vtodo' )) {
+        $end = $component->getProperty( 'due' );
+        if( !empty( $end )) {
+          $dueExist = TRUE;
+          $endDateFormat = ( isset( $end['hour'] )) ? 'Y-m-d H:i:s' : 'Y-m-d';
+        }
+      }
+      if( !empty( $end ) && !isset( $end['hour'] )) {
+          /* a DTEND without time part regards an event that ends the day before,
+             for an all-day event DTSTART=20071201 DTEND=20071202 (taking place 20071201!!! */
+        $endAllDayEvent = TRUE;
+        $endWdate = mktime( 23, 59, 59, $end['month'], ($end['day'] - 1), $end['year'] );
+        $end['year']  = date( 'Y', $endWdate );
+        $end['month'] = date( 'm', $endWdate );
+        $end['day']   = date( 'd', $endWdate );
+        $end['hour']  = 23;
+        $end['min']   = $end['sec'] = 59;
+      }
+      if( empty( $end )) {
+        $end = $component->getProperty( 'duration', FALSE, FALSE, TRUE );// in dtend (array) format
+        if( !empty( $end ))
+          $durationExist = TRUE;
+          $endDateFormat = ( isset( $start['hour'] )) ? 'Y-m-d H:i:s' : 'Y-m-d';
+// if( !empty($end))  echo 'selectComp 4 start='.implode('-',$start).' end='.implode('-',$end)."<br>\n"; // test ###
+      }
+      if( empty( $end )) { // assume one day duration if missing end date
+        $end = array( 'year' => $start['year'], 'month' => $start['month'], 'day' => $start['day'], 'hour' => 23, 'min' => 59, 'sec' => 59 );
+      }
+// if( isset($end))  echo 'selectComp 5 start='.implode('-',$start).' end='.implode('-',$end)."<br>\n"; // test ###
+      $endWdate = iCalUtilityFunctions::_date2timestamp( $end );
+      if( $endWdate < $startWdate ) { // MUST be after start date!!
+        $end = array( 'year' => $start['year'], 'month' => $start['month'], 'day' => $start['day'], 'hour' => 23, 'min' => 59, 'sec' => 59 );
+        $endWdate = iCalUtilityFunctions::_date2timestamp( $end );
+      }
+      $rdurWsecs  = $endWdate - $startWdate; // compute event (component) duration in seconds
+            /* make a list of optional exclude dates for component occurence from exrule and exdate */
+      $exdatelist = array();
+      $workstart  = iCalUtilityFunctions::_timestamp2date(( $startDate - $rdurWsecs ), 6);
+      $workend    = iCalUtilityFunctions::_timestamp2date(( $endDate + $rdurWsecs ), 6);
+      while( FALSE !== ( $exrule = $component->getProperty( 'exrule' )))    // check exrule
+        iCalUtilityFunctions::_recur2date( $exdatelist, $exrule, $start, $workstart, $workend );
+      while( FALSE !== ( $exdate = $component->getProperty( 'exdate' ))) {  // check exdate
+        foreach( $exdate as $theExdate ) {
+          $exWdate = iCalUtilityFunctions::_date2timestamp( $theExdate );
+          $exWdate = mktime( 0, 0, 0, date( 'm', $exWdate ), date( 'd', $exWdate ), date( 'Y', $exWdate )); // on a day-basis !!!
+          if((( $startDate - $rdurWsecs ) <= $exWdate ) && ( $endDate >= $exWdate ))
+            $exdatelist[$exWdate] = TRUE;
+        } // end - foreach( $exdate as $theExdate )
+      }  // end - check exdate
+            /* check recurrence-id (note, a missing sequence is the same as sequence=0 so don't test for sequence), remove hit with reccurr-id date */
+      if( FALSE !== ( $t = $recurrid = $component->getProperty( 'recurrence-id' ))) {
+        $recurrid = iCalUtilityFunctions::_date2timestamp( $recurrid );
+        $recurrid = mktime( 0, 0, 0, date( 'm', $recurrid ), date( 'd', $recurrid ), date( 'Y', $recurrid )); // on a day-basis !!!
+        $recurridList[$recurrid] = TRUE;                                             // no recurring to start this day
+// echo "adding comp no:$cix with date=".implode($start)." and recurrid=".implode($t)." to recurridList id=$recurrid<br>\n"; // test ###
+      } // end recurrence-id/sequence test
+            /* select only components with.. . */
+      if(( !$any && ( $startWdate >= $startDate ) && ( $startWdate <= $endDate )) || // (dt)start within the period
+         (  $any && ( $startWdate < $endDate ) && ( $endWdate >= $startDate ))) {    // occurs within the period
+            /* add the selected component (WITHIN valid dates) to output array */
+        if( $flat ) { // any=true/false, ignores split
+          if( !$recurrid )
+            $result[$compUID] = $component->copy(); // copy original to output (but not anyone with recurrence-id)
+        }
+        elseif( $split ) { // split the original component
+          if( $endWdate > $endDate )
+            $endWdate = $endDate;     // use period end date
+          $rstart   = $startWdate;
+          if( $rstart < $startDate )
+            $rstart = $startDate; // use period start date
+          $startYMD = $rstartYMD = date( 'Ymd', $rstart );
+          $endYMD   = date( 'Ymd', $endWdate );
+          $checkDate = mktime( 0, 0, 0, date( 'm', $rstart ), date( 'd', $rstart ), date( 'Y', $rstart ) ); // on a day-basis !!!
+// echo "going to test comp no:$cix with rstartYMD=$rstartYMD, endYMD=$endYMD and checkDate($checkDate) with recurridList=".implode(',',array_keys($recurridList))."<br>\n"; // test ###
+          if( !isset( $exdatelist[$checkDate] )) { // exclude any recurrence START date, found in exdatelist
+            while( $rstartYMD <= $endYMD ) { // iterate
+              if( isset( $exdatelist[$checkDate] ) ||                   // exclude any recurrence date, found in the exdatelist
+                ( isset( $recurridList[$checkDate] ) && !$recurrid )) { // or in the recurridList, but not itself
+// echo "skipping comp no:$cix with datestart=$rstartYMD and checkdate=$checkDate<br>\n"; // test ###
+                $rstart = mktime( date( 'H', $rstart ), date( 'i', $rstart ), date( 's', $rstart ), date( 'm', $rstart ), date( 'd', $rstart ) + 1, date( 'Y', $rstart ) ); // step one day
+                $rstartYMD = date( 'Ymd', $rstart );
+                continue;
+              }
+              if( $rstartYMD > $startYMD ) // date after dtstart
+                $datestring = date( $startDateFormat, $checkDate ); // mktime( 0, 0, 0, date( 'm', $rstart ), date( 'd', $rstart ), date( 'Y', $rstart )));
+              else
+                $datestring = date( $startDateFormat, $rstart );
+              if( isset( $start['tz'] ))
+                $datestring .= ' '.$start['tz'];
+// echo "split org comp no:$cix rstartYMD=$rstartYMD (datestring=$datestring)<br>\n"; // test ###
+              $component->setProperty( 'X-CURRENT-DTSTART', $datestring );
+              if( $dtendExist || $dueExist || $durationExist ) {
+                if( $rstartYMD < $endYMD ) // not the last day
+                  $tend = mktime( 23, 59, 59, date( 'm', $rstart ), date( 'd', $rstart ), date( 'Y', $rstart ));
+                else
+                  $tend = mktime( date( 'H', $endWdate ), date( 'i', $endWdate ), date( 's', $endWdate ), date( 'm', $rstart ), date( 'd', $rstart ), date( 'Y', $rstart ) ); // on a day-basis !!!
+                if( $endAllDayEvent && $dtendExist )
+                  $tend += ( 24 * 3600 ); // alldaysevents has an end date 'day after' meaning this day
+                $datestring = date( $endDateFormat, $tend );
+                if( isset( $end['tz'] ))
+                  $datestring .= ' '.$end['tz'];
+                $propName = ( !$dueExist ) ? 'X-CURRENT-DTEND' : 'X-CURRENT-DUE';
+                $component->setProperty( $propName, $datestring );
+              } // end if( $dtendExist || $dueExist || $durationExist )
+              $wd        = getdate( $rstart );
+              $result[$wd['year']][$wd['mon']][$wd['mday']][$compUID] = $component->copy(); // copy to output
+              $rstart    = mktime( date( 'H', $rstart ), date( 'i', $rstart ), date( 's', $rstart ), date( 'm', $rstart ), date( 'd', $rstart ) + 1, date( 'Y', $rstart ) ); // step one day
+              $rstartYMD = date( 'Ymd', $rstart );
+              $checkDate = mktime( 0, 0, 0, date( 'm', $rstart ), date( 'd', $rstart ), date( 'Y', $rstart ) ); // on a day-basis !!!
+            } // end while( $rstart <= $endWdate )
+          } // end if( !isset( $exdatelist[$checkDate] ))
+        } // end elseif( $split )   -  else use component date
+        elseif( $recurrid && !$flat && !$any && !$split )
+          $continue = TRUE;
+        else { // !$flat && !$split, i.e. no flat array and DTSTART within period
+          $checkDate = mktime( 0, 0, 0, date( 'm', $startWdate ), date( 'd', $startWdate ), date( 'Y', $startWdate ) ); // on a day-basis !!!
+// echo "going to test comp no:$cix with checkDate=$checkDate with recurridList=".implode(',',array_keys($recurridList)); // test ###
+          if(( !$any || !isset( $exdatelist[$checkDate] )) &&   // exclude any recurrence date, found in exdatelist
+              ( !isset( $recurridList[$checkDate] ) || $recurrid )) { // or in the recurridList, but not itself
+// echo " and copied to output<br>\n"; // test ###
+            $wd = getdate( $startWdate );
+            $result[$wd['year']][$wd['mon']][$wd['mday']][$compUID] = $component->copy(); // copy to output
+          }
+        }
+      } // end if(( $startWdate >= $startDate ) && ( $startWdate <= $endDate ))
+            /* if 'any' components, check components with reccurrence rules, removing all excluding dates */
+      if( TRUE === $any ) {
+            /* make a list of optional repeating dates for component occurence, rrule, rdate */
+        $recurlist = array();
+        while( FALSE !== ( $rrule = $component->getProperty( 'rrule' )))    // check rrule
+          iCalUtilityFunctions::_recur2date( $recurlist, $rrule, $start, $workstart, $workend );
+        foreach( $recurlist as $recurkey => $recurvalue )                   // key=match date as timestamp
+          $recurlist[$recurkey] = $rdurWsecs;                               // add duration in seconds
+        while( FALSE !== ( $rdate = $component->getProperty( 'rdate' ))) {  // check rdate
+          foreach( $rdate as $theRdate ) {
+            if( is_array( $theRdate ) && ( 2 == count( $theRdate )) &&      // all days within PERIOD
+                   array_key_exists( '0', $theRdate ) &&  array_key_exists( '1', $theRdate )) {
+              $rstart = iCalUtilityFunctions::_date2timestamp( $theRdate[0] );
+              if(( $rstart < ( $startDate - $rdurWsecs )) || ( $rstart > $endDate ))
+                continue;
+              if( isset( $theRdate[1]['year'] )) // date-date period
+                $rend = iCalUtilityFunctions::_date2timestamp( $theRdate[1] );
+              else {                             // date-duration period
+                $rend = iCalUtilityFunctions::_duration2date( $theRdate[0], $theRdate[1] );
+                $rend = iCalUtilityFunctions::_date2timestamp( $rend );
+              }
+              while( $rstart < $rend ) {
+                $recurlist[$rstart] = $rdurWsecs; // set start date for recurrence instance + rdate duration in seconds
+                $rstart = mktime( date( 'H', $rstart ), date( 'i', $rstart ), date( 's', $rstart ), date( 'm', $rstart ), date( 'd', $rstart ) + 1, date( 'Y', $rstart ) ); // step one day
+              }
+            } // PERIOD end
+            else { // single date
+              $theRdate = iCalUtilityFunctions::_date2timestamp( $theRdate );
+              if((( $startDate - $rdurWsecs ) <= $theRdate ) && ( $endDate >= $theRdate ))
+                $recurlist[$theRdate] = $rdurWsecs; // set start date for recurrence instance + event duration in seconds
+            }
+          }
+        }  // end - check rdate
+        foreach( $recurlist as $recurkey => $durvalue ) { // remove all recurrence START dates found in the exdatelist
+          $checkDate = mktime( 0, 0, 0, date( 'm', $recurkey ), date( 'd', $recurkey ), date( 'Y', $recurkey ) ); // on a day-basis !!!
+          if( isset( $exdatelist[$checkDate] )) // no recurring to start this day
+            unset( $recurlist[$recurkey] );
+        }
+        if( 0 < count( $recurlist )) {
+          ksort( $recurlist );
+          $xRecurrence = 1;
+          $component2  = $component->copy();
+          $compUID     = $component2->getProperty( 'UID' );
+          foreach( $recurlist as $recurkey => $durvalue ) {
+// echo "recurKey=".date( 'Y-m-d H:i:s', $recurkey ).' dur='.iCalUtilityFunctions::offsetSec2His( $durvalue )."<br>\n"; // test ###;
+            if((( $startDate - $rdurWsecs ) > $recurkey ) || ( $endDate < $recurkey )) // not within period
+              continue;
+            $checkDate = mktime( 0, 0, 0, date( 'm', $recurkey ), date( 'd', $recurkey ), date( 'Y', $recurkey ) ); // on a day-basis !!!
+            if( isset( $recurridList[$checkDate] )) // no recurring to start this day
+              continue;
+            if( isset( $exdatelist[$checkDate] ))   // check excluded dates
+              continue;
+            if( $startWdate >= $recurkey )          // exclude component start date
+              continue;
+            $rstart = $recurkey;
+            $rend   = $recurkey + $durvalue;
+           /* add repeating components within valid dates to output array, only start date set */
+            if( $flat ) {
+              if( !isset( $result[$compUID] )) // only one comp
+                $result[$compUID] = $component2->copy(); // copy to output
+            }
+           /* add repeating components within valid dates to output array, one each day */
+            elseif( $split ) {
+              $xRecurrence += 1;
+              if( $rend > $endDate )
+                $rend = $endDate;
+              $startYMD = $rstartYMD = date( 'Ymd', $rstart );
+              $endYMD   = date( 'Ymd', $rend );
+// echo "splitStart=".date( 'Y-m-d H:i:s', $rstart ).' end='.date( 'Y-m-d H:i:s', $rend )."<br>\n"; // test ###;
+              while( $rstart <= $rend ) { // iterate.. .
+                $checkDate = mktime( 0, 0, 0, date( 'm', $rstart ), date( 'd', $rstart ), date( 'Y', $rstart ) ); // on a day-basis !!!
+                if( isset( $recurridList[$checkDate] )) // no recurring to start this day
+                  break;
+                if( isset( $exdatelist[$checkDate] ))   // exclude any recurrence START date, found in exdatelist
+                  break;
+// echo "checking date after startdate=".date( 'Y-m-d H:i:s', $rstart ).' mot '.date( 'Y-m-d H:i:s', $startDate )."<br>"; // test ###;
+                if( $rstart >= $startDate ) {           // date after dtstart
+                  if( $rstartYMD > $startYMD )          // date after dtstart
+                    $datestring = date( $startDateFormat, $checkDate );
+                  else
+                    $datestring = date( $startDateFormat, $rstart );
+                  if( isset( $start['tz'] ))
+                    $datestring .= ' '.$start['tz'];
+// echo "spliting = $datestring<BR>\n"; // test ###
+                  $component2->setProperty( 'X-CURRENT-DTSTART', $datestring );
+                  if( $dtendExist || $dueExist || $durationExist ) {
+                    if( $rstartYMD < $endYMD ) // not the last day
+                      $tend = mktime( 23, 59, 59, date( 'm', $rstart ), date( 'd', $rstart ), date( 'Y', $rstart ));
+                    else
+                      $tend = mktime( date( 'H', $endWdate ), date( 'i', $endWdate ), date( 's', $endWdate ), date( 'm', $rstart ), date( 'd', $rstart ), date( 'Y', $rstart ) ); // on a day-basis !!!
+                    if( $endAllDayEvent && $dtendExist )
+                      $tend += ( 24 * 3600 );           // alldaysevents has an end date 'day after' meaning this day
+                    $datestring = date( $endDateFormat, $tend );
+                    if( isset( $end['tz'] ))
+                      $datestring .= ' '.$end['tz'];
+                    $propName = ( !$dueExist ) ? 'X-CURRENT-DTEND' : 'X-CURRENT-DUE';
+                    $component2->setProperty( $propName, $datestring );
+                  } // end if( $dtendExist || $dueExist || $durationExist )
+                  $component2->setProperty( 'X-RECURRENCE', $xRecurrence );
+                  $wd = getdate( $rstart );
+                  $result[$wd['year']][$wd['mon']][$wd['mday']][$compUID] = $component2->copy(); // copy to output
+                } // end if( $checkDate > $startYMD ) { // date after dtstart
+                $rstart = mktime( date( 'H', $rstart ), date( 'i', $rstart ), date( 's', $rstart ), date( 'm', $rstart ), date( 'd', $rstart ) + 1, date( 'Y', $rstart ) ); // step one day
+                $rstartYMD = date( 'Ymd', $rstart );
+              } // end while( $rstart <= $rend )
+            } // end elseif( $split )
+            elseif( $rstart >= $startDate ) {           // date within period   //* flat=FALSE && split=FALSE => one comp every recur startdate *//
+              $xRecurrence += 1;
+              $checkDate = mktime( 0, 0, 0, date( 'm', $rstart ), date( 'd', $rstart ), date( 'Y', $rstart ) ); // on a day-basis !!!
+              if( !isset( $exdatelist[$checkDate] )) {  // exclude any recurrence START date, found in exdatelist
+                $datestring = date( $startDateFormat, $rstart );
+                if( isset( $start['tz'] ))
+                  $datestring .= ' '.$start['tz'];
+//echo "X-CURRENT-DTSTART 2 = $datestring xRecurrence=$xRecurrence tcnt =".++$tcnt."<br>";$component2->setProperty( 'X-CNT', $tcnt ); // test ###
+                $component2->setProperty( 'X-CURRENT-DTSTART', $datestring );
+                if( $dtendExist || $dueExist || $durationExist ) {
+                  $tend = $rstart + $rdurWsecs;
+                  if( date( 'Ymd', $tend ) < date( 'Ymd', $endWdate ))
+                    $tend = mktime( 23, 59, 59, date( 'm', $tend ), date( 'd', $tend ), date( 'Y', $tend ));
+                  else
+                    $tend = mktime( date( 'H', $endWdate ), date( 'i', $endWdate ), date( 's', $endWdate ), date( 'm', $tend ), date( 'd', $tend ), date( 'Y', $tend ) ); // on a day-basis !!!
+                  if( $endAllDayEvent && $dtendExist )
+                    $tend += ( 24 * 3600 ); // alldaysevents has an end date 'day after' meaning this day
+                  $datestring = date( $endDateFormat, $tend );
+                  if( isset( $end['tz'] ))
+                    $datestring .= ' '.$end['tz'];
+                  $propName = ( !$dueExist ) ? 'X-CURRENT-DTEND' : 'X-CURRENT-DUE';
+                  $component2->setProperty( $propName, $datestring );
+                } // end if( $dtendExist || $dueExist || $durationExist )
+                $component2->setProperty( 'X-RECURRENCE', $xRecurrence );
+                $wd = getdate( $rstart );
+                $result[$wd['year']][$wd['mon']][$wd['mday']][$compUID] = $component2->copy(); // copy to output
+              } // end if( !isset( $exdatelist[$checkDate] ))
+            } // end elseif( $rstart >= $startDate )
+          } // end foreach( $recurlist as $recurkey => $durvalue )
+          unset( $component2 );
+        } // end if( 0 < count( $recurlist ))
+            /* deselect components with startdate/enddate not within period */
+        if(( $endWdate < $startDate ) || ( $startWdate > $endDate ))
+          continue;
+      } // end if( TRUE === $any )
+    } // end foreach ( $this->components as $cix => $component )
+    unset( $dtendExist, $dueExist, $durationExist, $endAllDayEvent, $recurrid, $recurridList,
+           $end, $startWdate, $endWdate, $rdurWsecs, $rdur, $exdatelist, $recurlist, $workstart, $workend, $endDateFormat ); // clean up
+    if( 0 >= count( $result )) return FALSE;
+    elseif( !$flat ) {
+      foreach( $result as $y => $yeararr ) {
+        foreach( $yeararr as $m => $montharr ) {
+          foreach( $montharr as $d => $dayarr ) {
+            if( empty( $result[$y][$m][$d] ))
+                unset( $result[$y][$m][$d] );
+            else
+              $result[$y][$m][$d] = array_values( $dayarr ); // skip tricky UID-index, hoping they are in hour order.. .
+          }
+          if( empty( $result[$y][$m] ))
+              unset( $result[$y][$m] );
+          else
+            ksort( $result[$y][$m] );
+        }
+        if( empty( $result[$y] ))
+            unset( $result[$y] );
+        else
+          ksort( $result[$y] );
+      }
+      if( empty( $result ))
+          unset( $result );
+      else
+        ksort( $result );
+    } // end elseif( !$flat )
+    if( 0 >= count( $result ))
+      return FALSE;
+    return $result;
+  }
+/**
+ * select components from calendar on based on specific property value(-s)
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.6 - 2012-12-26
+ * @param array $selectOptions, (string) key => (mixed) value, (key=propertyName)
+ * @return array
+ */
+  function selectComponents2( $selectOptions ) {
+    $output = array();
+    $allowedComps      = array('vevent', 'vtodo', 'vjournal', 'vfreebusy' );
+    $allowedProperties = array( 'ATTENDEE', 'CATEGORIES', 'CONTACT', 'LOCATION', 'ORGANIZER', 'PRIORITY', 'RELATED-TO', 'RESOURCES', 'STATUS', 'SUMMARY', 'UID', 'URL' );
+    foreach( $this->components as $cix => $component3 ) {
+      if( !in_array( $component3->objName, $allowedComps ))
+        continue;
+      $uid = $component3->getProperty( 'UID' );
+      foreach( $selectOptions as $propName => $pvalue ) {
+        $propName = strtoupper( $propName );
+        if( !in_array( $propName, $allowedProperties ))
+          continue;
+        if( !is_array( $pvalue ))
+          $pvalue = array( $pvalue );
+        if(( 'UID' == $propName ) && in_array( $uid, $pvalue )) {
+          $output[$uid][] = $component3->copy();
+          continue;
+        }
+        elseif(( 'ATTENDEE' == $propName ) || ( 'CATEGORIES' == $propName ) || ( 'CONTACT' == $propName ) || ( 'RELATED-TO' == $propName ) || ( 'RESOURCES' == $propName )) { // multiple occurrence?
+          $propValues = array();
+          $component3->_getProperties( $propName, $propValues );
+          $propValues = array_keys( $propValues );
+          foreach( $pvalue as $theValue ) {
+            if( in_array( $theValue, $propValues )) { //  && !isset( $output[$uid] )) {
+              $output[$uid][] = $component3->copy();
+              break;
+            }
+          }
+          continue;
+        } // end   elseif( // multiple occurrence?
+        elseif( FALSE === ( $d = $component3->getProperty( $propName ))) // single occurrence
+          continue;
+        if( is_array( $d )) {
+          foreach( $d as $part ) {
+            if( in_array( $part, $pvalue ) && !isset( $output[$uid] ))
+              $output[$uid][] = $component3->copy();
+          }
+        }
+        elseif(( 'SUMMARY' == $propName ) && !isset( $output[$uid] )) {
+          foreach( $pvalue as $pval ) {
+            if( FALSE !== stripos( $d, $pval )) {
+              $output[$uid][] = $component3->copy();
+              break;
+            }
+          }
+        }
+        elseif( in_array( $d, $pvalue ) && !isset( $output[$uid] ))
+          $output[$uid][] = $component3->copy();
+      } // end foreach( $selectOptions as $propName => $pvalue ) {
+    } // end foreach( $this->components as $cix => $component3 ) {
+    if( !empty( $output )) {
+      ksort( $output ); // uid order
+      $output2 = array();
+      foreach( $output as $uid => $components ) {
+        foreach( $components as $component )
+          $output2[] = $component;
+      }
+      $output = $output2;
+    }
+    return $output;
+  }
+/**
+ * add calendar component to container
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.8.8 - 2011-03-15
+ * @param object $component calendar component
+ * @param mixed $arg1 optional, ordno/component type/ component uid
+ * @param mixed $arg2 optional, ordno if arg1 = component type
+ * @return void
+ */
+  function setComponent( $component, $arg1=FALSE, $arg2=FALSE  ) {
+    $component->setConfig( $this->getConfig(), FALSE, TRUE );
+    if( !in_array( $component->objName, array( 'valarm', 'vtimezone' ))) {
+            /* make sure dtstamp and uid is set */
+      $dummy1 = $component->getProperty( 'dtstamp' );
+      $dummy2 = $component->getProperty( 'uid' );
+    }
+    if( !$arg1 ) { // plain insert, last in chain
+      $this->components[] = $component->copy();
+      return TRUE;
+    }
+    $argType = $index = null;
+    if ( ctype_digit( (string) $arg1 )) { // index insert/replace
+      $argType = 'INDEX';
+      $index   = (int) $arg1 - 1;
+    }
+    elseif( in_array( strtolower( $arg1 ), array( 'vevent', 'vtodo', 'vjournal', 'vfreebusy', 'valarm', 'vtimezone' ))) {
+      $argType = strtolower( $arg1 );
+      $index = ( ctype_digit( (string) $arg2 )) ? ((int) $arg2) - 1 : 0;
+    }
+    // else if arg1 is set, arg1 must be an UID
+    $cix1sC = 0;
+    foreach ( $this->components as $cix => $component2) {
+      if( empty( $component2 )) continue;
+      if(( 'INDEX' == $argType ) && ( $index == $cix )) { // index insert/replace
+        $this->components[$cix] = $component->copy();
+        return TRUE;
+      }
+      elseif( $argType == $component2->objName ) { // component Type index insert/replace
+        if( $index == $cix1sC ) {
+          $this->components[$cix] = $component->copy();
+          return TRUE;
+        }
+        $cix1sC++;
+      }
+      elseif( !$argType && ( $arg1 == $component2->getProperty( 'uid' ))) { // UID insert/replace
+        $this->components[$cix] = $component->copy();
+        return TRUE;
+      }
+    }
+            /* arg1=index and not found.. . insert at index .. .*/
+    if( 'INDEX' == $argType ) {
+      $this->components[$index] = $component->copy();
+      ksort( $this->components, SORT_NUMERIC );
+    }
+    else    /* not found.. . insert last in chain anyway .. .*/
+      $this->components[] = $component->copy();
+    return TRUE;
+  }
+/**
+ * sort iCal compoments
+ *
+ * ascending sort on properties (if exist) x-current-dtstart, dtstart,
+ * x-current-dtend, dtend, x-current-due, due, duration, created, dtstamp, uid if called without arguments,
+ * otherwise sorting on specific (argument) property values
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.4 - 2012-12-17
+ * @param string $sortArg, optional
+ * @return void
+ *
+ */
+  function sort( $sortArg=FALSE ) {
+    if( ! is_array( $this->components ) || ( 2 > count( $this->components )))
+      return;
+    if( $sortArg ) {
+      $sortArg = strtoupper( $sortArg );
+      if( !in_array( $sortArg, array( 'ATTENDEE', 'CATEGORIES', 'CONTACT', 'DTSTAMP', 'LOCATION', 'ORGANIZER', 'PRIORITY', 'RELATED-TO', 'RESOURCES', 'STATUS', 'SUMMARY', 'UID', 'URL' )))
+        $sortArg = FALSE;
+    }
+            /* set sort parameters for each component */
+    foreach( $this->components as $cix => & $c ) {
+      $c->srtk = array( '0', '0', '0', '0' );
+      if( 'vtimezone' == $c->objName ) {
+        if( FALSE === ( $c->srtk[0] = $c->getProperty( 'tzid' )))
+          $c->srtk[0] = 0;
+        continue;
+      }
+      elseif( $sortArg ) {
+        if(( 'ATTENDEE' == $sortArg ) || ( 'CATEGORIES' == $sortArg ) || ( 'CONTACT' == $sortArg ) || ( 'RELATED-TO' == $sortArg ) || ( 'RESOURCES' == $sortArg )) {
+          $propValues = array();
+          $c->_getProperties( $sortArg, $propValues );
+          if( !empty( $propValues )) {
+            $sk         = array_keys( $propValues );
+            $c->srtk[0] = $sk[0];
+            if( 'RELATED-TO'  == $sortArg )
+              $c->srtk[0] .= $c->getProperty( 'uid' );
+          }
+          elseif( 'RELATED-TO'  == $sortArg )
+            $c->srtk[0] = $c->getProperty( 'uid' );
+        }
+        elseif( FALSE !== ( $d = $c->getProperty( $sortArg ))) {
+          $c->srtk[0] = $d;
+          if( 'UID' == $sortArg ) {
+            if( FALSE !== ( $d = $c->getProperty( 'recurrence-id' ))) {
+              $c->srtk[1] = iCalUtilityFunctions::_date2strdate( $d );
+              if( FALSE === ( $c->srtk[2] = $c->getProperty( 'sequence' )))
+                $c->srtk[2] = PHP_INT_MAX;
+            }
+            else
+              $c->srtk[1] = $c->srtk[2] = PHP_INT_MAX;
+          }
+        }
+        continue;
+      } // end elseif( $sortArg )
+      if( FALSE !== ( $d = $c->getProperty( 'X-CURRENT-DTSTART' ))) {
+        $c->srtk[0] = iCalUtilityFunctions::_strdate2date( $d[1] );
+        unset( $c->srtk[0]['unparsedtext'] );
+      }
+      elseif( FALSE === ( $c->srtk[0] = $c->getProperty( 'dtstart' )))
+        $c->srtk[0] = 0;                                                  // sortkey 0 : dtstart
+
+      if( FALSE !== ( $d = $c->getProperty( 'X-CURRENT-DTEND' ))) {
+        $c->srtk[1] = iCalUtilityFunctions::_strdate2date( $d[1] );   // sortkey 1 : dtend/due(/duration)
+        unset( $c->srtk[1]['unparsedtext'] );
+      }
+      elseif( FALSE === ( $c->srtk[1] = $c->getProperty( 'dtend' ))) {
+        if( FALSE !== ( $d = $c->getProperty( 'X-CURRENT-DUE' ))) {
+          $c->srtk[1] = iCalUtilityFunctions::_strdate2date( $d[1] );
+          unset( $c->srtk[1]['unparsedtext'] );
+        }
+        elseif( FALSE === ( $c->srtk[1] = $c->getProperty( 'due' )))
+          if( FALSE === ( $c->srtk[1] = $c->getProperty( 'duration', FALSE, FALSE, TRUE )))
+            $c->srtk[1] = 0;
+      }
+
+      if( FALSE === ( $c->srtk[2] = $c->getProperty( 'created' )))      // sortkey 2 : created/dtstamp
+        if( FALSE === ( $c->srtk[2] = $c->getProperty( 'dtstamp' )))
+          $c->srtk[2] = 0;
+
+      if( FALSE === ( $c->srtk[3] = $c->getProperty( 'uid' )))          // sortkey 3 : uid
+        $c->srtk[3] = 0;
+    } // end foreach( $this->components as & $c
+            /* sort */
+    usort( $this->components, array( 'iCalUtilityFunctions', '_cmpfcn' ));
+  }
+/**
+ * parse iCal text/file into vcalendar, components, properties and parameters
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.2 - 2012-12-18
+ * @param mixed $unparsedtext, optional, strict rfc2445 formatted, single property string or array of property strings
+ * @return bool FALSE if error occurs during parsing
+ *
+ */
+  function parse( $unparsedtext=FALSE ) {
+    $nl = $this->getConfig( 'nl' );
+    if(( FALSE === $unparsedtext ) || empty( $unparsedtext )) {
+            /* directory+filename is set previously via setConfig directory+filename or url */
+      if( FALSE === ( $filename = $this->getConfig( 'url' )))
+        $filename = $this->getConfig( 'dirfile' );
+            /* READ FILE */
+      if( FALSE === ( $rows = file_get_contents( $filename )))
+        return FALSE;                 /* err 1 */
+    }
+    elseif( is_array( $unparsedtext ))
+      $rows =  implode( '\n'.$nl, $unparsedtext );
+    else
+      $rows = & $unparsedtext;
+            /* fix line folding */
+    $rows = explode( $nl, iCalUtilityFunctions::convEolChar( $rows, $nl ));
+            /* skip leading (empty/invalid) lines */
+    foreach( $rows as $lix => $line ) {
+      if( FALSE !== stripos( $line, 'BEGIN:VCALENDAR' ))
+        break;
+      unset( $rows[$lix] );
+    }
+    $rcnt = count( $rows );
+    if( 3 > $rcnt )                  /* err 10 */
+      return FALSE;
+            /* skip trailing empty lines and ensure an end row */
+    $lix  = array_keys( $rows );
+    $lix  = end( $lix );
+    while( 3 < $lix ) {
+      $tst = trim( $rows[$lix] );
+      if(( '\n' == $tst ) || empty( $tst )) {
+        unset( $rows[$lix] );
+        $lix--;
+        continue;
+      }
+      if( FALSE === stripos( $rows[$lix], 'END:VCALENDAR' ))
+        $rows[] = 'END:VCALENDAR';
+      break;
+    }
+    $comp    = & $this;
+    $calsync = $compsync = 0;
+            /* identify components and update unparsed data within component */
+    $config = $this->getConfig();
+    $endtxt = array( 'END:VE', 'END:VF', 'END:VJ', 'END:VT' );
+    foreach( $rows as $lix => $line ) {
+      if(     'BEGIN:VCALENDAR' == strtoupper( substr( $line, 0, 15 ))) {
+        $calsync++;
+        continue;
+      }
+      elseif( 'END:VCALENDAR'   == strtoupper( substr( $line, 0, 13 ))) {
+        if( 0 < $compsync )
+          $this->components[] = $comp->copy();
+        $compsync--;
+        $calsync--;
+        break;
+      }
+      elseif( 1 != $calsync )
+        return FALSE;                 /* err 20 */
+      elseif( in_array( strtoupper( substr( $line, 0, 6 )), $endtxt )) {
+        $this->components[] = $comp->copy();
+        $compsync--;
+        continue;
+      }
+      if(     'BEGIN:VEVENT'    == strtoupper( substr( $line, 0, 12 ))) {
+        $comp = new vevent( $config );
+        $compsync++;
+      }
+      elseif( 'BEGIN:VFREEBUSY' == strtoupper( substr( $line, 0, 15 ))) {
+        $comp = new vfreebusy( $config );
+        $compsync++;
+      }
+      elseif( 'BEGIN:VJOURNAL'  == strtoupper( substr( $line, 0, 14 ))) {
+        $comp = new vjournal( $config );
+        $compsync++;
+      }
+      elseif( 'BEGIN:VTODO'     == strtoupper( substr( $line, 0, 11 ))) {
+        $comp = new vtodo( $config );
+        $compsync++;
+      }
+      elseif( 'BEGIN:VTIMEZONE' == strtoupper( substr( $line, 0, 15 ))) {
+        $comp = new vtimezone( $config );
+        $compsync++;
+      }
+      else { /* update component with unparsed data */
+        $comp->unparsed[] = $line;
+      }
+    } // end foreach( $rows as $line )
+    unset( $config, $endtxt );
+            /* parse data for calendar (this) object */
+    if( isset( $this->unparsed ) && is_array( $this->unparsed ) && ( 0 < count( $this->unparsed ))) {
+            /* concatenate property values spread over several lines */
+      $propnames = array( 'calscale','method','prodid','version','x-' );
+      $proprows  = array();
+      for( $i = 0; $i < count( $this->unparsed ); $i++ ) { // concatenate lines
+        $line = rtrim( $this->unparsed[$i], $nl );
+        while( isset( $this->unparsed[$i+1] ) && !empty( $this->unparsed[$i+1] ) && ( ' ' == $this->unparsed[$i+1]{0} ))
+          $line .= rtrim( substr( $this->unparsed[++$i], 1 ), $nl );
+        $proprows[] = $line;
+      }
+      $paramMStz   = array( 'utc-', 'utc+', 'gmt-', 'gmt+' );
+      $paramProto3 = array( 'fax:', 'cid:', 'sms:', 'tel:', 'urn:' );
+      $paramProto4 = array( 'crid:', 'news:', 'pres:' );
+      foreach( $proprows as $line ) {
+        if( '\n' == substr( $line, -2 ))
+          $line = substr( $line, 0, -2 );
+            /* get property name */
+        $propname  = '';
+        $cix       = 0;
+        while( FALSE !== ( $char = substr( $line, $cix, 1 ))) {
+          if( in_array( $char, array( ':', ';' )))
+            break;
+          else
+            $propname .= $char;
+          $cix++;
+        }
+            /* skip non standard property names */
+        if(( 'x-' != strtolower( substr( $propname, 0, 2 ))) && !in_array( strtolower( $propname ), $propnames ))
+          continue;
+            /* ignore version/prodid properties */
+        if( in_array( strtolower( $propname ), array( 'version', 'prodid' )))
+          continue;
+            /* rest of the line is opt.params and value */
+        $line = substr( $line, $cix);
+            /* separate attributes from value */
+        $attr         = array();
+        $attrix       = -1;
+        $strlen       = strlen( $line );
+        $WithinQuotes = FALSE;
+        $cix          = 0;
+        while( FALSE !== substr( $line, $cix, 1 )) {
+          if(                       ( ':'  == $line[$cix] )                         &&
+                                    ( substr( $line,$cix,     3 )  != '://' )       &&
+             ( !in_array( strtolower( substr( $line,$cix - 6, 4 )), $paramMStz ))   &&
+             ( !in_array( strtolower( substr( $line,$cix - 3, 4 )), $paramProto3 )) &&
+             ( !in_array( strtolower( substr( $line,$cix - 4, 5 )), $paramProto4 )) &&
+                        ( strtolower( substr( $line,$cix - 6, 7 )) != 'mailto:' )   &&
+               !$WithinQuotes ) {
+            $attrEnd = TRUE;
+            if(( $cix < ( $strlen - 4 )) &&
+                 ctype_digit( substr( $line, $cix+1, 4 ))) { // an URI with a (4pos) portnr??
+              for( $c2ix = $cix; 3 < $c2ix; $c2ix-- ) {
+                if( '://' == substr( $line, $c2ix - 2, 3 )) {
+                  $attrEnd = FALSE;
+                  break; // an URI with a portnr!!
+                }
+              }
+            }
+            if( $attrEnd) {
+              $line = substr( $line, ( $cix + 1 ));
+              break;
+            }
+          }
+          if( '"' == $line[$cix] )
+            $WithinQuotes = ( FALSE === $WithinQuotes ) ? TRUE : FALSE;
+          if( ';' == $line[$cix] )
+            $attr[++$attrix] = null;
+          else
+            $attr[$attrix] .= $line[$cix];
+          $cix++;
+        }
+            /* make attributes in array format */
+        $propattr = array();
+        foreach( $attr as $attribute ) {
+          $attrsplit = explode( '=', $attribute, 2 );
+          if( 1 < count( $attrsplit ))
+            $propattr[$attrsplit[0]] = $attrsplit[1];
+          else
+            $propattr[] = $attribute;
+        }
+            /* update Property */
+        if( FALSE !== strpos( $line, ',' )) {
+          $content  = array( 0 => '' );
+          $cix = $lix = 0;
+          while( FALSE !== substr( $line, $lix, 1 )) {
+            if(( 0 < $lix ) && ( ',' == $line[$lix] ) && ( "\\" != $line[( $lix - 1 )])) {
+              $cix++;
+              $content[$cix] = '';
+            }
+            else
+              $content[$cix] .= $line[$lix];
+            $lix++;
+          }
+          if( 1 < count( $content )) {
+            foreach( $content as $cix => $contentPart )
+              $content[$cix] = iCalUtilityFunctions::_strunrep( $contentPart );
+            $this->setProperty( $propname, $content, $propattr );
+            continue;
+          }
+          else
+            $line = reset( $content );
+          $line = iCalUtilityFunctions::_strunrep( $line );
+        }
+        $this->setProperty( $propname, rtrim( $line, "\x00..\x1F" ), $propattr );
+      } // end - foreach( $this->unparsed.. .
+    } // end - if( is_array( $this->unparsed.. .
+    unset( $unparsedtext, $rows, $this->unparsed, $proprows );
+            /* parse Components */
+    if( is_array( $this->components ) && ( 0 < count( $this->components ))) {
+      $ckeys = array_keys( $this->components );
+      foreach( $ckeys as $ckey ) {
+        if( !empty( $this->components[$ckey] ) && !empty( $this->components[$ckey]->unparsed )) {
+          $this->components[$ckey]->parse();
+        }
+      }
+    }
+    else
+      return FALSE;                   /* err 91 or something.. . */
+    return TRUE;
+  }
+/*********************************************************************************/
+/**
+ * creates formatted output for calendar object instance
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.10.16 - 2011-10-28
+ * @return string
+ */
+  function createCalendar() {
+    $calendarInit = $calendarxCaldecl = $calendarStart = $calendar = '';
+    switch( $this->format ) {
+      case 'xcal':
+        $calendarInit  = '<?xml version="1.0" encoding="UTF-8"?>'.$this->nl.
+                         '<!DOCTYPE vcalendar PUBLIC "-//IETF//DTD XCAL/iCalendar XML//EN"'.$this->nl.
+                         '"http://www.ietf.org/internet-drafts/draft-ietf-calsch-many-xcal-01.txt"';
+        $calendarStart = '>'.$this->nl.'<vcalendar';
+        break;
+      default:
+        $calendarStart = 'BEGIN:VCALENDAR'.$this->nl;
+        break;
+    }
+    $calendarStart .= $this->createVersion();
+    $calendarStart .= $this->createProdid();
+    $calendarStart .= $this->createCalscale();
+    $calendarStart .= $this->createMethod();
+    if( 'xcal' == $this->format )
+      $calendarStart .= '>'.$this->nl;
+    $calendar .= $this->createXprop();
+
+    foreach( $this->components as $component ) {
+      if( empty( $component )) continue;
+      $component->setConfig( $this->getConfig(), FALSE, TRUE );
+      $calendar .= $component->createComponent( $this->xcaldecl );
+    }
+    if(( 'xcal' == $this->format ) && ( 0 < count( $this->xcaldecl ))) { // xCal only
+      $calendarInit .= ' [';
+      $old_xcaldecl  = array();
+      foreach( $this->xcaldecl as $declix => $declPart ) {
+        if(( 0 < count( $old_xcaldecl))    &&
+             isset( $declPart['uri'] )     && isset( $declPart['external'] )     &&
+             isset( $old_xcaldecl['uri'] ) && isset( $old_xcaldecl['external'] ) &&
+           ( in_array( $declPart['uri'],      $old_xcaldecl['uri'] ))            &&
+           ( in_array( $declPart['external'], $old_xcaldecl['external'] )))
+          continue; // no duplicate uri and ext. references
+        if(( 0 < count( $old_xcaldecl))    &&
+            !isset( $declPart['uri'] )     && !isset( $declPart['uri'] )         &&
+             isset( $declPart['ref'] )     && isset( $old_xcaldecl['ref'] )      &&
+           ( in_array( $declPart['ref'],      $old_xcaldecl['ref'] )))
+          continue; // no duplicate element declarations
+        $calendarxCaldecl .= $this->nl.'<!';
+        foreach( $declPart as $declKey => $declValue ) {
+          switch( $declKey ) {                    // index
+            case 'xmldecl':                       // no 1
+              $calendarxCaldecl .= $declValue.' ';
+              break;
+            case 'uri':                           // no 2
+              $calendarxCaldecl .= $declValue.' ';
+              $old_xcaldecl['uri'][] = $declValue;
+              break;
+            case 'ref':                           // no 3
+              $calendarxCaldecl .= $declValue.' ';
+              $old_xcaldecl['ref'][] = $declValue;
+              break;
+            case 'external':                      // no 4
+              $calendarxCaldecl .= '"'.$declValue.'" ';
+              $old_xcaldecl['external'][] = $declValue;
+              break;
+            case 'type':                          // no 5
+              $calendarxCaldecl .= $declValue.' ';
+              break;
+            case 'type2':                         // no 6
+              $calendarxCaldecl .= $declValue;
+              break;
+          }
+        }
+        $calendarxCaldecl .= '>';
+      }
+      $calendarxCaldecl .= $this->nl.']';
+    }
+    switch( $this->format ) {
+      case 'xcal':
+        $calendar .= '</vcalendar>'.$this->nl;
+        break;
+      default:
+        $calendar .= 'END:VCALENDAR'.$this->nl;
+        break;
+    }
+    return $calendarInit.$calendarxCaldecl.$calendarStart.$calendar;
+  }
+/**
+ * a HTTP redirect header is sent with created, updated and/or parsed calendar
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.10.24 - 2011-12-23
+ * @param bool $utf8Encode
+ * @param bool $gzip
+ * @return redirect
+ */
+  function returnCalendar( $utf8Encode=FALSE, $gzip=FALSE ) {
+    $filename = $this->getConfig( 'filename' );
+    $output   = $this->createCalendar();
+    if( $utf8Encode )
+      $output = utf8_encode( $output );
+    if( $gzip ) {
+      $output = gzencode( $output, 9 );
+      header( 'Content-Encoding: gzip' );
+      header( 'Vary: *' );
+      header( 'Content-Length: '.strlen( $output ));
+    }
+    if( 'xcal' == $this->format )
+      header( 'Content-Type: application/calendar+xml; charset=utf-8' );
+    else
+      header( 'Content-Type: text/calendar; charset=utf-8' );
+    header( 'Content-Disposition: attachment; filename="'.$filename.'"' );
+    header( 'Cache-Control: max-age=10' );
+    die( $output );
+  }
+/**
+ * save content in a file
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.2.12 - 2007-12-30
+ * @param string $directory optional
+ * @param string $filename optional
+ * @param string $delimiter optional
+ * @return bool
+ */
+  function saveCalendar( $directory=FALSE, $filename=FALSE, $delimiter=FALSE ) {
+    if( $directory )
+      $this->setConfig( 'directory', $directory );
+    if( $filename )
+      $this->setConfig( 'filename',  $filename );
+    if( $delimiter && ($delimiter != DIRECTORY_SEPARATOR ))
+      $this->setConfig( 'delimiter', $delimiter );
+    if( FALSE === ( $dirfile = $this->getConfig( 'url' )))
+      $dirfile = $this->getConfig( 'dirfile' );
+    $iCalFile = @fopen( $dirfile, 'w' );
+    if( $iCalFile ) {
+      if( FALSE === fwrite( $iCalFile, $this->createCalendar() ))
+        return FALSE;
+      fclose( $iCalFile );
+      return TRUE;
+    }
+    else
+      return FALSE;
+  }
+/**
+ * if recent version of calendar file exists (default one hour), an HTTP redirect header is sent
+ * else FALSE is returned
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.2.12 - 2007-10-28
+ * @param string $directory optional alt. int timeout
+ * @param string $filename optional
+ * @param string $delimiter optional
+ * @param int timeout optional, default 3600 sec
+ * @return redirect/FALSE
+ */
+  function useCachedCalendar( $directory=FALSE, $filename=FALSE, $delimiter=FALSE, $timeout=3600) {
+    if ( $directory && ctype_digit( (string) $directory ) && !$filename ) {
+      $timeout   = (int) $directory;
+      $directory = FALSE;
+    }
+    if( $directory )
+      $this->setConfig( 'directory', $directory );
+    if( $filename )
+      $this->setConfig( 'filename',  $filename );
+    if( $delimiter && ( $delimiter != DIRECTORY_SEPARATOR ))
+      $this->setConfig( 'delimiter', $delimiter );
+    $filesize    = $this->getConfig( 'filesize' );
+    if( 0 >= $filesize )
+      return FALSE;
+    $dirfile     = $this->getConfig( 'dirfile' );
+    if( time() - filemtime( $dirfile ) < $timeout) {
+      clearstatcache();
+      $dirfile   = $this->getConfig( 'dirfile' );
+      $filename  = $this->getConfig( 'filename' );
+//    if( headers_sent( $filename, $linenum ))
+//      die( "Headers already sent in $filename on line $linenum\n" );
+      if( 'xcal' == $this->format )
+        header( 'Content-Type: application/calendar+xml; charset=utf-8' );
+      else
+        header( 'Content-Type: text/calendar; charset=utf-8' );
+      header( 'Content-Length: '.$filesize );
+      header( 'Content-Disposition: attachment; filename="'.$filename.'"' );
+      header( 'Cache-Control: max-age=10' );
+      $fp = @fopen( $dirfile, 'r' );
+      if( $fp ) {
+        fpassthru( $fp );
+        fclose( $fp );
+      }
+      die();
+    }
+    else
+      return FALSE;
+  }
+}
+/*********************************************************************************/
+/*********************************************************************************/
+/**
+ *  abstract class for calendar components
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.9.6 - 2011-05-14
+ */
+class calendarComponent {
+            //  component property variables
+  var $uid;
+  var $dtstamp;
+
+            //  component config variables
+  var $allowEmpty;
+  var $language;
+  var $nl;
+  var $unique_id;
+  var $format;
+  var $objName; // created automatically at instance creation
+  var $dtzid;   // default (local) timezone
+            //  component internal variables
+  var $componentStart1;
+  var $componentStart2;
+  var $componentEnd1;
+  var $componentEnd2;
+  var $elementStart1;
+  var $elementStart2;
+  var $elementEnd1;
+  var $elementEnd2;
+  var $intAttrDelimiter;
+  var $attributeDelimiter;
+  var $valueInit;
+            //  component xCal declaration container
+  var $xcaldecl;
+/**
+ * constructor for calendar component object
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.9.6 - 2011-05-17
+ */
+  function __construct() {
+    $this->objName         = ( isset( $this->timezonetype )) ?
+                          strtolower( $this->timezonetype )  :  get_class ( $this );
+    $this->uid             = array();
+    $this->dtstamp         = array();
+
+    $this->language        = null;
+    $this->nl              = null;
+    $this->unique_id       = null;
+    $this->format          = null;
+    $this->dtzid           = null;
+    $this->allowEmpty      = TRUE;
+    $this->xcaldecl        = array();
+
+    $this->_createFormat();
+    $this->_makeDtstamp();
+  }
+/*********************************************************************************/
+/**
+ * Property Name: ACTION
+ */
+/**
+ * creates formatted output for calendar component property action
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.4.8 - 2008-10-22
+ * @return string
+ */
+  function createAction() {
+    if( empty( $this->action )) return FALSE;
+    if( empty( $this->action['value'] ))
+      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'ACTION' ) : FALSE;
+    $attributes = $this->_createParams( $this->action['params'] );
+    return $this->_createElement( 'ACTION', $attributes, $this->action['value'] );
+  }
+/**
+ * set calendar component property action
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.21 - 2013-06-23
+ * @param string $value  "AUDIO" / "DISPLAY" / "EMAIL" / "PROCEDURE"
+ * @param mixed $params
+ * @return bool
+ */
+  function setAction( $value, $params=FALSE ) {
+    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = ''; else return FALSE;
+    $this->action = array( 'value' => $value, 'params' => iCalUtilityFunctions::_setParams( $params ));
+    return TRUE;
+  }
+/*********************************************************************************/
+/**
+ * Property Name: ATTACH
+ */
+/**
+ * creates formatted output for calendar component property attach
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.11.16 - 2012-02-04
+ * @return string
+ */
+  function createAttach() {
+    if( empty( $this->attach )) return FALSE;
+    $output       = null;
+    foreach( $this->attach as $attachPart ) {
+      if( !empty( $attachPart['value'] )) {
+        $attributes = $this->_createParams( $attachPart['params'] );
+        if(( 'xcal' != $this->format ) && isset( $attachPart['params']['VALUE'] ) && ( 'BINARY' == $attachPart['params']['VALUE'] )) {
+          $attributes = str_replace( $this->intAttrDelimiter, $this->attributeDelimiter, $attributes );
+          $str        = 'ATTACH'.$attributes.$this->valueInit.$attachPart['value'];
+          $output     = substr( $str, 0, 75 ).$this->nl;
+          $str        = substr( $str, 75 );
+          $output    .= ' '.chunk_split( $str, 74, $this->nl.' ' );
+          if( ' ' == substr( $output, -1 ))
+            $output   = rtrim( $output );
+          if( $this->nl != substr( $output, ( 0 - strlen( $this->nl ))))
+            $output  .= $this->nl;
+          return $output;
+        }
+        $output    .= $this->_createElement( 'ATTACH', $attributes, $attachPart['value'] );
+      }
+      elseif( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'ATTACH' );
+    }
+    return $output;
+  }
+/**
+ * set calendar component property attach
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.21 - 2013-06-23
+ * @param string $value
+ * @param array $params, optional
+ * @param integer $index, optional
+ * @return bool
+ */
+  function setAttach( $value, $params=FALSE, $index=FALSE ) {
+    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = ''; else return FALSE;
+    iCalUtilityFunctions::_setMval( $this->attach, $value, $params, FALSE, $index );
+    return TRUE;
+  }
+/*********************************************************************************/
+/**
+ * Property Name: ATTENDEE
+ */
+/**
+ * creates formatted output for calendar component property attendee
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.11.12 - 2012-01-31
+ * @return string
+ */
+  function createAttendee() {
+    if( empty( $this->attendee )) return FALSE;
+    $output = null;
+    foreach( $this->attendee as $attendeePart ) {                      // start foreach 1
+      if( empty( $attendeePart['value'] )) {
+        if( $this->getConfig( 'allowEmpty' ))
+          $output .= $this->_createElement( 'ATTENDEE' );
+        continue;
+      }
+      $attendee1 = $attendee2 = null;
+      foreach( $attendeePart as $paramlabel => $paramvalue ) {         // start foreach 2
+        if( 'value' == $paramlabel )
+          $attendee2     .= $paramvalue;
+        elseif(( 'params' == $paramlabel ) && ( is_array( $paramvalue ))) { // start elseif
+          $mParams = array( 'MEMBER', 'DELEGATED-TO', 'DELEGATED-FROM' );
+          foreach( $paramvalue as $pKey => $pValue ) {                 // fix (opt) quotes
+            if( is_array( $pValue ) || in_array( $pKey, $mParams ))
+              continue;
+            if(( FALSE !== strpos( $pValue, ':' )) ||
+               ( FALSE !== strpos( $pValue, ';' )) ||
+               ( FALSE !== strpos( $pValue, ',' )))
+              $paramvalue[$pKey] = '"'.$pValue.'"';
+          }
+        // set attenddee parameters in rfc2445 order
+          if( isset( $paramvalue['CUTYPE'] ))
+            $attendee1   .= $this->intAttrDelimiter.'CUTYPE='.$paramvalue['CUTYPE'];
+          if( isset( $paramvalue['MEMBER'] )) {
+            $attendee1   .= $this->intAttrDelimiter.'MEMBER=';
+            foreach( $paramvalue['MEMBER'] as $cix => $opv )
+              $attendee1 .= ( $cix ) ? ',"'.$opv.'"' : '"'.$opv.'"' ;
+          }
+          if( isset( $paramvalue['ROLE'] ))
+            $attendee1   .= $this->intAttrDelimiter.'ROLE='.$paramvalue['ROLE'];
+          if( isset( $paramvalue['PARTSTAT'] ))
+            $attendee1   .= $this->intAttrDelimiter.'PARTSTAT='.$paramvalue['PARTSTAT'];
+          if( isset( $paramvalue['RSVP'] ))
+            $attendee1   .= $this->intAttrDelimiter.'RSVP='.$paramvalue['RSVP'];
+          if( isset( $paramvalue['DELEGATED-TO'] )) {
+            $attendee1   .= $this->intAttrDelimiter.'DELEGATED-TO=';
+            foreach( $paramvalue['DELEGATED-TO'] as $cix => $opv )
+              $attendee1 .= ( $cix ) ? ',"'.$opv.'"' : '"'.$opv.'"' ;
+          }
+          if( isset( $paramvalue['DELEGATED-FROM'] )) {
+            $attendee1   .= $this->intAttrDelimiter.'DELEGATED-FROM=';
+            foreach( $paramvalue['DELEGATED-FROM'] as $cix => $opv )
+              $attendee1 .= ( $cix ) ? ',"'.$opv.'"' : '"'.$opv.'"' ;
+          }
+          if( isset( $paramvalue['SENT-BY'] ))
+            $attendee1   .= $this->intAttrDelimiter.'SENT-BY='.$paramvalue['SENT-BY'];
+          if( isset( $paramvalue['CN'] ))
+            $attendee1   .= $this->intAttrDelimiter.'CN='.$paramvalue['CN'];
+          if( isset( $paramvalue['DIR'] )) {
+            $delim = ( FALSE === strpos( $paramvalue['DIR'], '"' )) ? '"' : '';
+            $attendee1   .= $this->intAttrDelimiter.'DIR='.$delim.$paramvalue['DIR'].$delim;
+          }
+          if( isset( $paramvalue['LANGUAGE'] ))
+            $attendee1   .= $this->intAttrDelimiter.'LANGUAGE='.$paramvalue['LANGUAGE'];
+          $xparams = array();
+          foreach( $paramvalue as $optparamlabel => $optparamvalue ) { // start foreach 3
+            if( ctype_digit( (string) $optparamlabel )) {
+              $xparams[]  = $optparamvalue;
+              continue;
+            }
+            if( !in_array( $optparamlabel, array( 'CUTYPE', 'MEMBER', 'ROLE', 'PARTSTAT', 'RSVP', 'DELEGATED-TO', 'DELEGATED-FROM', 'SENT-BY', 'CN', 'DIR', 'LANGUAGE' )))
+              $xparams[$optparamlabel] = $optparamvalue;
+          } // end foreach 3
+          ksort( $xparams, SORT_STRING );
+          foreach( $xparams as $paramKey => $paramValue ) {
+            if( ctype_digit( (string) $paramKey ))
+              $attendee1 .= $this->intAttrDelimiter.$paramValue;
+            else
+              $attendee1 .= $this->intAttrDelimiter."$paramKey=$paramValue";
+          }      // end foreach 3
+        }        // end elseif(( 'params' == $paramlabel ) && ( is_array( $paramvalue )))
+      }          // end foreach 2
+      $output .= $this->_createElement( 'ATTENDEE', $attendee1, $attendee2 );
+    }              // end foreach 1
+    return $output;
+  }
+/**
+ * set calendar component property attach
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.21 - 2013-06-23
+ * @param string $value
+ * @param array $params, optional
+ * @param integer $index, optional
+ * @return bool
+ */
+  function setAttendee( $value, $params=FALSE, $index=FALSE ) {
+    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = ''; else return FALSE;
+          // ftp://, http://, mailto:, file://, gopher://, news:, nntp://, telnet://, wais://, prospero://  may exist.. . also in params
+    if( !empty( $value )) {
+      if( FALSE === ( $pos = strpos( substr( $value, 0, 9 ), ':' )))
+        $value = 'MAILTO:'.$value;
+      elseif( !empty( $value ))
+        $value = strtolower( substr( $value, 0, $pos )).substr( $value, $pos );
+      $value = str_replace( 'mailto:', 'MAILTO:', $value );
+    }
+    $params2 = array();
+    if( is_array($params )) {
+      $optarrays = array();
+      foreach( $params as $optparamlabel => $optparamvalue ) {
+        $optparamlabel = strtoupper( $optparamlabel );
+        switch( $optparamlabel ) {
+          case 'MEMBER':
+          case 'DELEGATED-TO':
+          case 'DELEGATED-FROM':
+            if( !is_array( $optparamvalue ))
+              $optparamvalue = array( $optparamvalue );
+            foreach( $optparamvalue as $part ) {
+              $part = trim( $part );
+              if(( '"' == substr( $part, 0, 1 )) &&
+                 ( '"' == substr( $part, -1 )))
+                $part = substr( $part, 1, ( strlen( $part ) - 2 ));
+              if( 'mailto:' != strtolower( substr( $part, 0, 7 )))
+                $part = "MAILTO:$part";
+              else
+                $part = 'MAILTO:'.substr( $part, 7 );
+              $optarrays[$optparamlabel][] = $part;
+            }
+            break;
+          default:
+            if(( '"' == substr( $optparamvalue, 0, 1 )) &&
+               ( '"' == substr( $optparamvalue, -1 )))
+              $optparamvalue = substr( $optparamvalue, 1, ( strlen( $optparamvalue ) - 2 ));
+            if( 'SENT-BY' ==  $optparamlabel ) {
+              if( 'mailto:' != strtolower( substr( $optparamvalue, 0, 7 )))
+                $optparamvalue = "MAILTO:$optparamvalue";
+              else
+                $optparamvalue = 'MAILTO:'.substr( $optparamvalue, 7 );
+            }
+            $params2[$optparamlabel] = $optparamvalue;
+            break;
+        } // end switch( $optparamlabel.. .
+      } // end foreach( $optparam.. .
+      foreach( $optarrays as $optparamlabel => $optparams )
+        $params2[$optparamlabel] = $optparams;
+    }
+        // remove defaults
+    iCalUtilityFunctions::_existRem( $params2, 'CUTYPE',   'INDIVIDUAL' );
+    iCalUtilityFunctions::_existRem( $params2, 'PARTSTAT', 'NEEDS-ACTION' );
+    iCalUtilityFunctions::_existRem( $params2, 'ROLE',     'REQ-PARTICIPANT' );
+    iCalUtilityFunctions::_existRem( $params2, 'RSVP',     'FALSE' );
+        // check language setting
+    if( isset( $params2['CN' ] )) {
+      $lang = $this->getConfig( 'language' );
+      if( !isset( $params2['LANGUAGE' ] ) && !empty( $lang ))
+        $params2['LANGUAGE' ] = $lang;
+    }
+    iCalUtilityFunctions::_setMval( $this->attendee, $value, $params2, FALSE, $index );
+    return TRUE;
+  }
+/*********************************************************************************/
+/**
+ * Property Name: CATEGORIES
+ */
+/**
+ * creates formatted output for calendar component property categories
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.2 - 2012-12-18
+ * @return string
+ */
+  function createCategories() {
+    if( empty( $this->categories )) return FALSE;
+    $output = null;
+    foreach( $this->categories as $category ) {
+      if( empty( $category['value'] )) {
+        if ( $this->getConfig( 'allowEmpty' ))
+          $output .= $this->_createElement( 'CATEGORIES' );
+        continue;
+      }
+      $attributes = $this->_createParams( $category['params'], array( 'LANGUAGE' ));
+      if( is_array( $category['value'] )) {
+        foreach( $category['value'] as $cix => $categoryPart )
+          $category['value'][$cix] = iCalUtilityFunctions::_strrep( $categoryPart, $this->format, $this->nl );
+        $content  = implode( ',', $category['value'] );
+      }
+      else
+        $content  = iCalUtilityFunctions::_strrep( $category['value'], $this->format, $this->nl );
+      $output    .= $this->_createElement( 'CATEGORIES', $attributes, $content );
+    }
+    return $output;
+  }
+/**
+ * set calendar component property categories
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.21 - 2013-06-23
+ * @param mixed $value
+ * @param array $params, optional
+ * @param integer $index, optional
+ * @return bool
+ */
+  function setCategories( $value, $params=FALSE, $index=FALSE ) {
+    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = ''; else return FALSE;
+    iCalUtilityFunctions::_setMval( $this->categories, $value, $params, FALSE, $index );
+    return TRUE;
+ }
+/*********************************************************************************/
+/**
+ * Property Name: CLASS
+ */
+/**
+ * creates formatted output for calendar component property class
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 0.9.7 - 2006-11-20
+ * @return string
+ */
+  function createClass() {
+    if( empty( $this->class )) return FALSE;
+    if( empty( $this->class['value'] ))
+      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'CLASS' ) : FALSE;
+    $attributes = $this->_createParams( $this->class['params'] );
+    return $this->_createElement( 'CLASS', $attributes, $this->class['value'] );
+  }
+/**
+ * set calendar component property class
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.21 - 2013-06-23
+ * @param string $value "PUBLIC" / "PRIVATE" / "CONFIDENTIAL" / iana-token / x-name
+ * @param array $params optional
+ * @return bool
+ */
+  function setClass( $value, $params=FALSE ) {
+    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = ''; else return FALSE;
+    $this->class = array( 'value' => $value, 'params' => iCalUtilityFunctions::_setParams( $params ));
+    return TRUE;
+  }
+/*********************************************************************************/
+/**
+ * Property Name: COMMENT
+ */
+/**
+ * creates formatted output for calendar component property comment
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.2 - 2012-12-18
+ * @return string
+ */
+  function createComment() {
+    if( empty( $this->comment )) return FALSE;
+    $output = null;
+    foreach( $this->comment as $commentPart ) {
+      if( empty( $commentPart['value'] )) {
+        if( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'COMMENT' );
+        continue;
+      }
+      $attributes = $this->_createParams( $commentPart['params'], array( 'ALTREP', 'LANGUAGE' ));
+      $content    = iCalUtilityFunctions::_strrep( $commentPart['value'], $this->format, $this->nl );
+      $output    .= $this->_createElement( 'COMMENT', $attributes, $content );
+    }
+    return $output;
+  }
+/**
+ * set calendar component property comment
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.21 - 2013-06-23
+ * @param string $value
+ * @param array $params, optional
+ * @param integer $index, optional
+ * @return bool
+ */
+  function setComment( $value, $params=FALSE, $index=FALSE ) {
+    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = ''; else return FALSE;
+    iCalUtilityFunctions::_setMval( $this->comment, $value, $params, FALSE, $index );
+    return TRUE;
+  }
+/*********************************************************************************/
+/**
+ * Property Name: COMPLETED
+ */
+/**
+ * creates formatted output for calendar component property completed
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.4.8 - 2008-10-22
+ * @return string
+ */
+  function createCompleted( ) {
+    if( empty( $this->completed )) return FALSE;
+    if( !isset( $this->completed['value']['year'] )  &&
+        !isset( $this->completed['value']['month'] ) &&
+        !isset( $this->completed['value']['day'] )   &&
+        !isset( $this->completed['value']['hour'] )  &&
+        !isset( $this->completed['value']['min'] )   &&
+        !isset( $this->completed['value']['sec'] ))
+      if( $this->getConfig( 'allowEmpty' ))
+        return $this->_createElement( 'COMPLETED' );
+      else return FALSE;
+    $formatted  = iCalUtilityFunctions::_date2strdate( $this->completed['value'], 7 );
+    $attributes = $this->_createParams( $this->completed['params'] );
+    return $this->_createElement( 'COMPLETED', $attributes, $formatted );
+  }
+/**
+ * set calendar component property completed
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.21 - 2013-06-23
+ * @param mixed $year
+ * @param mixed $month optional
+ * @param int $day optional
+ * @param int $hour optional
+ * @param int $min optional
+ * @param int $sec optional
+ * @param array $params optional
+ * @return bool
+ */
+  function setCompleted( $year, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $params=FALSE ) {
+    if( empty( $year )) {
+      if( $this->getConfig( 'allowEmpty' )) {
+        $this->completed = array( 'value' => '', 'params' => iCalUtilityFunctions::_setParams( $params ));
+        return TRUE;
+      }
+      else
+        return FALSE;
+    }
+    $this->completed = iCalUtilityFunctions::_setDate2( $year, $month, $day, $hour, $min, $sec, $params );
+    return TRUE;
+  }
+/*********************************************************************************/
+/**
+ * Property Name: CONTACT
+ */
+/**
+ * creates formatted output for calendar component property contact
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.2 - 2012-12-18
+ * @return string
+ */
+  function createContact() {
+    if( empty( $this->contact )) return FALSE;
+    $output = null;
+    foreach( $this->contact as $contact ) {
+      if( !empty( $contact['value'] )) {
+        $attributes = $this->_createParams( $contact['params'], array( 'ALTREP', 'LANGUAGE' ));
+        $content    = iCalUtilityFunctions::_strrep( $contact['value'], $this->format, $this->nl );
+        $output    .= $this->_createElement( 'CONTACT', $attributes, $content );
+      }
+      elseif( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'CONTACT' );
+    }
+    return $output;
+  }
+/**
+ * set calendar component property contact
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.21 - 2013-06-23
+ * @param string $value
+ * @param array $params, optional
+ * @param integer $index, optional
+ * @return bool
+ */
+  function setContact( $value, $params=FALSE, $index=FALSE ) {
+    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = ''; else return FALSE;
+    iCalUtilityFunctions::_setMval( $this->contact, $value, $params, FALSE, $index );
+    return TRUE;
+  }
+/*********************************************************************************/
+/**
+ * Property Name: CREATED
+ */
+/**
+ * creates formatted output for calendar component property created
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.4.8 - 2008-10-21
+ * @return string
+ */
+  function createCreated() {
+    if( empty( $this->created )) return FALSE;
+    $formatted  = iCalUtilityFunctions::_date2strdate( $this->created['value'], 7 );
+    $attributes = $this->_createParams( $this->created['params'] );
+    return $this->_createElement( 'CREATED', $attributes, $formatted );
+  }
+/**
+ * set calendar component property created
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.4.8 - 2008-10-23
+ * @param mixed $year optional
+ * @param mixed $month optional
+ * @param int $day optional
+ * @param int $hour optional
+ * @param int $min optional
+ * @param int $sec optional
+ * @param mixed $params optional
+ * @return bool
+ */
+  function setCreated( $year=FALSE, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $params=FALSE ) {
+    if( !isset( $year )) {
+      $year = date('Ymd\THis', mktime( date( 'H' ), date( 'i' ), date( 's' ) - date( 'Z'), date( 'm' ), date( 'd' ), date( 'Y' )));
+    }
+    $this->created = iCalUtilityFunctions::_setDate2( $year, $month, $day, $hour, $min, $sec, $params );
+    return TRUE;
+  }
+/*********************************************************************************/
+/**
+ * Property Name: DESCRIPTION
+ */
+/**
+ * creates formatted output for calendar component property description
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.2 - 2012-12-18
+ * @return string
+ */
+  function createDescription() {
+    if( empty( $this->description )) return FALSE;
+    $output       = null;
+    foreach( $this->description as $description ) {
+      if( !empty( $description['value'] )) {
+        $attributes = $this->_createParams( $description['params'], array( 'ALTREP', 'LANGUAGE' ));
+        $content    = iCalUtilityFunctions::_strrep( $description['value'], $this->format, $this->nl );
+        $output    .= $this->_createElement( 'DESCRIPTION', $attributes, $content );
+      }
+      elseif( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'DESCRIPTION' );
+    }
+    return $output;
+  }
+/**
+ * set calendar component property description
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.21 - 2013-06-23
+ * @param string $value
+ * @param array $params, optional
+ * @param integer $index, optional
+ * @return bool
+ */
+  function setDescription( $value, $params=FALSE, $index=FALSE ) {
+    if( empty( $value )) { if( $this->getConfig( 'allowEmpty' )) $value = ''; else return FALSE; }
+    if( 'vjournal' != $this->objName )
+      $index = 1;
+    iCalUtilityFunctions::_setMval( $this->description, $value, $params, FALSE, $index );
+    return TRUE;
+  }
+/*********************************************************************************/
+/**
+ * Property Name: DTEND
+ */
+/**
+ * creates formatted output for calendar component property dtend
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.14.4 - 2012-09-26
+ * @return string
+ */
+  function createDtend() {
+    if( empty( $this->dtend )) return FALSE;
+    if( !isset( $this->dtend['value']['year'] )  &&
+        !isset( $this->dtend['value']['month'] ) &&
+        !isset( $this->dtend['value']['day'] )   &&
+        !isset( $this->dtend['value']['hour'] )  &&
+        !isset( $this->dtend['value']['min'] )   &&
+        !isset( $this->dtend['value']['sec'] ))
+      if( $this->getConfig( 'allowEmpty' ))
+        return $this->_createElement( 'DTEND' );
+      else return FALSE;
+    $parno      = ( isset( $this->dtend['params']['VALUE'] ) && ( 'DATE' == $this->dtend['params']['VALUE'] )) ? 3 : null;
+    $formatted  = iCalUtilityFunctions::_date2strdate( $this->dtend['value'], $parno );
+    $attributes = $this->_createParams( $this->dtend['params'] );
+    return $this->_createElement( 'DTEND', $attributes, $formatted );
+  }
+/**
+ * set calendar component property dtend
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.21 - 2013-06-23
+ * @param mixed $year
+ * @param mixed $month optional
+ * @param int $day optional
+ * @param int $hour optional
+ * @param int $min optional
+ * @param int $sec optional
+ * @param string $tz optional
+ * @param array params optional
+ * @return bool
+ */
+  function setDtend( $year, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $tz=FALSE, $params=FALSE ) {
+    if( empty( $year )) {
+      if( $this->getConfig( 'allowEmpty' )) {
+        $this->dtend = array( 'value' => '', 'params' => iCalUtilityFunctions::_setParams( $params ));
+        return TRUE;
+      }
+      else
+        return FALSE;
+    }
+    $this->dtend = iCalUtilityFunctions::_setDate( $year, $month, $day, $hour, $min, $sec, $tz, $params, null, null, $this->getConfig( 'TZID' ));
+    return TRUE;
+  }
+/*********************************************************************************/
+/**
+ * Property Name: DTSTAMP
+ */
+/**
+ * creates formatted output for calendar component property dtstamp
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.4.4 - 2008-03-07
+ * @return string
+ */
+  function createDtstamp() {
+    if( !isset( $this->dtstamp['value']['year'] )  &&
+        !isset( $this->dtstamp['value']['month'] ) &&
+        !isset( $this->dtstamp['value']['day'] )   &&
+        !isset( $this->dtstamp['value']['hour'] )  &&
+        !isset( $this->dtstamp['value']['min'] )   &&
+        !isset( $this->dtstamp['value']['sec'] ))
+      $this->_makeDtstamp();
+    $formatted  = iCalUtilityFunctions::_date2strdate( $this->dtstamp['value'], 7 );
+    $attributes = $this->_createParams( $this->dtstamp['params'] );
+    return $this->_createElement( 'DTSTAMP', $attributes, $formatted );
+  }
+/**
+ * computes datestamp for calendar component object instance dtstamp
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.14.1 - 2012-09-29
+ * @return void
+ */
+  function _makeDtstamp() {
+    $d    = date( 'Y-m-d-H-i-s', mktime( date('H'), date('i'), (date('s') - date( 'Z' )), date('m'), date('d'), date('Y')));
+    $date = explode( '-', $d );
+    $this->dtstamp['value'] = array( 'year' => $date[0], 'month' => $date[1], 'day' => $date[2], 'hour' => $date[3], 'min' => $date[4], 'sec' => $date[5], 'tz' => 'Z' );
+    $this->dtstamp['params'] = null;
+  }
+/**
+ * set calendar component property dtstamp
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.4.8 - 2008-10-23
+ * @param mixed $year
+ * @param mixed $month optional
+ * @param int $day optional
+ * @param int $hour optional
+ * @param int $min optional
+ * @param int $sec optional
+ * @param array $params optional
+ * @return TRUE
+ */
+  function setDtstamp( $year, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $params=FALSE ) {
+    if( empty( $year ))
+      $this->_makeDtstamp();
+    else
+      $this->dtstamp = iCalUtilityFunctions::_setDate2( $year, $month, $day, $hour, $min, $sec, $params );
+    return TRUE;
+  }
+/*********************************************************************************/
+/**
+ * Property Name: DTSTART
+ */
+/**
+ * creates formatted output for calendar component property dtstart
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.14.4 - 2012-09-26
+ * @return string
+ */
+  function createDtstart() {
+    if( empty( $this->dtstart )) return FALSE;
+    if( !isset( $this->dtstart['value']['year'] )  &&
+        !isset( $this->dtstart['value']['month'] ) &&
+        !isset( $this->dtstart['value']['day'] )   &&
+        !isset( $this->dtstart['value']['hour'] )  &&
+        !isset( $this->dtstart['value']['min'] )   &&
+        !isset( $this->dtstart['value']['sec'] )) {
+      if( $this->getConfig( 'allowEmpty' ))
+        return $this->_createElement( 'DTSTART' );
+      else return FALSE;
+    }
+    if( in_array( $this->objName, array( 'vtimezone', 'standard', 'daylight' )))
+       unset( $this->dtstart['value']['tz'], $this->dtstart['params']['TZID'] );
+    $parno      = ( isset( $this->dtstart['params']['VALUE'] ) && ( 'DATE' == $this->dtstart['params']['VALUE'] )) ? 3 : null;
+    $formatted  = iCalUtilityFunctions::_date2strdate( $this->dtstart['value'], $parno );
+    $attributes = $this->_createParams( $this->dtstart['params'] );
+    return $this->_createElement( 'DTSTART', $attributes, $formatted );
+  }
+/**
+ * set calendar component property dtstart
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.21 - 2013-06-23
+ * @param mixed $year
+ * @param mixed $month optional
+ * @param int $day optional
+ * @param int $hour optional
+ * @param int $min optional
+ * @param int $sec optional
+ * @param string $tz optional
+ * @param array $params optional
+ * @return bool
+ */
+  function setDtstart( $year, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $tz=FALSE, $params=FALSE ) {
+    if( empty( $year )) {
+      if( $this->getConfig( 'allowEmpty' )) {
+        $this->dtstart = array( 'value' => '', 'params' => iCalUtilityFunctions::_setParams( $params ));
+        return TRUE;
+      }
+      else
+        return FALSE;
+    }
+    $this->dtstart = iCalUtilityFunctions::_setDate( $year, $month, $day, $hour, $min, $sec, $tz, $params, 'dtstart', $this->objName, $this->getConfig( 'TZID' ));
+    return TRUE;
+  }
+/*********************************************************************************/
+/**
+ * Property Name: DUE
+ */
+/**
+ * creates formatted output for calendar component property due
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.14.4 - 2012-09-26
+ * @return string
+ */
+  function createDue() {
+    if( empty( $this->due )) return FALSE;
+    if( !isset( $this->due['value']['year'] )  &&
+        !isset( $this->due['value']['month'] ) &&
+        !isset( $this->due['value']['day'] )   &&
+        !isset( $this->due['value']['hour'] )  &&
+        !isset( $this->due['value']['min'] )   &&
+        !isset( $this->due['value']['sec'] )) {
+      if( $this->getConfig( 'allowEmpty' ))
+        return $this->_createElement( 'DUE' );
+      else
+       return FALSE;
+    }
+    $parno      = ( isset( $this->due['params']['VALUE'] ) && ( 'DATE' == $this->due['params']['VALUE'] )) ? 3 : null;
+    $formatted  = iCalUtilityFunctions::_date2strdate( $this->due['value'], $parno );
+    $attributes = $this->_createParams( $this->due['params'] );
+    return $this->_createElement( 'DUE', $attributes, $formatted );
+  }
+/**
+ * set calendar component property due
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.21 - 2013-06-23
+ * @param mixed $year
+ * @param mixed $month optional
+ * @param int $day optional
+ * @param int $hour optional
+ * @param int $min optional
+ * @param int $sec optional
+ * @param array $params optional
+ * @return bool
+ */
+  function setDue( $year, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $tz=FALSE, $params=FALSE ) {
+    if( empty( $year )) {
+      if( $this->getConfig( 'allowEmpty' )) {
+        $this->due = array( 'value' => '', 'params' => iCalUtilityFunctions::_setParams( $params ));
+        return TRUE;
+      }
+      else
+        return FALSE;
+    }
+    $this->due = iCalUtilityFunctions::_setDate( $year, $month, $day, $hour, $min, $sec, $tz, $params, null, null, $this->getConfig( 'TZID' ));
+    return TRUE;
+  }
+/*********************************************************************************/
+/**
+ * Property Name: DURATION
+ */
+/**
+ * creates formatted output for calendar component property duration
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.21 - 2013-05-25
+ * @return string
+ */
+  function createDuration() {
+    if( empty( $this->duration )) return FALSE;
+    if( !isset( $this->duration['value']['week'] ) &&
+        !isset( $this->duration['value']['day'] )  &&
+        !isset( $this->duration['value']['hour'] ) &&
+        !isset( $this->duration['value']['min'] )  &&
+        !isset( $this->duration['value']['sec'] ))
+      if( $this->getConfig( 'allowEmpty' ))
+        return $this->_createElement( 'DURATION' );
+      else return FALSE;
+    $attributes = $this->_createParams( $this->duration['params'] );
+    return $this->_createElement( 'DURATION', $attributes, iCalUtilityFunctions::_duration2str( $this->duration['value'] ));
+  }
+/**
+ * set calendar component property duration
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.21 - 2013-05-25
+ * @param mixed $week
+ * @param mixed $day optional
+ * @param int $hour optional
+ * @param int $min optional
+ * @param int $sec optional
+ * @param array $params optional
+ * @return bool
+ */
+  function setDuration( $week, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $params=FALSE ) {
+    if( empty( $week ) && empty( $day ) && empty( $hour ) && empty( $min ) && empty( $sec )) {
+      if( $this->getConfig( 'allowEmpty' ))
+        $week = $day = null;
+      else
+        return FALSE;
+    }
+    if( is_array( $week ) && ( 1 <= count( $week )))
+      $this->duration = array( 'value' => iCalUtilityFunctions::_duration2arr( $week ), 'params' => iCalUtilityFunctions::_setParams( $day ));
+    elseif( is_string( $week ) && ( 3 <= strlen( trim( $week )))) {
+      $week = trim( $week );
+      if( in_array( substr( $week, 0, 1 ), array( '+', '-' )))
+        $week = substr( $week, 1 );
+      $this->duration = array( 'value' => iCalUtilityFunctions::_durationStr2arr( $week ), 'params' => iCalUtilityFunctions::_setParams( $day ));
+    }
+    else
+      $this->duration = array( 'value' => iCalUtilityFunctions::_duration2arr( array( 'week' => $week, 'day' => $day, 'hour' => $hour, 'min' => $min, 'sec' => $sec ))
+                             , 'params' => iCalUtilityFunctions::_setParams( $params ));
+    return TRUE;
+  }
+/*********************************************************************************/
+/**
+ * Property Name: EXDATE
+ */
+/**
+ * creates formatted output for calendar component property exdate
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.5 - 2012-12-28
+ * @return string
+ */
+  function createExdate() {
+    if( empty( $this->exdate )) return FALSE;
+    $output  = null;
+    $exdates = array();
+    foreach( $this->exdate as $theExdate ) {
+      if( empty( $theExdate['value'] )) {
+        if( $this->getConfig( 'allowEmpty' ))
+          $output .= $this->_createElement( 'EXDATE' );
+        continue;
+      }
+      if( 1 < count( $theExdate['value'] ))
+        usort( $theExdate['value'], array( 'iCalUtilityFunctions', '_sortExdate1' ));
+      $exdates[] = $theExdate;
+    }
+    if( 1 < count( $exdates ))
+      usort( $exdates, array( 'iCalUtilityFunctions', '_sortExdate2' ));
+    foreach( $exdates as $theExdate ) {
+      $content = $attributes = null;
+      foreach( $theExdate['value'] as $eix => $exdatePart ) {
+        $parno = count( $exdatePart );
+        $formatted = iCalUtilityFunctions::_date2strdate( $exdatePart, $parno );
+        if( isset( $theExdate['params']['TZID'] ))
+          $formatted = str_replace( 'Z', '', $formatted);
+        if( 0 < $eix ) {
+          if( isset( $theExdate['value'][0]['tz'] )) {
+            if( ctype_digit( substr( $theExdate['value'][0]['tz'], -4 )) ||
+               ( 'Z' == $theExdate['value'][0]['tz'] )) {
+              if( 'Z' != substr( $formatted, -1 ))
+                $formatted .= 'Z';
+            }
+            else
+              $formatted = str_replace( 'Z', '', $formatted );
+          }
+          else
+            $formatted = str_replace( 'Z', '', $formatted );
+        } // end if( 0 < $eix )
+        $content .= ( 0 < $eix ) ? ','.$formatted : $formatted;
+      } // end foreach( $theExdate['value'] as $eix => $exdatePart )
+      $attributes .= $this->_createParams( $theExdate['params'] );
+      $output .= $this->_createElement( 'EXDATE', $attributes, $content );
+    } // end foreach( $exdates as $theExdate )
+    return $output;
+  }
+/**
+ * set calendar component property exdate
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.21 - 2013-06-23
+ * @param array exdates
+ * @param array $params, optional
+ * @param integer $index, optional
+ * @return bool
+ */
+  function setExdate( $exdates, $params=FALSE, $index=FALSE ) {
+    if( empty( $exdates )) {
+      if( $this->getConfig( 'allowEmpty' )) {
+        iCalUtilityFunctions::_setMval( $this->exdate, '', $params, FALSE, $index );
+        return TRUE;
+      }
+      else
+        return FALSE;
+    }
+    $input  = array( 'params' => iCalUtilityFunctions::_setParams( $params, array( 'VALUE' => 'DATE-TIME' )));
+    $toZ = ( isset( $input['params']['TZID'] ) && in_array( strtoupper( $input['params']['TZID'] ), array( 'GMT', 'UTC', 'Z' ))) ? TRUE : FALSE;
+            /* ev. check 1:st date and save ev. timezone **/
+    iCalUtilityFunctions::_chkdatecfg( reset( $exdates ), $parno, $input['params'] );
+    iCalUtilityFunctions::_existRem( $input['params'], 'VALUE', 'DATE-TIME' ); // remove default parameter
+    foreach( $exdates as $eix => $theExdate ) {
+      iCalUtilityFunctions::_strDate2arr( $theExdate );
+      if( iCalUtilityFunctions::_isArrayTimestampDate( $theExdate )) {
+        if( isset( $theExdate['tz'] ) && !iCalUtilityFunctions::_isOffset( $theExdate['tz'] )) {
+          if( isset( $input['params']['TZID'] ))
+            $theExdate['tz'] = $input['params']['TZID'];
+          else
+            $input['params']['TZID'] = $theExdate['tz'];
+        }
+        $exdatea = iCalUtilityFunctions::_timestamp2date( $theExdate, $parno );
+      }
+      elseif(  is_array( $theExdate )) {
+        $d = iCalUtilityFunctions::_chkDateArr( $theExdate, $parno );
+        if( isset( $d['tz'] ) && ( 'Z' != $d['tz'] ) && iCalUtilityFunctions::_isOffset( $d['tz'] )) {
+          $strdate = sprintf( '%04d-%02d-%02d %02d:%02d:%02d %s', $d['year'], $d['month'], $d['day'], $d['hour'], $d['min'], $d['sec'], $d['tz'] );
+          $exdatea = iCalUtilityFunctions::_strdate2date( $strdate, 7 );
+          unset( $exdatea['unparsedtext'] );
+        }
+        else
+          $exdatea = $d;
+      }
+      elseif( 8 <= strlen( trim( $theExdate ))) { // ex. 2006-08-03 10:12:18
+        $exdatea = iCalUtilityFunctions::_strdate2date( $theExdate, $parno );
+        unset( $exdatea['unparsedtext'] );
+      }
+      if( 3 == $parno )
+        unset( $exdatea['hour'], $exdatea['min'], $exdatea['sec'], $exdatea['tz'] );
+      elseif( isset( $exdatea['tz'] ))
+        $exdatea['tz'] = (string) $exdatea['tz'];
+      if(  isset( $input['params']['TZID'] ) ||
+         ( isset( $exdatea['tz'] ) && !iCalUtilityFunctions::_isOffset( $exdatea['tz'] )) ||
+         ( isset( $input['value'][0] ) && ( !isset( $input['value'][0]['tz'] ))) ||
+         ( isset( $input['value'][0]['tz'] ) && !iCalUtilityFunctions::_isOffset( $input['value'][0]['tz'] )))
+        unset( $exdatea['tz'] );
+      if( $toZ ) // time zone Z
+        $exdatea['tz'] = 'Z';
+      $input['value'][] = $exdatea;
+    }
+    if( 0 >= count( $input['value'] ))
+      return FALSE;
+    if( 3 == $parno ) {
+      $input['params']['VALUE'] = 'DATE';
+      unset( $input['params']['TZID'] );
+    }
+    if( $toZ ) // time zone Z
+      unset( $input['params']['TZID'] );
+    iCalUtilityFunctions::_setMval( $this->exdate, $input['value'], $input['params'], FALSE, $index );
+    return TRUE;
+  }
+/*********************************************************************************/
+/**
+ * Property Name: EXRULE
+ */
+/**
+ * creates formatted output for calendar component property exrule
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.4.8 - 2008-10-22
+ * @return string
+ */
+  function createExrule() {
+    if( empty( $this->exrule )) return FALSE;
+    return $this->_format_recur( 'EXRULE', $this->exrule );
+  }
+/**
+ * set calendar component property exdate
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.21 - 2013-06-23
+ * @param array $exruleset
+ * @param array $params, optional
+ * @param integer $index, optional
+ * @return bool
+ */
+  function setExrule( $exruleset, $params=FALSE, $index=FALSE ) {
+    if( empty( $exruleset )) if( $this->getConfig( 'allowEmpty' )) $exruleset = ''; else return FALSE;
+    iCalUtilityFunctions::_setMval( $this->exrule, iCalUtilityFunctions::_setRexrule( $exruleset ), $params, FALSE, $index );
+    return TRUE;
+  }
+/*********************************************************************************/
+/**
+ * Property Name: FREEBUSY
+ */
+/**
+ * creates formatted output for calendar component property freebusy
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.27 - 2013-07-05
+ * @return string
+ */
+  function createFreebusy() {
+    if( empty( $this->freebusy )) return FALSE;
+    $output = null;
+    foreach( $this->freebusy as $freebusyPart ) {
+      if( empty( $freebusyPart['value'] ) || (( 1 == count( $freebusyPart['value'] )) && isset( $freebusyPart['value']['fbtype'] ))) {
+        if( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'FREEBUSY' );
+        continue;
+      }
+      $attributes = $content = null;
+      if( isset( $freebusyPart['value']['fbtype'] )) {
+          $attributes .= $this->intAttrDelimiter.'FBTYPE='.$freebusyPart['value']['fbtype'];
+        unset( $freebusyPart['value']['fbtype'] );
+        $freebusyPart['value'] = array_values( $freebusyPart['value'] );
+      }
+      else
+        $attributes .= $this->intAttrDelimiter.'FBTYPE=BUSY';
+      $attributes .= $this->_createParams( $freebusyPart['params'] );
+      $fno = 1;
+      $cnt = count( $freebusyPart['value']);
+      if( 1 < $cnt )
+        usort( $freebusyPart['value'], array( 'iCalUtilityFunctions', '_sortRdate1' ));
+      foreach( $freebusyPart['value'] as $periodix => $freebusyPeriod ) {
+        $formatted   = iCalUtilityFunctions::_date2strdate( $freebusyPeriod[0] );
+        $content .= $formatted;
+        $content .= '/';
+        $cnt2 = count( $freebusyPeriod[1]);
+        if( array_key_exists( 'year', $freebusyPeriod[1] ))      // date-time
+          $cnt2 = 7;
+        elseif( array_key_exists( 'week', $freebusyPeriod[1] ))  // duration
+          $cnt2 = 5;
+        if(( 7 == $cnt2 )   &&    // period=  -> date-time
+            isset( $freebusyPeriod[1]['year'] )  &&
+            isset( $freebusyPeriod[1]['month'] ) &&
+            isset( $freebusyPeriod[1]['day'] )) {
+          $content .= iCalUtilityFunctions::_date2strdate( $freebusyPeriod[1] );
+        }
+        else {                                  // period=  -> dur-time
+          $content .= iCalUtilityFunctions::_duration2str( $freebusyPeriod[1] );
+        }
+        if( $fno < $cnt )
+          $content .= ',';
+        $fno++;
+      }
+      $output .= $this->_createElement( 'FREEBUSY', $attributes, $content );
+    }
+    return $output;
+  }
+/**
+ * set calendar component property freebusy
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.21 - 2013-06-23
+ * @param string $fbType
+ * @param array $fbValues
+ * @param array $params, optional
+ * @param integer $index, optional
+ * @return bool
+ */
+  function setFreebusy( $fbType, $fbValues, $params=FALSE, $index=FALSE ) {
+    if( empty( $fbValues )) {
+      if( $this->getConfig( 'allowEmpty' )) {
+        iCalUtilityFunctions::_setMval( $this->freebusy, '', $params, FALSE, $index );
+        return TRUE;
+      }
+      else
+        return FALSE;
+    }
+    $fbType = strtoupper( $fbType );
+    if(( !in_array( $fbType, array( 'FREE', 'BUSY', 'BUSY-UNAVAILABLE', 'BUSY-TENTATIVE' ))) &&
+       ( 'X-' != substr( $fbType, 0, 2 )))
+      $fbType = 'BUSY';
+    $input = array( 'fbtype' => $fbType );
+    foreach( $fbValues as $fbPeriod ) {   // periods => period
+      if( empty( $fbPeriod ))
+        continue;
+      $freebusyPeriod = array();
+      foreach( $fbPeriod as $fbMember ) { // pairs => singlepart
+        $freebusyPairMember = array();
+        if( is_array( $fbMember )) {
+          if( iCalUtilityFunctions::_isArrayDate( $fbMember )) { // date-time value
+            $freebusyPairMember       = iCalUtilityFunctions::_chkDateArr( $fbMember, 7 );
+            $freebusyPairMember['tz'] = 'Z';
+          }
+          elseif( iCalUtilityFunctions::_isArrayTimestampDate( $fbMember )) { // timestamp value
+            $freebusyPairMember       = iCalUtilityFunctions::_timestamp2date( $fbMember['timestamp'], 7 );
+            $freebusyPairMember['tz'] = 'Z';
+          }
+          else {                                         // array format duration
+            $freebusyPairMember = iCalUtilityFunctions::_duration2arr( $fbMember );
+          }
+        }
+        elseif(( 3 <= strlen( trim( $fbMember ))) &&    // string format duration
+               ( in_array( $fbMember{0}, array( 'P', '+', '-' )))) {
+          if( 'P' != $fbMember{0} )
+            $fbmember = substr( $fbMember, 1 );
+          $freebusyPairMember = iCalUtilityFunctions::_durationStr2arr( $fbMember );
+        }
+        elseif( 8 <= strlen( trim( $fbMember ))) { // text date ex. 2006-08-03 10:12:18
+          $freebusyPairMember       = iCalUtilityFunctions::_strdate2date( $fbMember, 7 );
+          unset( $freebusyPairMember['unparsedtext'] );
+          $freebusyPairMember['tz'] = 'Z';
+        }
+        $freebusyPeriod[]   = $freebusyPairMember;
+      }
+      $input[]              = $freebusyPeriod;
+    }
+    iCalUtilityFunctions::_setMval( $this->freebusy, $input, $params, FALSE, $index );
+    return TRUE;
+  }
+/*********************************************************************************/
+/**
+ * Property Name: GEO
+ */
+/**
+ * creates formatted output for calendar component property geo
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.12.6 - 2012-04-21
+ * @return string
+ */
+  function createGeo() {
+    if( empty( $this->geo )) return FALSE;
+    if( empty( $this->geo['value'] ))
+      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'GEO' ) : FALSE;
+    $attributes = $this->_createParams( $this->geo['params'] );
+    if( 0.0 < $this->geo['value']['latitude'] )
+      $sign   = '+';
+    else
+      $sign   = ( 0.0 > $this->geo['value']['latitude'] ) ? '-' : '';
+    $content  = $sign.sprintf( "%09.6f", abs( $this->geo['value']['latitude'] ));       // sprintf && lpad && float && sign !"#¤%&/(
+    $content  = rtrim( rtrim( $content, '0' ), '.' );
+    if( 0.0 < $this->geo['value']['longitude'] )
+      $sign   = '+';
+    else
+      $sign   = ( 0.0 > $this->geo['value']['longitude'] ) ? '-' : '';
+    $content .= ';'.$sign.sprintf( '%8.6f', abs( $this->geo['value']['longitude'] ));   // sprintf && lpad && float && sign !"#¤%&/(
+    $content  = rtrim( rtrim( $content, '0' ), '.' );
+    return $this->_createElement( 'GEO', $attributes, $content );
+  }
+/**
+ * set calendar component property geo
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.21 - 2013-06-23
+ * @param float $latitude
+ * @param float $longitude
+ * @param array $params optional
+ * @return bool
+ */
+  function setGeo( $latitude, $longitude, $params=FALSE ) {
+    if( isset( $latitude ) && isset( $longitude )) {
+      if( !is_array( $this->geo )) $this->geo = array();
+      $this->geo['value']['latitude']  = (float) $latitude;
+      $this->geo['value']['longitude'] = (float) $longitude;
+      $this->geo['params'] = iCalUtilityFunctions::_setParams( $params );
+    }
+    elseif( $this->getConfig( 'allowEmpty' ))
+      $this->geo = array( 'value' => '', 'params' => iCalUtilityFunctions::_setParams( $params ) );
+    else
+      return FALSE;
+    return TRUE;
+  }
+/*********************************************************************************/
+/**
+ * Property Name: LAST-MODIFIED
+ */
+/**
+ * creates formatted output for calendar component property last-modified
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.4.8 - 2008-10-21
+ * @return string
+ */
+  function createLastModified() {
+    if( empty( $this->lastmodified )) return FALSE;
+    $attributes = $this->_createParams( $this->lastmodified['params'] );
+    $formatted  = iCalUtilityFunctions::_date2strdate( $this->lastmodified['value'], 7 );
+    return $this->_createElement( 'LAST-MODIFIED', $attributes, $formatted );
+  }
+/**
+ * set calendar component property completed
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.4.8 - 2008-10-23
+ * @param mixed $year optional
+ * @param mixed $month optional
+ * @param int $day optional
+ * @param int $hour optional
+ * @param int $min optional
+ * @param int $sec optional
+ * @param array $params optional
+ * @return boll
+ */
+  function setLastModified( $year=FALSE, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $params=FALSE ) {
+    if( empty( $year ))
+      $year = date('Ymd\THis', mktime( date( 'H' ), date( 'i' ), date( 's' ) - date( 'Z'), date( 'm' ), date( 'd' ), date( 'Y' )));
+    $this->lastmodified = iCalUtilityFunctions::_setDate2( $year, $month, $day, $hour, $min, $sec, $params );
+    return TRUE;
+  }
+/*********************************************************************************/
+/**
+ * Property Name: LOCATION
+ */
+/**
+ * creates formatted output for calendar component property location
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.2 - 2012-12-18
+ * @return string
+ */
+  function createLocation() {
+    if( empty( $this->location )) return FALSE;
+    if( empty( $this->location['value'] ))
+      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'LOCATION' ) : FALSE;
+    $attributes = $this->_createParams( $this->location['params'], array( 'ALTREP', 'LANGUAGE' ));
+    $content    = iCalUtilityFunctions::_strrep( $this->location['value'], $this->format, $this->nl );
+    return $this->_createElement( 'LOCATION', $attributes, $content );
+  }
+/**
+ * set calendar component property location
+ '
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.21 - 2013-06-23
+ * @param string $value
+ * @param array params optional
+ * @return bool
+ */
+  function setLocation( $value, $params=FALSE ) {
+    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = ''; else return FALSE;
+    $this->location = array( 'value' => $value, 'params' => iCalUtilityFunctions::_setParams( $params ));
+    return TRUE;
+  }
+/*********************************************************************************/
+/**
+ * Property Name: ORGANIZER
+ */
+/**
+ * creates formatted output for calendar component property organizer
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.6.33 - 2010-12-17
+ * @return string
+ */
+  function createOrganizer() {
+    if( empty( $this->organizer )) return FALSE;
+    if( empty( $this->organizer['value'] ))
+      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'ORGANIZER' ) : FALSE;
+    $attributes = $this->_createParams( $this->organizer['params']
+                                      , array( 'CN', 'DIR', 'SENT-BY', 'LANGUAGE' ));
+    return $this->_createElement( 'ORGANIZER', $attributes, $this->organizer['value'] );
+  }
+/**
+ * set calendar component property organizer
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.21 - 2013-06-23
+ * @param string $value
+ * @param array params optional
+ * @return bool
+ */
+  function setOrganizer( $value, $params=FALSE ) {
+    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = ''; else return FALSE;
+    if( !empty( $value )) {
+      if( FALSE === ( $pos = strpos( substr( $value, 0, 9 ), ':' )))
+        $value = 'MAILTO:'.$value;
+      elseif( !empty( $value ))
+        $value = strtolower( substr( $value, 0, $pos )).substr( $value, $pos );
+      $value = str_replace( 'mailto:', 'MAILTO:', $value );
+    }
+    $this->organizer = array( 'value' => $value, 'params' => iCalUtilityFunctions::_setParams( $params ));
+    if( isset( $this->organizer['params']['SENT-BY'] )){
+      if( 'mailto:' !== strtolower( substr( $this->organizer['params']['SENT-BY'], 0, 7 )))
+        $this->organizer['params']['SENT-BY'] = 'MAILTO:'.$this->organizer['params']['SENT-BY'];
+      else
+        $this->organizer['params']['SENT-BY'] = 'MAILTO:'.substr( $this->organizer['params']['SENT-BY'], 7 );
+    }
+    return TRUE;
+  }
+/*********************************************************************************/
+/**
+ * Property Name: PERCENT-COMPLETE
+ */
+/**
+ * creates formatted output for calendar component property percent-complete
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.9.3 - 2011-05-14
+ * @return string
+ */
+  function createPercentComplete() {
+    if( !isset($this->percentcomplete) || ( empty( $this->percentcomplete ) && !is_numeric( $this->percentcomplete ))) return FALSE;
+    if( !isset( $this->percentcomplete['value'] ) || ( empty( $this->percentcomplete['value'] ) && !is_numeric( $this->percentcomplete['value'] )))
+      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'PERCENT-COMPLETE' ) : FALSE;
+    $attributes = $this->_createParams( $this->percentcomplete['params'] );
+    return $this->_createElement( 'PERCENT-COMPLETE', $attributes, $this->percentcomplete['value'] );
+  }
+/**
+ * set calendar component property percent-complete
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.21 - 2013-06-23
+ * @param int $value
+ * @param array $params optional
+ * @return bool
+ */
+  function setPercentComplete( $value, $params=FALSE ) {
+    if( empty( $value ) && !is_numeric( $value )) if( $this->getConfig( 'allowEmpty' )) $value = ''; else return FALSE;
+    $this->percentcomplete = array( 'value' => $value, 'params' => iCalUtilityFunctions::_setParams( $params ));
+    return TRUE;
+  }
+/*********************************************************************************/
+/**
+ * Property Name: PRIORITY
+ */
+/**
+ * creates formatted output for calendar component property priority
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.9.3 - 2011-05-14
+ * @return string
+ */
+  function createPriority() {
+    if( !isset($this->priority) || ( empty( $this->priority ) && !is_numeric( $this->priority ))) return FALSE;
+    if( !isset( $this->priority['value'] ) || ( empty( $this->priority['value'] ) && !is_numeric( $this->priority['value'] )))
+      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'PRIORITY' ) : FALSE;
+    $attributes = $this->_createParams( $this->priority['params'] );
+    return $this->_createElement( 'PRIORITY', $attributes, $this->priority['value'] );
+  }
+/**
+ * set calendar component property priority
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.21 - 2013-06-23
+ * @param int $value
+ * @param array $params optional
+ * @return bool
+ */
+  function setPriority( $value, $params=FALSE  ) {
+    if( empty( $value ) && !is_numeric( $value )) if( $this->getConfig( 'allowEmpty' )) $value = ''; else return FALSE;
+    $this->priority = array( 'value' => $value, 'params' => iCalUtilityFunctions::_setParams( $params ));
+    return TRUE;
+  }
+/*********************************************************************************/
+/**
+ * Property Name: RDATE
+ */
+/**
+ * creates formatted output for calendar component property rdate
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.9 - 2013-01-09
+ * @return string
+ */
+  function createRdate() {
+    if( empty( $this->rdate )) return FALSE;
+    $utctime = ( in_array( $this->objName, array( 'vtimezone', 'standard', 'daylight' ))) ? TRUE : FALSE;
+    $output = null;
+    $rdates = array();
+    foreach( $this->rdate as $rpix => $theRdate ) {
+      if( empty( $theRdate['value'] )) {
+        if( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'RDATE' );
+        continue;
+      }
+      if( $utctime  )
+        unset( $theRdate['params']['TZID'] );
+      if( 1 < count( $theRdate['value'] ))
+        usort( $theRdate['value'], array( 'iCalUtilityFunctions', '_sortRdate1' ));
+      $rdates[] = $theRdate;
+    }
+    if( 1 < count( $rdates ))
+      usort( $rdates, array( 'iCalUtilityFunctions', '_sortRdate2' ));
+    foreach( $rdates as $rpix => $theRdate ) {
+      $attributes = $this->_createParams( $theRdate['params'] );
+      $cnt = count( $theRdate['value'] );
+      $content = null;
+      $rno = 1;
+      foreach( $theRdate['value'] as $rix => $rdatePart ) {
+        $contentPart = null;
+        if( is_array( $rdatePart ) &&
+            isset( $theRdate['params']['VALUE'] ) && ( 'PERIOD' == $theRdate['params']['VALUE'] )) { // PERIOD
+          if( $utctime )
+            unset( $rdatePart[0]['tz'] );
+          $formatted = iCalUtilityFunctions::_date2strdate( $rdatePart[0] ); // PERIOD part 1
+          if( $utctime || !empty( $theRdate['params']['TZID'] ))
+            $formatted = str_replace( 'Z', '', $formatted);
+          $contentPart .= $formatted;
+          $contentPart .= '/';
+          $cnt2 = count( $rdatePart[1]);
+          if( array_key_exists( 'year', $rdatePart[1] )) {
+            if( array_key_exists( 'hour', $rdatePart[1] ))
+              $cnt2 = 7;                                      // date-time
+            else
+              $cnt2 = 3;                                      // date
+          }
+          elseif( array_key_exists( 'week', $rdatePart[1] ))  // duration
+            $cnt2 = 5;
+          if(( 7 == $cnt2 )   &&    // period=  -> date-time
+              isset( $rdatePart[1]['year'] )  &&
+              isset( $rdatePart[1]['month'] ) &&
+              isset( $rdatePart[1]['day'] )) {
+            if( $utctime )
+              unset( $rdatePart[1]['tz'] );
+            $formatted = iCalUtilityFunctions::_date2strdate( $rdatePart[1] ); // PERIOD part 2
+            if( $utctime || !empty( $theRdate['params']['TZID'] ))
+              $formatted = str_replace( 'Z', '', $formatted );
+           $contentPart .= $formatted;
+          }
+          else {                                  // period=  -> dur-time
+            $contentPart .= iCalUtilityFunctions::_duration2str( $rdatePart[1] );
+          }
+        } // PERIOD end
+        else { // SINGLE date start
+          if( $utctime )
+            unset( $rdatePart['tz'] );
+          $parno = ( isset( $theRdate['params']['VALUE'] ) && ( 'DATE' == isset( $theRdate['params']['VALUE'] ))) ? 3 : null;
+          $formatted = iCalUtilityFunctions::_date2strdate( $rdatePart, $parno );
+          if( $utctime || !empty( $theRdate['params']['TZID'] ))
+            $formatted = str_replace( 'Z', '', $formatted);
+          $contentPart .= $formatted;
+        }
+        $content .= $contentPart;
+        if( $rno < $cnt )
+          $content .= ',';
+        $rno++;
+      }
+      $output    .= $this->_createElement( 'RDATE', $attributes, $content );
+    }
+    return $output;
+  }
+/**
+ * set calendar component property rdate
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.21 - 2013-06-23
+ * @param array $rdates
+ * @param array $params, optional
+ * @param integer $index, optional
+ * @return bool
+ */
+  function setRdate( $rdates, $params=FALSE, $index=FALSE ) {
+    if( empty( $rdates )) {
+      if( $this->getConfig( 'allowEmpty' )) {
+        iCalUtilityFunctions::_setMval( $this->rdate, '', $params, FALSE, $index );
+        return TRUE;
+      }
+      else
+        return FALSE;
+    }
+    $input = array( 'params' => iCalUtilityFunctions::_setParams( $params, array( 'VALUE' => 'DATE-TIME' )));
+    if( in_array( $this->objName, array( 'vtimezone', 'standard', 'daylight' ))) {
+      unset( $input['params']['TZID'] );
+      $input['params']['VALUE'] = 'DATE-TIME';
+    }
+    $zArr = array( 'GMT', 'UTC', 'Z' );
+    $toZ = ( isset( $params['TZID'] ) && in_array( strtoupper( $params['TZID'] ), $zArr )) ? TRUE : FALSE;
+            /*  check if PERIOD, if not set */
+    if((!isset( $input['params']['VALUE'] ) || !in_array( $input['params']['VALUE'], array( 'DATE', 'PERIOD' ))) &&
+          isset( $rdates[0] )    && is_array( $rdates[0] ) && ( 2 == count( $rdates[0] )) &&
+          isset( $rdates[0][0] ) &&    isset( $rdates[0][1] ) && !isset( $rdates[0]['timestamp'] ) &&
+    (( is_array( $rdates[0][0] ) && ( isset( $rdates[0][0]['timestamp'] ) ||
+                                      iCalUtilityFunctions::_isArrayDate( $rdates[0][0] ))) ||
+                                    ( is_string( $rdates[0][0] ) && ( 8 <= strlen( trim( $rdates[0][0] )))))  &&
+     ( is_array( $rdates[0][1] ) || ( is_string( $rdates[0][1] ) && ( 3 <= strlen( trim( $rdates[0][1] ))))))
+      $input['params']['VALUE'] = 'PERIOD';
+            /* check 1:st date, upd. $parno (opt) and save ev. timezone **/
+    $date  = reset( $rdates );
+    if( isset( $input['params']['VALUE'] ) && ( 'PERIOD' == $input['params']['VALUE'] )) // PERIOD
+      $date  = reset( $date );
+    iCalUtilityFunctions::_chkdatecfg( $date, $parno, $input['params'] );
+    iCalUtilityFunctions::_existRem( $input['params'], 'VALUE', 'DATE-TIME' ); // remove default
+    foreach( $rdates as $rpix => $theRdate ) {
+      $inputa = null;
+      iCalUtilityFunctions::_strDate2arr( $theRdate );
+      if( is_array( $theRdate )) {
+        if( isset( $input['params']['VALUE'] ) && ( 'PERIOD' == $input['params']['VALUE'] )) { // PERIOD
+          foreach( $theRdate as $rix => $rPeriod ) {
+            iCalUtilityFunctions::_strDate2arr( $theRdate );
+            if( is_array( $rPeriod )) {
+              if( iCalUtilityFunctions::_isArrayTimestampDate( $rPeriod )) {    // timestamp
+                if( isset( $rPeriod['tz'] ) && !iCalUtilityFunctions::_isOffset( $rPeriod['tz'] )) {
+                  if( isset( $input['params']['TZID'] ))
+                    $rPeriod['tz'] = $input['params']['TZID'];
+                  else
+                    $input['params']['TZID'] = $rPeriod['tz'];
+                }
+                $inputab = iCalUtilityFunctions::_timestamp2date( $rPeriod, $parno );
+              }
+              elseif( iCalUtilityFunctions::_isArrayDate( $rPeriod )) {
+                $d = ( 3 < count ( $rPeriod )) ? iCalUtilityFunctions::_chkDateArr( $rPeriod, $parno ) : iCalUtilityFunctions::_chkDateArr( $rPeriod, 6 );
+                if( isset( $d['tz'] ) && ( 'Z' != $d['tz'] ) && iCalUtilityFunctions::_isOffset( $d['tz'] )) {
+                  $strdate = sprintf( '%04d-%02d-%02d %02d:%02d:%02d %s', $d['year'], $d['month'], $d['day'], $d['hour'], $d['min'], $d['sec'], $d['tz'] );
+                  $inputab = iCalUtilityFunctions::_strdate2date( $strdate, 7 );
+                  unset( $inputab['unparsedtext'] );
+                }
+                else
+                  $inputab = $d;
+              }
+              elseif (( 1 == count( $rPeriod )) && ( 8 <= strlen( reset( $rPeriod )))) { // text-date
+                $inputab   = iCalUtilityFunctions::_strdate2date( reset( $rPeriod ), $parno );
+                unset( $inputab['unparsedtext'] );
+              }
+              else                                               // array format duration
+                $inputab   = iCalUtilityFunctions::_duration2arr( $rPeriod );
+            }
+            elseif(( 3 <= strlen( trim( $rPeriod ))) &&          // string format duration
+                   ( in_array( $rPeriod[0], array( 'P', '+', '-' )))) {
+              if( 'P' != $rPeriod[0] )
+                $rPeriod   = substr( $rPeriod, 1 );
+              $inputab     = iCalUtilityFunctions::_durationStr2arr( $rPeriod );
+            }
+            elseif( 8 <= strlen( trim( $rPeriod ))) {            // text date ex. 2006-08-03 10:12:18
+              $inputab     = iCalUtilityFunctions::_strdate2date( $rPeriod, $parno );
+              unset( $inputab['unparsedtext'] );
+            }
+            if(( 0 == $rpix ) && ( 0 == $rix )) {
+              if( isset( $inputab['tz'] ) && in_array( strtoupper( $inputab['tz'] ), $zArr )) {
+                $inputab['tz'] = 'Z';
+                $toZ = TRUE;
+              }
+            }
+            else {
+              if( isset( $inputa[0]['tz'] ) && ( 'Z' == $inputa[0]['tz'] ) && isset( $inputab['year'] ))
+                $inputab['tz'] = 'Z';
+              else
+                unset( $inputab['tz'] );
+            }
+            if( $toZ && isset( $inputab['year'] ) )
+              $inputab['tz'] = 'Z';
+            $inputa[]      = $inputab;
+          }
+        } // PERIOD end
+        elseif ( iCalUtilityFunctions::_isArrayTimestampDate( $theRdate )) {    // timestamp
+          if( isset( $theRdate['tz'] ) && !iCalUtilityFunctions::_isOffset( $theRdate['tz'] )) {
+            if( isset( $input['params']['TZID'] ))
+              $theRdate['tz'] = $input['params']['TZID'];
+            else
+              $input['params']['TZID'] = $theRdate['tz'];
+          }
+          $inputa = iCalUtilityFunctions::_timestamp2date( $theRdate, $parno );
+        }
+        else {                                                                  // date[-time]
+          $inputa = iCalUtilityFunctions::_chkDateArr( $theRdate, $parno );
+          if( isset( $inputa['tz'] ) && ( 'Z' != $inputa['tz'] ) && iCalUtilityFunctions::_isOffset( $inputa['tz'] )) {
+            $strdate = sprintf( '%04d-%02d-%02d %02d:%02d:%02d %s', $inputa['year'], $inputa['month'], $inputa['day'], $inputa['hour'], $inputa['min'], $inputa['sec'], $inputa['tz'] );
+            $inputa  = iCalUtilityFunctions::_strdate2date( $strdate, 7 );
+            unset( $inputa['unparsedtext'] );
+          }
+        }
+      }
+      elseif( 8 <= strlen( trim( $theRdate ))) {                 // text date ex. 2006-08-03 10:12:18
+        $inputa       = iCalUtilityFunctions::_strdate2date( $theRdate, $parno );
+        unset( $inputa['unparsedtext'] );
+        if( $toZ )
+          $inputa['tz'] = 'Z';
+      }
+      if( !isset( $input['params']['VALUE'] ) || ( 'PERIOD' != $input['params']['VALUE'] )) { // no PERIOD
+        if(( 0 == $rpix ) && !$toZ )
+          $toZ = ( isset( $inputa['tz'] ) && in_array( strtoupper( $inputa['tz'] ), $zArr )) ? TRUE : FALSE;
+        if( $toZ )
+          $inputa['tz']    = 'Z';
+        if( 3 == $parno )
+          unset( $inputa['hour'], $inputa['min'], $inputa['sec'], $inputa['tz'] );
+        elseif( isset( $inputa['tz'] ))
+          $inputa['tz']    = (string) $inputa['tz'];
+        if( isset( $input['params']['TZID'] ) || ( isset( $input['value'][0] ) && ( !isset( $input['value'][0]['tz'] ))))
+          if( !$toZ )
+            unset( $inputa['tz'] );
+      }
+      $input['value'][]    = $inputa;
+    }
+    if( 3 == $parno ) {
+      $input['params']['VALUE'] = 'DATE';
+      unset( $input['params']['TZID'] );
+    }
+    if( $toZ )
+      unset( $input['params']['TZID'] );
+    iCalUtilityFunctions::_setMval( $this->rdate, $input['value'], $input['params'], FALSE, $index );
+    return TRUE;
+  }
+/*********************************************************************************/
+/**
+ * Property Name: RECURRENCE-ID
+ */
+/**
+ * creates formatted output for calendar component property recurrence-id
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.14.4 - 2012-09-26
+ * @return string
+ */
+  function createRecurrenceid() {
+    if( empty( $this->recurrenceid )) return FALSE;
+    if( empty( $this->recurrenceid['value'] ))
+      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'RECURRENCE-ID' ) : FALSE;
+    $parno      = ( isset( $this->recurrenceid['params']['VALUE'] ) && ( 'DATE' == $this->recurrenceid['params']['VALUE'] )) ? 3 : null;
+    $formatted  = iCalUtilityFunctions::_date2strdate( $this->recurrenceid['value'], $parno );
+    $attributes = $this->_createParams( $this->recurrenceid['params'] );
+    return $this->_createElement( 'RECURRENCE-ID', $attributes, $formatted );
+  }
+/**
+ * set calendar component property recurrence-id
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.21 - 2013-06-23
+ * @param mixed $year
+ * @param mixed $month optional
+ * @param int $day optional
+ * @param int $hour optional
+ * @param int $min optional
+ * @param int $sec optional
+ * @param array $params optional
+ * @return bool
+ */
+  function setRecurrenceid( $year, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $tz=FALSE, $params=FALSE ) {
+    if( empty( $year )) {
+      if( $this->getConfig( 'allowEmpty' )) {
+        $this->recurrenceid = array( 'value' => '', 'params' => null );
+        return TRUE;
+      }
+      else
+        return FALSE;
+    }
+    $this->recurrenceid = iCalUtilityFunctions::_setDate( $year, $month, $day, $hour, $min, $sec, $tz, $params, null, null, $this->getConfig( 'TZID' ));
+    return TRUE;
+  }
+/*********************************************************************************/
+/**
+ * Property Name: RELATED-TO
+ */
+/**
+ * creates formatted output for calendar component property related-to
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.21 - 2013-05-25
+ * @return string
+ */
+  function createRelatedTo() {
+    if( empty( $this->relatedto )) return FALSE;
+    $output = null;
+    foreach( $this->relatedto as $relation ) {
+      if( !empty( $relation['value'] ))
+        $output .= $this->_createElement( 'RELATED-TO', $this->_createParams( $relation['params'] ), iCalUtilityFunctions::_strrep( $relation['value'], $this->format, $this->nl ));
+      elseif( $this->getConfig( 'allowEmpty' ))
+        $output .= $this->_createElement( 'RELATED-TO' );
+    }
+    return $output;
+  }
+/**
+ * set calendar component property related-to
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.21 - 2013-06-23
+ * @param float $relid
+ * @param array $params, optional
+ * @param index $index, optional
+ * @return bool
+ */
+  function setRelatedTo( $value, $params=FALSE, $index=FALSE ) {
+    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = ''; else return FALSE;
+    iCalUtilityFunctions::_existRem( $params, 'RELTYPE', 'PARENT', TRUE ); // remove default
+    iCalUtilityFunctions::_setMval( $this->relatedto, $value, $params, FALSE, $index );
+    return TRUE;
+  }
+/*********************************************************************************/
+/**
+ * Property Name: REPEAT
+ */
+/**
+ * creates formatted output for calendar component property repeat
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.9.3 - 2011-05-14
+ * @return string
+ */
+  function createRepeat() {
+    if( !isset( $this->repeat ) || ( empty( $this->repeat ) && !is_numeric( $this->repeat ))) return FALSE;
+    if( !isset( $this->repeat['value']) || ( empty( $this->repeat['value'] ) && !is_numeric( $this->repeat['value'] )))
+      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'REPEAT' ) : FALSE;
+    $attributes = $this->_createParams( $this->repeat['params'] );
+    return $this->_createElement( 'REPEAT', $attributes, $this->repeat['value'] );
+  }
+/**
+ * set calendar component property repeat
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.21 - 2013-06-23
+ * @param string $value
+ * @param array $params optional
+ * @return void
+ */
+  function setRepeat( $value, $params=FALSE ) {
+    if( empty( $value ) && !is_numeric( $value )) if( $this->getConfig( 'allowEmpty' )) $value = ''; else return FALSE;
+    $this->repeat = array( 'value' => $value, 'params' => iCalUtilityFunctions::_setParams( $params ));
+    return TRUE;
+  }
+/*********************************************************************************/
+/**
+ * Property Name: REQUEST-STATUS
+ */
+/**
+ * creates formatted output for calendar component property request-status
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.2 - 2012-12-18
+ * @return string
+ */
+  function createRequestStatus() {
+    if( empty( $this->requeststatus )) return FALSE;
+    $output = null;
+    foreach( $this->requeststatus as $rstat ) {
+      if( empty( $rstat['value']['statcode'] )) {
+        if( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'REQUEST-STATUS' );
+        continue;
+      }
+      $attributes  = $this->_createParams( $rstat['params'], array( 'LANGUAGE' ));
+      $content     = number_format( (float) $rstat['value']['statcode'], 2, '.', '');
+      $content    .= ';'.iCalUtilityFunctions::_strrep( $rstat['value']['text'], $this->format, $this->nl );
+      if( isset( $rstat['value']['extdata'] ))
+        $content  .= ';'.iCalUtilityFunctions::_strrep( $rstat['value']['extdata'], $this->format, $this->nl );
+      $output     .= $this->_createElement( 'REQUEST-STATUS', $attributes, $content );
+    }
+    return $output;
+  }
+/**
+ * set calendar component property request-status
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.21 - 2013-06-23
+ * @param float $statcode
+ * @param string $text
+ * @param string $extdata, optional
+ * @param array $params, optional
+ * @param integer $index, optional
+ * @return bool
+ */
+  function setRequestStatus( $statcode, $text, $extdata=FALSE, $params=FALSE, $index=FALSE ) {
+    if( empty( $statcode ) || empty( $text )) if( $this->getConfig( 'allowEmpty' )) $statcode = $text = ''; else return FALSE;
+    $input              = array( 'statcode' => $statcode, 'text' => $text );
+    if( $extdata )
+      $input['extdata'] = $extdata;
+    iCalUtilityFunctions::_setMval( $this->requeststatus, $input, $params, FALSE, $index );
+    return TRUE;
+  }
+/*********************************************************************************/
+/**
+ * Property Name: RESOURCES
+ */
+/**
+ * creates formatted output for calendar component property resources
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.2 - 2012-12-18
+ * @return string
+ */
+  function createResources() {
+    if( empty( $this->resources )) return FALSE;
+    $output = null;
+    foreach( $this->resources as $resource ) {
+      if( empty( $resource['value'] )) {
+        if( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'RESOURCES' );
+        continue;
+      }
+      $attributes  = $this->_createParams( $resource['params'], array( 'ALTREP', 'LANGUAGE' ));
+      if( is_array( $resource['value'] )) {
+        foreach( $resource['value'] as $rix => $resourcePart )
+          $resource['value'][$rix] = iCalUtilityFunctions::_strrep( $resourcePart, $this->format, $this->nl );
+        $content   = implode( ',', $resource['value'] );
+      }
+      else
+        $content   = iCalUtilityFunctions::_strrep( $resource['value'], $this->format, $this->nl );
+      $output     .= $this->_createElement( 'RESOURCES', $attributes, $content );
+    }
+    return $output;
+  }
+/**
+ * set calendar component property recources
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.21 - 2013-06-23
+ * @param mixed $value
+ * @param array $params, optional
+ * @param integer $index, optional
+ * @return bool
+ */
+  function setResources( $value, $params=FALSE, $index=FALSE ) {
+    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = ''; else return FALSE;
+    iCalUtilityFunctions::_setMval( $this->resources, $value, $params, FALSE, $index );
+    return TRUE;
+  }
+/*********************************************************************************/
+/**
+ * Property Name: RRULE
+ */
+/**
+ * creates formatted output for calendar component property rrule
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.4.8 - 2008-10-21
+ * @return string
+ */
+  function createRrule() {
+    if( empty( $this->rrule )) return FALSE;
+    return $this->_format_recur( 'RRULE', $this->rrule );
+  }
+/**
+ * set calendar component property rrule
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.21 - 2013-06-23
+ * @param array $rruleset
+ * @param array $params, optional
+ * @param integer $index, optional
+ * @return void
+ */
+  function setRrule( $rruleset, $params=FALSE, $index=FALSE ) {
+    if( empty( $rruleset )) if( $this->getConfig( 'allowEmpty' )) $rruleset = ''; else return FALSE;
+    iCalUtilityFunctions::_setMval( $this->rrule, iCalUtilityFunctions::_setRexrule( $rruleset ), $params, FALSE, $index );
+    return TRUE;
+  }
+/*********************************************************************************/
+/**
+ * Property Name: SEQUENCE
+ */
+/**
+ * creates formatted output for calendar component property sequence
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.9.3 - 2011-05-14
+ * @return string
+ */
+  function createSequence() {
+    if( !isset( $this->sequence ) || ( empty( $this->sequence ) && !is_numeric( $this->sequence ))) return FALSE;
+    if(( !isset($this->sequence['value'] ) || ( empty( $this->sequence['value'] ) && !is_numeric( $this->sequence['value'] ))) &&
+       ( '0' != $this->sequence['value'] ))
+      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'SEQUENCE' ) : FALSE;
+    $attributes = $this->_createParams( $this->sequence['params'] );
+    return $this->_createElement( 'SEQUENCE', $attributes, $this->sequence['value'] );
+  }
+/**
+ * set calendar component property sequence
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.10.8 - 2011-09-19
+ * @param int $value optional
+ * @param array $params optional
+ * @return bool
+ */
+  function setSequence( $value=FALSE, $params=FALSE ) {
+    if(( empty( $value ) && !is_numeric( $value )) && ( '0' != $value ))
+      $value = ( isset( $this->sequence['value'] ) && ( -1 < $this->sequence['value'] )) ? $this->sequence['value'] + 1 : '0';
+    $this->sequence = array( 'value' => $value, 'params' => iCalUtilityFunctions::_setParams( $params ));
+    return TRUE;
+  }
+/*********************************************************************************/
+/**
+ * Property Name: STATUS
+ */
+/**
+ * creates formatted output for calendar component property status
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.4.8 - 2008-10-21
+ * @return string
+ */
+  function createStatus() {
+    if( empty( $this->status )) return FALSE;
+    if( empty( $this->status['value'] ))
+      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'STATUS' ) : FALSE;
+    $attributes = $this->_createParams( $this->status['params'] );
+    return $this->_createElement( 'STATUS', $attributes, $this->status['value'] );
+  }
+/**
+ * set calendar component property status
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.21 - 2013-06-23
+ * @param string $value
+ * @param array $params optional
+ * @return bool
+ */
+  function setStatus( $value, $params=FALSE ) {
+    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = ''; else return FALSE;
+    $this->status = array( 'value' => $value, 'params' => iCalUtilityFunctions::_setParams( $params ));
+    return TRUE;
+  }
+/*********************************************************************************/
+/**
+ * Property Name: SUMMARY
+ */
+/**
+ * creates formatted output for calendar component property summary
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.2 - 2012-12-18
+ * @return string
+ */
+  function createSummary() {
+    if( empty( $this->summary )) return FALSE;
+    if( empty( $this->summary['value'] ))
+      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'SUMMARY' ) : FALSE;
+    $attributes = $this->_createParams( $this->summary['params'], array( 'ALTREP', 'LANGUAGE' ));
+    $content    = iCalUtilityFunctions::_strrep( $this->summary['value'], $this->format, $this->nl );
+    return $this->_createElement( 'SUMMARY', $attributes, $content );
+  }
+/**
+ * set calendar component property summary
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.21 - 2013-06-23
+ * @param string $value
+ * @param string $params optional
+ * @return bool
+ */
+  function setSummary( $value, $params=FALSE ) {
+    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = ''; else return FALSE;
+    $this->summary = array( 'value' => $value, 'params' => iCalUtilityFunctions::_setParams( $params ));
+    return TRUE;
+  }
+/*********************************************************************************/
+/**
+ * Property Name: TRANSP
+ */
+/**
+ * creates formatted output for calendar component property transp
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.4.8 - 2008-10-21
+ * @return string
+ */
+  function createTransp() {
+    if( empty( $this->transp )) return FALSE;
+    if( empty( $this->transp['value'] ))
+      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'TRANSP' ) : FALSE;
+    $attributes = $this->_createParams( $this->transp['params'] );
+    return $this->_createElement( 'TRANSP', $attributes, $this->transp['value'] );
+  }
+/**
+ * set calendar component property transp
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.21 - 2013-06-23
+ * @param string $value
+ * @param string $params optional
+ * @return bool
+ */
+  function setTransp( $value, $params=FALSE ) {
+    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = ''; else return FALSE;
+    $this->transp = array( 'value' => $value, 'params' => iCalUtilityFunctions::_setParams( $params ));
+    return TRUE;
+  }
+/*********************************************************************************/
+/**
+ * Property Name: TRIGGER
+ */
+/**
+ * creates formatted output for calendar component property trigger
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.4.16 - 2008-10-21
+ * @return string
+ */
+  function createTrigger() {
+    if( empty( $this->trigger )) return FALSE;
+    if( empty( $this->trigger['value'] ))
+      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'TRIGGER' ) : FALSE;
+    $content = $attributes = null;
+    if( isset( $this->trigger['value']['year'] )   &&
+        isset( $this->trigger['value']['month'] )  &&
+        isset( $this->trigger['value']['day'] ))
+      $content      .= iCalUtilityFunctions::_date2strdate( $this->trigger['value'] );
+    else {
+      if( TRUE !== $this->trigger['value']['relatedStart'] )
+        $attributes .= $this->intAttrDelimiter.'RELATED=END';
+      if( $this->trigger['value']['before'] )
+        $content    .= '-';
+      $content      .= iCalUtilityFunctions::_duration2str( $this->trigger['value'] );
+    }
+    $attributes     .= $this->_createParams( $this->trigger['params'] );
+    return $this->_createElement( 'TRIGGER', $attributes, $content );
+  }
+/**
+ * set calendar component property trigger
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.21 - 2013-06-23
+ * @param mixed $year
+ * @param mixed $month optional
+ * @param int $day optional
+ * @param int $week optional
+ * @param int $hour optional
+ * @param int $min optional
+ * @param int $sec optional
+ * @param bool $relatedStart optional
+ * @param bool $before optional
+ * @param array $params optional
+ * @return bool
+ */
+  function setTrigger( $year, $month=null, $day=null, $week=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $relatedStart=TRUE, $before=TRUE, $params=FALSE ) {
+    if( empty( $year ) && ( empty( $month ) || is_array( $month )) && empty( $day ) && empty( $week ) && empty( $hour ) && empty( $min ) && empty( $sec ))
+      if( $this->getConfig( 'allowEmpty' )) {
+        $this->trigger = array( 'value' => '', 'params' => iCalUtilityFunctions::_setParams( $month ) );
+        return TRUE;
+      }
+      else
+        return FALSE;
+    if( iCalUtilityFunctions::_isArrayTimestampDate( $year )) { // timestamp UTC
+      $params = iCalUtilityFunctions::_setParams( $month );
+      $date   = iCalUtilityFunctions::_timestamp2date( $year, 7 );
+      foreach( $date as $k => $v )
+        $$k = $v;
+    }
+    elseif( is_array( $year ) && ( is_array( $month ) || empty( $month ))) {
+      $params = iCalUtilityFunctions::_setParams( $month );
+      if(!(array_key_exists( 'year',  $year ) &&   // exclude date-time
+           array_key_exists( 'month', $year ) &&
+           array_key_exists( 'day',   $year ))) {  // when this must be a duration
+        if( isset( $params['RELATED'] ) && ( 'END' == strtoupper( $params['RELATED'] )))
+          $relatedStart = FALSE;
+        else
+          $relatedStart = ( array_key_exists( 'relatedStart', $year ) && ( TRUE !== $year['relatedStart'] )) ? FALSE : TRUE;
+        $before         = ( array_key_exists( 'before', $year )       && ( TRUE !== $year['before'] ))       ? FALSE : TRUE;
+      }
+      $SSYY  = ( array_key_exists( 'year',  $year )) ? $year['year']  : null;
+      $month = ( array_key_exists( 'month', $year )) ? $year['month'] : null;
+      $day   = ( array_key_exists( 'day',   $year )) ? $year['day']   : null;
+      $week  = ( array_key_exists( 'week',  $year )) ? $year['week']  : null;
+      $hour  = ( array_key_exists( 'hour',  $year )) ? $year['hour']  : 0; //null;
+      $min   = ( array_key_exists( 'min',   $year )) ? $year['min']   : 0; //null;
+      $sec   = ( array_key_exists( 'sec',   $year )) ? $year['sec']   : 0; //null;
+      $year  = $SSYY;
+    }
+    elseif(is_string( $year ) && ( is_array( $month ) || empty( $month ))) {  // duration or date in a string
+      $params = iCalUtilityFunctions::_setParams( $month );
+      if( in_array( $year{0}, array( 'P', '+', '-' ))) { // duration
+        $relatedStart = ( isset( $params['RELATED'] ) && ( 'END' == strtoupper( $params['RELATED'] ))) ? FALSE : TRUE;
+        $before       = ( '-'  == $year[0] ) ? TRUE : FALSE;
+        if(     'P'  != $year[0] )
+          $year       = substr( $year, 1 );
+        $date         = iCalUtilityFunctions::_durationStr2arr( $year);
+      }
+      else   // date
+        $date    = iCalUtilityFunctions::_strdate2date( $year, 7 );
+      unset( $year, $month, $day, $date['unparsedtext'] );
+      if( empty( $date ))
+        $sec = 0;
+      else
+        foreach( $date as $k => $v )
+          $$k = $v;
+    }
+    else // single values in function input parameters
+      $params = iCalUtilityFunctions::_setParams( $params );
+    if( !empty( $year ) && !empty( $month ) && !empty( $day )) { // date
+      $params['VALUE'] = 'DATE-TIME';
+      $hour = ( $hour ) ? $hour : 0;
+      $min  = ( $min  ) ? $min  : 0;
+      $sec  = ( $sec  ) ? $sec  : 0;
+      $this->trigger = array( 'params' => $params );
+      $this->trigger['value'] = array( 'year'  => $year
+                                     , 'month' => $month
+                                     , 'day'   => $day
+                                     , 'hour'  => $hour
+                                     , 'min'   => $min
+                                     , 'sec'   => $sec
+                                     , 'tz'    => 'Z' );
+      return TRUE;
+    }
+    elseif(( empty( $year ) && empty( $month )) &&    // duration
+           (( !empty( $week ) || ( 0 == $week )) ||
+            ( !empty( $day )  || ( 0 == $day  )) ||
+            ( !empty( $hour ) || ( 0 == $hour )) ||
+            ( !empty( $min )  || ( 0 == $min  )) ||
+            ( !empty( $sec )  || ( 0 == $sec  )))) {
+      unset( $params['RELATED'] ); // set at output creation (END only)
+      unset( $params['VALUE'] );   // 'DURATION' default
+      $this->trigger = array( 'params' => $params );
+      $this->trigger['value']  = array();
+      if( !empty( $week )) $this->trigger['value']['week'] = $week;
+      if( !empty( $day  )) $this->trigger['value']['day']  = $day;
+      if( !empty( $hour )) $this->trigger['value']['hour'] = $hour;
+      if( !empty( $min  )) $this->trigger['value']['min']  = $min;
+      if( !empty( $sec  )) $this->trigger['value']['sec']  = $sec;
+      if( empty( $this->trigger['value'] )) {
+        $this->trigger['value']['sec'] = 0;
+        $before                        = FALSE;
+      }
+      else
+        $this->trigger['value'] = iCalUtilityFunctions::_duration2arr( $this->trigger['value'] );
+      $relatedStart = ( FALSE !== $relatedStart ) ? TRUE : FALSE;
+      $before       = ( FALSE !== $before )       ? TRUE : FALSE;
+      $this->trigger['value']['relatedStart'] = $relatedStart;
+      $this->trigger['value']['before']       = $before;
+      return TRUE;
+    }
+    return FALSE;
+  }
+/*********************************************************************************/
+/**
+ * Property Name: TZID
+ */
+/**
+ * creates formatted output for calendar component property tzid
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.2 - 2012-12-18
+ * @return string
+ */
+  function createTzid() {
+    if( empty( $this->tzid )) return FALSE;
+    if( empty( $this->tzid['value'] ))
+      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'TZID' ) : FALSE;
+    $attributes = $this->_createParams( $this->tzid['params'] );
+    return $this->_createElement( 'TZID', $attributes, iCalUtilityFunctions::_strrep( $this->tzid['value'], $this->format, $this->nl ));
+  }
+/**
+ * set calendar component property tzid
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.21 - 2013-06-23
+ * @param string $value
+ * @param array $params optional
+ * @return bool
+ */
+  function setTzid( $value, $params=FALSE ) {
+    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = ''; else return FALSE;
+    $this->tzid = array( 'value' => $value, 'params' => iCalUtilityFunctions::_setParams( $params ));
+    return TRUE;
+  }
+/*********************************************************************************/
+/**
+ * .. .
+ * Property Name: TZNAME
+ */
+/**
+ * creates formatted output for calendar component property tzname
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.2 - 2012-12-18
+ * @return string
+ */
+  function createTzname() {
+    if( empty( $this->tzname )) return FALSE;
+    $output = null;
+    foreach( $this->tzname as $theName ) {
+      if( !empty( $theName['value'] )) {
+        $attributes = $this->_createParams( $theName['params'], array( 'LANGUAGE' ));
+        $output    .= $this->_createElement( 'TZNAME', $attributes, iCalUtilityFunctions::_strrep( $theName['value'], $this->format, $this->nl ));
+      }
+      elseif( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'TZNAME' );
+    }
+    return $output;
+  }
+/**
+ * set calendar component property tzname
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.21 - 2013-06-23
+ * @param string $value
+ * @param string $params, optional
+ * @param integer $index, optional
+ * @return bool
+ */
+  function setTzname( $value, $params=FALSE, $index=FALSE ) {
+    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = ''; else return FALSE;
+    iCalUtilityFunctions::_setMval( $this->tzname, $value, $params, FALSE, $index );
+    return TRUE;
+  }
+/*********************************************************************************/
+/**
+ * Property Name: TZOFFSETFROM
+ */
+/**
+ * creates formatted output for calendar component property tzoffsetfrom
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.4.8 - 2008-10-21
+ * @return string
+ */
+  function createTzoffsetfrom() {
+    if( empty( $this->tzoffsetfrom )) return FALSE;
+    if( empty( $this->tzoffsetfrom['value'] ))
+      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'TZOFFSETFROM' ) : FALSE;
+    $attributes = $this->_createParams( $this->tzoffsetfrom['params'] );
+    return $this->_createElement( 'TZOFFSETFROM', $attributes, $this->tzoffsetfrom['value'] );
+  }
+/**
+ * set calendar component property tzoffsetfrom
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.21 - 2013-06-23
+ * @param string $value
+ * @param string $params optional
+ * @return bool
+ */
+  function setTzoffsetfrom( $value, $params=FALSE ) {
+    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = ''; else return FALSE;
+    $this->tzoffsetfrom = array( 'value' => $value, 'params' => iCalUtilityFunctions::_setParams( $params ));
+    return TRUE;
+  }
+/*********************************************************************************/
+/**
+ * Property Name: TZOFFSETTO
+ */
+/**
+ * creates formatted output for calendar component property tzoffsetto
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.4.8 - 2008-10-21
+ * @return string
+ */
+  function createTzoffsetto() {
+    if( empty( $this->tzoffsetto )) return FALSE;
+    if( empty( $this->tzoffsetto['value'] ))
+      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'TZOFFSETTO' ) : FALSE;
+    $attributes = $this->_createParams( $this->tzoffsetto['params'] );
+    return $this->_createElement( 'TZOFFSETTO', $attributes, $this->tzoffsetto['value'] );
+  }
+/**
+ * set calendar component property tzoffsetto
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.21 - 2013-06-23
+ * @param string $value
+ * @param string $params optional
+ * @return bool
+ */
+  function setTzoffsetto( $value, $params=FALSE ) {
+    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = ''; else return FALSE;
+    $this->tzoffsetto = array( 'value' => $value, 'params' => iCalUtilityFunctions::_setParams( $params ));
+    return TRUE;
+  }
+/*********************************************************************************/
+/**
+ * Property Name: TZURL
+ */
+/**
+ * creates formatted output for calendar component property tzurl
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.4.8 - 2008-10-21
+ * @return string
+ */
+  function createTzurl() {
+    if( empty( $this->tzurl )) return FALSE;
+    if( empty( $this->tzurl['value'] ))
+      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'TZURL' ) : FALSE;
+    $attributes = $this->_createParams( $this->tzurl['params'] );
+    return $this->_createElement( 'TZURL', $attributes, $this->tzurl['value'] );
+  }
+/**
+ * set calendar component property tzurl
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.21 - 2013-06-23
+ * @param string $value
+ * @param string $params optional
+ * @return boll
+ */
+  function setTzurl( $value, $params=FALSE ) {
+    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = ''; else return FALSE;
+    $this->tzurl = array( 'value' => $value, 'params' => iCalUtilityFunctions::_setParams( $params ));
+    return TRUE;
+  }
+/*********************************************************************************/
+/**
+ * Property Name: UID
+ */
+/**
+ * creates formatted output for calendar component property uid
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 0.9.7 - 2006-11-20
+ * @return string
+ */
+  function createUid() {
+    if( 0 >= count( $this->uid ))
+      $this->_makeuid();
+    $attributes = $this->_createParams( $this->uid['params'] );
+    return $this->_createElement( 'UID', $attributes, $this->uid['value'] );
+  }
+/**
+ * create an unique id for this calendar component object instance
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.2.7 - 2007-09-04
+ * @return void
+ */
+  function _makeUid() {
+    $date   = date('Ymd\THisT');
+    $unique = substr(microtime(), 2, 4);
+    $base   = 'aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPrRsStTuUvVxXuUvVwWzZ1234567890';
+    $start  = 0;
+    $end    = strlen( $base ) - 1;
+    $length = 6;
+    $str    = null;
+    for( $p = 0; $p < $length; $p++ )
+      $unique .= $base{mt_rand( $start, $end )};
+    $this->uid = array( 'params' => null );
+    $this->uid['value']  = $date.'-'.$unique.'@'.$this->getConfig( 'unique_id' );
+  }
+/**
+ * set calendar component property uid
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.4.8 - 2008-11-04
+ * @param string $value
+ * @param string $params optional
+ * @return bool
+ */
+  function setUid( $value, $params=FALSE ) {
+    if( empty( $value )) return FALSE; // no allowEmpty check here !!!!
+    $this->uid = array( 'value' => $value, 'params' => iCalUtilityFunctions::_setParams( $params ));
+    return TRUE;
+  }
+/*********************************************************************************/
+/**
+ * Property Name: URL
+ */
+/**
+ * creates formatted output for calendar component property url
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.4.8 - 2008-10-21
+ * @return string
+ */
+  function createUrl() {
+    if( empty( $this->url )) return FALSE;
+    if( empty( $this->url['value'] ))
+      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'URL' ) : FALSE;
+    $attributes = $this->_createParams( $this->url['params'] );
+    return $this->_createElement( 'URL', $attributes, $this->url['value'] );
+  }
+/**
+ * set calendar component property url
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.21 - 2013-06-23
+ * @param string $value
+ * @param string $params optional
+ * @return bool
+ */
+  function setUrl( $value, $params=FALSE ) {
+    if( !empty( $value )) {
+      if( !filter_var( $value, FILTER_VALIDATE_URL ) && ( 'urn' != strtolower( substr( $value, 0, 3 ))))
+        return FALSE;
+    }
+    elseif( $this->getConfig( 'allowEmpty' ))
+      $value = '';
+    else
+      return FALSE;
+    $this->url = array( 'value' => $value, 'params' => iCalUtilityFunctions::_setParams( $params ));
+    return TRUE;
+  }
+/*********************************************************************************/
+/**
+ * Property Name: x-prop
+ */
+/**
+ * creates formatted output for calendar component property x-prop
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.2 - 2012-12-18
+ * @return string
+ */
+  function createXprop() {
+    if( empty( $this->xprop )) return FALSE;
+    $output = null;
+    foreach( $this->xprop as $label => $xpropPart ) {
+      if( !isset($xpropPart['value']) || ( empty( $xpropPart['value'] ) && !is_numeric( $xpropPart['value'] ))) {
+        if( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( $label );
+        continue;
+      }
+      $attributes = $this->_createParams( $xpropPart['params'], array( 'LANGUAGE' ));
+      if( is_array( $xpropPart['value'] )) {
+        foreach( $xpropPart['value'] as $pix => $theXpart )
+          $xpropPart['value'][$pix] = iCalUtilityFunctions::_strrep( $theXpart, $this->format, $this->format );
+        $xpropPart['value']  = implode( ',', $xpropPart['value'] );
+      }
+      else
+        $xpropPart['value'] = iCalUtilityFunctions::_strrep( $xpropPart['value'], $this->format, $this->nl );
+      $output    .= $this->_createElement( $label, $attributes, $xpropPart['value'] );
+    }
+    return $output;
+  }
+/**
+ * set calendar component property x-prop
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.21 - 2013-06-23
+ * @param string $label
+ * @param mixed $value
+ * @param array $params optional
+ * @return bool
+ */
+  function setXprop( $label, $value, $params=FALSE ) {
+    if( empty( $label ))
+      return FALSE;
+    if( 'X-' != strtoupper( substr( $label, 0, 2 )))
+      return FALSE;
+    if( empty( $value ) && !is_numeric( $value )) if( $this->getConfig( 'allowEmpty' )) $value = ''; else return FALSE;
+    $xprop           = array( 'value' => $value );
+    $xprop['params'] = iCalUtilityFunctions::_setParams( $params );
+    if( !is_array( $this->xprop )) $this->xprop = array();
+    $this->xprop[strtoupper( $label )] = $xprop;
+    return TRUE;
+  }
+/*********************************************************************************/
+/*********************************************************************************/
+/**
+ * create element format parts
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.0.6 - 2006-06-20
+ * @return string
+ */
+  function _createFormat() {
+    $objectname                   = null;
+    switch( $this->format ) {
+      case 'xcal':
+        $objectname               = ( isset( $this->timezonetype )) ?
+                                 strtolower( $this->timezonetype )  :  strtolower( $this->objName );
+        $this->componentStart1    = $this->elementStart1 = '<';
+        $this->componentStart2    = $this->elementStart2 = '>';
+        $this->componentEnd1      = $this->elementEnd1   = '</';
+        $this->componentEnd2      = $this->elementEnd2   = '>'.$this->nl;
+        $this->intAttrDelimiter   = '<!-- -->';
+        $this->attributeDelimiter = $this->nl;
+        $this->valueInit          = null;
+        break;
+      default:
+        $objectname               = ( isset( $this->timezonetype )) ?
+                                 strtoupper( $this->timezonetype )  :  strtoupper( $this->objName );
+        $this->componentStart1    = 'BEGIN:';
+        $this->componentStart2    = null;
+        $this->componentEnd1      = 'END:';
+        $this->componentEnd2      = $this->nl;
+        $this->elementStart1      = null;
+        $this->elementStart2      = null;
+        $this->elementEnd1        = null;
+        $this->elementEnd2        = $this->nl;
+        $this->intAttrDelimiter   = '<!-- -->';
+        $this->attributeDelimiter = ';';
+        $this->valueInit          = ':';
+        break;
+    }
+    return $objectname;
+  }
+/**
+ * creates formatted output for calendar component property
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.2 - 2012-12-18
+ * @param string $label property name
+ * @param string $attributes property attributes
+ * @param string $content property content (optional)
+ * @return string
+ */
+  function _createElement( $label, $attributes=null, $content=FALSE ) {
+    switch( $this->format ) {
+      case 'xcal':
+        $label = strtolower( $label );
+        break;
+      default:
+        $label = strtoupper( $label );
+        break;
+    }
+    $output = $this->elementStart1.$label;
+    $categoriesAttrLang = null;
+    $attachInlineBinary = FALSE;
+    $attachfmttype      = null;
+    if (( 'xcal' == $this->format) && ( 'x-' == substr( $label, 0, 2 ))) {
+      $this->xcaldecl[] = array( 'xmldecl'  => 'ELEMENT'
+                               , 'ref'      => $label
+                               , 'type2'    => '(#PCDATA)' );
+    }
+    if( !empty( $attributes ))  {
+      $attributes  = trim( $attributes );
+      if ( 'xcal' == $this->format ) {
+        $attributes2 = explode( $this->intAttrDelimiter, $attributes );
+        $attributes  = null;
+        foreach( $attributes2 as $aix => $attribute ) {
+          $attrKVarr = explode( '=', $attribute );
+          if( empty( $attrKVarr[0] ))
+            continue;
+          if( !isset( $attrKVarr[1] )) {
+            $attrValue = $attrKVarr[0];
+            $attrKey   = $aix;
+          }
+          elseif( 2 == count( $attrKVarr)) {
+            $attrKey   = strtolower( $attrKVarr[0] );
+            $attrValue = $attrKVarr[1];
+          }
+          else {
+            $attrKey   = strtolower( $attrKVarr[0] );
+            unset( $attrKVarr[0] );
+            $attrValue = implode( '=', $attrKVarr );
+          }
+          if(( 'attach' == $label ) && ( in_array( $attrKey, array( 'fmttype', 'encoding', 'value' )))) {
+            $attachInlineBinary = TRUE;
+            if( 'fmttype' == $attrKey )
+              $attachfmttype = $attrKey.'='.$attrValue;
+            continue;
+          }
+          elseif(( 'categories' == $label ) && ( 'language' == $attrKey ))
+            $categoriesAttrLang = $attrKey.'='.$attrValue;
+          else {
+            $attributes .= ( empty( $attributes )) ? ' ' : $this->attributeDelimiter.' ';
+            $attributes .= ( !empty( $attrKey )) ? $attrKey.'=' : null;
+            if(( '"' == substr( $attrValue, 0, 1 )) && ( '"' == substr( $attrValue, -1 ))) {
+              $attrValue = substr( $attrValue, 1, ( strlen( $attrValue ) - 2 ));
+              $attrValue = str_replace( '"', '', $attrValue );
+            }
+            $attributes .= '"'.htmlspecialchars( $attrValue ).'"';
+          }
+        }
+      }
+      else {
+        $attributes = str_replace( $this->intAttrDelimiter, $this->attributeDelimiter, $attributes );
+      }
+    }
+    if(( 'xcal' == $this->format) &&
+       ((( 'attach' == $label ) && !$attachInlineBinary ) || ( in_array( $label, array( 'tzurl', 'url' ))))) {
+      $pos = strrpos($content, "/");
+      $docname = ( $pos !== false) ? substr( $content, (1 - strlen( $content ) + $pos )) : $content;
+      $this->xcaldecl[] = array( 'xmldecl'  => 'ENTITY'
+                               , 'uri'      => $docname
+                               , 'ref'      => 'SYSTEM'
+                               , 'external' => $content
+                               , 'type'     => 'NDATA'
+                               , 'type2'    => 'BINERY' );
+      $attributes .= ( empty( $attributes )) ? ' ' : $this->attributeDelimiter.' ';
+      $attributes .= 'uri="'.$docname.'"';
+      $content = null;
+      if( 'attach' == $label ) {
+        $attributes = str_replace( $this->attributeDelimiter, $this->intAttrDelimiter, $attributes );
+        $content = $this->nl.$this->_createElement( 'extref', $attributes, null );
+        $attributes = null;
+      }
+    }
+    elseif(( 'xcal' == $this->format) && ( 'attach' == $label ) && $attachInlineBinary ) {
+      $content = $this->nl.$this->_createElement( 'b64bin', $attachfmttype, $content ); // max one attribute
+    }
+    $output .= $attributes;
+    if( !$content && ( '0' != $content )) {
+      switch( $this->format ) {
+        case 'xcal':
+          $output .= ' /';
+          $output .= $this->elementStart2.$this->nl;
+          return $output;
+          break;
+        default:
+          $output .= $this->elementStart2.$this->valueInit;
+          return iCalUtilityFunctions::_size75( $output, $this->nl );
+          break;
+      }
+    }
+    $output .= $this->elementStart2;
+    $output .= $this->valueInit.$content;
+    switch( $this->format ) {
+      case 'xcal':
+        return $output.$this->elementEnd1.$label.$this->elementEnd2;
+        break;
+      default:
+        return iCalUtilityFunctions::_size75( $output, $this->nl );
+        break;
+    }
+  }
+/**
+ * creates formatted output for calendar component property parameters
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.10.27 - 2012-01-16
+ * @param array $params  optional
+ * @param array $ctrKeys optional
+ * @return string
+ */
+  function _createParams( $params=array(), $ctrKeys=array() ) {
+    if( !is_array( $params ) || empty( $params ))
+      $params = array();
+    $attrLANG = $attr1 = $attr2 = $lang = null;
+    $CNattrKey   = ( in_array( 'CN',       $ctrKeys )) ? TRUE : FALSE ;
+    $LANGattrKey = ( in_array( 'LANGUAGE', $ctrKeys )) ? TRUE : FALSE ;
+    $CNattrExist = $LANGattrExist = FALSE;
+    $xparams = array();
+    foreach( $params as $paramKey => $paramValue ) {
+      if(( FALSE !== strpos( $paramValue, ':' )) ||
+         ( FALSE !== strpos( $paramValue, ';' )) ||
+         ( FALSE !== strpos( $paramValue, ',' )))
+        $paramValue = '"'.$paramValue.'"';
+      if( ctype_digit( (string) $paramKey )) {
+        $xparams[]          = $paramValue;
+        continue;
+      }
+      $paramKey             = strtoupper( $paramKey );
+      if( !in_array( $paramKey, array( 'ALTREP', 'CN', 'DIR', 'ENCODING', 'FMTTYPE', 'LANGUAGE', 'RANGE', 'RELTYPE', 'SENT-BY', 'TZID', 'VALUE' )))
+        $xparams[$paramKey] = $paramValue;
+      else
+        $params[$paramKey]  = $paramValue;
+    }
+    ksort( $xparams, SORT_STRING );
+    foreach( $xparams as $paramKey => $paramValue ) {
+      if( ctype_digit( (string) $paramKey ))
+        $attr2             .= $this->intAttrDelimiter.$paramValue;
+      else
+        $attr2             .= $this->intAttrDelimiter."$paramKey=$paramValue";
+    }
+    if( isset( $params['FMTTYPE'] )  && !in_array( 'FMTTYPE', $ctrKeys )) {
+      $attr1               .= $this->intAttrDelimiter.'FMTTYPE='.$params['FMTTYPE'].$attr2;
+      $attr2                = null;
+    }
+    if( isset( $params['ENCODING'] ) && !in_array( 'ENCODING',   $ctrKeys )) {
+      if( !empty( $attr2 )) {
+        $attr1             .= $attr2;
+        $attr2              = null;
+      }
+      $attr1               .= $this->intAttrDelimiter.'ENCODING='.$params['ENCODING'];
+    }
+    if( isset( $params['VALUE'] )    && !in_array( 'VALUE',   $ctrKeys ))
+      $attr1               .= $this->intAttrDelimiter.'VALUE='.$params['VALUE'];
+    if( isset( $params['TZID'] )     && !in_array( 'TZID',    $ctrKeys )) {
+      $attr1               .= $this->intAttrDelimiter.'TZID='.$params['TZID'];
+    }
+    if( isset( $params['RANGE'] )    && !in_array( 'RANGE',   $ctrKeys ))
+      $attr1               .= $this->intAttrDelimiter.'RANGE='.$params['RANGE'];
+    if( isset( $params['RELTYPE'] )  && !in_array( 'RELTYPE', $ctrKeys ))
+      $attr1               .= $this->intAttrDelimiter.'RELTYPE='.$params['RELTYPE'];
+    if( isset( $params['CN'] )       && $CNattrKey ) {
+      $attr1                = $this->intAttrDelimiter.'CN='.$params['CN'];
+      $CNattrExist          = TRUE;
+    }
+    if( isset( $params['DIR'] )      && in_array( 'DIR',      $ctrKeys )) {
+      $delim = ( FALSE !== strpos( $params['DIR'], '"' )) ? '' : '"';
+      $attr1               .= $this->intAttrDelimiter.'DIR='.$delim.$params['DIR'].$delim;
+    }
+    if( isset( $params['SENT-BY'] )  && in_array( 'SENT-BY',  $ctrKeys ))
+      $attr1               .= $this->intAttrDelimiter.'SENT-BY='.$params['SENT-BY'];
+    if( isset( $params['ALTREP'] )   && in_array( 'ALTREP',   $ctrKeys )) {
+      $delim = ( FALSE !== strpos( $params['ALTREP'], '"' )) ? '' : '"';
+      $attr1               .= $this->intAttrDelimiter.'ALTREP='.$delim.$params['ALTREP'].$delim;
+    }
+    if( isset( $params['LANGUAGE'] ) && $LANGattrKey ) {
+      $attrLANG            .= $this->intAttrDelimiter.'LANGUAGE='.$params['LANGUAGE'];
+      $LANGattrExist        = TRUE;
+    }
+    if( !$LANGattrExist ) {
+      $lang = $this->getConfig( 'language' );
+      if(( $CNattrExist || $LANGattrKey ) && $lang )
+        $attrLANG .= $this->intAttrDelimiter.'LANGUAGE='.$lang;
+    }
+    return $attr1.$attrLANG.$attr2;
+  }
+/**
+ * creates formatted output for calendar component property data value type recur
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.25 - 2013-06-30
+ * @param array $recurlabel
+ * @param array $recurdata
+ * @return string
+ */
+  function _format_recur( $recurlabel, $recurdata ) {
+    $output = null;
+    foreach( $recurdata as $therule ) {
+      if( empty( $therule['value'] )) {
+        if( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( $recurlabel );
+        continue;
+      }
+      $attributes = ( isset( $therule['params'] )) ? $this->_createParams( $therule['params'] ) : null;
+      $content1  = $content2  = null;
+      foreach( $therule['value'] as $rulelabel => $rulevalue ) {
+        switch( strtoupper( $rulelabel )) {
+          case 'FREQ': {
+            $content1 .= "FREQ=$rulevalue";
+            break;
+          }
+          case 'UNTIL': {
+            $parno     = ( isset( $rulevalue['hour'] )) ? 7 : 3;
+            $content2 .= ';UNTIL='.iCalUtilityFunctions::_date2strdate( $rulevalue, $parno );
+            break;
+          }
+          case 'COUNT':
+          case 'INTERVAL':
+          case 'WKST': {
+            $content2 .= ";$rulelabel=$rulevalue";
+            break;
+          }
+          case 'BYSECOND':
+          case 'BYMINUTE':
+          case 'BYHOUR':
+          case 'BYMONTHDAY':
+          case 'BYYEARDAY':
+          case 'BYWEEKNO':
+          case 'BYMONTH':
+          case 'BYSETPOS': {
+            $content2 .= ";$rulelabel=";
+            if( is_array( $rulevalue )) {
+              foreach( $rulevalue as $vix => $valuePart ) {
+                $content2 .= ( $vix ) ? ',' : null;
+                $content2 .= $valuePart;
+              }
+            }
+            else
+             $content2 .= $rulevalue;
+            break;
+          }
+          case 'BYDAY': {
+            $byday          = array( '' );
+            $bx             = 0;
+            foreach( $rulevalue as $bix => $bydayPart ) {
+              if( ! empty( $byday[$bx] ) && ! ctype_digit( substr( $byday[$bx], -1 ))) // new day
+                $byday[++$bx] = '';
+              if( ! is_array( $bydayPart ))   // day without order number
+                $byday[$bx] .= (string) $bydayPart;
+              else {                          // day with order number
+                foreach( $bydayPart as $bix2 => $bydayPart2 )
+                  $byday[$bx] .= (string) $bydayPart2;
+              }
+            } // end foreach( $rulevalue as $bix => $bydayPart )
+            if( 1 < count( $byday ))
+              usort( $byday, array( 'iCalUtilityFunctions', '_recurBydaySort' ));
+            $content2      .= ';BYDAY='.implode( ',', $byday );
+            break;
+          }
+          default: {
+            $content2 .= ";$rulelabel=$rulevalue";
+            break;
+          }
+        }
+      }
+      $output .= $this->_createElement( $recurlabel, $attributes, $content1.$content2 );
+    }
+    return $output;
+  }
+/**
+ * check if property not exists within component
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.5.1 - 2008-10-15
+ * @param string $propName
+ * @return bool
+ */
+  function _notExistProp( $propName ) {
+    if( empty( $propName )) return FALSE; // when deleting x-prop, an empty propName may be used=allowed
+    $propName = strtolower( $propName );
+    if(     'last-modified'    == $propName )  { if( !isset( $this->lastmodified ))    return TRUE; }
+    elseif( 'percent-complete' == $propName )  { if( !isset( $this->percentcomplete )) return TRUE; }
+    elseif( 'recurrence-id'    == $propName )  { if( !isset( $this->recurrenceid ))    return TRUE; }
+    elseif( 'related-to'       == $propName )  { if( !isset( $this->relatedto ))       return TRUE; }
+    elseif( 'request-status'   == $propName )  { if( !isset( $this->requeststatus ))   return TRUE; }
+    elseif((       'x-' != substr($propName,0,2)) && !isset( $this->$propName ))       return TRUE;
+    return FALSE;
+  }
+/*********************************************************************************/
+/*********************************************************************************/
+/**
+ * get general component config variables or info about subcomponents
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.9.6 - 2011-05-14
+ * @param mixed $config
+ * @return value
+ */
+  function getConfig( $config = FALSE) {
+    if( !$config ) {
+      $return = array();
+      $return['ALLOWEMPTY']  = $this->getConfig( 'ALLOWEMPTY' );
+      $return['FORMAT']      = $this->getConfig( 'FORMAT' );
+      if( FALSE !== ( $lang  = $this->getConfig( 'LANGUAGE' )))
+        $return['LANGUAGE']  = $lang;
+      $return['NEWLINECHAR'] = $this->getConfig( 'NEWLINECHAR' );
+      $return['TZTD']        = $this->getConfig( 'TZID' );
+      $return['UNIQUE_ID']   = $this->getConfig( 'UNIQUE_ID' );
+      return $return;
+    }
+    switch( strtoupper( $config )) {
+      case 'ALLOWEMPTY':
+        return $this->allowEmpty;
+        break;
+      case 'COMPSINFO':
+        unset( $this->compix );
+        $info = array();
+        if( isset( $this->components )) {
+          foreach( $this->components as $cix => $component ) {
+            if( empty( $component )) continue;
+            $info[$cix]['ordno'] = $cix + 1;
+            $info[$cix]['type']  = $component->objName;
+            $info[$cix]['uid']   = $component->getProperty( 'uid' );
+            $info[$cix]['props'] = $component->getConfig( 'propinfo' );
+            $info[$cix]['sub']   = $component->getConfig( 'compsinfo' );
+          }
+        }
+        return $info;
+        break;
+      case 'FORMAT':
+        return $this->format;
+        break;
+      case 'LANGUAGE':
+         // get language for calendar component as defined in [RFC 1766]
+        return $this->language;
+        break;
+      case 'NL':
+      case 'NEWLINECHAR':
+        return $this->nl;
+        break;
+      case 'PROPINFO':
+        $output = array();
+        if( !in_array( $this->objName, array( 'valarm', 'vtimezone', 'standard', 'daylight' ))) {
+          if( empty( $this->uid['value'] ))   $this->_makeuid();
+                                              $output['UID']              = 1;
+          if( empty( $this->dtstamp ))        $this->_makeDtstamp();
+                                              $output['DTSTAMP']          = 1;
+        }
+        if( !empty( $this->summary ))         $output['SUMMARY']          = 1;
+        if( !empty( $this->description ))     $output['DESCRIPTION']      = count( $this->description );
+        if( !empty( $this->dtstart ))         $output['DTSTART']          = 1;
+        if( !empty( $this->dtend ))           $output['DTEND']            = 1;
+        if( !empty( $this->due ))             $output['DUE']              = 1;
+        if( !empty( $this->duration ))        $output['DURATION']         = 1;
+        if( !empty( $this->rrule ))           $output['RRULE']            = count( $this->rrule );
+        if( !empty( $this->rdate ))           $output['RDATE']            = count( $this->rdate );
+        if( !empty( $this->exdate ))          $output['EXDATE']           = count( $this->exdate );
+        if( !empty( $this->exrule ))          $output['EXRULE']           = count( $this->exrule );
+        if( !empty( $this->action ))          $output['ACTION']           = 1;
+        if( !empty( $this->attach ))          $output['ATTACH']           = count( $this->attach );
+        if( !empty( $this->attendee ))        $output['ATTENDEE']         = count( $this->attendee );
+        if( !empty( $this->categories ))      $output['CATEGORIES']       = count( $this->categories );
+        if( !empty( $this->class ))           $output['CLASS']            = 1;
+        if( !empty( $this->comment ))         $output['COMMENT']          = count( $this->comment );
+        if( !empty( $this->completed ))       $output['COMPLETED']        = 1;
+        if( !empty( $this->contact ))         $output['CONTACT']          = count( $this->contact );
+        if( !empty( $this->created ))         $output['CREATED']          = 1;
+        if( !empty( $this->freebusy ))        $output['FREEBUSY']         = count( $this->freebusy );
+        if( !empty( $this->geo ))             $output['GEO']              = 1;
+        if( !empty( $this->lastmodified ))    $output['LAST-MODIFIED']    = 1;
+        if( !empty( $this->location ))        $output['LOCATION']         = 1;
+        if( !empty( $this->organizer ))       $output['ORGANIZER']        = 1;
+        if( !empty( $this->percentcomplete )) $output['PERCENT-COMPLETE'] = 1;
+        if( !empty( $this->priority ))        $output['PRIORITY']         = 1;
+        if( !empty( $this->recurrenceid ))    $output['RECURRENCE-ID']    = 1;
+        if( !empty( $this->relatedto ))       $output['RELATED-TO']       = count( $this->relatedto );
+        if( !empty( $this->repeat ))          $output['REPEAT']           = 1;
+        if( !empty( $this->requeststatus ))   $output['REQUEST-STATUS']   = count( $this->requeststatus );
+        if( !empty( $this->resources ))       $output['RESOURCES']        = count( $this->resources );
+        if( !empty( $this->sequence ))        $output['SEQUENCE']         = 1;
+        if( !empty( $this->sequence ))        $output['SEQUENCE']         = 1;
+        if( !empty( $this->status ))          $output['STATUS']           = 1;
+        if( !empty( $this->transp ))          $output['TRANSP']           = 1;
+        if( !empty( $this->trigger ))         $output['TRIGGER']          = 1;
+        if( !empty( $this->tzid ))            $output['TZID']             = 1;
+        if( !empty( $this->tzname ))          $output['TZNAME']           = count( $this->tzname );
+        if( !empty( $this->tzoffsetfrom ))    $output['TZOFFSETFROM']     = 1;
+        if( !empty( $this->tzoffsetto ))      $output['TZOFFSETTO']       = 1;
+        if( !empty( $this->tzurl ))           $output['TZURL']            = 1;
+        if( !empty( $this->url ))             $output['URL']              = 1;
+        if( !empty( $this->xprop ))           $output['X-PROP']           = count( $this->xprop );
+        return $output;
+        break;
+      case 'SETPROPERTYNAMES':
+        return array_keys( $this->getConfig( 'propinfo' ));
+        break;
+      case 'TZID':
+        return $this->dtzid;
+        break;
+      case 'UNIQUE_ID':
+        if( empty( $this->unique_id ))
+          $this->unique_id  = ( isset( $_SERVER['SERVER_NAME'] )) ? gethostbyname( $_SERVER['SERVER_NAME'] ) : 'localhost';
+        return $this->unique_id;
+        break;
+    }
+  }
+/**
+ * general component config setting
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.10.18 - 2011-10-28
+ * @param mixed  $config
+ * @param string $value
+ * @param bool   $softUpdate
+ * @return void
+ */
+  function setConfig( $config, $value = FALSE, $softUpdate = FALSE ) {
+    if( is_array( $config )) {
+      $ak = array_keys( $config );
+      foreach( $ak as $k ) {
+        if( 'NEWLINECHAR' == strtoupper( $k )) {
+          if( FALSE === $this->setConfig( 'NEWLINECHAR', $config[$k] ))
+            return FALSE;
+          unset( $config[$k] );
+          break;
+        }
+      }
+      foreach( $config as $cKey => $cValue ) {
+        if( FALSE === $this->setConfig( $cKey, $cValue, $softUpdate ))
+          return FALSE;
+      }
+      return TRUE;
+    }
+    $res = FALSE;
+    switch( strtoupper( $config )) {
+      case 'ALLOWEMPTY':
+        $this->allowEmpty = $value;
+        $subcfg = array( 'ALLOWEMPTY' => $value );
+        $res    = TRUE;
+        break;
+      case 'FORMAT':
+        $value  = trim( strtolower( $value ));
+        $this->format = $value;
+        $this->_createFormat();
+        $subcfg = array( 'FORMAT' => $value );
+        $res    = TRUE;
+        break;
+      case 'LANGUAGE':
+         // set language for calendar component as defined in [RFC 1766]
+        $value  = trim( $value );
+        if( empty( $this->language ) || !$softUpdate )
+          $this->language = $value;
+        $subcfg = array( 'LANGUAGE' => $value );
+        $res    = TRUE;
+        break;
+      case 'NL':
+      case 'NEWLINECHAR':
+        $this->nl = $value;
+        $this->_createFormat();
+        $subcfg = array( 'NL' => $value );
+        $res    = TRUE;
+        break;
+      case 'TZID':
+        $this->dtzid = $value;
+        $subcfg = array( 'TZID' => $value );
+        $res    = TRUE;
+        break;
+      case 'UNIQUE_ID':
+        $value  = trim( $value );
+        $this->unique_id = $value;
+        $subcfg = array( 'UNIQUE_ID' => $value );
+        $res    = TRUE;
+        break;
+      default:  // any unvalid config key.. .
+        return TRUE;
+    }
+    if( !$res ) return FALSE;
+    if( isset( $subcfg ) && !empty( $this->components )) {
+      foreach( $subcfg as $cfgkey => $cfgvalue ) {
+        foreach( $this->components as $cix => $component ) {
+          $res = $component->setConfig( $cfgkey, $cfgvalue, $softUpdate );
+          if( !$res )
+            break 2;
+          $this->components[$cix] = $component->copy(); // PHP4 compliant
+        }
+      }
+    }
+    return $res;
+  }
+/*********************************************************************************/
+/**
+ * delete component property value
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.8.8 - 2011-03-15
+ * @param mixed $propName, bool FALSE => X-property
+ * @param int   $propix, optional, if specific property is wanted in case of multiply occurences
+ * @return bool, if successfull delete TRUE
+ */
+  function deleteProperty( $propName=FALSE, $propix=FALSE ) {
+    if( $this->_notExistProp( $propName )) return FALSE;
+    $propName = strtoupper( $propName );
+    if( in_array( $propName, array( 'ATTACH',   'ATTENDEE', 'CATEGORIES', 'COMMENT',   'CONTACT', 'DESCRIPTION',    'EXDATE', 'EXRULE',
+                                    'FREEBUSY', 'RDATE',    'RELATED-TO', 'RESOURCES', 'RRULE',   'REQUEST-STATUS', 'TZNAME', 'X-PROP'  ))) {
+      if( !$propix )
+        $propix = ( isset( $this->propdelix[$propName] ) && ( 'X-PROP' != $propName )) ? $this->propdelix[$propName] + 2 : 1;
+      $this->propdelix[$propName] = --$propix;
+    }
+    $return = FALSE;
+    switch( $propName ) {
+      case 'ACTION':
+        if( !empty( $this->action )) {
+          $this->action = '';
+          $return = TRUE;
+        }
+        break;
+      case 'ATTACH':
+        return $this->deletePropertyM( $this->attach, $this->propdelix[$propName] );
+        break;
+      case 'ATTENDEE':
+        return $this->deletePropertyM( $this->attendee, $this->propdelix[$propName] );
+        break;
+      case 'CATEGORIES':
+        return $this->deletePropertyM( $this->categories, $this->propdelix[$propName] );
+        break;
+      case 'CLASS':
+        if( !empty( $this->class )) {
+          $this->class = '';
+          $return = TRUE;
+        }
+        break;
+      case 'COMMENT':
+        return $this->deletePropertyM( $this->comment, $this->propdelix[$propName] );
+        break;
+      case 'COMPLETED':
+        if( !empty( $this->completed )) {
+          $this->completed = '';
+          $return = TRUE;
+        }
+        break;
+      case 'CONTACT':
+        return $this->deletePropertyM( $this->contact, $this->propdelix[$propName] );
+        break;
+      case 'CREATED':
+        if( !empty( $this->created )) {
+          $this->created = '';
+          $return = TRUE;
+        }
+        break;
+      case 'DESCRIPTION':
+        return $this->deletePropertyM( $this->description, $this->propdelix[$propName] );
+        break;
+      case 'DTEND':
+        if( !empty( $this->dtend )) {
+          $this->dtend = '';
+          $return = TRUE;
+        }
+        break;
+      case 'DTSTAMP':
+        if( in_array( $this->objName, array( 'valarm', 'vtimezone', 'standard', 'daylight' )))
+          return FALSE;
+        if( !empty( $this->dtstamp )) {
+          $this->dtstamp = '';
+          $return = TRUE;
+        }
+        break;
+      case 'DTSTART':
+        if( !empty( $this->dtstart )) {
+          $this->dtstart = '';
+          $return = TRUE;
+        }
+        break;
+      case 'DUE':
+        if( !empty( $this->due )) {
+          $this->due = '';
+          $return = TRUE;
+        }
+        break;
+      case 'DURATION':
+        if( !empty( $this->duration )) {
+          $this->duration = '';
+          $return = TRUE;
+        }
+        break;
+      case 'EXDATE':
+        return $this->deletePropertyM( $this->exdate, $this->propdelix[$propName] );
+        break;
+      case 'EXRULE':
+        return $this->deletePropertyM( $this->exrule, $this->propdelix[$propName] );
+        break;
+      case 'FREEBUSY':
+        return $this->deletePropertyM( $this->freebusy, $this->propdelix[$propName] );
+        break;
+      case 'GEO':
+        if( !empty( $this->geo )) {
+          $this->geo = '';
+          $return = TRUE;
+        }
+        break;
+      case 'LAST-MODIFIED':
+        if( !empty( $this->lastmodified )) {
+          $this->lastmodified = '';
+          $return = TRUE;
+        }
+        break;
+      case 'LOCATION':
+        if( !empty( $this->location )) {
+          $this->location = '';
+          $return = TRUE;
+        }
+        break;
+      case 'ORGANIZER':
+        if( !empty( $this->organizer )) {
+          $this->organizer = '';
+          $return = TRUE;
+        }
+        break;
+      case 'PERCENT-COMPLETE':
+        if( !empty( $this->percentcomplete )) {
+          $this->percentcomplete = '';
+          $return = TRUE;
+        }
+        break;
+      case 'PRIORITY':
+        if( !empty( $this->priority )) {
+          $this->priority = '';
+          $return = TRUE;
+        }
+        break;
+      case 'RDATE':
+        return $this->deletePropertyM( $this->rdate, $this->propdelix[$propName] );
+        break;
+      case 'RECURRENCE-ID':
+        if( !empty( $this->recurrenceid )) {
+          $this->recurrenceid = '';
+          $return = TRUE;
+        }
+        break;
+      case 'RELATED-TO':
+        return $this->deletePropertyM( $this->relatedto, $this->propdelix[$propName] );
+        break;
+      case 'REPEAT':
+        if( !empty( $this->repeat )) {
+          $this->repeat = '';
+          $return = TRUE;
+        }
+        break;
+      case 'REQUEST-STATUS':
+        return $this->deletePropertyM( $this->requeststatus, $this->propdelix[$propName] );
+        break;
+      case 'RESOURCES':
+        return $this->deletePropertyM( $this->resources, $this->propdelix[$propName] );
+        break;
+      case 'RRULE':
+        return $this->deletePropertyM( $this->rrule, $this->propdelix[$propName] );
+        break;
+      case 'SEQUENCE':
+        if( !empty( $this->sequence )) {
+          $this->sequence = '';
+          $return = TRUE;
+        }
+        break;
+      case 'STATUS':
+        if( !empty( $this->status )) {
+          $this->status = '';
+          $return = TRUE;
+        }
+        break;
+      case 'SUMMARY':
+        if( !empty( $this->summary )) {
+          $this->summary = '';
+          $return = TRUE;
+        }
+        break;
+      case 'TRANSP':
+        if( !empty( $this->transp )) {
+          $this->transp = '';
+          $return = TRUE;
+        }
+        break;
+      case 'TRIGGER':
+        if( !empty( $this->trigger )) {
+          $this->trigger = '';
+          $return = TRUE;
+        }
+        break;
+      case 'TZID':
+        if( !empty( $this->tzid )) {
+          $this->tzid = '';
+          $return = TRUE;
+        }
+        break;
+      case 'TZNAME':
+        return $this->deletePropertyM( $this->tzname, $this->propdelix[$propName] );
+        break;
+      case 'TZOFFSETFROM':
+        if( !empty( $this->tzoffsetfrom )) {
+          $this->tzoffsetfrom = '';
+          $return = TRUE;
+        }
+        break;
+      case 'TZOFFSETTO':
+        if( !empty( $this->tzoffsetto )) {
+          $this->tzoffsetto = '';
+          $return = TRUE;
+        }
+        break;
+      case 'TZURL':
+        if( !empty( $this->tzurl )) {
+          $this->tzurl = '';
+          $return = TRUE;
+        }
+        break;
+      case 'UID':
+        if( in_array( $this->objName, array( 'valarm', 'vtimezone', 'standard', 'daylight' )))
+          return FALSE;
+        if( !empty( $this->uid )) {
+          $this->uid = '';
+          $return = TRUE;
+        }
+        break;
+      case 'URL':
+        if( !empty( $this->url )) {
+          $this->url = '';
+          $return = TRUE;
+        }
+        break;
+      default:
+        $reduced = '';
+        if( $propName != 'X-PROP' ) {
+          if( !isset( $this->xprop[$propName] )) return FALSE;
+          foreach( $this->xprop as $k => $a ) {
+            if(( $k != $propName ) && !empty( $a ))
+              $reduced[$k] = $a;
+          }
+        }
+        else {
+          if( count( $this->xprop ) <= $propix ) { unset( $this->propdelix[$propName] ); return FALSE; }
+          $xpropno = 0;
+          foreach( $this->xprop as $xpropkey => $xpropvalue ) {
+            if( $propix != $xpropno )
+              $reduced[$xpropkey] = $xpropvalue;
+            $xpropno++;
+          }
+        }
+        $this->xprop = $reduced;
+        if( empty( $this->xprop )) {
+          unset( $this->propdelix[$propName] );
+          return FALSE;
+        }
+        return TRUE;
+    }
+    return $return;
+  }
+/*********************************************************************************/
+/**
+ * delete component property value, fixing components with multiple occurencies
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.8.8 - 2011-03-15
+ * @param array $multiprop, reference to a component property
+ * @param int   $propix, reference to removal counter
+ * @return bool TRUE
+ */
+  function deletePropertyM( & $multiprop, & $propix ) {
+    if( isset( $multiprop[$propix] ))
+      unset( $multiprop[$propix] );
+    if( empty( $multiprop )) {
+      $multiprop = '';
+      unset( $propix );
+      return FALSE;
+    }
+    else
+      return TRUE;
+  }
+/**
+ * get component property value/params
+ *
+ * if property has multiply values, consequtive function calls are needed
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.21 - 2013-06-23
+ * @param string $propName, optional
+ * @param int @propix, optional, if specific property is wanted in case of multiply occurences
+ * @param bool $inclParam=FALSE
+ * @param bool $specform=FALSE
+ * @return mixed
+ */
+  function getProperty( $propName=FALSE, $propix=FALSE, $inclParam=FALSE, $specform=FALSE ) {
+    if( 'GEOLOCATION' == strtoupper( $propName )) {
+      $content = $this->getProperty( 'LOCATION' );
+      $content = ( !empty( $content )) ? $content.' ' : '';
+      if(( FALSE === ( $geo     = $this->getProperty( 'GEO' ))) || empty( $geo ))
+        return FALSE;
+      if( 0.0 < $geo['latitude'] )
+        $sign   = '+';
+      else
+        $sign   = ( 0.0 > $geo['latitude'] ) ? '-' : '';
+      $content .= $sign.sprintf( "%09.6f", abs( $geo['latitude'] ));   // sprintf && lpad && float && sign !"#¤%&/(
+      $content  = rtrim( rtrim( $content, '0' ), '.' );
+      if( 0.0 < $geo['longitude'] )
+        $sign   = '+';
+      else
+       $sign   = ( 0.0 > $geo['longitude'] ) ? '-' : '';
+      return $content.$sign.sprintf( '%8.6f', abs( $geo['longitude'] )).'/';   // sprintf && lpad && float && sign !"#¤%&/(
+    }
+    if( $this->_notExistProp( $propName )) return FALSE;
+    $propName = ( $propName ) ? strtoupper( $propName ) : 'X-PROP';
+    if( in_array( $propName, array( 'ATTACH',   'ATTENDEE', 'CATEGORIES', 'COMMENT',   'CONTACT', 'DESCRIPTION',    'EXDATE', 'EXRULE',
+                                    'FREEBUSY', 'RDATE',    'RELATED-TO', 'RESOURCES', 'RRULE',   'REQUEST-STATUS', 'TZNAME', 'X-PROP'  ))) {
+      if( !$propix )
+        $propix = ( isset( $this->propix[$propName] )) ? $this->propix[$propName] + 2 : 1;
+      $this->propix[$propName] = --$propix;
+    }
+    switch( $propName ) {
+      case 'ACTION':
+        if( isset( $this->action['value'] )) return ( $inclParam ) ? $this->action : $this->action['value'];
+        break;
+      case 'ATTACH':
+        $ak = ( is_array( $this->attach )) ? array_keys( $this->attach ) : array();
+        while( is_array( $this->attach ) && !isset( $this->attach[$propix] ) && ( 0 < count( $this->attach )) && ( $propix < end( $ak )))
+          $propix++;
+        $this->propix[$propName] = $propix;
+        if( !isset( $this->attach[$propix] )) { unset( $this->propix[$propName] ); return FALSE; }
+        return ( $inclParam ) ? $this->attach[$propix] : $this->attach[$propix]['value'];
+        break;
+      case 'ATTENDEE':
+        $ak = ( is_array( $this->attendee )) ? array_keys( $this->attendee ) : array();
+        while( is_array( $this->attendee ) && !isset( $this->attendee[$propix] ) && ( 0 < count( $this->attendee )) && ( $propix < end( $ak )))
+          $propix++;
+        $this->propix[$propName] = $propix;
+        if( !isset( $this->attendee[$propix] )) { unset( $this->propix[$propName] ); return FALSE; }
+        return ( $inclParam ) ? $this->attendee[$propix] : $this->attendee[$propix]['value'];
+        break;
+      case 'CATEGORIES':
+        $ak = ( is_array( $this->categories )) ? array_keys( $this->categories ) : array();
+        while( is_array( $this->categories ) && !isset( $this->categories[$propix] ) && ( 0 < count( $this->categories )) && ( $propix < end( $ak )))
+          $propix++;
+        $this->propix[$propName] = $propix;
+        if( !isset( $this->categories[$propix] )) { unset( $this->propix[$propName] ); return FALSE; }
+        return ( $inclParam ) ? $this->categories[$propix] : $this->categories[$propix]['value'];
+        break;
+      case 'CLASS':
+        if( isset( $this->class['value'] )) return ( $inclParam ) ? $this->class : $this->class['value'];
+        break;
+      case 'COMMENT':
+        $ak = ( is_array( $this->comment )) ? array_keys( $this->comment ) : array();
+        while( is_array( $this->comment ) && !isset( $this->comment[$propix] ) && ( 0 < count( $this->comment )) && ( $propix < end( $ak )))
+          $propix++;
+        $this->propix[$propName] = $propix;
+        if( !isset( $this->comment[$propix] )) { unset( $this->propix[$propName] ); return FALSE; }
+        return ( $inclParam ) ? $this->comment[$propix] : $this->comment[$propix]['value'];
+        break;
+      case 'COMPLETED':
+        if( isset( $this->completed['value'] )) return ( $inclParam ) ? $this->completed : $this->completed['value'];
+        break;
+      case 'CONTACT':
+        $ak = ( is_array( $this->contact )) ? array_keys( $this->contact ) : array();
+        while( is_array( $this->contact ) && !isset( $this->contact[$propix] ) && ( 0 < count( $this->contact )) && ( $propix < end( $ak )))
+          $propix++;
+        $this->propix[$propName] = $propix;
+        if( !isset( $this->contact[$propix] )) { unset( $this->propix[$propName] ); return FALSE; }
+        return ( $inclParam ) ? $this->contact[$propix] : $this->contact[$propix]['value'];
+        break;
+      case 'CREATED':
+        if( isset( $this->created['value'] )) return ( $inclParam ) ? $this->created : $this->created['value'];
+        break;
+      case 'DESCRIPTION':
+        $ak = ( is_array( $this->description )) ? array_keys( $this->description ) : array();
+        while( is_array( $this->description ) && !isset( $this->description[$propix] ) && ( 0 < count( $this->description )) && ( $propix < end( $ak )))
+          $propix++;
+        $this->propix[$propName] = $propix;
+        if( !isset( $this->description[$propix] )) { unset( $this->propix[$propName] ); return FALSE; }
+        return ( $inclParam ) ? $this->description[$propix] : $this->description[$propix]['value'];
+        break;
+      case 'DTEND':
+        if( isset( $this->dtend['value'] )) return ( $inclParam ) ? $this->dtend : $this->dtend['value'];
+        break;
+      case 'DTSTAMP':
+        if( in_array( $this->objName, array( 'valarm', 'vtimezone', 'standard', 'daylight' )))
+          return;
+        if( !isset( $this->dtstamp['value'] ))
+          $this->_makeDtstamp();
+        return ( $inclParam ) ? $this->dtstamp : $this->dtstamp['value'];
+        break;
+      case 'DTSTART':
+        if( isset( $this->dtstart['value'] )) return ( $inclParam ) ? $this->dtstart : $this->dtstart['value'];
+        break;
+      case 'DUE':
+        if( isset( $this->due['value'] )) return ( $inclParam ) ? $this->due : $this->due['value'];
+        break;
+      case 'DURATION':
+        if( ! isset( $this->duration['value'] )) return FALSE;
+        $value = ( $specform && isset( $this->dtstart['value'] ) && isset( $this->duration['value'] )) ? iCalUtilityFunctions::_duration2date( $this->dtstart['value'], $this->duration['value'] ) : $this->duration['value'];
+        return ( $inclParam ) ? array( 'value' => $value, 'params' =>  $this->duration['params'] ) : $value;
+        break;
+      case 'EXDATE':
+        $ak = ( is_array( $this->exdate )) ? array_keys( $this->exdate ) : array();
+        while( is_array( $this->exdate ) && !isset( $this->exdate[$propix] ) && ( 0 < count( $this->exdate )) && ( $propix < end( $ak )))
+          $propix++;
+        $this->propix[$propName] = $propix;
+        if( !isset( $this->exdate[$propix] )) { unset( $this->propix[$propName] ); return FALSE; }
+        return ( $inclParam ) ? $this->exdate[$propix] : $this->exdate[$propix]['value'];
+        break;
+      case 'EXRULE':
+        $ak = ( is_array( $this->exrule )) ? array_keys( $this->exrule ) : array();
+        while( is_array( $this->exrule ) && !isset( $this->exrule[$propix] ) && ( 0 < count( $this->exrule )) && ( $propix < end( $ak )))
+          $propix++;
+        $this->propix[$propName] = $propix;
+        if( !isset( $this->exrule[$propix] )) { unset( $this->propix[$propName] ); return FALSE; }
+        return ( $inclParam ) ? $this->exrule[$propix] : $this->exrule[$propix]['value'];
+        break;
+      case 'FREEBUSY':
+        $ak = ( is_array( $this->freebusy )) ? array_keys( $this->freebusy ) : array();
+        while( is_array( $this->freebusy ) && !isset( $this->freebusy[$propix] ) && ( 0 < count( $this->freebusy )) && ( $propix < end( $ak )))
+          $propix++;
+        $this->propix[$propName] = $propix;
+        if( !isset( $this->freebusy[$propix] )) { unset( $this->propix[$propName] ); return FALSE; }
+        return ( $inclParam ) ? $this->freebusy[$propix] : $this->freebusy[$propix]['value'];
+        break;
+      case 'GEO':
+        if( isset( $this->geo['value'] )) return ( $inclParam ) ? $this->geo : $this->geo['value'];
+        break;
+      case 'LAST-MODIFIED':
+        if( isset( $this->lastmodified['value'] )) return ( $inclParam ) ? $this->lastmodified : $this->lastmodified['value'];
+        break;
+      case 'LOCATION':
+        if( isset( $this->location['value'] )) return ( $inclParam ) ? $this->location : $this->location['value'];
+        break;
+      case 'ORGANIZER':
+        if( isset( $this->organizer['value'] )) return ( $inclParam ) ? $this->organizer : $this->organizer['value'];
+        break;
+      case 'PERCENT-COMPLETE':
+        if( isset( $this->percentcomplete['value'] )) return ( $inclParam ) ? $this->percentcomplete : $this->percentcomplete['value'];
+        break;
+      case 'PRIORITY':
+        if( isset( $this->priority['value'] )) return ( $inclParam ) ? $this->priority : $this->priority['value'];
+        break;
+      case 'RDATE':
+        $ak = ( is_array( $this->rdate )) ? array_keys( $this->rdate ) : array();
+        while( is_array( $this->rdate ) && !isset( $this->rdate[$propix] ) && ( 0 < count( $this->rdate )) && ( $propix < end( $ak )))
+          $propix++;
+        $this->propix[$propName] = $propix;
+        if( !isset( $this->rdate[$propix] )) { unset( $this->propix[$propName] ); return FALSE; }
+        return ( $inclParam ) ? $this->rdate[$propix] : $this->rdate[$propix]['value'];
+        break;
+      case 'RECURRENCE-ID':
+        if( isset( $this->recurrenceid['value'] )) return ( $inclParam ) ? $this->recurrenceid : $this->recurrenceid['value'];
+        break;
+      case 'RELATED-TO':
+        $ak = ( is_array( $this->relatedto )) ? array_keys( $this->relatedto ) : array();
+        while( is_array( $this->relatedto ) && !isset( $this->relatedto[$propix] ) && ( 0 < count( $this->relatedto )) && ( $propix < end( $ak )))
+          $propix++;
+        $this->propix[$propName] = $propix;
+        if( !isset( $this->relatedto[$propix] )) { unset( $this->propix[$propName] ); return FALSE; }
+        return ( $inclParam ) ? $this->relatedto[$propix] : $this->relatedto[$propix]['value'];
+        break;
+      case 'REPEAT':
+        if( isset( $this->repeat['value'] )) return ( $inclParam ) ? $this->repeat : $this->repeat['value'];
+        break;
+      case 'REQUEST-STATUS':
+        $ak = ( is_array( $this->requeststatus )) ? array_keys( $this->requeststatus ) : array();
+        while( is_array( $this->requeststatus ) && !isset( $this->requeststatus[$propix] ) && ( 0 < count( $this->requeststatus )) && ( $propix < end( $ak )))
+          $propix++;
+        $this->propix[$propName] = $propix;
+        if( !isset( $this->requeststatus[$propix] )) { unset( $this->propix[$propName] ); return FALSE; }
+        return ( $inclParam ) ? $this->requeststatus[$propix] : $this->requeststatus[$propix]['value'];
+        break;
+      case 'RESOURCES':
+        $ak = ( is_array( $this->resources )) ? array_keys( $this->resources ) : array();
+        while( is_array( $this->resources ) && !isset( $this->resources[$propix] ) && ( 0 < count( $this->resources )) && ( $propix < end( $ak )))
+          $propix++;
+        $this->propix[$propName] = $propix;
+        if( !isset( $this->resources[$propix] )) { unset( $this->propix[$propName] ); return FALSE; }
+        return ( $inclParam ) ? $this->resources[$propix] : $this->resources[$propix]['value'];
+        break;
+      case 'RRULE':
+        $ak = ( is_array( $this->rrule )) ? array_keys( $this->rrule ) : array();
+        while( is_array( $this->rrule ) && !isset( $this->rrule[$propix] ) && ( 0 < count( $this->rrule )) && ( $propix < end( $ak )))
+          $propix++;
+        $this->propix[$propName] = $propix;
+        if( !isset( $this->rrule[$propix] )) { unset( $this->propix[$propName] ); return FALSE; }
+        return ( $inclParam ) ? $this->rrule[$propix] : $this->rrule[$propix]['value'];
+        break;
+      case 'SEQUENCE':
+        if( isset( $this->sequence['value'] )) return ( $inclParam ) ? $this->sequence : $this->sequence['value'];
+        break;
+      case 'STATUS':
+        if( isset( $this->status['value'] )) return ( $inclParam ) ? $this->status : $this->status['value'];
+        break;
+      case 'SUMMARY':
+        if( isset( $this->summary['value'] )) return ( $inclParam ) ? $this->summary : $this->summary['value'];
+        break;
+      case 'TRANSP':
+        if( isset( $this->transp['value'] )) return ( $inclParam ) ? $this->transp : $this->transp['value'];
+        break;
+      case 'TRIGGER':
+        if( isset( $this->trigger['value'] )) return ( $inclParam ) ? $this->trigger : $this->trigger['value'];
+        break;
+      case 'TZID':
+        if( isset( $this->tzid['value'] )) return ( $inclParam ) ? $this->tzid : $this->tzid['value'];
+        break;
+      case 'TZNAME':
+        $ak = ( is_array( $this->tzname )) ? array_keys( $this->tzname ) : array();
+        while( is_array( $this->tzname ) && !isset( $this->tzname[$propix] ) && ( 0 < count( $this->tzname )) && ( $propix < end( $ak )))
+          $propix++;
+        $this->propix[$propName] = $propix;
+        if( !isset( $this->tzname[$propix] )) { unset( $this->propix[$propName] ); return FALSE; }
+        return ( $inclParam ) ? $this->tzname[$propix] : $this->tzname[$propix]['value'];
+        break;
+      case 'TZOFFSETFROM':
+        if( isset( $this->tzoffsetfrom['value'] )) return ( $inclParam ) ? $this->tzoffsetfrom : $this->tzoffsetfrom['value'];
+        break;
+      case 'TZOFFSETTO':
+        if( isset( $this->tzoffsetto['value'] )) return ( $inclParam ) ? $this->tzoffsetto : $this->tzoffsetto['value'];
+        break;
+      case 'TZURL':
+        if( isset( $this->tzurl['value'] )) return ( $inclParam ) ? $this->tzurl : $this->tzurl['value'];
+        break;
+      case 'UID':
+        if( in_array( $this->objName, array( 'valarm', 'vtimezone', 'standard', 'daylight' )))
+          return FALSE;
+        if( empty( $this->uid['value'] ))
+          $this->_makeuid();
+        return ( $inclParam ) ? $this->uid : $this->uid['value'];
+        break;
+      case 'URL':
+        if( isset( $this->url['value'] )) return ( $inclParam ) ? $this->url : $this->url['value'];
+        break;
+      default:
+        if( $propName != 'X-PROP' ) {
+          if( !isset( $this->xprop[$propName] )) return FALSE;
+          return ( $inclParam ) ? array( $propName, $this->xprop[$propName] )
+                                : array( $propName, $this->xprop[$propName]['value'] );
+        }
+        else {
+          if( empty( $this->xprop )) return FALSE;
+          $xpropno = 0;
+          foreach( $this->xprop as $xpropkey => $xpropvalue ) {
+            if( $propix == $xpropno )
+              return ( $inclParam ) ? array( $xpropkey, $this->xprop[$xpropkey] )
+                                    : array( $xpropkey, $this->xprop[$xpropkey]['value'] );
+            else
+              $xpropno++;
+          }
+          return FALSE; // not found ??
+        }
+    }
+    return FALSE;
+  }
+/**
+ * returns calendar property unique values for 'ATTENDEE', 'CATEGORIES', 'CONTACT', 'RELATED-TO' or 'RESOURCES' and for each, number of occurrence
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.13.4 - 2012-08-07
+ * @param string $propName
+ * @param array  $output, incremented result array
+ */
+  function _getProperties( $propName, & $output ) {
+    if( empty( $output ))
+      $output = array();
+    if( !in_array( strtoupper( $propName ), array( 'ATTENDEE', 'CATEGORIES', 'CONTACT', 'RELATED-TO', 'RESOURCES' )))
+      return $output;
+    while( FALSE !== ( $content = $this->getProperty( $propName ))) {
+      if( empty( $content ))
+        continue;
+      if( is_array( $content )) {
+        foreach( $content as $part ) {
+          if( FALSE !== strpos( $part, ',' )) {
+            $part = explode( ',', $part );
+            foreach( $part as $thePart ) {
+              $thePart = trim( $thePart );
+              if( !empty( $thePart )) {
+                if( !isset( $output[$thePart] ))
+                  $output[$thePart] = 1;
+                else
+                  $output[$thePart] += 1;
+              }
+            }
+          }
+          else {
+            $part = trim( $part );
+            if( !isset( $output[$part] ))
+              $output[$part] = 1;
+            else
+              $output[$part] += 1;
+          }
+        }
+      } // end if( is_array( $content ))
+      elseif( FALSE !== strpos( $content, ',' )) {
+        $content = explode( ',', $content );
+        foreach( $content as $thePart ) {
+          $thePart = trim( $thePart );
+          if( !empty( $thePart )) {
+            if( !isset( $output[$thePart] ))
+              $output[$thePart] = 1;
+            else
+              $output[$thePart] += 1;
+          }
+        }
+      } // end elseif( FALSE !== strpos( $content, ',' ))
+      else {
+        $content = trim( $content );
+        if( !empty( $content )) {
+          if( !isset( $output[$content] ))
+            $output[$content] = 1;
+          else
+            $output[$content] += 1;
+        }
+      }
+    }
+    ksort( $output );
+  }
+/**
+ * general component property setting
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.5.1 - 2008-11-05
+ * @param mixed $args variable number of function arguments,
+ *                    first argument is ALWAYS component name,
+ *                    second ALWAYS component value!
+ * @return void
+ */
+  function setProperty() {
+    $numargs    = func_num_args();
+    if( 1 > $numargs ) return FALSE;
+    $arglist    = func_get_args();
+    if( $this->_notExistProp( $arglist[0] )) return FALSE;
+    if( !$this->getConfig( 'allowEmpty' ) && ( !isset( $arglist[1] ) || empty( $arglist[1] )))
+      return FALSE;
+    $arglist[0] = strtoupper( $arglist[0] );
+    for( $argix=$numargs; $argix < 12; $argix++ ) {
+      if( !isset( $arglist[$argix] ))
+        $arglist[$argix] = null;
+    }
+    switch( $arglist[0] ) {
+      case 'ACTION':
+        return $this->setAction(          $arglist[1], $arglist[2] );
+      case 'ATTACH':
+        return $this->setAttach(          $arglist[1], $arglist[2], $arglist[3] );
+      case 'ATTENDEE':
+        return $this->setAttendee(        $arglist[1], $arglist[2], $arglist[3] );
+      case 'CATEGORIES':
+        return $this->setCategories(      $arglist[1], $arglist[2], $arglist[3] );
+      case 'CLASS':
+        return $this->setClass(           $arglist[1], $arglist[2] );
+      case 'COMMENT':
+        return $this->setComment(         $arglist[1], $arglist[2], $arglist[3] );
+      case 'COMPLETED':
+        return $this->setCompleted(       $arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6], $arglist[7] );
+      case 'CONTACT':
+        return $this->setContact(         $arglist[1], $arglist[2], $arglist[3] );
+      case 'CREATED':
+        return $this->setCreated(         $arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6], $arglist[7] );
+      case 'DESCRIPTION':
+        return $this->setDescription(     $arglist[1], $arglist[2], $arglist[3] );
+      case 'DTEND':
+        return $this->setDtend(           $arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6], $arglist[7], $arglist[8] );
+      case 'DTSTAMP':
+        return $this->setDtstamp(         $arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6], $arglist[7] );
+      case 'DTSTART':
+        return $this->setDtstart(         $arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6], $arglist[7], $arglist[8] );
+      case 'DUE':
+        return $this->setDue(             $arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6], $arglist[7], $arglist[8] );
+      case 'DURATION':
+        return $this->setDuration(        $arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6] );
+      case 'EXDATE':
+        return $this->setExdate(          $arglist[1], $arglist[2], $arglist[3] );
+      case 'EXRULE':
+        return $this->setExrule(          $arglist[1], $arglist[2], $arglist[3] );
+      case 'FREEBUSY':
+        return $this->setFreebusy(        $arglist[1], $arglist[2], $arglist[3], $arglist[4] );
+      case 'GEO':
+        return $this->setGeo(             $arglist[1], $arglist[2], $arglist[3] );
+      case 'LAST-MODIFIED':
+        return $this->setLastModified(    $arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6], $arglist[7] );
+      case 'LOCATION':
+        return $this->setLocation(        $arglist[1], $arglist[2] );
+      case 'ORGANIZER':
+        return $this->setOrganizer(       $arglist[1], $arglist[2] );
+      case 'PERCENT-COMPLETE':
+        return $this->setPercentComplete( $arglist[1], $arglist[2] );
+      case 'PRIORITY':
+        return $this->setPriority(        $arglist[1], $arglist[2] );
+      case 'RDATE':
+        return $this->setRdate(           $arglist[1], $arglist[2], $arglist[3] );
+      case 'RECURRENCE-ID':
+       return $this->setRecurrenceid(     $arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6], $arglist[7], $arglist[8] );
+      case 'RELATED-TO':
+        return $this->setRelatedTo(       $arglist[1], $arglist[2], $arglist[3] );
+      case 'REPEAT':
+        return $this->setRepeat(          $arglist[1], $arglist[2] );
+      case 'REQUEST-STATUS':
+        return $this->setRequestStatus(   $arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5] );
+      case 'RESOURCES':
+        return $this->setResources(       $arglist[1], $arglist[2], $arglist[3] );
+      case 'RRULE':
+        return $this->setRrule(           $arglist[1], $arglist[2], $arglist[3] );
+      case 'SEQUENCE':
+        return $this->setSequence(        $arglist[1], $arglist[2] );
+      case 'STATUS':
+        return $this->setStatus(          $arglist[1], $arglist[2] );
+      case 'SUMMARY':
+        return $this->setSummary(         $arglist[1], $arglist[2] );
+      case 'TRANSP':
+        return $this->setTransp(          $arglist[1], $arglist[2] );
+      case 'TRIGGER':
+        return $this->setTrigger(         $arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6], $arglist[7], $arglist[8], $arglist[9], $arglist[10], $arglist[11] );
+      case 'TZID':
+        return $this->setTzid(            $arglist[1], $arglist[2] );
+      case 'TZNAME':
+        return $this->setTzname(          $arglist[1], $arglist[2], $arglist[3] );
+      case 'TZOFFSETFROM':
+        return $this->setTzoffsetfrom(    $arglist[1], $arglist[2] );
+      case 'TZOFFSETTO':
+        return $this->setTzoffsetto(      $arglist[1], $arglist[2] );
+      case 'TZURL':
+        return $this->setTzurl(           $arglist[1], $arglist[2] );
+      case 'UID':
+        return $this->setUid(             $arglist[1], $arglist[2] );
+      case 'URL':
+        return $this->setUrl(             $arglist[1], $arglist[2] );
+      default:
+        return $this->setXprop(           $arglist[0], $arglist[1], $arglist[2] );
+    }
+    return FALSE;
+  }
+/*********************************************************************************/
+/**
+ * parse component unparsed data into properties
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.26 - 2013-07-02
+ * @param mixed $unparsedtext, optional, strict rfc2445 formatted, single property string or array of strings
+ * @return bool FALSE if error occurs during parsing
+ *
+ */
+  function parse( $unparsedtext=null ) {
+    $nl = $this->getConfig( 'nl' );
+    if( !empty( $unparsedtext )) {
+      if( is_array( $unparsedtext ))
+        $unparsedtext = implode( '\n'.$nl, $unparsedtext );
+      $unparsedtext = explode( $nl, iCalUtilityFunctions::convEolChar( $unparsedtext, $nl ));
+    }
+    elseif( !isset( $this->unparsed ))
+      $unparsedtext = array();
+    else
+      $unparsedtext = $this->unparsed;
+            /* skip leading (empty/invalid) lines */
+    foreach( $unparsedtext as $lix => $line ) {
+      $tst = trim( $line );
+      if(( '\n' == $tst ) || empty( $tst ))
+        unset( $unparsedtext[$lix] );
+      else
+        break;
+    }
+    $this->unparsed = array();
+    $comp           = & $this;
+    $config         = $this->getConfig();
+    $compsync = $subsync = 0;
+    foreach ( $unparsedtext as $lix => $line ) {
+      if( 'END:VALARM'         == strtoupper( substr( $line, 0, 10 ))) {
+        if( 1 != $subsync ) return FALSE;
+        $this->components[]     = $comp->copy();
+        $subsync--;
+      }
+      elseif( 'END:DAYLIGHT'   == strtoupper( substr( $line, 0, 12 ))) {
+        if( 1 != $subsync ) return FALSE;
+        $this->components[]     = $comp->copy();
+        $subsync--;
+      }
+      elseif( 'END:STANDARD'   == strtoupper( substr( $line, 0, 12 ))) {
+        if( 1 != $subsync ) return FALSE;
+        array_unshift( $this->components, $comp->copy());
+        $subsync--;
+      }
+      elseif( 'END:'           == strtoupper( substr( $line, 0, 4 ))) { // end:<component>
+        if( 1 != $compsync ) return FALSE;
+        if( 0 < $subsync )
+          $this->components[]   = $comp->copy();
+        $compsync--;
+        break;                       /* skip trailing empty lines */
+      }
+      elseif( 'BEGIN:VALARM'   == strtoupper( substr( $line, 0, 12 ))) {
+        $comp = new valarm( $config);
+        $subsync++;
+      }
+      elseif( 'BEGIN:STANDARD' == strtoupper( substr( $line, 0, 14 ))) {
+        $comp = new vtimezone( 'standard', $config );
+        $subsync++;
+      }
+      elseif( 'BEGIN:DAYLIGHT' == strtoupper( substr( $line, 0, 14 ))) {
+        $comp = new vtimezone( 'daylight', $config );
+        $subsync++;
+      }
+      elseif( 'BEGIN:'         == strtoupper( substr( $line, 0, 6 )))  // begin:<component>
+        $compsync++;
+      else
+        $comp->unparsed[]       = $line;
+    }
+    if( 0 < $subsync )
+      $this->components[]   = $comp->copy();
+    unset( $config );
+            /* concatenate property values spread over several lines */
+    $lastix    = -1;
+    $propnames = array( 'action', 'attach', 'attendee', 'categories', 'comment', 'completed'
+                      , 'contact', 'class', 'created', 'description', 'dtend', 'dtstart'
+                      , 'dtstamp', 'due', 'duration', 'exdate', 'exrule', 'freebusy', 'geo'
+                      , 'last-modified', 'location', 'organizer', 'percent-complete'
+                      , 'priority', 'rdate', 'recurrence-id', 'related-to', 'repeat'
+                      , 'request-status', 'resources', 'rrule', 'sequence', 'status'
+                      , 'summary', 'transp', 'trigger', 'tzid', 'tzname', 'tzoffsetfrom'
+                      , 'tzoffsetto', 'tzurl', 'uid', 'url', 'x-' );
+    $proprows  = array();
+    for( $i = 0; $i < count( $this->unparsed ); $i++ ) { // concatenate lines
+      $line = rtrim( $this->unparsed[$i], $nl );
+      while( isset( $this->unparsed[$i+1] ) && !empty( $this->unparsed[$i+1] ) && ( ' ' == $this->unparsed[$i+1]{0} ))
+        $line .= rtrim( substr( $this->unparsed[++$i], 1 ), $nl );
+      $proprows[] = $line;
+    }
+            /* parse each property 'line' */
+    $paramMStz   = array( 'utc-', 'utc+', 'gmt-', 'gmt+' );
+    $paramProto3 = array( 'fax:', 'cid:', 'sms:', 'tel:', 'urn:' );
+    $paramProto4 = array( 'crid:', 'news:', 'pres:' );
+    foreach( $proprows as $line ) {
+      if( '\n' == substr( $line, -2 ))
+        $line = substr( $line, 0, -2 );
+            /* get propname */
+      $propname = null;
+      $cix = 0;
+      while( isset( $line[$cix] )) {
+        if( in_array( $line[$cix], array( ':', ';' )))
+          break;
+        else
+          $propname .= $line[$cix];
+        $cix++;
+      }
+      if(( 'x-' == substr( $propname, 0, 2 )) || ( 'X-' == substr( $propname, 0, 2 ))) {
+        $propname2 = $propname;
+        $propname  = 'X-';
+      }
+      if( !in_array( strtolower( $propname ), $propnames )) // skip non standard property names
+        continue;
+            /* rest of the line is opt.params and value */
+      $line = substr( $line, $cix );
+            /* separate attributes from value */
+      $attr         = array();
+      $attrix       = -1;
+      $clen         = strlen( $line );
+      $WithinQuotes = FALSE;
+      $cix          = 0;
+      while( FALSE !== substr( $line, $cix, 1 )) {
+        if(                       (  ':' == $line[$cix] )                         &&
+                                  ( substr( $line,$cix,     3 )  != '://' )       &&
+           ( !in_array( strtolower( substr( $line,$cix - 6, 4 )), $paramMStz ))   &&
+           ( !in_array( strtolower( substr( $line,$cix - 3, 4 )), $paramProto3 )) &&
+           ( !in_array( strtolower( substr( $line,$cix - 4, 5 )), $paramProto4 )) &&
+                      ( strtolower( substr( $line,$cix - 6, 7 )) != 'mailto:' )   &&
+             !$WithinQuotes ) {
+          $attrEnd = TRUE;
+          if(( $cix < ( $clen - 4 )) &&
+               ctype_digit( substr( $line, $cix+1, 4 ))) { // an URI with a (4pos) portnr??
+            for( $c2ix = $cix; 3 < $c2ix; $c2ix-- ) {
+              if( '://' == substr( $line, $c2ix - 2, 3 )) {
+                $attrEnd = FALSE;
+                break; // an URI with a portnr!!
+              }
+            }
+          }
+          if( $attrEnd) {
+            $line = substr( $line, ( $cix + 1 ));
+            break;
+          }
+          $cix++;
+        }
+        if( '"' == $line[$cix] )
+          $WithinQuotes = ( FALSE === $WithinQuotes ) ? TRUE : FALSE;
+        if( ';' == $line[$cix] )
+          $attr[++$attrix] = null;
+        else
+          $attr[$attrix] .= $line[$cix];
+        $cix++;
+      }
+            /* make attributes in array format */
+      $propattr = array();
+      foreach( $attr as $attribute ) {
+        $attrsplit = explode( '=', $attribute, 2 );
+        if( 1 < count( $attrsplit ))
+          $propattr[$attrsplit[0]] = $attrsplit[1];
+        else
+          $propattr[] = $attribute;
+      }
+            /* call setProperty( $propname.. . */
+      switch( strtoupper( $propname )) {
+        case 'ATTENDEE':
+          foreach( $propattr as $pix => $attr ) {
+            if( !in_array( strtoupper( $pix ), array( 'MEMBER', 'DELEGATED-TO', 'DELEGATED-FROM' )))
+              continue;
+            $attr2 = explode( ',', $attr );
+              if( 1 < count( $attr2 ))
+                $propattr[$pix] = $attr2;
+          }
+          $this->setProperty( $propname, $line, $propattr );
+          break;
+        case 'CATEGORIES':
+        case 'RESOURCES':
+          if( FALSE !== strpos( $line, ',' )) {
+            $content  = array( 0 => '' );
+            $cix = $lix = 0;
+            while( FALSE !== substr( $line, $lix, 1 )) {
+              if(( ',' == $line[$lix] ) && ( "\\" != $line[( $lix - 1 )])) {
+                $cix++;
+                $content[$cix] = '';
+              }
+              else
+                $content[$cix] .= $line[$lix];
+              $lix++;
+            }
+            if( 1 < count( $content )) {
+              $content = array_values( $content );
+              foreach( $content as $cix => $contentPart )
+                $content[$cix] = iCalUtilityFunctions::_strunrep( $contentPart );
+              $this->setProperty( $propname, $content, $propattr );
+              break;
+            }
+            else
+              $line = reset( $content );
+          }
+        case 'COMMENT':
+        case 'CONTACT':
+        case 'DESCRIPTION':
+        case 'LOCATION':
+        case 'SUMMARY':
+          if( empty( $line ))
+            $propattr = null;
+          $this->setProperty( $propname, iCalUtilityFunctions::_strunrep( $line ), $propattr );
+          break;
+        case 'REQUEST-STATUS':
+          $values    = explode( ';', $line, 3 );
+          $values[1] = ( !isset( $values[1] )) ? null : iCalUtilityFunctions::_strunrep( $values[1] );
+          $values[2] = ( !isset( $values[2] )) ? null : iCalUtilityFunctions::_strunrep( $values[2] );
+          $this->setProperty( $propname
+                            , $values[0]  // statcode
+                            , $values[1]  // statdesc
+                            , $values[2]  // extdata
+                            , $propattr );
+          break;
+        case 'FREEBUSY':
+          $fbtype = ( isset( $propattr['FBTYPE'] )) ? $propattr['FBTYPE'] : ''; // force setting default, if missing
+          unset( $propattr['FBTYPE'] );
+          $values = explode( ',', $line );
+          foreach( $values as $vix => $value ) {
+            $value2 = explode( '/', $value );
+            if( 1 < count( $value2 ))
+              $values[$vix] = $value2;
+          }
+          $this->setProperty( $propname, $fbtype, $values, $propattr );
+          break;
+        case 'GEO':
+          $value = explode( ';', $line, 2 );
+          if( 2 > count( $value ))
+            $value[1] = null;
+          $this->setProperty( $propname, $value[0], $value[1], $propattr );
+          break;
+        case 'EXDATE':
+          $values = ( !empty( $line )) ? explode( ',', $line ) : null;
+          $this->setProperty( $propname, $values, $propattr );
+          break;
+        case 'RDATE':
+          if( empty( $line )) {
+            $this->setProperty( $propname, $line, $propattr );
+            break;
+          }
+          $values = explode( ',', $line );
+          foreach( $values as $vix => $value ) {
+            $value2 = explode( '/', $value );
+            if( 1 < count( $value2 ))
+              $values[$vix] = $value2;
+          }
+          $this->setProperty( $propname, $values, $propattr );
+          break;
+        case 'EXRULE':
+        case 'RRULE':
+          $values = explode( ';', $line );
+          $recur = array();
+          foreach( $values as $value2 ) {
+            if( empty( $value2 ))
+              continue; // ;-char in ending position ???
+            $value3 = explode( '=', $value2, 2 );
+            $rulelabel = strtoupper( $value3[0] );
+            switch( $rulelabel ) {
+              case 'BYDAY': {
+                $value4 = explode( ',', $value3[1] );
+                if( 1 < count( $value4 )) {
+                  foreach( $value4 as $v5ix => $value5 ) {
+                    $value6 = array();
+                    $dayno = $dayname = null;
+                    $value5 = trim( (string) $value5 );
+                    if(( ctype_alpha( substr( $value5, -1 ))) &&
+                       ( ctype_alpha( substr( $value5, -2, 1 )))) {
+                      $dayname = substr( $value5, -2, 2 );
+                      if( 2 < strlen( $value5 ))
+                        $dayno = substr( $value5, 0, ( strlen( $value5 ) - 2 ));
+                    }
+                    if( $dayno )
+                      $value6[] = $dayno;
+                    if( $dayname )
+                      $value6['DAY'] = $dayname;
+                    $value4[$v5ix] = $value6;
+                  }
+                }
+                else {
+                  $value4 = array();
+                  $dayno  = $dayname = null;
+                  $value5 = trim( (string) $value3[1] );
+                  if(( ctype_alpha( substr( $value5, -1 ))) &&
+                     ( ctype_alpha( substr( $value5, -2, 1 )))) {
+                      $dayname = substr( $value5, -2, 2 );
+                    if( 2 < strlen( $value5 ))
+                      $dayno = substr( $value5, 0, ( strlen( $value5 ) - 2 ));
+                  }
+                  if( $dayno )
+                    $value4[] = $dayno;
+                  if( $dayname )
+                    $value4['DAY'] = $dayname;
+                }
+                $recur[$rulelabel] = $value4;
+                break;
+              }
+              default: {
+                $value4 = explode( ',', $value3[1] );
+                if( 1 < count( $value4 ))
+                  $value3[1] = $value4;
+                $recur[$rulelabel] = $value3[1];
+                break;
+              }
+            } // end - switch $rulelabel
+          } // end - foreach( $values.. .
+          $this->setProperty( $propname, $recur, $propattr );
+          break;
+        case 'X-':
+          $propname = ( isset( $propname2 )) ? $propname2 : $propname;
+          unset( $propname2 );
+        case 'ACTION':
+        case 'CLASSIFICATION':
+        case 'STATUS':
+        case 'TRANSP':
+        case 'UID':
+        case 'TZID':
+        case 'RELATED-TO':
+        case 'TZNAME':
+          $line = iCalUtilityFunctions::_strunrep( $line );
+        default:
+          $this->setProperty( $propname, $line, $propattr );
+          break;
+      } // end  switch( $propname.. .
+    } // end - foreach( $proprows.. .
+    unset( $unparsedtext, $this->unparsed, $proprows );
+    if( isset( $this->components ) && is_array( $this->components ) && ( 0 < count( $this->components ))) {
+      $ckeys = array_keys( $this->components );
+      foreach( $ckeys as $ckey ) {
+        if( !empty( $this->components[$ckey] ) && !empty( $this->components[$ckey]->unparsed )) {
+          $this->components[$ckey]->parse();
+        }
+      }
+    }
+    return TRUE;
+  }
+/*********************************************************************************/
+/*********************************************************************************/
+/**
+ * return a copy of this component
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.15.4 - 2012-10-18
+ * @return object
+ */
+  function copy() {
+    return unserialize( serialize( $this ));
+ }
+/*********************************************************************************/
+/*********************************************************************************/
+/**
+ * delete calendar subcomponent from component container
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.8.8 - 2011-03-15
+ * @param mixed $arg1 ordno / component type / component uid
+ * @param mixed $arg2 optional, ordno if arg1 = component type
+ * @return void
+ */
+  function deleteComponent( $arg1, $arg2=FALSE  ) {
+    if( !isset( $this->components )) return FALSE;
+    $argType = $index = null;
+    if ( ctype_digit( (string) $arg1 )) {
+      $argType = 'INDEX';
+      $index   = (int) $arg1 - 1;
+    }
+    elseif(( strlen( $arg1 ) <= strlen( 'vfreebusy' )) && ( FALSE === strpos( $arg1, '@' ))) {
+      $argType = strtolower( $arg1 );
+      $index   = ( !empty( $arg2 ) && ctype_digit( (string) $arg2 )) ? (( int ) $arg2 - 1 ) : 0;
+    }
+    $cix2dC = 0;
+    foreach ( $this->components as $cix => $component) {
+      if( empty( $component )) continue;
+      if(( 'INDEX' == $argType ) && ( $index == $cix )) {
+        unset( $this->components[$cix] );
+        return TRUE;
+      }
+      elseif( $argType == $component->objName ) {
+        if( $index == $cix2dC ) {
+          unset( $this->components[$cix] );
+          return TRUE;
+        }
+        $cix2dC++;
+      }
+      elseif( !$argType && ($arg1 == $component->getProperty( 'uid' ))) {
+        unset( $this->components[$cix] );
+        return TRUE;
+      }
+    }
+    return FALSE;
+  }
+/**
+ * get calendar component subcomponent from component container
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.8.8 - 2011-03-15
+ * @param mixed $arg1 optional, ordno/component type/ component uid
+ * @param mixed $arg2 optional, ordno if arg1 = component type
+ * @return object
+ */
+  function getComponent ( $arg1=FALSE, $arg2=FALSE ) {
+    if( !isset( $this->components )) return FALSE;
+    $index = $argType = null;
+    if ( !$arg1 ) {
+      $argType = 'INDEX';
+      $index   = $this->compix['INDEX'] =
+        ( isset( $this->compix['INDEX'] )) ? $this->compix['INDEX'] + 1 : 1;
+    }
+    elseif ( ctype_digit( (string) $arg1 )) {
+      $argType = 'INDEX';
+      $index   = (int) $arg1;
+      unset( $this->compix );
+    }
+    elseif(( strlen( $arg1 ) <= strlen( 'vfreebusy' )) && ( FALSE === strpos( $arg1, '@' ))) {
+      unset( $this->compix['INDEX'] );
+      $argType = strtolower( $arg1 );
+      if( !$arg2 )
+        $index = $this->compix[$argType] = ( isset( $this->compix[$argType] )) ? $this->compix[$argType] + 1 : 1;
+      else
+        $index = (int) $arg2;
+    }
+    $index  -= 1;
+    $ckeys = array_keys( $this->components );
+    if( !empty( $index) && ( $index > end( $ckeys )))
+      return FALSE;
+    $cix2gC = 0;
+    foreach( $this->components as $cix => $component ) {
+      if( empty( $component )) continue;
+      if(( 'INDEX' == $argType ) && ( $index == $cix ))
+        return $component->copy();
+      elseif( $argType == $component->objName ) {
+         if( $index == $cix2gC )
+           return $component->copy();
+         $cix2gC++;
+      }
+      elseif( !$argType && ( $arg1 == $component->getProperty( 'uid' )))
+        return $component->copy();
+    }
+            /* not found.. . */
+    unset( $this->compix );
+    return false;
+  }
+/**
+ * add calendar component as subcomponent to container for subcomponents
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 1.x.x - 2007-04-24
+ * @param object $component calendar component
+ * @return void
+ */
+  function addSubComponent ( $component ) {
+    $this->setComponent( $component );
+  }
+/**
+ * create new calendar component subcomponent, already included within component
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.6.33 - 2011-01-03
+ * @param string $compType subcomponent type
+ * @return object (reference)
+ */
+  function & newComponent( $compType ) {
+    $config = $this->getConfig();
+    $keys   = array_keys( $this->components );
+    $ix     = end( $keys) + 1;
+    switch( strtoupper( $compType )) {
+      case 'ALARM':
+      case 'VALARM':
+        $this->components[$ix] = new valarm( $config );
+        break;
+      case 'STANDARD':
+        array_unshift( $this->components, new vtimezone( 'STANDARD', $config ));
+        $ix = 0;
+        break;
+      case 'DAYLIGHT':
+        $this->components[$ix] = new vtimezone( 'DAYLIGHT', $config );
+        break;
+      default:
+        return FALSE;
+    }
+    return $this->components[$ix];
+  }
+/**
+ * add calendar component as subcomponent to container for subcomponents
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.8.8 - 2011-03-15
+ * @param object $component calendar component
+ * @param mixed $arg1 optional, ordno/component type/ component uid
+ * @param mixed $arg2 optional, ordno if arg1 = component type
+ * @return bool
+ */
+  function setComponent( $component, $arg1=FALSE, $arg2=FALSE  ) {
+    if( !isset( $this->components )) return FALSE;
+    $component->setConfig( $this->getConfig(), FALSE, TRUE );
+    if( !in_array( $component->objName, array( 'valarm', 'vtimezone', 'standard', 'daylight' ))) {
+            /* make sure dtstamp and uid is set */
+      $dummy = $component->getProperty( 'dtstamp' );
+      $dummy = $component->getProperty( 'uid' );
+    }
+    if( !$arg1 ) { // plain insert, last in chain
+      $this->components[] = $component->copy();
+      return TRUE;
+    }
+    $argType = $index = null;
+    if ( ctype_digit( (string) $arg1 )) { // index insert/replace
+      $argType = 'INDEX';
+      $index   = (int) $arg1 - 1;
+    }
+    elseif( in_array( strtolower( $arg1 ), array( 'vevent', 'vtodo', 'vjournal', 'vfreebusy', 'valarm', 'vtimezone' ))) {
+      $argType = strtolower( $arg1 );
+      $index = ( ctype_digit( (string) $arg2 )) ? ((int) $arg2) - 1 : 0;
+    }
+    // else if arg1 is set, arg1 must be an UID
+    $cix2sC = 0;
+    foreach ( $this->components as $cix => $component2 ) {
+      if( empty( $component2 )) continue;
+      if(( 'INDEX' == $argType ) && ( $index == $cix )) { // index insert/replace
+        $this->components[$cix] = $component->copy();
+        return TRUE;
+      }
+      elseif( $argType == $component2->objName ) { // component Type index insert/replace
+        if( $index == $cix2sC ) {
+          $this->components[$cix] = $component->copy();
+          return TRUE;
+        }
+        $cix2sC++;
+      }
+      elseif( !$argType && ( $arg1 == $component2->getProperty( 'uid' ))) { // UID insert/replace
+        $this->components[$cix] = $component->copy();
+        return TRUE;
+      }
+    }
+            /* arg1=index and not found.. . insert at index .. .*/
+    if( 'INDEX' == $argType ) {
+      $this->components[$index] = $component->copy();
+      ksort( $this->components, SORT_NUMERIC );
+    }
+    else    /* not found.. . insert last in chain anyway .. .*/
+    $this->components[] = $component->copy();
+    return TRUE;
+  }
+/**
+ * creates formatted output for subcomponents
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.11.20 - 2012-02-06
+ * @param array $xcaldecl
+ * @return string
+ */
+  function createSubComponent() {
+    $output = null;
+    if( 'vtimezone' == $this->objName ) { // sort subComponents, first standard, then daylight, in dtstart order
+      $stdarr = $dlarr = array();
+      foreach( $this->components as $component ) {
+        if( empty( $component ))
+          continue;
+        $dt  = $component->getProperty( 'dtstart' );
+        $key = sprintf( '%04d%02d%02d%02d%02d%02d000', $dt['year'], $dt['month'], $dt['day'], $dt['hour'], $dt['min'], $dt['sec'] );
+        if( 'standard' == $component->objName ) {
+          while( isset( $stdarr[$key] ))
+            $key += 1;
+          $stdarr[$key] = $component->copy();
+        }
+        elseif( 'daylight' == $component->objName ) {
+          while( isset( $dlarr[$key] ))
+            $key += 1;
+          $dlarr[$key] = $component->copy();
+        }
+      } // end foreach( $this->components as $component )
+      $this->components = array();
+      ksort( $stdarr, SORT_NUMERIC );
+      foreach( $stdarr as $std )
+        $this->components[] = $std->copy();
+      unset( $stdarr );
+      ksort( $dlarr,  SORT_NUMERIC );
+      foreach( $dlarr as $dl )
+        $this->components[] = $dl->copy();
+      unset( $dlarr );
+    } // end if( 'vtimezone' == $this->objName )
+    foreach( $this->components as $component ) {
+      $component->setConfig( $this->getConfig(), FALSE, TRUE );
+      $output .= $component->createComponent( $this->xcaldecl );
+    }
+    return $output;
+  }
+}
+/*********************************************************************************/
+/*********************************************************************************/
+/**
+ * class for calendar component VEVENT
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.5.1 - 2008-10-12
+ */
+class vevent extends calendarComponent {
+  var $attach;
+  var $attendee;
+  var $categories;
+  var $comment;
+  var $contact;
+  var $class;
+  var $created;
+  var $description;
+  var $dtend;
+  var $dtstart;
+  var $duration;
+  var $exdate;
+  var $exrule;
+  var $geo;
+  var $lastmodified;
+  var $location;
+  var $organizer;
+  var $priority;
+  var $rdate;
+  var $recurrenceid;
+  var $relatedto;
+  var $requeststatus;
+  var $resources;
+  var $rrule;
+  var $sequence;
+  var $status;
+  var $summary;
+  var $transp;
+  var $url;
+  var $xprop;
+            //  component subcomponents container
+  var $components;
+/**
+ * constructor for calendar component VEVENT object
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.8.2 - 2011-05-01
+ * @param  array $config
+ * @return void
+ */
+  function __construct( $config = array()) {
+    parent::__construct();
+
+    $this->attach          = '';
+    $this->attendee        = '';
+    $this->categories      = '';
+    $this->class           = '';
+    $this->comment         = '';
+    $this->contact         = '';
+    $this->created         = '';
+    $this->description     = '';
+    $this->dtstart         = '';
+    $this->dtend           = '';
+    $this->duration        = '';
+    $this->exdate          = '';
+    $this->exrule          = '';
+    $this->geo             = '';
+    $this->lastmodified    = '';
+    $this->location        = '';
+    $this->organizer       = '';
+    $this->priority        = '';
+    $this->rdate           = '';
+    $this->recurrenceid    = '';
+    $this->relatedto       = '';
+    $this->requeststatus   = '';
+    $this->resources       = '';
+    $this->rrule           = '';
+    $this->sequence        = '';
+    $this->status          = '';
+    $this->summary         = '';
+    $this->transp          = '';
+    $this->url             = '';
+    $this->xprop           = '';
+
+    $this->components      = array();
+
+    if( defined( 'ICAL_LANG' ) && !isset( $config['language'] ))
+                                          $config['language']   = ICAL_LANG;
+    if( !isset( $config['allowEmpty'] ))  $config['allowEmpty'] = TRUE;
+    if( !isset( $config['nl'] ))          $config['nl']         = "\r\n";
+    if( !isset( $config['format'] ))      $config['format']     = 'iCal';
+    if( !isset( $config['delimiter'] ))   $config['delimiter']  = DIRECTORY_SEPARATOR;
+    $this->setConfig( $config );
+
+  }
+/**
+ * create formatted output for calendar component VEVENT object instance
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.10.16 - 2011-10-28
+ * @param array $xcaldecl
+ * @return string
+ */
+  function createComponent( &$xcaldecl ) {
+    $objectname    = $this->_createFormat();
+    $component     = $this->componentStart1.$objectname.$this->componentStart2.$this->nl;
+    $component    .= $this->createUid();
+    $component    .= $this->createDtstamp();
+    $component    .= $this->createAttach();
+    $component    .= $this->createAttendee();
+    $component    .= $this->createCategories();
+    $component    .= $this->createComment();
+    $component    .= $this->createContact();
+    $component    .= $this->createClass();
+    $component    .= $this->createCreated();
+    $component    .= $this->createDescription();
+    $component    .= $this->createDtstart();
+    $component    .= $this->createDtend();
+    $component    .= $this->createDuration();
+    $component    .= $this->createExdate();
+    $component    .= $this->createExrule();
+    $component    .= $this->createGeo();
+    $component    .= $this->createLastModified();
+    $component    .= $this->createLocation();
+    $component    .= $this->createOrganizer();
+    $component    .= $this->createPriority();
+    $component    .= $this->createRdate();
+    $component    .= $this->createRrule();
+    $component    .= $this->createRelatedTo();
+    $component    .= $this->createRequestStatus();
+    $component    .= $this->createRecurrenceid();
+    $component    .= $this->createResources();
+    $component    .= $this->createSequence();
+    $component    .= $this->createStatus();
+    $component    .= $this->createSummary();
+    $component    .= $this->createTransp();
+    $component    .= $this->createUrl();
+    $component    .= $this->createXprop();
+    $component    .= $this->createSubComponent();
+    $component    .= $this->componentEnd1.$objectname.$this->componentEnd2;
+    if( is_array( $this->xcaldecl ) && ( 0 < count( $this->xcaldecl ))) {
+      foreach( $this->xcaldecl as $localxcaldecl )
+        $xcaldecl[] = $localxcaldecl;
+    }
+    return $component;
+  }
+}
+/*********************************************************************************/
+/*********************************************************************************/
+/**
+ * class for calendar component VTODO
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.5.1 - 2008-10-12
+ */
+class vtodo extends calendarComponent {
+  var $attach;
+  var $attendee;
+  var $categories;
+  var $comment;
+  var $completed;
+  var $contact;
+  var $class;
+  var $created;
+  var $description;
+  var $dtstart;
+  var $due;
+  var $duration;
+  var $exdate;
+  var $exrule;
+  var $geo;
+  var $lastmodified;
+  var $location;
+  var $organizer;
+  var $percentcomplete;
+  var $priority;
+  var $rdate;
+  var $recurrenceid;
+  var $relatedto;
+  var $requeststatus;
+  var $resources;
+  var $rrule;
+  var $sequence;
+  var $status;
+  var $summary;
+  var $url;
+  var $xprop;
+            //  component subcomponents container
+  var $components;
+/**
+ * constructor for calendar component VTODO object
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.8.2 - 2011-05-01
+ * @param array $config
+ * @return void
+ */
+  function __construct( $config = array()) {
+    parent::__construct();
+
+    $this->attach          = '';
+    $this->attendee        = '';
+    $this->categories      = '';
+    $this->class           = '';
+    $this->comment         = '';
+    $this->completed       = '';
+    $this->contact         = '';
+    $this->created         = '';
+    $this->description     = '';
+    $this->dtstart         = '';
+    $this->due             = '';
+    $this->duration        = '';
+    $this->exdate          = '';
+    $this->exrule          = '';
+    $this->geo             = '';
+    $this->lastmodified    = '';
+    $this->location        = '';
+    $this->organizer       = '';
+    $this->percentcomplete = '';
+    $this->priority        = '';
+    $this->rdate           = '';
+    $this->recurrenceid    = '';
+    $this->relatedto       = '';
+    $this->requeststatus   = '';
+    $this->resources       = '';
+    $this->rrule           = '';
+    $this->sequence        = '';
+    $this->status          = '';
+    $this->summary         = '';
+    $this->url             = '';
+    $this->xprop           = '';
+
+    $this->components      = array();
+
+    if( defined( 'ICAL_LANG' ) && !isset( $config['language'] ))
+                                          $config['language']   = ICAL_LANG;
+    if( !isset( $config['allowEmpty'] ))  $config['allowEmpty'] = TRUE;
+    if( !isset( $config['nl'] ))          $config['nl']         = "\r\n";
+    if( !isset( $config['format'] ))      $config['format']     = 'iCal';
+    if( !isset( $config['delimiter'] ))   $config['delimiter']  = DIRECTORY_SEPARATOR;
+    $this->setConfig( $config );
+
+  }
+/**
+ * create formatted output for calendar component VTODO object instance
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.5.1 - 2008-11-07
+ * @param array $xcaldecl
+ * @return string
+ */
+  function createComponent( &$xcaldecl ) {
+    $objectname    = $this->_createFormat();
+    $component     = $this->componentStart1.$objectname.$this->componentStart2.$this->nl;
+    $component    .= $this->createUid();
+    $component    .= $this->createDtstamp();
+    $component    .= $this->createAttach();
+    $component    .= $this->createAttendee();
+    $component    .= $this->createCategories();
+    $component    .= $this->createClass();
+    $component    .= $this->createComment();
+    $component    .= $this->createCompleted();
+    $component    .= $this->createContact();
+    $component    .= $this->createCreated();
+    $component    .= $this->createDescription();
+    $component    .= $this->createDtstart();
+    $component    .= $this->createDue();
+    $component    .= $this->createDuration();
+    $component    .= $this->createExdate();
+    $component    .= $this->createExrule();
+    $component    .= $this->createGeo();
+    $component    .= $this->createLastModified();
+    $component    .= $this->createLocation();
+    $component    .= $this->createOrganizer();
+    $component    .= $this->createPercentComplete();
+    $component    .= $this->createPriority();
+    $component    .= $this->createRdate();
+    $component    .= $this->createRelatedTo();
+    $component    .= $this->createRequestStatus();
+    $component    .= $this->createRecurrenceid();
+    $component    .= $this->createResources();
+    $component    .= $this->createRrule();
+    $component    .= $this->createSequence();
+    $component    .= $this->createStatus();
+    $component    .= $this->createSummary();
+    $component    .= $this->createUrl();
+    $component    .= $this->createXprop();
+    $component    .= $this->createSubComponent();
+    $component    .= $this->componentEnd1.$objectname.$this->componentEnd2;
+    if( is_array( $this->xcaldecl ) && ( 0 < count( $this->xcaldecl ))) {
+      foreach( $this->xcaldecl as $localxcaldecl )
+        $xcaldecl[] = $localxcaldecl;
+    }
+    return $component;
+  }
+}
+/*********************************************************************************/
+/*********************************************************************************/
+/**
+ * class for calendar component VJOURNAL
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.5.1 - 2008-10-12
+ */
+class vjournal extends calendarComponent {
+  var $attach;
+  var $attendee;
+  var $categories;
+  var $comment;
+  var $contact;
+  var $class;
+  var $created;
+  var $description;
+  var $dtstart;
+  var $exdate;
+  var $exrule;
+  var $lastmodified;
+  var $organizer;
+  var $rdate;
+  var $recurrenceid;
+  var $relatedto;
+  var $requeststatus;
+  var $rrule;
+  var $sequence;
+  var $status;
+  var $summary;
+  var $url;
+  var $xprop;
+/**
+ * constructor for calendar component VJOURNAL object
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.8.2 - 2011-05-01
+ * @param array $config
+ * @return void
+ */
+  function __construct( $config = array()) {
+    parent::__construct();
+
+    $this->attach          = '';
+    $this->attendee        = '';
+    $this->categories      = '';
+    $this->class           = '';
+    $this->comment         = '';
+    $this->contact         = '';
+    $this->created         = '';
+    $this->description     = '';
+    $this->dtstart         = '';
+    $this->exdate          = '';
+    $this->exrule          = '';
+    $this->lastmodified    = '';
+    $this->organizer       = '';
+    $this->rdate           = '';
+    $this->recurrenceid    = '';
+    $this->relatedto       = '';
+    $this->requeststatus   = '';
+    $this->rrule           = '';
+    $this->sequence        = '';
+    $this->status          = '';
+    $this->summary         = '';
+    $this->url             = '';
+    $this->xprop           = '';
+
+    if( defined( 'ICAL_LANG' ) && !isset( $config['language'] ))
+                                          $config['language']   = ICAL_LANG;
+    if( !isset( $config['allowEmpty'] ))  $config['allowEmpty'] = TRUE;
+    if( !isset( $config['nl'] ))          $config['nl']         = "\r\n";
+    if( !isset( $config['format'] ))      $config['format']     = 'iCal';
+    if( !isset( $config['delimiter'] ))   $config['delimiter']  = DIRECTORY_SEPARATOR;
+    $this->setConfig( $config );
+
+  }
+/**
+ * create formatted output for calendar component VJOURNAL object instance
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.5.1 - 2008-10-12
+ * @param array $xcaldecl
+ * @return string
+ */
+  function createComponent( &$xcaldecl ) {
+    $objectname = $this->_createFormat();
+    $component  = $this->componentStart1.$objectname.$this->componentStart2.$this->nl;
+    $component .= $this->createUid();
+    $component .= $this->createDtstamp();
+    $component .= $this->createAttach();
+    $component .= $this->createAttendee();
+    $component .= $this->createCategories();
+    $component .= $this->createClass();
+    $component .= $this->createComment();
+    $component .= $this->createContact();
+    $component .= $this->createCreated();
+    $component .= $this->createDescription();
+    $component .= $this->createDtstart();
+    $component .= $this->createExdate();
+    $component .= $this->createExrule();
+    $component .= $this->createLastModified();
+    $component .= $this->createOrganizer();
+    $component .= $this->createRdate();
+    $component .= $this->createRequestStatus();
+    $component .= $this->createRecurrenceid();
+    $component .= $this->createRelatedTo();
+    $component .= $this->createRrule();
+    $component .= $this->createSequence();
+    $component .= $this->createStatus();
+    $component .= $this->createSummary();
+    $component .= $this->createUrl();
+    $component .= $this->createXprop();
+    $component .= $this->componentEnd1.$objectname.$this->componentEnd2;
+    if( is_array( $this->xcaldecl ) && ( 0 < count( $this->xcaldecl ))) {
+      foreach( $this->xcaldecl as $localxcaldecl )
+        $xcaldecl[] = $localxcaldecl;
+    }
+    return $component;
+  }
+}
+/*********************************************************************************/
+/*********************************************************************************/
+/**
+ * class for calendar component VFREEBUSY
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.5.1 - 2008-10-12
+ */
+class vfreebusy extends calendarComponent {
+  var $attendee;
+  var $comment;
+  var $contact;
+  var $dtend;
+  var $dtstart;
+  var $duration;
+  var $freebusy;
+  var $organizer;
+  var $requeststatus;
+  var $url;
+  var $xprop;
+            //  component subcomponents container
+  var $components;
+/**
+ * constructor for calendar component VFREEBUSY object
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.8.2 - 2011-05-01
+ * @param array $config
+ * @return void
+ */
+  function __construct( $config = array()) {
+    parent::__construct();
+
+    $this->attendee        = '';
+    $this->comment         = '';
+    $this->contact         = '';
+    $this->dtend           = '';
+    $this->dtstart         = '';
+    $this->duration        = '';
+    $this->freebusy        = '';
+    $this->organizer       = '';
+    $this->requeststatus   = '';
+    $this->url             = '';
+    $this->xprop           = '';
+
+    if( defined( 'ICAL_LANG' ) && !isset( $config['language'] ))
+                                          $config['language']   = ICAL_LANG;
+    if( !isset( $config['allowEmpty'] ))  $config['allowEmpty'] = TRUE;
+    if( !isset( $config['nl'] ))          $config['nl']         = "\r\n";
+    if( !isset( $config['format'] ))      $config['format']     = 'iCal';
+    if( !isset( $config['delimiter'] ))   $config['delimiter']  = DIRECTORY_SEPARATOR;
+    $this->setConfig( $config );
+
+  }
+/**
+ * create formatted output for calendar component VFREEBUSY object instance
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.3.1 - 2007-11-19
+ * @param array $xcaldecl
+ * @return string
+ */
+  function createComponent( &$xcaldecl ) {
+    $objectname = $this->_createFormat();
+    $component  = $this->componentStart1.$objectname.$this->componentStart2.$this->nl;
+    $component .= $this->createUid();
+    $component .= $this->createDtstamp();
+    $component .= $this->createAttendee();
+    $component .= $this->createComment();
+    $component .= $this->createContact();
+    $component .= $this->createDtstart();
+    $component .= $this->createDtend();
+    $component .= $this->createDuration();
+    $component .= $this->createFreebusy();
+    $component .= $this->createOrganizer();
+    $component .= $this->createRequestStatus();
+    $component .= $this->createUrl();
+    $component .= $this->createXprop();
+    $component .= $this->componentEnd1.$objectname.$this->componentEnd2;
+    if( is_array( $this->xcaldecl ) && ( 0 < count( $this->xcaldecl ))) {
+      foreach( $this->xcaldecl as $localxcaldecl )
+        $xcaldecl[] = $localxcaldecl;
+    }
+    return $component;
+  }
+}
+/*********************************************************************************/
+/*********************************************************************************/
+/**
+ * class for calendar component VALARM
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.5.1 - 2008-10-12
+ */
+class valarm extends calendarComponent {
+  var $action;
+  var $attach;
+  var $attendee;
+  var $description;
+  var $duration;
+  var $repeat;
+  var $summary;
+  var $trigger;
+  var $xprop;
+/**
+ * constructor for calendar component VALARM object
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.8.2 - 2011-05-01
+ * @param array $config
+ * @return void
+ */
+  function __construct( $config = array()) {
+    parent::__construct();
+
+    $this->action          = '';
+    $this->attach          = '';
+    $this->attendee        = '';
+    $this->description     = '';
+    $this->duration        = '';
+    $this->repeat          = '';
+    $this->summary         = '';
+    $this->trigger         = '';
+    $this->xprop           = '';
+
+    if( defined( 'ICAL_LANG' ) && !isset( $config['language'] ))
+                                          $config['language']   = ICAL_LANG;
+    if( !isset( $config['allowEmpty'] ))  $config['allowEmpty'] = TRUE;
+    if( !isset( $config['nl'] ))          $config['nl']         = "\r\n";
+    if( !isset( $config['format'] ))      $config['format']     = 'iCal';
+    if( !isset( $config['delimiter'] ))   $config['delimiter']  = DIRECTORY_SEPARATOR;
+    $this->setConfig( $config );
+
+  }
+/**
+ * create formatted output for calendar component VALARM object instance
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.5.1 - 2008-10-22
+ * @param array $xcaldecl
+ * @return string
+ */
+  function createComponent( &$xcaldecl ) {
+    $objectname    = $this->_createFormat();
+    $component     = $this->componentStart1.$objectname.$this->componentStart2.$this->nl;
+    $component    .= $this->createAction();
+    $component    .= $this->createAttach();
+    $component    .= $this->createAttendee();
+    $component    .= $this->createDescription();
+    $component    .= $this->createDuration();
+    $component    .= $this->createRepeat();
+    $component    .= $this->createSummary();
+    $component    .= $this->createTrigger();
+    $component    .= $this->createXprop();
+    $component    .= $this->componentEnd1.$objectname.$this->componentEnd2;
+    if( is_array( $this->xcaldecl ) && ( 0 < count( $this->xcaldecl ))) {
+      foreach( $this->xcaldecl as $localxcaldecl )
+        $xcaldecl[] = $localxcaldecl;
+    }
+    return $component;
+  }
+}
+/**********************************************************************************
+/*********************************************************************************/
+/**
+ * class for calendar component VTIMEZONE
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.5.1 - 2008-10-12
+ */
+class vtimezone extends calendarComponent {
+  var $timezonetype;
+
+  var $comment;
+  var $dtstart;
+  var $lastmodified;
+  var $rdate;
+  var $rrule;
+  var $tzid;
+  var $tzname;
+  var $tzoffsetfrom;
+  var $tzoffsetto;
+  var $tzurl;
+  var $xprop;
+            //  component subcomponents container
+  var $components;
+/**
+ * constructor for calendar component VTIMEZONE object
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.8.2 - 2011-05-01
+ * @param mixed $timezonetype optional, default FALSE ( STANDARD / DAYLIGHT )
+ * @param array $config
+ * @return void
+ */
+  function __construct( $timezonetype=FALSE, $config = array()) {
+    if( is_array( $timezonetype )) {
+      $config       = $timezonetype;
+      $timezonetype = FALSE;
+    }
+    if( !$timezonetype )
+      $this->timezonetype = 'VTIMEZONE';
+    else
+      $this->timezonetype = strtoupper( $timezonetype );
+    parent::__construct();
+
+    $this->comment         = '';
+    $this->dtstart         = '';
+    $this->lastmodified    = '';
+    $this->rdate           = '';
+    $this->rrule           = '';
+    $this->tzid            = '';
+    $this->tzname          = '';
+    $this->tzoffsetfrom    = '';
+    $this->tzoffsetto      = '';
+    $this->tzurl           = '';
+    $this->xprop           = '';
+
+    $this->components      = array();
+
+    if( defined( 'ICAL_LANG' ) && !isset( $config['language'] ))
+                                          $config['language']   = ICAL_LANG;
+    if( !isset( $config['allowEmpty'] ))  $config['allowEmpty'] = TRUE;
+    if( !isset( $config['nl'] ))          $config['nl']         = "\r\n";
+    if( !isset( $config['format'] ))      $config['format']     = 'iCal';
+    if( !isset( $config['delimiter'] ))   $config['delimiter']  = DIRECTORY_SEPARATOR;
+    $this->setConfig( $config );
+
+  }
+/**
+ * create formatted output for calendar component VTIMEZONE object instance
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.5.1 - 2008-10-25
+ * @param array $xcaldecl
+ * @return string
+ */
+  function createComponent( &$xcaldecl ) {
+    $objectname    = $this->_createFormat();
+    $component     = $this->componentStart1.$objectname.$this->componentStart2.$this->nl;
+    $component    .= $this->createTzid();
+    $component    .= $this->createLastModified();
+    $component    .= $this->createTzurl();
+    $component    .= $this->createDtstart();
+    $component    .= $this->createTzoffsetfrom();
+    $component    .= $this->createTzoffsetto();
+    $component    .= $this->createComment();
+    $component    .= $this->createRdate();
+    $component    .= $this->createRrule();
+    $component    .= $this->createTzname();
+    $component    .= $this->createXprop();
+    $component    .= $this->createSubComponent();
+    $component    .= $this->componentEnd1.$objectname.$this->componentEnd2;
+    if( is_array( $this->xcaldecl ) && ( 0 < count( $this->xcaldecl ))) {
+      foreach( $this->xcaldecl as $localxcaldecl )
+        $xcaldecl[] = $localxcaldecl;
+    }
+    return $component;
+  }
+}
+/*********************************************************************************/
+/*********************************************************************************/
+/**
+ * moving all utility (static) functions to a utility class
+ * 20111223 - move iCalUtilityFunctions class to the end of the iCalcreator class file
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.10.1 - 2011-07-16
+ *
+ */
+class iCalUtilityFunctions {
+  // Store the single instance of iCalUtilityFunctions
+  private static $m_pInstance;
+
+  // Private constructor to limit object instantiation to within the class
+  private function __construct() {
+    $m_pInstance = FALSE;
+  }
+
+  // Getter method for creating/returning the single instance of this class
+  public static function getInstance() {
+    if (!self::$m_pInstance)
+      self::$m_pInstance = new iCalUtilityFunctions();
+
+    return self::$m_pInstance;
+  }
+/**
+ * ensures internal date-time/date format (keyed array) for an input date-time/date array (keyed or unkeyed)
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.24 - 2013-06-26
+ * @param array $datetime
+ * @param int $parno optional, default FALSE
+ * @return array
+ */
+  public static function _date_time_array( $datetime, $parno=FALSE ) {
+    return iCalUtilityFunctions::_chkDateArr( $datetime, $parno );
+  }
+  public static function _chkDateArr( $datetime, $parno=FALSE ) {
+    $output = array();
+    if(( !$parno || ( 6 <= $parno )) && isset( $datetime[3] ) && !isset( $datetime[4] )) { // Y-m-d with tz
+      $temp        = $datetime[3];
+      $datetime[3] = $datetime[4] = $datetime[5] = 0;
+      $datetime[6] = $temp;
+    }
+    foreach( $datetime as $dateKey => $datePart ) {
+      switch ( $dateKey ) {
+        case '0': case 'year':   $output['year']  = $datePart; break;
+        case '1': case 'month':  $output['month'] = $datePart; break;
+        case '2': case 'day':    $output['day']   = $datePart; break;
+      }
+      if( 3 != $parno ) {
+        switch ( $dateKey ) {
+          case '0':
+          case '1':
+          case '2': break;
+          case '3': case 'hour': $output['hour']  = $datePart; break;
+          case '4': case 'min' : $output['min']   = $datePart; break;
+          case '5': case 'sec' : $output['sec']   = $datePart; break;
+          case '6': case 'tz'  : $output['tz']    = $datePart; break;
+        }
+      }
+    }
+    if( 3 != $parno ) {
+      if( !isset( $output['hour'] ))         $output['hour'] = 0;
+      if( !isset( $output['min']  ))         $output['min']  = 0;
+      if( !isset( $output['sec']  ))         $output['sec']  = 0;
+      if( isset( $output['tz'] ) &&
+        (( '+0000' == $output['tz'] ) || ( '-0000' == $output['tz'] ) || ( '+000000' == $output['tz'] ) || ( '-000000' == $output['tz'] )))
+                                             $output['tz']   = 'Z';
+    }
+    return $output;
+  }
+/**
+ * check date(-time) and params arrays for an opt. timezone and if it is a DATE-TIME or DATE (updates $parno and params)
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.10.30 - 2012-01-16
+ * @param array $date, date to check
+ * @param int $parno, no of date parts (i.e. year, month.. .)
+ * @param array $params, property parameters
+ * @return void
+ */
+  public static function _chkdatecfg( $theDate, & $parno, & $params ) {
+    if( isset( $params['TZID'] ))
+      $parno = 6;
+    elseif( isset( $params['VALUE'] ) && ( 'DATE' == $params['VALUE'] ))
+      $parno = 3;
+    else {
+      if( isset( $params['VALUE'] ) && ( 'PERIOD' == $params['VALUE'] ))
+        $parno = 7;
+      if( is_array( $theDate )) {
+        if( isset( $theDate['timestamp'] ))
+          $tzid = ( isset( $theDate['tz'] )) ? $theDate['tz'] : null;
+        else
+          $tzid = ( isset( $theDate['tz'] )) ? $theDate['tz'] : ( 7 == count( $theDate )) ? end( $theDate ) : null;
+        if( !empty( $tzid )) {
+          $parno = 7;
+          if( !iCalUtilityFunctions::_isOffset( $tzid ))
+            $params['TZID'] = $tzid; // save only timezone
+        }
+        elseif( !$parno && ( 3 == count( $theDate )) &&
+          ( isset( $params['VALUE'] ) && ( 'DATE' == $params['VALUE'] )))
+          $parno = 3;
+        else
+          $parno = 6;
+      }
+      else { // string
+        $date = trim( $theDate );
+        if( 'Z' == substr( $date, -1 ))
+          $parno = 7; // UTC DATE-TIME
+        elseif((( 8 == strlen( $date ) && ctype_digit( $date )) || ( 11 >= strlen( $date ))) &&
+          ( !isset( $params['VALUE'] ) || !in_array( $params['VALUE'], array( 'DATE-TIME', 'PERIOD' ))))
+          $parno = 3; // DATE
+        $date = iCalUtilityFunctions::_strdate2date( $date, $parno );
+        unset( $date['unparsedtext'] );
+        if( !empty( $date['tz'] )) {
+          $parno = 7;
+          if( !iCalUtilityFunctions::_isOffset( $date['tz'] ))
+            $params['TZID'] = $date['tz']; // save only timezone
+        }
+        elseif( empty( $parno ))
+          $parno = 6;
+      }
+      if( isset( $params['TZID'] ))
+        $parno = 6;
+    }
+  }
+/**
+ * vcalendar sort callback function
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.2 - 2012-12-17
+ * @param array $a
+ * @param array $b
+ * @return int
+ */
+  public static function _cmpfcn( $a, $b ) {
+    if(        empty( $a ))                       return -1;
+    if(        empty( $b ))                       return  1;
+    if( 'vtimezone' == $a->objName ) {
+      if( 'vtimezone' != $b->objName )            return -1;
+      elseif( $a->srtk[0] <= $b->srtk[0] )        return -1;
+      else                                        return  1;
+    }
+    elseif( 'vtimezone' == $b->objName )          return  1;
+    $sortkeys = array( 'year', 'month', 'day', 'hour', 'min', 'sec' );
+    for( $k = 0; $k < 4 ; $k++ ) {
+      if(        empty( $a->srtk[$k] ))           return -1;
+      elseif(    empty( $b->srtk[$k] ))           return  1;
+      if( is_array( $a->srtk[$k] )) {
+        if( is_array( $b->srtk[$k] )) {
+          foreach( $sortkeys as $key ) {
+            if    ( !isset( $a->srtk[$k][$key] )) return -1;
+            elseif( !isset( $b->srtk[$k][$key] )) return  1;
+            if    (  empty( $a->srtk[$k][$key] )) return -1;
+            elseif(  empty( $b->srtk[$k][$key] )) return  1;
+            if    (         $a->srtk[$k][$key] == $b->srtk[$k][$key])
+                                                  continue;
+            if    ((  (int) $a->srtk[$k][$key] ) < ((int) $b->srtk[$k][$key] ))
+                                                  return -1;
+            elseif((  (int) $a->srtk[$k][$key] ) > ((int) $b->srtk[$k][$key] ))
+                                                  return  1;
+          }
+        }
+        else                                      return -1;
+      }
+      elseif( is_array( $b->srtk[$k] ))           return  1;
+      elseif( $a->srtk[$k] < $b->srtk[$k] )       return -1;
+      elseif( $a->srtk[$k] > $b->srtk[$k] )       return  1;
+    }
+    return 0;
+  }
+/**
+ * byte oriented line folding fix
+ *
+ * remove any line-endings that may include spaces or tabs
+ * and convert all line endings (iCal default '\r\n'),
+ * takes care of '\r\n', '\r' and '\n' and mixed '\r\n'+'\r', '\r\n'+'\n'
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.12.17 - 2012-07-12
+ * @param string $text
+ * @param string $nl
+ * @return string
+ */
+  public static function convEolChar( & $text, $nl ) {
+    $outp = '';
+    $cix  = 0;
+    while(    isset(   $text[$cix] )) {
+      if(     isset(   $text[$cix + 2] ) &&  ( "\r" == $text[$cix] ) && ( "\n" == $text[$cix + 1] ) &&
+        ((    " " ==   $text[$cix + 2] ) ||  ( "\t" == $text[$cix + 2] )))                    // 2 pos eolchar + ' ' or '\t'
+        $cix  += 2;                                                                           // skip 3
+      elseif( isset(   $text[$cix + 1] ) &&  ( "\r" == $text[$cix] ) && ( "\n" == $text[$cix + 1] )) {
+        $outp .= $nl;                                                                         // 2 pos eolchar
+        $cix  += 1;                                                                           // replace with $nl
+      }
+      elseif( isset(   $text[$cix + 1] ) && (( "\r" == $text[$cix] ) || ( "\n" == $text[$cix] )) &&
+           (( " " ==   $text[$cix + 1] ) ||  ( "\t" == $text[$cix + 1] )))                     // 1 pos eolchar + ' ' or '\t'
+        $cix  += 1;                                                                            // skip 2
+      elseif(( "\r" == $text[$cix] )     ||  ( "\n" == $text[$cix] ))                          // 1 pos eolchar
+        $outp .= $nl;                                                                          // replace with $nl
+      else
+        $outp .= $text[$cix];                                                                  // add any other byte
+      $cix    += 1;
+    }
+    return $outp;
+  }
+/**
+ * create a calendar timezone and standard/daylight components
+ *
+ * Result when 'Europe/Stockholm' and no from/to arguments is used as timezone:
+ *
+ * BEGIN:VTIMEZONE
+ * TZID:Europe/Stockholm
+ * BEGIN:STANDARD
+ * DTSTART:20101031T020000
+ * TZOFFSETFROM:+0200
+ * TZOFFSETTO:+0100
+ * TZNAME:CET
+ * END:STANDARD
+ * BEGIN:DAYLIGHT
+ * DTSTART:20100328T030000
+ * TZOFFSETFROM:+0100
+ * TZOFFSETTO:+0200
+ * TZNAME:CEST
+ * END:DAYLIGHT
+ * END:VTIMEZONE
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.1 - 2012-11-26
+ * Generates components for all transitions in a date range, based on contribution by Yitzchok Lavi <icalcreator@onebigsystem.com>
+ * Additional changes jpirkey
+ * @param object $calendar, reference to an iCalcreator calendar instance
+ * @param string $timezone, a PHP5 (DateTimeZone) valid timezone
+ * @param array  $xProp,    *[x-propName => x-propValue], optional
+ * @param int    $from      a unix timestamp
+ * @param int    $to        a unix timestamp
+ * @return bool
+ */
+  public static function createTimezone( & $calendar, $timezone, $xProp=array(), $from=null, $to=null ) {
+    if( empty( $timezone ))
+      return FALSE;
+    if( !empty( $from ) && !is_int( $from ))
+      return FALSE;
+    if( !empty( $to )   && !is_int( $to ))
+      return FALSE;
+    try {
+      $dtz               = new DateTimeZone( $timezone );
+      $transitions       = $dtz->getTransitions();
+      $utcTz             = new DateTimeZone( 'UTC' );
+    }
+    catch( Exception $e ) { return FALSE; }
+    if( empty( $to )) {
+      $dates             = array_keys( $calendar->getProperty( 'dtstart' ));
+      if( empty( $dates ))
+        $dates           = array( date( 'Ymd' ));
+    }
+    if( !empty( $from ))
+      $dateFrom          = new DateTime( "@$from" );             // set lowest date (UTC)
+    else {
+      $from              = reset( $dates );                      // set lowest date to the lowest dtstart date
+      $dateFrom          = new DateTime( $from.'T000000', $dtz );
+      $dateFrom->modify( '-1 month' );                           // set $dateFrom to one month before the lowest date
+      $dateFrom->setTimezone( $utcTz );                          // convert local date to UTC
+    }
+    $dateFromYmd         = $dateFrom->format('Y-m-d' );
+    if( !empty( $to ))
+      $dateTo            = new DateTime( "@$to" );               // set end date (UTC)
+    else {
+      $to                = end( $dates );                        // set highest date to the highest dtstart date
+      $dateTo            = new DateTime( $to.'T235959', $dtz );
+      $dateTo->modify( '+1 year' );                              // set $dateTo to one year after the highest date
+      $dateTo->setTimezone( $utcTz );                            // convert local date to UTC
+    }
+    $dateToYmd           = $dateTo->format('Y-m-d' );
+    unset( $dtz );
+    $transTemp           = array();
+    $prevOffsetfrom      = 0;
+    $stdIx  = $dlghtIx   = null;
+    $prevTrans           = FALSE;
+    foreach( $transitions as $tix => $trans ) {                  // all transitions in date-time order!!
+      $date              = new DateTime( "@{$trans['ts']}" );    // set transition date (UTC)
+      $transDateYmd      = $date->format('Y-m-d' );
+      if ( $transDateYmd < $dateFromYmd ) {
+        $prevOffsetfrom  = $trans['offset'];                     // previous trans offset will be 'next' trans offsetFrom
+        $prevTrans       = $trans;                               // save it in case we don't find any that match
+        $prevTrans['offsetfrom'] = ( 0 < $tix ) ? $transitions[$tix-1]['offset'] : 0;
+        continue;
+      }
+      if( $transDateYmd > $dateToYmd )
+        break;                                                   // loop always (?) breaks here
+      if( !empty( $prevOffsetfrom ) || ( 0 == $prevOffsetfrom )) {
+        $trans['offsetfrom'] = $prevOffsetfrom;                  // i.e. set previous offsetto as offsetFrom
+        $date->modify( $trans['offsetfrom'].'seconds' );         // convert utc date to local date
+        $d = $date->format( 'Y-n-j-G-i-s' );                     // set date to array to ease up dtstart and (opt) rdate setting
+        $d = explode( '-', $d );
+        $trans['time']   = array( 'year' => $d[0], 'month' => $d[1], 'day' => $d[2], 'hour' => $d[3], 'min' => $d[4], 'sec' => $d[5] );
+      }
+      $prevOffsetfrom    = $trans['offset'];
+      if( TRUE !== $trans['isdst'] ) {                           // standard timezone
+        if( !empty( $stdIx ) && isset( $transTemp[$stdIx]['offsetfrom'] )  && // check for any repeating rdate's (in order)
+           ( $transTemp[$stdIx]['abbr']       ==   $trans['abbr'] )        &&
+           ( $transTemp[$stdIx]['offsetfrom'] ==   $trans['offsetfrom'] )  &&
+           ( $transTemp[$stdIx]['offset']     ==   $trans['offset'] )) {
+          $transTemp[$stdIx]['rdate'][]        =   $trans['time'];
+          continue;
+        }
+        $stdIx           = $tix;
+      } // end standard timezone
+      else {                                                     // daylight timezone
+        if( !empty( $dlghtIx ) && isset( $transTemp[$dlghtIx]['offsetfrom'] ) && // check for any repeating rdate's (in order)
+           ( $transTemp[$dlghtIx]['abbr']       ==   $trans['abbr'] )         &&
+           ( $transTemp[$dlghtIx]['offsetfrom'] ==   $trans['offsetfrom'] )   &&
+           ( $transTemp[$dlghtIx]['offset']     ==   $trans['offset'] )) {
+          $transTemp[$dlghtIx]['rdate'][]        =   $trans['time'];
+          continue;
+        }
+        $dlghtIx         = $tix;
+      } // end daylight timezone
+      $transTemp[$tix]   = $trans;
+    } // end foreach( $transitions as $tix => $trans )
+    $tz  = & $calendar->newComponent( 'vtimezone' );
+    $tz->setproperty( 'tzid', $timezone );
+    if( !empty( $xProp )) {
+      foreach( $xProp as $xPropName => $xPropValue )
+        if( 'x-' == strtolower( substr( $xPropName, 0, 2 )))
+          $tz->setproperty( $xPropName, $xPropValue );
+    }
+    if( empty( $transTemp )) {      // if no match found
+      if( $prevTrans ) {            // then we use the last transition (before startdate) for the tz info
+        $date = new DateTime( "@{$prevTrans['ts']}" );           // set transition date (UTC)
+        $date->modify( $prevTrans['offsetfrom'].'seconds' );     // convert utc date to local date
+        $d = $date->format( 'Y-n-j-G-i-s' );                     // set date to array to ease up dtstart setting
+        $d = explode( '-', $d );
+        $prevTrans['time'] = array( 'year' => $d[0], 'month' => $d[1], 'day' => $d[2], 'hour' => $d[3], 'min' => $d[4], 'sec' => $d[5] );
+        $transTemp[0] = $prevTrans;
+      }
+      else {                        // or we use the timezone identifier to BUILD the standard tz info (?)
+        $date = new DateTime( 'now', new DateTimeZone( $timezone ));
+        $transTemp[0] = array( 'time'       => $date->format( 'Y-m-d\TH:i:s O' )
+                             , 'offset'     => $date->format( 'Z' )
+                             , 'offsetfrom' => $date->format( 'Z' )
+                             , 'isdst'      => FALSE );
+      }
+    }
+    unset( $transitions, $date, $prevTrans );
+    foreach( $transTemp as $tix => $trans ) {
+      $type  = ( TRUE !== $trans['isdst'] ) ? 'standard' : 'daylight';
+      $scomp = & $tz->newComponent( $type );
+      $scomp->setProperty( 'dtstart',         $trans['time'] );
+//      $scomp->setProperty( 'x-utc-timestamp', $tix.' : '.$trans['ts'] );   // test ###
+      if( !empty( $trans['abbr'] ))
+        $scomp->setProperty( 'tzname',        $trans['abbr'] );
+      if( isset( $trans['offsetfrom'] ))
+        $scomp->setProperty( 'tzoffsetfrom',  iCalUtilityFunctions::offsetSec2His( $trans['offsetfrom'] ));
+      $scomp->setProperty( 'tzoffsetto',      iCalUtilityFunctions::offsetSec2His( $trans['offset'] ));
+      if( isset( $trans['rdate'] ))
+        $scomp->setProperty( 'RDATE',         $trans['rdate'] );
+    }
+    return TRUE;
+  }
+/**
+ * creates formatted output for calendar component property data value type date/date-time
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.14.1 - 2012-09-17
+ * @param array   $datetime
+ * @param int     $parno, optional, default 6
+ * @return string
+ */
+  public static function _format_date_time( $datetime, $parno=6 ) {
+    return iCalUtilityFunctions::_date2strdate( $datetime, $parno );
+  }
+  public static function _date2strdate( $datetime, $parno=6 ) {
+    if( !isset( $datetime['year'] )  &&
+        !isset( $datetime['month'] ) &&
+        !isset( $datetime['day'] )   &&
+        !isset( $datetime['hour'] )  &&
+        !isset( $datetime['min'] )   &&
+        !isset( $datetime['sec'] ))
+      return;
+    $output     = null;
+    foreach( $datetime as $dkey => & $dvalue )
+      if( 'tz' != $dkey ) $dvalue = (integer) $dvalue;
+    $output = sprintf( '%04d%02d%02d', $datetime['year'], $datetime['month'], $datetime['day'] );
+    if( 3 == $parno )
+      return $output;
+    if( !isset( $datetime['hour'] )) $datetime['hour'] = 0;
+    if( !isset( $datetime['min'] ))  $datetime['min']  = 0;
+    if( !isset( $datetime['sec'] ))  $datetime['sec']  = 0;
+    $output    .= sprintf( 'T%02d%02d%02d', $datetime['hour'], $datetime['min'], $datetime['sec'] );
+    if( isset( $datetime['tz'] ) && ( '' < trim( $datetime['tz'] ))) {
+      $datetime['tz'] = trim( $datetime['tz'] );
+      if( 'Z'  == $datetime['tz'] )
+        $parno  = 7;
+      elseif( iCalUtilityFunctions::_isOffset( $datetime['tz'] )) {
+        $parno  = 7;
+        $offset = iCalUtilityFunctions::_tz2offset( $datetime['tz'] );
+        try {
+          $d    = new DateTime( $output, new DateTimeZone( 'UTC' ));
+          if( 0 != $offset ) // adjust för offset
+            $d->modify( "$offset seconds" );
+          $output = $d->format( 'Ymd\THis' );
+        }
+        catch( Exception $e ) {
+          $output = date( 'Ymd\THis', mktime( $datetime['hour'], $datetime['min'], ($datetime['sec'] - $offset), $datetime['month'], $datetime['day'], $datetime['year'] ));
+        }
+      }
+      if( 7 == $parno )
+        $output .= 'Z';
+    }
+    return $output;
+  }
+/**
+ * convert a date/datetime (array) to timestamp
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.14.1 - 2012-09-29
+ * @param array  $datetime  datetime(/date)
+ * @param string $wtz       timezone
+ * @return int
+ */
+  public static function _date2timestamp( $datetime, $wtz=null ) {
+    if( !isset( $datetime['hour'] )) $datetime['hour'] = 0;
+    if( !isset( $datetime['min'] ))  $datetime['min']  = 0;
+    if( !isset( $datetime['sec'] ))  $datetime['sec']  = 0;
+    if( empty( $wtz ) && ( !isset( $datetime['tz'] ) || empty(  $datetime['tz'] )))
+      return mktime( $datetime['hour'], $datetime['min'], $datetime['sec'], $datetime['month'], $datetime['day'], $datetime['year'] );
+    $output = $offset = 0;
+    if( empty( $wtz )) {
+      if( iCalUtilityFunctions::_isOffset( $datetime['tz'] )) {
+        $offset = iCalUtilityFunctions::_tz2offset( $datetime['tz'] ) * -1;
+        $wtz    = 'UTC';
+      }
+      else
+        $wtz    = $datetime['tz'];
+    }
+    if(( 'Z' == $wtz ) || ( 'GMT' == strtoupper( $wtz )))
+      $wtz      = 'UTC';
+    try {
+      $strdate  = sprintf( '%04d-%02d-%02d %02d:%02d:%02d', $datetime['year'], $datetime['month'], $datetime['day'], $datetime['hour'], $datetime['min'], $datetime['sec'] );
+      $d        = new DateTime( $strdate, new DateTimeZone( $wtz ));
+      if( 0    != $offset )  // adjust for offset
+        $d->modify( $offset.' seconds' );
+      $output   = $d->format( 'U' );
+      unset( $d );
+    }
+    catch( Exception $e ) {
+      $output = mktime( $datetime['hour'], $datetime['min'], $datetime['sec'], $datetime['month'], $datetime['day'], $datetime['year'] );
+    }
+    return $output;
+  }
+/**
+ * ensures internal duration format for input in array format
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.23 - 2013-06-23
+ * @param array $duration
+ * @return array
+ */
+  public static function _duration_array( $duration ) {
+    return iCalUtilityFunctions::_duration2arr( $duration );
+  }
+  public static function _duration2arr( $duration ) {
+    $seconds        = 0;
+    foreach( $duration as $durKey => $durValue ) {
+      if( empty( $durValue )) continue;
+      switch ( $durKey ) {
+        case '0': case 'week':
+          $seconds += (((int) $durValue ) * 60 * 60 * 24 * 7 );
+          break;
+        case '1': case 'day':
+          $seconds += (((int) $durValue ) * 60 * 60 * 24 );
+          break;
+        case '2': case 'hour':
+          $seconds += (((int) $durValue ) * 60 * 60 );
+          break;
+        case '3': case 'min':
+          $seconds += (((int) $durValue ) * 60 );
+          break;
+        case '4': case 'sec':
+          $seconds +=   (int) $durValue;
+          break;
+      }
+    }
+    $output         = array();
+    $output['week'] = (int) floor( $seconds / ( 60 * 60 * 24 * 7 ));
+    $seconds        =            ( $seconds % ( 60 * 60 * 24 * 7 ));
+    $output['day']  = (int) floor( $seconds / ( 60 * 60 * 24 ));
+    $seconds        =            ( $seconds % ( 60 * 60 * 24 ));
+    $output['hour'] = (int) floor( $seconds / ( 60 * 60 ));
+    $seconds        =            ( $seconds % ( 60 * 60 ));
+    $output['min']  = (int) floor( $seconds /   60 );
+    $output['sec']  =            ( $seconds %   60 );
+    if( !empty( $output['week'] ))
+      unset( $output['day'], $output['hour'], $output['min'], $output['sec'] );
+    else {
+      unset( $output['week'] );
+      if( empty( $output['day'] ))
+        unset( $output['day'] );
+      if(( 0 == $output['hour'] ) && ( 0 == $output['min'] ) && ( 0 == $output['sec'] ))
+        unset( $output['hour'], $output['min'], $output['sec'] );
+    }
+    return $output;
+  }
+/**
+ * convert startdate+duration to a array format datetime
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.15.12 - 2012-10-31
+ * @param array   $startdate
+ * @param array   $duration
+ * @return array, date format
+ */
+  public static function _duration2date( $startdate, $duration ) {
+    $dateOnly          = ( isset( $startdate['hour'] ) || isset( $startdate['min'] ) || isset( $startdate['sec'] )) ? FALSE : TRUE;
+    $startdate['hour'] = ( isset( $startdate['hour'] )) ? $startdate['hour'] : 0;
+    $startdate['min']  = ( isset( $startdate['min'] ))  ? $startdate['min']  : 0;
+    $startdate['sec']  = ( isset( $startdate['sec'] ))  ? $startdate['sec']  : 0;
+    $dtend = 0;
+    if(    isset( $duration['week'] )) $dtend += ( $duration['week'] * 7 * 24 * 60 * 60 );
+    if(    isset( $duration['day'] ))  $dtend += ( $duration['day'] * 24 * 60 * 60 );
+    if(    isset( $duration['hour'] )) $dtend += ( $duration['hour'] * 60 *60 );
+    if(    isset( $duration['min'] ))  $dtend += ( $duration['min'] * 60 );
+    if(    isset( $duration['sec'] ))  $dtend +=   $duration['sec'];
+    $date     = date( 'Y-m-d-H-i-s', mktime((int) $startdate['hour'], (int) $startdate['min'], (int) ( $startdate['sec'] + $dtend ), (int) $startdate['month'], (int) $startdate['day'], (int) $startdate['year'] ));
+    $d        = explode( '-', $date );
+    $dtend2   = array( 'year' => $d[0], 'month' => $d[1], 'day' => $d[2], 'hour' => $d[3], 'min' => $d[4], 'sec' => $d[5] );
+    if( isset( $startdate['tz'] ))
+      $dtend2['tz']   = $startdate['tz'];
+    if( $dateOnly && (( 0 == $dtend2['hour'] ) && ( 0 == $dtend2['min'] ) && ( 0 == $dtend2['sec'] )))
+      unset( $dtend2['hour'], $dtend2['min'], $dtend2['sec'] );
+    return $dtend2;
+  }
+/**
+ * ensures internal duration format for an input string (iCal) formatted duration
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.14.1 - 2012-09-25
+ * @param string $duration
+ * @return array
+ */
+  public static function _duration_string( $duration ) {
+    return iCalUtilityFunctions::_durationStr2arr( $duration );
+  }
+  public static function _durationStr2arr( $duration ) {
+    $duration = (string) trim( $duration );
+    while( 'P' != strtoupper( substr( $duration, 0, 1 ))) {
+      if( 0 < strlen( $duration ))
+        $duration = substr( $duration, 1 );
+      else
+        return false; // no leading P !?!?
+    }
+    $duration = substr( $duration, 1 ); // skip P
+    $duration = str_replace ( 't', 'T', $duration );
+    $duration = str_replace ( 'T', '', $duration );
+    $output = array();
+    $val    = null;
+    for( $ix=0; $ix < strlen( $duration ); $ix++ ) {
+      switch( strtoupper( substr( $duration, $ix, 1 ))) {
+       case 'W':
+         $output['week'] = $val;
+         $val            = null;
+         break;
+       case 'D':
+         $output['day']  = $val;
+         $val            = null;
+         break;
+       case 'H':
+         $output['hour'] = $val;
+         $val            = null;
+         break;
+       case 'M':
+         $output['min']  = $val;
+         $val            = null;
+         break;
+       case 'S':
+         $output['sec']  = $val;
+         $val            = null;
+         break;
+       default:
+         if( !ctype_digit( substr( $duration, $ix, 1 )))
+           return false; // unknown duration control character  !?!?
+         else
+           $val .= substr( $duration, $ix, 1 );
+      }
+    }
+    return iCalUtilityFunctions::_duration2arr( $output );
+  }
+/**
+ * creates formatted output for calendar component property data value type duration
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.15.8 - 2012-10-30
+ * @param array $duration, array( week, day, hour, min, sec )
+ * @return string
+ */
+  public static function _format_duration( $duration ) {
+    return iCalUtilityFunctions::_duration2str( $duration );
+  }
+  public static function _duration2str( $duration ) {
+    if( isset( $duration['week'] ) ||
+        isset( $duration['day'] )  ||
+        isset( $duration['hour'] ) ||
+        isset( $duration['min'] )  ||
+        isset( $duration['sec'] ))
+       $ok = TRUE;
+    else
+      return;
+    if( isset( $duration['week'] ) && ( 0 < $duration['week'] ))
+      return 'P'.$duration['week'].'W';
+    $output = 'P';
+    if( isset($duration['day'] ) && ( 0 < $duration['day'] ))
+      $output .= $duration['day'].'D';
+    if(( isset( $duration['hour']) && ( 0 < $duration['hour'] )) ||
+       ( isset( $duration['min'])  && ( 0 < $duration['min'] ))  ||
+       ( isset( $duration['sec'])  && ( 0 < $duration['sec'] ))) {
+      $output .= 'T';
+      $output .= ( isset( $duration['hour']) && ( 0 < $duration['hour'] )) ? $duration['hour'].'H' : '0H';
+      $output .= ( isset( $duration['min'])  && ( 0 < $duration['min'] ))  ? $duration['min']. 'M' : '0M';
+      $output .= ( isset( $duration['sec'])  && ( 0 < $duration['sec'] ))  ? $duration['sec']. 'S' : '0S';
+    }
+    if( 'P' == $output )
+      $output = 'PT0H0M0S';
+    return $output;
+  }
+/**
+ * removes expkey+expvalue from array and returns hitval (if found) else returns elseval
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.4.16 - 2008-11-08
+ * @param array $array
+ * @param string $expkey, expected key
+ * @param string $expval, expected value
+ * @param int $hitVal optional, return value if found
+ * @param int $elseVal optional, return value if not found
+ * @param int $preSet optional, return value if already preset
+ * @return int
+ */
+  public static function _existRem( &$array, $expkey, $expval=FALSE, $hitVal=null, $elseVal=null, $preSet=null ) {
+    if( $preSet )
+      return $preSet;
+    if( !is_array( $array ) || ( 0 == count( $array )))
+      return $elseVal;
+    foreach( $array as $key => $value ) {
+      if( strtoupper( $expkey ) == strtoupper( $key )) {
+        if( !$expval || ( strtoupper( $expval ) == strtoupper( $array[$key] ))) {
+          unset( $array[$key] );
+          return $hitVal;
+        }
+      }
+    }
+    return $elseVal;
+  }
+/**
+ * checks if input contains a (array formatted) date/time
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.24 - 2013-07-02
+ * @param array $input
+ * @return bool
+ */
+  public static function _isArrayDate( $input ) {
+    if( !is_array( $input ) || isset( $input['week'] ) || isset( $input['timestamp'] ) || ( 3 > count( $input )))
+      return FALSE;
+    if( 7 == count( $input ))
+      return TRUE;
+    if( isset( $input['year'] ) && isset( $input['month'] ) && isset( $input['day'] ))
+      return checkdate( (int) $input['month'], (int) $input['day'], (int) $input['year'] );
+    if( isset( $input['day'] ) || isset( $input['hour'] ) || isset( $input['min'] ) || isset( $input['sec'] ))
+      return FALSE;
+    if(( 0 == $input[0] ) || ( 0 == $input[1] ) || ( 0 == $input[2] ))
+      return FALSE;
+    if(( 1970 > $input[0] ) || ( 12 < $input[1] ) || ( 31 < $input[2] ))
+      return FALSE;
+    if(( isset( $input[0] ) && isset( $input[1] ) && isset( $input[2] )) &&
+         checkdate((int) $input[1], (int) $input[2], (int) $input[0] ))
+      return TRUE;
+    $input = iCalUtilityFunctions::_strdate2date( $input[1].'/'.$input[2].'/'.$input[0], 3 ); //  m - d - Y
+    if( isset( $input['year'] ) && isset( $input['month'] ) && isset( $input['day'] ))
+      return checkdate( (int) $input['month'], (int) $input['day'], (int) $input['year'] );
+    return FALSE;
+  }
+/**
+ * checks if input array contains a timestamp date
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.4.16 - 2008-10-18
+ * @param array $input
+ * @return bool
+ */
+  public static function _isArrayTimestampDate( $input ) {
+    return ( is_array( $input ) && isset( $input['timestamp'] )) ? TRUE : FALSE ;
+  }
+/**
+ * controls if input string contains (trailing) UTC/iCal offset
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.14.1 - 2012-09-21
+ * @param string $input
+ * @return bool
+ */
+  public static function _isOffset( $input ) {
+    $input         = trim( (string) $input );
+    if( 'Z' == substr( $input, -1 ))
+      return TRUE;
+    elseif((   5 <= strlen( $input )) &&
+       ( in_array( substr( $input, -5, 1 ), array( '+', '-' ))) &&
+       (   '0000' <= substr( $input, -4 )) && (   '9999' >= substr( $input, -4 )))
+      return TRUE;
+    elseif((    7 <= strlen( $input )) &&
+       ( in_array( substr( $input, -7, 1 ), array( '+', '-' ))) &&
+       ( '000000' <= substr( $input, -6 )) && ( '999999' >= substr( $input, -6 )))
+      return TRUE;
+    return FALSE;
+  }
+/**
+ * (very simple) conversion of a MS timezone to a PHP5 valid (Date-)timezone
+ * matching (MS) UCT offset and time zone descriptors
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.14.1 - 2012-09-16
+ * @param string $timezone, input/output variable reference
+ * @return bool
+ */
+  public static function ms2phpTZ( & $timezone ) {
+    if( empty( $timezone ))
+      return FALSE;
+    $search = str_replace( '"', '', $timezone );
+    $search = str_replace( array('GMT', 'gmt', 'utc' ), 'UTC', $search );
+    if( '(UTC' != substr( $search, 0, 4 ))
+      return FALSE;
+    if( FALSE === ( $pos = strpos( $search, ')' )))
+      return FALSE;
+    $pos    = strpos( $search, ')' );
+    $searchOffset = substr( $search, 4, ( $pos - 4 ));
+    $searchOffset = iCalUtilityFunctions::_tz2offset( str_replace( ':', '', $searchOffset ));
+    while( ' ' ==substr( $search, ( $pos + 1 )))
+      $pos += 1;
+    $searchText   = trim( str_replace( array( '(', ')', '&', ',', '  ' ), ' ', substr( $search, ( $pos + 1 )) ));
+    $searchWords  = explode( ' ', $searchText );
+    $timezone_abbreviations = DateTimeZone::listAbbreviations();
+    $hits = array();
+    foreach( $timezone_abbreviations as $name => $transitions ) {
+      foreach( $transitions as $cnt => $transition ) {
+        if( empty( $transition['offset'] )      ||
+            empty( $transition['timezone_id'] ) ||
+          ( $transition['offset'] != $searchOffset ))
+        continue;
+        $cWords = explode( '/', $transition['timezone_id'] );
+        $cPrio   = $hitCnt = $rank = 0;
+        foreach( $cWords as $cWord ) {
+          if( empty( $cWord ))
+            continue;
+          $cPrio += 1;
+          $sPrio  = 0;
+          foreach( $searchWords as $sWord ) {
+            if( empty( $sWord ) || ( 'time' == strtolower( $sWord )))
+              continue;
+            $sPrio += 1;
+            if( strtolower( $cWord ) == strtolower( $sWord )) {
+              $hitCnt += 1;
+              $rank   += ( $cPrio + $sPrio );
+            }
+            else
+              $rank += 10;
+          }
+        }
+        if( 0 < $hitCnt ) {
+          $hits[$rank][] = $transition['timezone_id'];
+        }
+      }
+    }
+    unset( $timezone_abbreviations );
+    if( empty( $hits ))
+      return FALSE;
+    ksort( $hits );
+    foreach( $hits as $rank => $tzs ) {
+      if( !empty( $tzs )) {
+        $timezone = reset( $tzs );
+        return TRUE;
+      }
+    }
+    return FALSE;
+  }
+/**
+ * transforms offset in seconds to [-/+]hhmm[ss]
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2011-05-02
+ * @param string $seconds
+ * @return string
+ */
+  public static function offsetSec2His( $seconds ) {
+    if( '-' == substr( $seconds, 0, 1 )) {
+      $prefix  = '-';
+      $seconds = substr( $seconds, 1 );
+    }
+    elseif( '+' == substr( $seconds, 0, 1 )) {
+      $prefix  = '+';
+      $seconds = substr( $seconds, 1 );
+    }
+    else
+      $prefix  = '+';
+    $output  = '';
+    $hour    = (int) floor( $seconds / 3600 );
+    if( 10 > $hour )
+      $hour  = '0'.$hour;
+    $seconds = $seconds % 3600;
+    $min     = (int) floor( $seconds / 60 );
+    if( 10 > $min )
+      $min   = '0'.$min;
+    $output  = $hour.$min;
+    $seconds = $seconds % 60;
+    if( 0 < $seconds) {
+      if( 9 < $seconds)
+        $output .= $seconds;
+      else
+        $output .= '0'.$seconds;
+    }
+    return $prefix.$output;
+  }
+/**
+ * updates an array with dates based on a recur pattern
+ *
+ * if missing, UNTIL is set 1 year from startdate (emergency break)
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.10.19 - 2011-10-31
+ * @param array $result, array to update, array([timestamp] => timestamp)
+ * @param array $recur, pattern for recurrency (only value part, params ignored)
+ * @param array $wdate, component start date
+ * @param array $startdate, start date
+ * @param array $enddate, optional
+ * @return void
+ * @todo BYHOUR, BYMINUTE, BYSECOND, WEEKLY at year end/start
+ */
+  public static function _recur2date( & $result, $recur, $wdate, $startdate, $enddate=FALSE ) {
+    foreach( $wdate as $k => $v ) if( ctype_digit( $v )) $wdate[$k] = (int) $v;
+    $wdateStart  = $wdate;
+    $wdatets     = iCalUtilityFunctions::_date2timestamp( $wdate );
+    $startdatets = iCalUtilityFunctions::_date2timestamp( $startdate );
+    if( !$enddate ) {
+      $enddate = $startdate;
+      $enddate['year'] += 1;
+    }
+// echo "recur __in_ comp start ".implode('-',$wdate)." period start ".implode('-',$startdate)." period end ".implode('-',$enddate)."<br>\n";print_r($recur);echo "<br>\n";//test###
+    $endDatets = iCalUtilityFunctions::_date2timestamp( $enddate ); // fix break
+    if( !isset( $recur['COUNT'] ) && !isset( $recur['UNTIL'] ))
+      $recur['UNTIL'] = $enddate; // create break
+    if( isset( $recur['UNTIL'] )) {
+      $tdatets = iCalUtilityFunctions::_date2timestamp( $recur['UNTIL'] );
+      if( $endDatets > $tdatets ) {
+        $endDatets = $tdatets; // emergency break
+        $enddate   = iCalUtilityFunctions::_timestamp2date( $endDatets, 6 );
+      }
+      else
+        $recur['UNTIL'] = iCalUtilityFunctions::_timestamp2date( $endDatets, 6 );
+    }
+    if( $wdatets > $endDatets ) {
+// echo "recur out of date ".date('Y-m-d H:i:s',$wdatets)."<br>\n";//test
+      return array(); // nothing to do.. .
+    }
+    if( !isset( $recur['FREQ'] )) // "MUST be specified.. ."
+      $recur['FREQ'] = 'DAILY'; // ??
+    $wkst = ( isset( $recur['WKST'] ) && ( 'SU' == $recur['WKST'] )) ? 24*60*60 : 0; // ??
+    $weekStart = (int) date( 'W', ( $wdatets + $wkst ));
+    if( !isset( $recur['INTERVAL'] ))
+      $recur['INTERVAL'] = 1;
+    $countcnt = ( !isset( $recur['BYSETPOS'] )) ? 1 : 0; // DTSTART counts as the first occurrence
+            /* find out how to step up dates and set index for interval count */
+    $step = array();
+    if( 'YEARLY' == $recur['FREQ'] )
+      $step['year']  = 1;
+    elseif( 'MONTHLY' == $recur['FREQ'] )
+      $step['month'] = 1;
+    elseif( 'WEEKLY' == $recur['FREQ'] )
+      $step['day']   = 7;
+    else
+      $step['day']   = 1;
+    if( isset( $step['year'] ) && isset( $recur['BYMONTH'] ))
+      $step = array( 'month' => 1 );
+    if( empty( $step ) && isset( $recur['BYWEEKNO'] )) // ??
+      $step = array( 'day' => 7 );
+    if( isset( $recur['BYYEARDAY'] ) || isset( $recur['BYMONTHDAY'] ) || isset( $recur['BYDAY'] ))
+      $step = array( 'day' => 1 );
+    $intervalarr = array();
+    if( 1 < $recur['INTERVAL'] ) {
+      $intervalix = iCalUtilityFunctions::_recurIntervalIx( $recur['FREQ'], $wdate, $wkst );
+      $intervalarr = array( $intervalix => 0 );
+    }
+    if( isset( $recur['BYSETPOS'] )) { // save start date + weekno
+      $bysetposymd1 = $bysetposymd2 = $bysetposw1 = $bysetposw2 = array();
+// echo "bysetposXold_start=$bysetposYold $bysetposMold $bysetposDold<br>\n"; // test ###
+      if( is_array( $recur['BYSETPOS'] )) {
+        foreach( $recur['BYSETPOS'] as $bix => $bval )
+          $recur['BYSETPOS'][$bix] = (int) $bval;
+      }
+      else
+        $recur['BYSETPOS'] = array( (int) $recur['BYSETPOS'] );
+      if( 'YEARLY' == $recur['FREQ'] ) {
+        $wdate['month'] = $wdate['day'] = 1; // start from beginning of year
+        $wdatets        = iCalUtilityFunctions::_date2timestamp( $wdate );
+        iCalUtilityFunctions::_stepdate( $enddate, $endDatets, array( 'year' => 1 )); // make sure to count whole last year
+      }
+      elseif( 'MONTHLY' == $recur['FREQ'] ) {
+        $wdate['day']   = 1; // start from beginning of month
+        $wdatets        = iCalUtilityFunctions::_date2timestamp( $wdate );
+        iCalUtilityFunctions::_stepdate( $enddate, $endDatets, array( 'month' => 1 )); // make sure to count whole last month
+      }
+      else
+        iCalUtilityFunctions::_stepdate( $enddate, $endDatets, $step); // make sure to count whole last period
+// echo "BYSETPOS endDat++ =".implode('-',$enddate).' step='.var_export($step,TRUE)."<br>\n";//test###
+      $bysetposWold = (int) date( 'W', ( $wdatets + $wkst ));
+      $bysetposYold = $wdate['year'];
+      $bysetposMold = $wdate['month'];
+      $bysetposDold = $wdate['day'];
+    }
+    else
+      iCalUtilityFunctions::_stepdate( $wdate, $wdatets, $step);
+    $year_old     = null;
+    $daynames     = array( 'SU', 'MO', 'TU', 'WE', 'TH', 'FR', 'SA' );
+             /* MAIN LOOP */
+// echo "recur start ".implode('-',$wdate)." end ".implode('-',$enddate)."<br>\n";//test
+    while( TRUE ) {
+      if( isset( $endDatets ) && ( $wdatets > $endDatets ))
+        break;
+      if( isset( $recur['COUNT'] ) && ( $countcnt >= $recur['COUNT'] ))
+        break;
+      if( $year_old != $wdate['year'] ) {
+        $year_old   = $wdate['year'];
+        $daycnts    = array();
+        $yeardays   = $weekno = 0;
+        $yeardaycnt = array();
+        foreach( $daynames as $dn )
+          $yeardaycnt[$dn] = 0;
+        for( $m = 1; $m <= 12; $m++ ) { // count up and update up-counters
+          $daycnts[$m] = array();
+          $weekdaycnt = array();
+          foreach( $daynames as $dn )
+            $weekdaycnt[$dn] = 0;
+          $mcnt     = date( 't', mktime( 0, 0, 0, $m, 1, $wdate['year'] ));
+          for( $d   = 1; $d <= $mcnt; $d++ ) {
+            $daycnts[$m][$d] = array();
+            if( isset( $recur['BYYEARDAY'] )) {
+              $yeardays++;
+              $daycnts[$m][$d]['yearcnt_up'] = $yeardays;
+            }
+            if( isset( $recur['BYDAY'] )) {
+              $day    = date( 'w', mktime( 0, 0, 0, $m, $d, $wdate['year'] ));
+              $day    = $daynames[$day];
+              $daycnts[$m][$d]['DAY'] = $day;
+              $weekdaycnt[$day]++;
+              $daycnts[$m][$d]['monthdayno_up'] = $weekdaycnt[$day];
+              $yeardaycnt[$day]++;
+              $daycnts[$m][$d]['yeardayno_up'] = $yeardaycnt[$day];
+            }
+            if(  isset( $recur['BYWEEKNO'] ) || ( $recur['FREQ'] == 'WEEKLY' ))
+              $daycnts[$m][$d]['weekno_up'] =(int)date('W',mktime(0,0,$wkst,$m,$d,$wdate['year']));
+          }
+        }
+        $daycnt = 0;
+        $yeardaycnt = array();
+        if(  isset( $recur['BYWEEKNO'] ) || ( $recur['FREQ'] == 'WEEKLY' )) {
+          $weekno = null;
+          for( $d=31; $d > 25; $d-- ) { // get last weekno for year
+            if( !$weekno )
+              $weekno = $daycnts[12][$d]['weekno_up'];
+            elseif( $weekno < $daycnts[12][$d]['weekno_up'] ) {
+              $weekno = $daycnts[12][$d]['weekno_up'];
+              break;
+            }
+          }
+        }
+        for( $m = 12; $m > 0; $m-- ) { // count down and update down-counters
+          $weekdaycnt = array();
+          foreach( $daynames as $dn )
+            $yeardaycnt[$dn] = $weekdaycnt[$dn] = 0;
+          $monthcnt = 0;
+          $mcnt     = date( 't', mktime( 0, 0, 0, $m, 1, $wdate['year'] ));
+          for( $d   = $mcnt; $d > 0; $d-- ) {
+            if( isset( $recur['BYYEARDAY'] )) {
+              $daycnt -= 1;
+              $daycnts[$m][$d]['yearcnt_down'] = $daycnt;
+            }
+            if( isset( $recur['BYMONTHDAY'] )) {
+              $monthcnt -= 1;
+              $daycnts[$m][$d]['monthcnt_down'] = $monthcnt;
+            }
+            if( isset( $recur['BYDAY'] )) {
+              $day  = $daycnts[$m][$d]['DAY'];
+              $weekdaycnt[$day] -= 1;
+              $daycnts[$m][$d]['monthdayno_down'] = $weekdaycnt[$day];
+              $yeardaycnt[$day] -= 1;
+              $daycnts[$m][$d]['yeardayno_down'] = $yeardaycnt[$day];
+            }
+            if(  isset( $recur['BYWEEKNO'] ) || ( $recur['FREQ'] == 'WEEKLY' ))
+              $daycnts[$m][$d]['weekno_down'] = ($daycnts[$m][$d]['weekno_up'] - $weekno - 1);
+          }
+        }
+      }
+            /* check interval */
+      if( 1 < $recur['INTERVAL'] ) {
+            /* create interval index */
+        $intervalix = iCalUtilityFunctions::_recurIntervalIx( $recur['FREQ'], $wdate, $wkst );
+            /* check interval */
+        $currentKey = array_keys( $intervalarr );
+        $currentKey = end( $currentKey ); // get last index
+        if( $currentKey != $intervalix )
+          $intervalarr = array( $intervalix => ( $intervalarr[$currentKey] + 1 ));
+        if(( $recur['INTERVAL'] != $intervalarr[$intervalix] ) &&
+           ( 0 != $intervalarr[$intervalix] )) {
+            /* step up date */
+// echo "skip: ".implode('-',$wdate)." ix=$intervalix old=$currentKey interval=".$intervalarr[$intervalix]."<br>\n";//test
+          iCalUtilityFunctions::_stepdate( $wdate, $wdatets, $step);
+          continue;
+        }
+        else // continue within the selected interval
+          $intervalarr[$intervalix] = 0;
+// echo "cont: ".implode('-',$wdate)." ix=$intervalix old=$currentKey interval=".$intervalarr[$intervalix]."<br>\n";//test
+      }
+      $updateOK = TRUE;
+      if( $updateOK && isset( $recur['BYMONTH'] ))
+        $updateOK = iCalUtilityFunctions::_recurBYcntcheck( $recur['BYMONTH']
+                                           , $wdate['month']
+                                           ,($wdate['month'] - 13));
+      if( $updateOK && isset( $recur['BYWEEKNO'] ))
+        $updateOK = iCalUtilityFunctions::_recurBYcntcheck( $recur['BYWEEKNO']
+                                           , $daycnts[$wdate['month']][$wdate['day']]['weekno_up']
+                                           , $daycnts[$wdate['month']][$wdate['day']]['weekno_down'] );
+      if( $updateOK && isset( $recur['BYYEARDAY'] ))
+        $updateOK = iCalUtilityFunctions::_recurBYcntcheck( $recur['BYYEARDAY']
+                                           , $daycnts[$wdate['month']][$wdate['day']]['yearcnt_up']
+                                           , $daycnts[$wdate['month']][$wdate['day']]['yearcnt_down'] );
+      if( $updateOK && isset( $recur['BYMONTHDAY'] ))
+        $updateOK = iCalUtilityFunctions::_recurBYcntcheck( $recur['BYMONTHDAY']
+                                           , $wdate['day']
+                                           , $daycnts[$wdate['month']][$wdate['day']]['monthcnt_down'] );
+// echo "efter BYMONTHDAY: ".implode('-',$wdate).' status: '; echo ($updateOK) ? 'TRUE' : 'FALSE'; echo "<br>\n";//test###
+      if( $updateOK && isset( $recur['BYDAY'] )) {
+        $updateOK = FALSE;
+        $m = $wdate['month'];
+        $d = $wdate['day'];
+        if( isset( $recur['BYDAY']['DAY'] )) { // single day, opt with year/month day order no
+          $daynoexists = $daynosw = $daynamesw =  FALSE;
+          if( $recur['BYDAY']['DAY'] == $daycnts[$m][$d]['DAY'] )
+            $daynamesw = TRUE;
+          if( isset( $recur['BYDAY'][0] )) {
+            $daynoexists = TRUE;
+            if(( isset( $recur['FREQ'] ) && ( $recur['FREQ'] == 'MONTHLY' )) || isset( $recur['BYMONTH'] ))
+              $daynosw = iCalUtilityFunctions::_recurBYcntcheck( $recur['BYDAY'][0]
+                                                , $daycnts[$m][$d]['monthdayno_up']
+                                                , $daycnts[$m][$d]['monthdayno_down'] );
+            elseif( isset( $recur['FREQ'] ) && ( $recur['FREQ'] == 'YEARLY' ))
+              $daynosw = iCalUtilityFunctions::_recurBYcntcheck( $recur['BYDAY'][0]
+                                                , $daycnts[$m][$d]['yeardayno_up']
+                                                , $daycnts[$m][$d]['yeardayno_down'] );
+          }
+          if((  $daynoexists &&  $daynosw && $daynamesw ) ||
+             ( !$daynoexists && !$daynosw && $daynamesw )) {
+            $updateOK = TRUE;
+// echo "m=$m d=$d day=".$daycnts[$m][$d]['DAY']." yeardayno_up=".$daycnts[$m][$d]['yeardayno_up']." daynoexists:$daynoexists daynosw:$daynosw daynamesw:$daynamesw updateOK:$updateOK<br>\n"; // test ###
+          }
+// echo "m=$m d=$d day=".$daycnts[$m][$d]['DAY']." yeardayno_up=".$daycnts[$m][$d]['yeardayno_up']." daynoexists:$daynoexists daynosw:$daynosw daynamesw:$daynamesw updateOK:$updateOK<br>\n"; // test ###
+        }
+        else {
+          foreach( $recur['BYDAY'] as $bydayvalue ) {
+            $daynoexists = $daynosw = $daynamesw = FALSE;
+            if( isset( $bydayvalue['DAY'] ) &&
+                     ( $bydayvalue['DAY'] == $daycnts[$m][$d]['DAY'] ))
+              $daynamesw = TRUE;
+            if( isset( $bydayvalue[0] )) {
+              $daynoexists = TRUE;
+              if(( isset( $recur['FREQ'] ) && ( $recur['FREQ'] == 'MONTHLY' )) ||
+                   isset( $recur['BYMONTH'] ))
+                $daynosw = iCalUtilityFunctions::_recurBYcntcheck( $bydayvalue['0']
+                                                  , $daycnts[$m][$d]['monthdayno_up']
+                                                  , $daycnts[$m][$d]['monthdayno_down'] );
+              elseif( isset( $recur['FREQ'] ) && ( $recur['FREQ'] == 'YEARLY' ))
+                $daynosw = iCalUtilityFunctions::_recurBYcntcheck( $bydayvalue['0']
+                                                  , $daycnts[$m][$d]['yeardayno_up']
+                                                  , $daycnts[$m][$d]['yeardayno_down'] );
+            }
+// echo "daynoexists:$daynoexists daynosw:$daynosw daynamesw:$daynamesw<br>\n"; // test ###
+            if((  $daynoexists &&  $daynosw && $daynamesw ) ||
+               ( !$daynoexists && !$daynosw && $daynamesw )) {
+              $updateOK = TRUE;
+              break;
+            }
+          }
+        }
+      }
+// echo "efter BYDAY: ".implode('-',$wdate).' status: '; echo ($updateOK) ? 'TRUE' : 'FALSE'; echo "<br>\n"; // test ###
+            /* check BYSETPOS */
+      if( $updateOK ) {
+        if( isset( $recur['BYSETPOS'] ) &&
+          ( in_array( $recur['FREQ'], array( 'YEARLY', 'MONTHLY', 'WEEKLY', 'DAILY' )))) {
+          if( isset( $recur['WEEKLY'] )) {
+            if( $bysetposWold == $daycnts[$wdate['month']][$wdate['day']]['weekno_up'] )
+              $bysetposw1[] = $wdatets;
+            else
+              $bysetposw2[] = $wdatets;
+          }
+          else {
+            if(( isset( $recur['FREQ'] ) && ( 'YEARLY'      == $recur['FREQ'] )  &&
+                                            ( $bysetposYold == $wdate['year'] ))   ||
+               ( isset( $recur['FREQ'] ) && ( 'MONTHLY'     == $recur['FREQ'] )  &&
+                                           (( $bysetposYold == $wdate['year'] )  &&
+                                            ( $bysetposMold == $wdate['month'] ))) ||
+               ( isset( $recur['FREQ'] ) && ( 'DAILY'       == $recur['FREQ'] )  &&
+                                           (( $bysetposYold == $wdate['year'] )  &&
+                                            ( $bysetposMold == $wdate['month'])  &&
+                                            ( $bysetposDold == $wdate['day'] )))) {
+// echo "bysetposymd1[]=".date('Y-m-d H:i:s',$wdatets)."<br>\n";//test
+              $bysetposymd1[] = $wdatets;
+            }
+            else {
+// echo "bysetposymd2[]=".date('Y-m-d H:i:s',$wdatets)."<br>\n";//test
+              $bysetposymd2[] = $wdatets;
+            }
+          }
+        }
+        else {
+            /* update result array if BYSETPOS is set */
+          $countcnt++;
+          if( $startdatets <= $wdatets ) { // only output within period
+            $result[$wdatets] = TRUE;
+// echo "recur ".date('Y-m-d H:i:s',$wdatets)."<br>\n";//test
+          }
+// echo "recur undate ".date('Y-m-d H:i:s',$wdatets)." okdatstart ".date('Y-m-d H:i:s',$startdatets)."<br>\n";//test
+          $updateOK = FALSE;
+        }
+      }
+            /* step up date */
+      iCalUtilityFunctions::_stepdate( $wdate, $wdatets, $step);
+            /* check if BYSETPOS is set for updating result array */
+      if( $updateOK && isset( $recur['BYSETPOS'] )) {
+        $bysetpos       = FALSE;
+        if( isset( $recur['FREQ'] ) && ( 'YEARLY'  == $recur['FREQ'] ) &&
+          ( $bysetposYold != $wdate['year'] )) {
+          $bysetpos     = TRUE;
+          $bysetposYold = $wdate['year'];
+        }
+        elseif( isset( $recur['FREQ'] ) && ( 'MONTHLY' == $recur['FREQ'] &&
+         (( $bysetposYold != $wdate['year'] ) || ( $bysetposMold != $wdate['month'] )))) {
+          $bysetpos     = TRUE;
+          $bysetposYold = $wdate['year'];
+          $bysetposMold = $wdate['month'];
+        }
+        elseif( isset( $recur['FREQ'] ) && ( 'WEEKLY'  == $recur['FREQ'] )) {
+          $weekno = (int) date( 'W', mktime( 0, 0, $wkst, $wdate['month'], $wdate['day'], $wdate['year']));
+          if( $bysetposWold != $weekno ) {
+            $bysetposWold = $weekno;
+            $bysetpos     = TRUE;
+          }
+        }
+        elseif( isset( $recur['FREQ'] ) && ( 'DAILY'   == $recur['FREQ'] ) &&
+         (( $bysetposYold != $wdate['year'] )  ||
+          ( $bysetposMold != $wdate['month'] ) ||
+          ( $bysetposDold != $wdate['day'] ))) {
+          $bysetpos     = TRUE;
+          $bysetposYold = $wdate['year'];
+          $bysetposMold = $wdate['month'];
+          $bysetposDold = $wdate['day'];
+        }
+        if( $bysetpos ) {
+          if( isset( $recur['BYWEEKNO'] )) {
+            $bysetposarr1 = & $bysetposw1;
+            $bysetposarr2 = & $bysetposw2;
+          }
+          else {
+            $bysetposarr1 = & $bysetposymd1;
+            $bysetposarr2 = & $bysetposymd2;
+          }
+// echo 'test före out startYMD (weekno)='.$wdateStart['year'].':'.$wdateStart['month'].':'.$wdateStart['day']." ($weekStart) "; // test ###
+          foreach( $recur['BYSETPOS'] as $ix ) {
+            if( 0 > $ix ) // both positive and negative BYSETPOS allowed
+              $ix = ( count( $bysetposarr1 ) + $ix + 1);
+            $ix--;
+            if( isset( $bysetposarr1[$ix] )) {
+              if( $startdatets <= $bysetposarr1[$ix] ) { // only output within period
+//                $testdate   = iCalUtilityFunctions::_timestamp2date( $bysetposarr1[$ix], 6 );                // test ###
+//                $testweekno = (int) date( 'W', mktime( 0, 0, $wkst, $testdate['month'], $testdate['day'], $testdate['year'] )); // test ###
+// echo " testYMD (weekno)=".$testdate['year'].':'.$testdate['month'].':'.$testdate['day']." ($testweekno)";   // test ###
+                $result[$bysetposarr1[$ix]] = TRUE;
+// echo " recur ".date('Y-m-d H:i:s',$bysetposarr1[$ix]); // test ###
+              }
+              $countcnt++;
+            }
+            if( isset( $recur['COUNT'] ) && ( $countcnt >= $recur['COUNT'] ))
+              break;
+          }
+// echo "<br>\n"; // test ###
+          $bysetposarr1 = $bysetposarr2;
+          $bysetposarr2 = array();
+        }
+      }
+    }
+  }
+  public static function _recurBYcntcheck( $BYvalue, $upValue, $downValue ) {
+    if( is_array( $BYvalue ) &&
+      ( in_array( $upValue, $BYvalue ) || in_array( $downValue, $BYvalue )))
+      return TRUE;
+    elseif(( $BYvalue == $upValue ) || ( $BYvalue == $downValue ))
+      return TRUE;
+    else
+      return FALSE;
+  }
+  public static function _recurIntervalIx( $freq, $date, $wkst ) {
+            /* create interval index */
+    switch( $freq ) {
+      case 'YEARLY':
+        $intervalix = $date['year'];
+        break;
+      case 'MONTHLY':
+        $intervalix = $date['year'].'-'.$date['month'];
+        break;
+      case 'WEEKLY':
+        $wdatets    = iCalUtilityFunctions::_date2timestamp( $date );
+        $intervalix = (int) date( 'W', ( $wdatets + $wkst ));
+       break;
+      case 'DAILY':
+           default:
+        $intervalix = $date['year'].'-'.$date['month'].'-'.$date['day'];
+        break;
+    }
+    return $intervalix;
+  }
+  public static function _recurBydaySort( $bydaya, $bydayb ) {
+    static $days = array( 'SU' => 0, 'MO' => 1, 'TU' => 2, 'WE' => 3, 'TH' => 4, 'FR' => 5, 'SA' => 6 );
+    return ( $days[substr( $bydaya, -2 )] < $days[substr( $bydayb, -2 )] ) ? -1 : 1;
+  }
+/**
+ * convert input format for exrule and rrule to internal format
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.14.1 - 2012-09-24
+ * @param array $rexrule
+ * @return array
+ */
+  public static function _setRexrule( $rexrule ) {
+    $input          = array();
+    if( empty( $rexrule ))
+      return $input;
+    foreach( $rexrule as $rexrulelabel => $rexrulevalue ) {
+      $rexrulelabel = strtoupper( $rexrulelabel );
+      if( 'UNTIL'  != $rexrulelabel )
+        $input[$rexrulelabel]   = $rexrulevalue;
+      else {
+        iCalUtilityFunctions::_strDate2arr( $rexrulevalue );
+        if( iCalUtilityFunctions::_isArrayTimestampDate( $rexrulevalue )) // timestamp, always date-time UTC
+          $input[$rexrulelabel] = iCalUtilityFunctions::_timestamp2date( $rexrulevalue, 7, 'UTC' );
+        elseif( iCalUtilityFunctions::_isArrayDate( $rexrulevalue )) { // date or UTC date-time
+          $parno = ( isset( $rexrulevalue['hour'] ) || isset( $rexrulevalue[4] )) ? 7 : 3;
+          $d = iCalUtilityFunctions::_chkDateArr( $rexrulevalue, $parno );
+          if(( 3 < $parno ) && isset( $d['tz'] ) && ( 'Z' != $d['tz'] ) && iCalUtilityFunctions::_isOffset( $d['tz'] )) {
+            $strdate              = sprintf( '%04d-%02d-%02d %02d:%02d:%02d %s', $d['year'], $d['month'], $d['day'], $d['hour'], $d['min'], $d['sec'], $d['tz'] );
+            $input[$rexrulelabel] = iCalUtilityFunctions::_strdate2date( $strdate, 7 );
+            unset( $input[$rexrulelabel]['unparsedtext'] );
+          }
+          else
+           $input[$rexrulelabel] = $d;
+        }
+        elseif( 8 <= strlen( trim( $rexrulevalue ))) { // ex. textual date-time 2006-08-03 10:12:18 => UTC
+          $input[$rexrulelabel] = iCalUtilityFunctions::_strdate2date( $rexrulevalue );
+          unset( $input['$rexrulelabel']['unparsedtext'] );
+        }
+        if(( 3 < count( $input[$rexrulelabel] )) && !isset( $input[$rexrulelabel]['tz'] ))
+          $input[$rexrulelabel]['tz'] = 'Z';
+      }
+    }
+            /* set recurrence rule specification in rfc2445 order */
+    $input2 = array();
+    if( isset( $input['FREQ'] ))
+      $input2['FREQ']       = $input['FREQ'];
+    if( isset( $input['UNTIL'] ))
+      $input2['UNTIL']      = $input['UNTIL'];
+    elseif( isset( $input['COUNT'] ))
+      $input2['COUNT']      = $input['COUNT'];
+    if( isset( $input['INTERVAL'] ))
+      $input2['INTERVAL']   = $input['INTERVAL'];
+    if( isset( $input['BYSECOND'] ))
+      $input2['BYSECOND']   = $input['BYSECOND'];
+    if( isset( $input['BYMINUTE'] ))
+      $input2['BYMINUTE']   = $input['BYMINUTE'];
+    if( isset( $input['BYHOUR'] ))
+      $input2['BYHOUR']     = $input['BYHOUR'];
+    if( isset( $input['BYDAY'] )) {
+      if( !is_array( $input['BYDAY'] )) // ensure upper case.. .
+        $input2['BYDAY']    = strtoupper( $input['BYDAY'] );
+      else {
+        foreach( $input['BYDAY'] as $BYDAYx => $BYDAYv ) {
+          if( 'DAY'        == strtoupper( $BYDAYx ))
+             $input2['BYDAY']['DAY'] = strtoupper( $BYDAYv );
+          elseif( !is_array( $BYDAYv )) {
+             $input2['BYDAY'][$BYDAYx]  = $BYDAYv;
+          }
+          else {
+            foreach( $BYDAYv as $BYDAYx2 => $BYDAYv2 ) {
+              if( 'DAY'    == strtoupper( $BYDAYx2 ))
+                 $input2['BYDAY'][$BYDAYx]['DAY'] = strtoupper( $BYDAYv2 );
+              else
+                 $input2['BYDAY'][$BYDAYx][$BYDAYx2] = $BYDAYv2;
+            }
+          }
+        }
+      }
+    }
+    if( isset( $input['BYMONTHDAY'] ))
+      $input2['BYMONTHDAY'] = $input['BYMONTHDAY'];
+    if( isset( $input['BYYEARDAY'] ))
+      $input2['BYYEARDAY']  = $input['BYYEARDAY'];
+    if( isset( $input['BYWEEKNO'] ))
+      $input2['BYWEEKNO']   = $input['BYWEEKNO'];
+    if( isset( $input['BYMONTH'] ))
+      $input2['BYMONTH']    = $input['BYMONTH'];
+    if( isset( $input['BYSETPOS'] ))
+      $input2['BYSETPOS']   = $input['BYSETPOS'];
+    if( isset( $input['WKST'] ))
+      $input2['WKST']       = $input['WKST'];
+    return $input2;
+  }
+/**
+ * convert format for input date to internal date with parameters
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.24 - 2013-06-26
+ * @param mixed  $year
+ * @param mixed  $month   optional
+ * @param int    $day     optional
+ * @param int    $hour    optional
+ * @param int    $min     optional
+ * @param int    $sec     optional
+ * @param string $tz      optional
+ * @param array  $params  optional
+ * @param string $caller  optional
+ * @param string $objName optional
+ * @param string $tzid    optional
+ * @return array
+ */
+  public static function _setDate( $year, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $tz=FALSE, $params=FALSE, $caller=null, $objName=null, $tzid=FALSE ) {
+    $input = $parno = null;
+    $localtime = (( 'dtstart' == $caller ) && in_array( $objName, array( 'vtimezone', 'standard', 'daylight' ))) ? TRUE : FALSE;
+    iCalUtilityFunctions::_strDate2arr( $year );
+    if( iCalUtilityFunctions::_isArrayDate( $year )) {
+      $input['value']  = iCalUtilityFunctions::_chkDateArr( $year, FALSE ); //$parno );
+      if( 100 > $input['value']['year'] )
+        $input['value']['year'] += 2000;
+      if( $localtime )
+        unset( $month['VALUE'], $month['TZID'] );
+      elseif( !isset( $month['TZID'] ) && isset( $tzid ))
+        $month['TZID'] = $tzid;
+      if( isset( $input['value']['tz'] ) && iCalUtilityFunctions::_isOffset( $input['value']['tz'] ))
+        unset( $month['TZID'] );
+      elseif( !isset( $input['value']['tz'] ) &&  isset( $month['TZID'] ) && iCalUtilityFunctions::_isOffset( $month['TZID'] )) {
+        $input['value']['tz'] = $month['TZID'];
+        unset( $month['TZID'] );
+      }
+      $input['params'] = iCalUtilityFunctions::_setParams( $month, array( 'VALUE' => 'DATE-TIME' ));
+      $hitval          = ( isset( $input['value']['tz'] )) ? 7 : 6;
+      $parno           = iCalUtilityFunctions::_existRem( $input['params'], 'VALUE', 'DATE-TIME', $hitval );
+      $parno           = iCalUtilityFunctions::_existRem( $input['params'], 'VALUE', 'DATE', 3, count( $input['value'] ), $parno );
+      if( 6 > $parno )
+        unset( $input['value']['tz'], $input['params']['TZID'], $tzid );
+      if(( 6 <= $parno ) && isset( $input['value']['tz'] ) && ( 'Z' != $input['value']['tz'] ) && iCalUtilityFunctions::_isOffset( $input['value']['tz'] )) {
+        $d             = $input['value'];
+        $strdate       = sprintf( '%04d-%02d-%02d %02d:%02d:%02d %s', $d['year'], $d['month'], $d['day'], $d['hour'], $d['min'], $d['sec'], $d['tz'] );
+        $input['value'] = iCalUtilityFunctions::_strdate2date( $strdate, $parno );
+        unset( $input['value']['unparsedtext'], $input['params']['TZID'] );
+      }
+      if( isset( $input['value']['tz'] ) && !iCalUtilityFunctions::_isOffset( $input['value']['tz'] )) {
+        $input['params']['TZID'] = $input['value']['tz'];
+        unset( $input['value']['tz'] );
+      }
+    } // end if( iCalUtilityFunctions::_isArrayDate( $year ))
+    elseif( iCalUtilityFunctions::_isArrayTimestampDate( $year )) {
+      if( $localtime ) unset ( $month['VALUE'], $month['TZID'] );
+      $input['params'] = iCalUtilityFunctions::_setParams( $month, array( 'VALUE' => 'DATE-TIME' ));
+      $parno           = iCalUtilityFunctions::_existRem( $input['params'], 'VALUE', 'DATE', 3 );
+      $hitval          = 7;
+      $parno           = iCalUtilityFunctions::_existRem( $input['params'], 'VALUE', 'DATE-TIME', $hitval, $parno );
+      if( isset( $year['tz'] ) && !empty( $year['tz'] )) {
+        if( !iCalUtilityFunctions::_isOffset( $year['tz'] )) {
+          $input['params']['TZID'] = $year['tz'];
+          unset( $year['tz'], $tzid );
+        }
+        else {
+          if( isset( $input['params']['TZID'] ) && !empty( $input['params']['TZID'] )) {
+            if( !iCalUtilityFunctions::_isOffset( $input['params']['TZID'] ))
+              unset( $tzid );
+            else
+              unset( $input['params']['TZID']);
+          }
+          elseif( isset( $tzid ) && !iCalUtilityFunctions::_isOffset( $tzid ))
+            $input['params']['TZID'] = $tzid;
+        }
+      }
+      elseif( isset( $input['params']['TZID'] ) && !empty( $input['params']['TZID'] )) {
+        if( iCalUtilityFunctions::_isOffset( $input['params']['TZID'] )) {
+          $year['tz'] = $input['params']['TZID'];
+          unset( $input['params']['TZID']);
+          if( isset( $tzid ) && !empty( $tzid ) && !iCalUtilityFunctions::_isOffset( $tzid ))
+            $input['params']['TZID'] = $tzid;
+        }
+      }
+      elseif( isset( $tzid ) && !empty( $tzid )) {
+        if( iCalUtilityFunctions::_isOffset( $tzid )) {
+          $year['tz'] = $tzid;
+          unset( $input['params']['TZID']);
+        }
+        else
+          $input['params']['TZID'] = $tzid;
+      }
+      $input['value']  = iCalUtilityFunctions::_timestamp2date( $year, $parno );
+    } // end elseif( iCalUtilityFunctions::_isArrayTimestampDate( $year ))
+    elseif( 8 <= strlen( trim( $year ))) { // ex. 2006-08-03 10:12:18 [[[+/-]1234[56]] / timezone]
+      if( $localtime )
+        unset( $month['VALUE'], $month['TZID'] );
+      elseif( !isset( $month['TZID'] ) && !empty( $tzid ))
+        $month['TZID'] = $tzid;
+      $input['params'] = iCalUtilityFunctions::_setParams( $month, array( 'VALUE' => 'DATE-TIME' ));
+      $parno           = iCalUtilityFunctions::_existRem( $input['params'], 'VALUE', 'DATE-TIME', 7, $parno );
+      $parno           = iCalUtilityFunctions::_existRem( $input['params'], 'VALUE', 'DATE', 3, $parno, $parno );
+      $input['value']  = iCalUtilityFunctions::_strdate2date( $year, $parno );
+      if( 3 == $parno )
+        unset( $input['value']['tz'], $input['params']['TZID'] );
+      unset( $input['value']['unparsedtext'] );
+      if( isset( $input['value']['tz'] )) {
+        if( iCalUtilityFunctions::_isOffset( $input['value']['tz'] )) {
+          $d           = $input['value'];
+          $strdate     = sprintf( '%04d-%02d-%02d %02d:%02d:%02d %s', $d['year'], $d['month'], $d['day'], $d['hour'], $d['min'], $d['sec'], $d['tz'] );
+          $input['value'] = iCalUtilityFunctions::_strdate2date( $strdate, 7 );
+          unset( $input['value']['unparsedtext'], $input['params']['TZID'] );
+        }
+        else {
+          $input['params']['TZID'] = $input['value']['tz'];
+          unset( $input['value']['tz'] );
+        }
+      }
+      elseif( isset( $input['params']['TZID'] ) && iCalUtilityFunctions::_isOffset( $input['params']['TZID'] )) {
+        $d             = $input['value'];
+        $strdate       = sprintf( '%04d-%02d-%02d %02d:%02d:%02d %s', $d['year'], $d['month'], $d['day'], $d['hour'], $d['min'], $d['sec'], $input['params']['TZID'] );
+        $input['value'] = iCalUtilityFunctions::_strdate2date( $strdate, 7 );
+        unset( $input['value']['unparsedtext'], $input['params']['TZID'] );
+      }
+    } // end elseif( 8 <= strlen( trim( $year )))
+    else {
+      if( is_array( $params ))
+        $input['params'] = iCalUtilityFunctions::_setParams( $params, array( 'VALUE' => 'DATE-TIME' ));
+      elseif( is_array( $tz )) {
+        $input['params'] = iCalUtilityFunctions::_setParams( $tz,     array( 'VALUE' => 'DATE-TIME' ));
+        $tz = FALSE;
+      }
+      elseif( is_array( $hour )) {
+        $input['params'] = iCalUtilityFunctions::_setParams( $hour,   array( 'VALUE' => 'DATE-TIME' ));
+        $hour = $min = $sec = $tz = FALSE;
+      }
+      if( $localtime )
+        unset ( $input['params']['VALUE'], $input['params']['TZID'] );
+      elseif( !isset( $tz ) && !isset( $input['params']['TZID'] ) && !empty( $tzid ))
+        $input['params']['TZID'] = $tzid;
+      elseif( isset( $tz ) && iCalUtilityFunctions::_isOffset( $tz ))
+        unset( $input['params']['TZID'] );
+      elseif( isset( $input['params']['TZID'] ) && iCalUtilityFunctions::_isOffset( $input['params']['TZID'] )) {
+        $tz            = $input['params']['TZID'];
+        unset( $input['params']['TZID'] );
+      }
+      $parno           = iCalUtilityFunctions::_existRem( $input['params'], 'VALUE', 'DATE', 3 );
+      $hitval          = ( iCalUtilityFunctions::_isOffset( $tz )) ? 7 : 6;
+      $parno           = iCalUtilityFunctions::_existRem( $input['params'], 'VALUE', 'DATE-TIME', $hitval, $parno, $parno );
+      $input['value']  = array( 'year'  => $year, 'month' => $month, 'day'   => $day );
+      if( 3 != $parno ) {
+        $input['value']['hour'] = ( $hour ) ? $hour : '0';
+        $input['value']['min']  = ( $min )  ? $min  : '0';
+        $input['value']['sec']  = ( $sec )  ? $sec  : '0';
+        if( !empty( $tz ))
+          $input['value']['tz'] = $tz;
+        $strdate       = iCalUtilityFunctions::_date2strdate( $input['value'], $parno );
+        if( !empty( $tz ) && !iCalUtilityFunctions::_isOffset( $tz ))
+          $strdate    .= ( 'Z' == $tz ) ? $tz : ' '.$tz;
+        $input['value'] = iCalUtilityFunctions::_strdate2date( $strdate, $parno );
+        unset( $input['value']['unparsedtext'] );
+        if( isset( $input['value']['tz'] )) {
+          if( iCalUtilityFunctions::_isOffset( $input['value']['tz'] )) {
+            $d           = $input['value'];
+            $strdate     = sprintf( '%04d-%02d-%02d %02d:%02d:%02d %s', $d['year'], $d['month'], $d['day'], $d['hour'], $d['min'], $d['sec'], $d['tz'] );
+            $input['value'] = iCalUtilityFunctions::_strdate2date( $strdate, 7 );
+            unset( $input['value']['unparsedtext'], $input['params']['TZID'] );
+          }
+          else {
+            $input['params']['TZID'] = $input['value']['tz'];
+            unset( $input['value']['tz'] );
+          }
+        }
+        elseif( isset( $input['params']['TZID'] ) && iCalUtilityFunctions::_isOffset( $input['params']['TZID'] )) {
+          $d             = $input['value'];
+          $strdate       = sprintf( '%04d-%02d-%02d %02d:%02d:%02d %s', $d['year'], $d['month'], $d['day'], $d['hour'], $d['min'], $d['sec'], $input['params']['TZID'] );
+          $input['value'] = iCalUtilityFunctions::_strdate2date( $strdate, 7 );
+          unset( $input['value']['unparsedtext'], $input['params']['TZID'] );
+        }
+      }
+    } // end else (i.e. using all arguments)
+    if(( 3 == $parno ) || ( isset( $input['params']['VALUE'] ) && ( 'DATE' == $input['params']['VALUE'] ))) {
+      $input['params']['VALUE'] = 'DATE';
+      unset( $input['value']['hour'], $input['value']['min'], $input['value']['sec'], $input['value']['tz'], $input['params']['TZID'] );
+    }
+    elseif( isset( $input['params']['TZID'] )) {
+      if(( 'UTC' == strtoupper( $input['params']['TZID'] )) || ( 'GMT' == strtoupper( $input['params']['TZID'] ))) {
+        $input['value']['tz'] = 'Z';
+        unset( $input['params']['TZID'] );
+      }
+      else
+        unset( $input['value']['tz'] );
+    }
+    elseif( isset( $input['value']['tz'] )) {
+      if(( 'UTC' == strtoupper( $input['value']['tz'] )) || ( 'GMT' == strtoupper( $input['value']['tz'] )))
+        $input['value']['tz'] = 'Z';
+      if( 'Z' != $input['value']['tz'] ) {
+        $input['params']['TZID'] = $input['value']['tz'];
+        unset( $input['value']['tz'] );
+      }
+      else
+        unset( $input['params']['TZID'] );
+    }
+    if( $localtime )
+      unset( $input['value']['tz'], $input['params']['TZID'] );
+    return $input;
+  }
+/**
+ * convert format for input date (UTC) to internal date with parameters
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.24 - 2013-07-01
+ * @param mixed $year
+ * @param mixed $month  optional
+ * @param int   $day    optional
+ * @param int   $hour   optional
+ * @param int   $min    optional
+ * @param int   $sec    optional
+ * @param array $params optional
+ * @return array
+ */
+  public static function _setDate2( $year, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $params=FALSE ) {
+    $input = null;
+    iCalUtilityFunctions::_strDate2arr( $year );
+    if( iCalUtilityFunctions::_isArrayDate( $year )) {
+      $input['value']  = iCalUtilityFunctions::_chkDateArr( $year, 7 );
+      if( isset( $input['value']['year'] ) && ( 100 > $input['value']['year'] ))
+        $input['value']['year'] += 2000;
+      $input['params'] = iCalUtilityFunctions::_setParams( $month, array( 'VALUE' => 'DATE-TIME' ));
+      unset( $input['params']['VALUE']  );
+      if( isset( $input['value']['tz'] ) && iCalUtilityFunctions::_isOffset( $input['value']['tz'] ))
+        $tzid = $input['value']['tz'];
+      elseif( isset( $input['params']['TZID'] ) && iCalUtilityFunctions::_isOffset( $input['params']['TZID'] ))
+        $tzid = $input['params']['TZID'];
+      else
+        $tzid = '';
+      unset( $input['params']['VALUE'], $input['params']['TZID']  );
+      if( !empty( $tzid ) && ( 'Z' != $tzid ) && iCalUtilityFunctions::_isOffset( $tzid )) {
+        $d             = $input['value'];
+        $strdate       = sprintf( '%04d-%02d-%02d %02d:%02d:%02d %s', $d['year'], $d['month'], $d['day'], $d['hour'], $d['min'], $d['sec'], $tzid );
+        $input['value'] = iCalUtilityFunctions::_strdate2date( $strdate, 7 );
+        unset( $input['value']['unparsedtext'] );
+      }
+    }
+    elseif( iCalUtilityFunctions::_isArrayTimestampDate( $year )) {
+      if( isset( $year['tz'] ) && ! iCalUtilityFunctions::_isOffset( $year['tz'] ))
+        $year['tz']    = 'UTC';
+      elseif( isset( $input['params']['TZID'] ) && iCalUtilityFunctions::_isOffset( $input['params']['TZID'] ))
+        $year['tz']    = $input['params']['TZID'];
+      else
+        $year['tz']    = 'UTC';
+      $input['value']  = iCalUtilityFunctions::_timestamp2date( $year, 7 );
+      $input['params'] = iCalUtilityFunctions::_setParams( $month, array( 'VALUE' => 'DATE-TIME' ));
+      unset( $input['params']['VALUE'], $input['params']['TZID']  );
+    }
+    elseif( 8 <= strlen( trim( $year ))) { // ex. 2006-08-03 10:12:18
+      $input['value']  = iCalUtilityFunctions::_strdate2date( $year, 7 );
+      unset( $input['value']['unparsedtext'] );
+      $input['params'] = iCalUtilityFunctions::_setParams( $month, array( 'VALUE' => 'DATE-TIME' ));
+      if(( !isset( $input['value']['tz'] ) || empty( $input['value']['tz'] )) && isset( $input['params']['TZID'] ) && iCalUtilityFunctions::_isOffset( $input['params']['TZID'] )) {
+        $d             = $input['value'];
+        $strdate       = sprintf( '%04d-%02d-%02d %02d:%02d:%02d %s', $d['year'], $d['month'], $d['day'], $d['hour'], $d['min'], $d['sec'], $input['params']['TZID'] );
+        $input['value'] = iCalUtilityFunctions::_strdate2date( $strdate, 7 );
+        unset( $input['value']['unparsedtext'] );
+      }
+      unset( $input['params']['VALUE'], $input['params']['TZID']  );
+    }
+    else {
+      $input['value']  = array( 'year'  => $year
+                              , 'month' => $month
+                              , 'day'   => $day
+                              , 'hour'  => $hour
+                              , 'min'   => $min
+                              , 'sec'   => $sec );
+      if(  isset( $tz )) $input['value']['tz'] = $tz;
+      if(( isset( $tz ) && iCalUtilityFunctions::_isOffset( $tz )) ||
+         ( isset( $input['params']['TZID'] ) && iCalUtilityFunctions::_isOffset( $input['params']['TZID'] ))) {
+          if( !isset( $tz ) && isset( $input['params']['TZID'] ) && iCalUtilityFunctions::_isOffset( $input['params']['TZID'] ))
+            $input['value']['tz'] = $input['params']['TZID'];
+          unset( $input['params']['TZID'] );
+        $strdate        = iCalUtilityFunctions::_date2strdate( $input['value'], 7 );
+        $input['value'] = iCalUtilityFunctions::_strdate2date( $strdate, 7 );
+        unset( $input['value']['unparsedtext'] );
+      }
+      $input['params'] = iCalUtilityFunctions::_setParams( $params, array( 'VALUE' => 'DATE-TIME' ));
+      unset( $input['params']['VALUE']  );
+    }
+    $parno = iCalUtilityFunctions::_existRem( $input['params'], 'VALUE', 'DATE-TIME', 7 ); // remove default
+    if( !isset( $input['value']['hour'] )) $input['value']['hour'] = 0;
+    if( !isset( $input['value']['min'] ))  $input['value']['min']  = 0;
+    if( !isset( $input['value']['sec'] ))  $input['value']['sec']  = 0;
+    $input['value']['tz'] = 'Z';
+    return $input;
+  }
+/**
+ * check index and set (an indexed) content in multiple value array
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.6.12 - 2011-01-03
+ * @param array $valArr
+ * @param mixed $value
+ * @param array $params
+ * @param array $defaults
+ * @param int $index
+ * @return void
+ */
+  public static function _setMval( & $valArr, $value, $params=FALSE, $defaults=FALSE, $index=FALSE ) {
+    if( !is_array( $valArr )) $valArr = array();
+    if( $index )
+      $index = $index - 1;
+    elseif( 0 < count( $valArr )) {
+      $keys  = array_keys( $valArr );
+      $index = end( $keys ) + 1;
+    }
+    else
+      $index = 0;
+    $valArr[$index] = array( 'value' => $value, 'params' => iCalUtilityFunctions::_setParams( $params, $defaults ));
+    ksort( $valArr );
+  }
+/**
+ * set input (formatted) parameters- component property attributes
+ *
+ * default parameters can be set, if missing
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 1.x.x - 2007-05-01
+ * @param array $params
+ * @param array $defaults
+ * @return array
+ */
+  public static function _setParams( $params, $defaults=FALSE ) {
+    if( !is_array( $params))
+      $params = array();
+    $input = array();
+    foreach( $params as $paramKey => $paramValue ) {
+      if( is_array( $paramValue )) {
+        foreach( $paramValue as $pkey => $pValue ) {
+          if(( '"' == substr( $pValue, 0, 1 )) && ( '"' == substr( $pValue, -1 )))
+            $paramValue[$pkey] = substr( $pValue, 1, ( strlen( $pValue ) - 2 ));
+        }
+      }
+      elseif(( '"' == substr( $paramValue, 0, 1 )) && ( '"' == substr( $paramValue, -1 )))
+        $paramValue = substr( $paramValue, 1, ( strlen( $paramValue ) - 2 ));
+      if( 'VALUE' == strtoupper( $paramKey ))
+        $input['VALUE']                 = strtoupper( $paramValue );
+      else
+        $input[strtoupper( $paramKey )] = $paramValue;
+    }
+    if( is_array( $defaults )) {
+      foreach( $defaults as $paramKey => $paramValue ) {
+        if( !isset( $input[$paramKey] ))
+          $input[$paramKey] = $paramValue;
+      }
+    }
+    return (0 < count( $input )) ? $input : null;
+  }
+/**
+ * break lines at pos 75
+ *
+ * Lines of text SHOULD NOT be longer than 75 octets, excluding the line
+ * break. Long content lines SHOULD be split into a multiple line
+ * representations using a line "folding" technique. That is, a long
+ * line can be split between any two characters by inserting a CRLF
+ * immediately followed by a single linear white space character (i.e.,
+ * SPACE, US-ASCII decimal 32 or HTAB, US-ASCII decimal 9). Any sequence
+ * of CRLF followed immediately by a single linear white space character
+ * is ignored (i.e., removed) when processing the content type.
+ *
+ * Edited 2007-08-26 by Anders Litzell, anders@litzell.se to fix bug where
+ * the reserved expression "\n" in the arg $string could be broken up by the
+ * folding of lines, causing ambiguity in the return string.
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.2 - 2012-12-18
+ * @param string $value
+ * @return string
+ */
+  public static function _size75( $string, $nl ) {
+    $tmp             = $string;
+    $string          = '';
+    $cCnt = $x       = 0;
+    while( TRUE ) {
+      if( !isset( $tmp[$x] )) {
+        $string     .= $nl;                           // loop breakes here
+        break;
+      }
+      elseif(( 74   <= $cCnt ) && ( '\\'  == $tmp[$x] ) && ( 'n' == $tmp[$x+1] )) {
+        $string     .= $nl.' \n';                     // don't break lines inside '\n'
+        $x          += 2;
+        if( !isset( $tmp[$x] )) {
+          $string   .= $nl;
+          break;
+        }
+        $cCnt        = 3;
+      }
+      elseif( 75    <= $cCnt ) {
+        $string     .= $nl.' ';
+        $cCnt        = 1;
+      }
+      $byte          = ord( $tmp[$x] );
+      $string       .= $tmp[$x];
+      switch( TRUE ) { // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+        case(( $byte >= 0x20 ) && ( $byte <= 0x7F )): // characters U-00000000 - U-0000007F (same as ASCII)
+          $cCnt     += 1;
+          break;                                      // add a one byte character
+        case(( $byte & 0xE0) == 0xC0 ):               // characters U-00000080 - U-000007FF, mask 110XXXXX
+          if( isset( $tmp[$x+1] )) {
+            $cCnt   += 1;
+            $string  .= $tmp[$x+1];
+            $x       += 1;                            // add a two bytes character
+          }
+          break;
+        case(( $byte & 0xF0 ) == 0xE0 ):              // characters U-00000800 - U-0000FFFF, mask 1110XXXX
+          if( isset( $tmp[$x+2] )) {
+            $cCnt   += 1;
+            $string .= $tmp[$x+1].$tmp[$x+2];
+            $x      += 2;                             // add a three bytes character
+          }
+          break;
+        case(( $byte & 0xF8 ) == 0xF0 ):              // characters U-00010000 - U-001FFFFF, mask 11110XXX
+          if( isset( $tmp[$x+3] )) {
+            $cCnt   += 1;
+            $string .= $tmp[$x+1].$tmp[$x+2].$tmp[$x+3];
+            $x      += 3;                             // add a four bytes character
+          }
+          break;
+        case(( $byte & 0xFC ) == 0xF8 ):              // characters U-00200000 - U-03FFFFFF, mask 111110XX
+          if( isset( $tmp[$x+4] )) {
+            $cCnt   += 1;
+            $string .= $tmp[$x+1].$tmp[$x+2].$tmp[$x+3].$tmp[$x+4];
+            $x      += 4;                             // add a five bytes character
+          }
+          break;
+        case(( $byte & 0xFE ) == 0xFC ):              // characters U-04000000 - U-7FFFFFFF, mask 1111110X
+          if( isset( $tmp[$x+5] )) {
+            $cCnt   += 1;
+            $string .= $tmp[$x+1].$tmp[$x+2].$tmp[$x+3].$tmp[$x+4].$tmp[$x+5];
+            $x      += 5;                             // add a six bytes character
+          }
+        default:                                      // add any other byte without counting up $cCnt
+          break;
+      } // end switch( TRUE )
+      $x         += 1;                                // next 'byte' to test
+    } // end while( TRUE ) {
+    return $string;
+  }
+/**
+ * sort callback functions for exdate
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.11 - 2013-01-12
+ * @param array $a
+ * @param array $b
+ * @return int
+ */
+  public static function _sortExdate1( $a, $b ) {
+    $as  = sprintf( '%04d%02d%02d', $a['year'], $a['month'], $a['day'] );
+    $as .= ( isset( $a['hour'] )) ? sprintf( '%02d%02d%02d', $a['hour'], $a['min'], $a['sec'] ) : '';
+    $bs  = sprintf( '%04d%02d%02d', $b['year'], $b['month'], $b['day'] );
+    $bs .= ( isset( $b['hour'] )) ? sprintf( '%02d%02d%02d', $b['hour'], $b['min'], $b['sec'] ) : '';
+    return strcmp( $as, $bs );
+  }
+  public static function _sortExdate2( $a, $b ) {
+    $val = reset( $a['value'] );
+    $as  = sprintf( '%04d%02d%02d', $val['year'], $val['month'], $val['day'] );
+    $as .= ( isset( $val['hour'] )) ? sprintf( '%02d%02d%02d', $val['hour'], $val['min'], $val['sec'] ) : '';
+    $val = reset( $b['value'] );
+    $bs  = sprintf( '%04d%02d%02d', $val['year'], $val['month'], $val['day'] );
+    $bs .= ( isset( $val['hour'] )) ? sprintf( '%02d%02d%02d', $val['hour'], $val['min'], $val['sec'] ) : '';
+    return strcmp( $as, $bs );
+  }
+/**
+ * sort callback functions for rdate
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.27 - 2013-07-05
+ * @param array $a
+ * @param array $b
+ * @return int
+ */
+  public static function _sortRdate1( $a, $b ) {
+    $val = isset( $a['year'] ) ? $a : $a[0];
+    $as  = sprintf( '%04d%02d%02d', $val['year'], $val['month'], $val['day'] );
+    $as .= ( isset( $val['hour'] )) ? sprintf( '%02d%02d%02d', $val['hour'], $val['min'], $val['sec'] ) : '';
+    $val = isset( $b['year'] ) ? $b : $b[0];
+    $bs  = sprintf( '%04d%02d%02d', $val['year'], $val['month'], $val['day'] );
+    $bs .= ( isset( $val['hour'] )) ? sprintf( '%02d%02d%02d', $val['hour'], $val['min'], $val['sec'] ) : '';
+    return strcmp( $as, $bs );
+  }
+  public static function _sortRdate2( $a, $b ) {
+    $val   = isset( $a['value'][0]['year'] ) ? $a['value'][0] : $a['value'][0][0];
+    if( empty( $val ))
+      $as  = '';
+    else {
+      $as  = sprintf( '%04d%02d%02d', $val['year'], $val['month'], $val['day'] );
+      $as .= ( isset( $val['hour'] )) ? sprintf( '%02d%02d%02d', $val['hour'], $val['min'], $val['sec'] ) : '';
+    }
+    $val   = isset( $b['value'][0]['year'] ) ? $b['value'][0] : $b['value'][0][0];
+    if( empty( $val ))
+      $bs  = '';
+    else {
+      $bs  = sprintf( '%04d%02d%02d', $val['year'], $val['month'], $val['day'] );
+      $bs .= ( isset( $val['hour'] )) ? sprintf( '%02d%02d%02d', $val['hour'], $val['min'], $val['sec'] ) : '';
+    }
+    return strcmp( $as, $bs );
+  }
+/**
+ * step date, return updated date, array and timpstamp
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.14.1 - 2012-09-24
+ * @param array $date, date to step
+ * @param int   $timestamp
+ * @param array $step, default array( 'day' => 1 )
+ * @return void
+ */
+  public static function _stepdate( &$date, &$timestamp, $step=array( 'day' => 1 )) {
+    if( !isset( $date['hour'] )) $date['hour'] = 0;
+    if( !isset( $date['min'] ))  $date['min']  = 0;
+    if( !isset( $date['sec'] ))  $date['sec']  = 0;
+    foreach( $step as $stepix => $stepvalue )
+      $date[$stepix] += $stepvalue;
+    $timestamp  = mktime( $date['hour'], $date['min'], $date['sec'], $date['month'], $date['day'], $date['year'] );
+    $d          = date( 'Y-m-d-H-i-s', $timestamp);
+    $d          = explode( '-', $d );
+    $date       = array( 'year' => $d[0], 'month' => $d[1], 'day' => $d[2], 'hour' => $d[3], 'min' => $d[4], 'sec' => $d[5] );
+    foreach( $date as $k => $v )
+      $date[$k] = (int) $v;
+  }
+/**
+ * convert a date from specific string to array format
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.11.8 - 2012-01-27
+ * @param mixed $input
+ * @return bool, TRUE on success
+ */
+  public static function _strDate2arr( & $input ) {
+    if( is_array( $input ))
+      return FALSE;
+    if( 5 > strlen( (string) $input ))
+      return FALSE;
+    $work = $input;
+    if( 2 == substr_count( $work, '-' ))
+      $work = str_replace( '-', '', $work );
+    if( 2 == substr_count( $work, '/' ))
+      $work = str_replace( '/', '', $work );
+    if( !ctype_digit( substr( $work, 0, 8 )))
+      return FALSE;
+    $temp = array( 'year'  => (int) substr( $work,  0, 4 )
+                 , 'month' => (int) substr( $work,  4, 2 )
+                 , 'day'   => (int) substr( $work,  6, 2 ));
+    if( !checkdate( $temp['month'], $temp['day'], $temp['year'] ))
+      return FALSE;
+    if( 8 == strlen( $work )) {
+      $input = $temp;
+      return TRUE;
+    }
+    if(( ' ' == substr( $work, 8, 1 )) || ( 'T' == substr( $work, 8, 1 )) || ( 't' == substr( $work, 8, 1 )))
+      $work =  substr( $work, 9 );
+    elseif( ctype_digit( substr( $work, 8, 1 )))
+      $work = substr( $work, 8 );
+    else
+     return FALSE;
+    if( 2 == substr_count( $work, ':' ))
+      $work = str_replace( ':', '', $work );
+    if( !ctype_digit( substr( $work, 0, 4 )))
+      return FALSE;
+    $temp['hour']  = substr( $work, 0, 2 );
+    $temp['min']   = substr( $work, 2, 2 );
+    if((( 0 > $temp['hour'] ) || ( $temp['hour'] > 23 )) ||
+       (( 0 > $temp['min'] )  || ( $temp['min']  > 59 )))
+      return FALSE;
+    if( ctype_digit( substr( $work, 4, 2 ))) {
+      $temp['sec'] = substr( $work, 4, 2 );
+      if((  0 > $temp['sec'] ) || ( $temp['sec']  > 59 ))
+        return FALSE;
+      $len = 6;
+    }
+    else {
+      $temp['sec'] = 0;
+      $len = 4;
+    }
+    if( $len < strlen( $work))
+      $temp['tz'] = trim( substr( $work, 6 ));
+    $input = $temp;
+    return TRUE;
+  }
+/**
+ * ensures internal date-time/date format for input date-time/date in string fromat
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.24 - 2013-06-26
+ * Modified to also return original string value by Yitzchok Lavi <icalcreator@onebigsystem.com>
+ * @param array $datetime
+ * @param int   $parno optional, default FALSE
+ * @param moxed $wtz optional, default null
+ * @return array
+ */
+  public static function _date_time_string( $datetime, $parno=FALSE ) {
+    return iCalUtilityFunctions::_strdate2date( $datetime, $parno, null );
+  }
+  public static function _strdate2date( $datetime, $parno=FALSE, $wtz=null ) {
+    // save original input string to return it later
+    $unparseddatetime = $datetime;
+    $datetime   = (string) trim( $datetime );
+    $tz         = null;
+    $offset     = 0;
+    $tzSts      = FALSE;
+    $len        = strlen( $datetime );
+    if( 'Z' == substr( $datetime, -1 )) {
+      $tz       = 'Z';
+      $datetime = trim( substr( $datetime, 0, ( $len - 1 )));
+      $tzSts    = TRUE;
+    }
+    if( iCalUtilityFunctions::_isOffset( substr( $datetime, -5, 5 ))) { // [+/-]NNNN offset
+      $tz       = substr( $datetime, -5, 5 );
+      $datetime = trim( substr( $datetime, 0, ($len - 5)));
+    }
+    elseif( iCalUtilityFunctions::_isOffset( substr( $datetime, -7, 7 ))) { // [+/-]NNNNNN offset
+      $tz       = substr( $datetime, -7, 7 );
+      $datetime = trim( substr( $datetime, 0, ($len - 7)));
+    }
+    elseif( empty( $wtz ) && ctype_digit( substr( $datetime, 0, 4 )) && ctype_digit( substr( $datetime, -2, 2 )) && iCalUtilityFunctions::_strDate2arr( $datetime )) {
+      $output = $datetime;
+      if( !empty( $tz ))
+        $output['tz'] = 'Z';
+      $output['unparsedtext'] = $unparseddatetime;
+      return $output;
+    }
+    else {
+      $cx  = $tx = 0;    //  find any trailing timezone or offset
+      $len = strlen( $datetime );
+      for( $cx = -1; $cx > ( 9 - $len ); $cx-- ) {
+        $char = substr( $datetime, $cx, 1 );
+        if(( ' ' == $char ) || ctype_digit( $char ))
+          break; // if exists, tz ends here.. . ?
+        else
+           $tx--; // tz length counter
+      }
+      if( 0 > $tx ) { // if any
+        $tz     = substr( $datetime, $tx );
+        $datetime = trim( substr( $datetime, 0, $len + $tx ));
+      }
+      if(( ctype_digit( substr( $datetime, 0, 8 )) && ( 'T' ==  substr( $datetime, 8, 1 )) && ctype_digit( substr( $datetime, -6, 6 ))) ||
+         ( ctype_digit( substr( $datetime, 0, 14 ))))
+        $tzSts  = TRUE;
+    }
+    if( empty( $tz ) && !empty( $wtz ))
+      $tz       = $wtz;
+    if( 3 == $parno )
+      $tz       = null;
+    if( !empty( $tz )) { // tz set
+      if(( 'Z' != $tz ) && ( iCalUtilityFunctions::_isOffset( $tz ))) {
+        $offset = (string) iCalUtilityFunctions::_tz2offset( $tz ) * -1;
+        $tz     = 'UTC';
+        $tzSts  = TRUE;
+      }
+      elseif( !empty( $wtz ))
+        $tzSts  = TRUE;
+      $tz       = trim( $tz );
+      if(( 'Z' == $tz ) || ( 'GMT' == strtoupper( $tz )))
+        $tz     = 'UTC';
+      if( 0 < substr_count( $datetime, '-' ))
+        $datetime = str_replace( '-', '/', $datetime );
+      try {
+        $d        = new DateTime( $datetime, new DateTimeZone( $tz ));
+        if( 0  != $offset )  // adjust for offset
+          $d->modify( $offset.' seconds' );
+        $datestring = $d->format( 'Y-m-d-H-i-s' );
+        unset( $d );
+      }
+      catch( Exception $e ) {
+        $datestring = date( 'Y-m-d-H-i-s', strtotime( $datetime ));
+      }
+    } // end if( !empty( $tz ))
+    else
+      $datestring = date( 'Y-m-d-H-i-s', strtotime( $datetime ));
+    if( 'UTC' == $tz )
+      $tz         = 'Z';
+    $d            = explode( '-', $datestring );
+    $output       = array( 'year' => $d[0], 'month' => $d[1], 'day' => $d[2] );
+    if( !$parno || ( 3 != $parno )) { // parno is set to 6 or 7
+      $output['hour'] = $d[3];
+      $output['min']  = $d[4];
+      $output['sec']  = $d[5];
+      if(( $tzSts || ( 7 == $parno )) && !empty( $tz ))
+        $output['tz'] = $tz;
+    }
+    // return original string in the array in case strtotime failed to make sense of it
+    $output['unparsedtext'] = $unparseddatetime;
+    return $output;
+  }
+/********************************************************************************/
+/**
+ * special characters management output
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.2 - 2012-12-18
+ * @param string $string
+ * @param string $format
+ * @param string $nl
+ * @return string
+ */
+  public static function _strrep( $string, $format, $nl ) {
+    switch( $format ) {
+      case 'xcal':
+        $string = str_replace( '\n',  $nl, $string);
+        $string = htmlspecialchars( strip_tags( stripslashes( urldecode ( $string ))));
+        break;
+      default:
+        $pos = 0;
+        $specChars = array( 'n', 'N', 'r', ',', ';' );
+        while( isset( $string[$pos] )) {
+          if( FALSE === ( $pos = strpos( $string, "\\", $pos )))
+            break;
+          if( !in_array( substr( $string, $pos, 1 ), $specChars )) {
+            $string = substr( $string, 0, $pos )."\\".substr( $string, ( $pos + 1 ));
+            $pos += 1;
+          }
+          $pos += 1;
+        }
+        if( FALSE !== strpos( $string, '"' ))
+          $string = str_replace('"',   "'",       $string);
+        if( FALSE !== strpos( $string, ',' ))
+          $string = str_replace(',',   '\,',      $string);
+        if( FALSE !== strpos( $string, ';' ))
+          $string = str_replace(';',   '\;',      $string);
+        if( FALSE !== strpos( $string, "\r\n" ))
+          $string = str_replace( "\r\n", '\n',    $string);
+        elseif( FALSE !== strpos( $string, "\r" ))
+          $string = str_replace( "\r", '\n',      $string);
+        elseif( FALSE !== strpos( $string, "\n" ))
+          $string = str_replace( "\n", '\n',      $string);
+        if( FALSE !== strpos( $string, '\N' ))
+          $string = str_replace( '\N', '\n',      $string);
+//        if( FALSE !== strpos( $string, $nl ))
+          $string = str_replace( $nl, '\n', $string);
+        break;
+    }
+    return $string;
+  }
+/**
+ * special characters management input (from iCal file)
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.2 - 2012-12-18
+ * @param string $string
+ * @return string
+ */
+  public static function _strunrep( $string ) {
+    $string = str_replace( '\\\\', '\\',     $string);
+    $string = str_replace( '\,',   ',',      $string);
+    $string = str_replace( '\;',   ';',      $string);
+//    $string = str_replace( '\n',  $nl, $string); // ??
+    return $string;
+  }
+/**
+ * convert timestamp to date array, default UTC or adjusted for offset/timezone
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.15.1 - 2012-10-17
+ * @param mixed   $timestamp
+ * @param int     $parno
+ * @param string  $wtz
+ * @return array
+ */
+  public static function _timestamp2date( $timestamp, $parno=6, $wtz=null ) {
+    if( is_array( $timestamp )) {
+      $tz        = ( isset( $timestamp['tz'] )) ? $timestamp['tz'] : $wtz;
+      $timestamp = $timestamp['timestamp'];
+    }
+    $tz          = ( isset( $tz )) ? $tz : $wtz;
+    $offset      = 0;
+    if( empty( $tz ) || ( 'Z' == $tz ) || ( 'GMT' == strtoupper( $tz )))
+      $tz        = 'UTC';
+    elseif( iCalUtilityFunctions::_isOffset( $tz )) {
+      $offset    = iCalUtilityFunctions::_tz2offset( $tz );
+//      $tz        = 'UTC';
+    }
+    try {
+      $d         = new DateTime( "@$timestamp" );  // set UTC date
+      if(  0 != $offset )                          // adjust for offset
+        $d->modify( $offset.' seconds' );
+      elseif( 'UTC' != $tz )
+        $d->setTimezone( new DateTimeZone( $tz )); // convert to local date
+      $date      = $d->format( 'Y-m-d-H-i-s' );
+      unset( $d );
+    }
+    catch( Exception $e ) {
+      $date      = date( 'Y-m-d-H-i-s', $timestamp );
+    }
+    $date        = explode( '-', $date );
+    $output      = array( 'year' => $date[0], 'month' => $date[1], 'day' => $date[2] );
+    if( 3 != $parno ) {
+      $output['hour'] = $date[3];
+      $output['min']  = $date[4];
+      $output['sec']  = $date[5];
+      if(( 'UTC' == $tz ) || ( 0 == $offset ))
+        $output['tz'] = 'Z';
+    }
+    return $output;
+  }
+/**
+ * convert timestamp (seconds) to duration in array format
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.6.23 - 2010-10-23
+ * @param int $timestamp
+ * @return array, duration format
+ */
+  public static function _timestamp2duration( $timestamp ) {
+    $dur         = array();
+    $dur['week'] = (int) floor( $timestamp / ( 7 * 24 * 60 * 60 ));
+    $timestamp   =              $timestamp % ( 7 * 24 * 60 * 60 );
+    $dur['day']  = (int) floor( $timestamp / ( 24 * 60 * 60 ));
+    $timestamp   =              $timestamp % ( 24 * 60 * 60 );
+    $dur['hour'] = (int) floor( $timestamp / ( 60 * 60 ));
+    $timestamp   =              $timestamp % ( 60 * 60 );
+    $dur['min']  = (int) floor( $timestamp / ( 60 ));
+    $dur['sec']  = (int)        $timestamp % ( 60 );
+    return $dur;
+  }
+/**
+ * transforms a dateTime from a timezone to another using PHP DateTime and DateTimeZone class (PHP >= PHP 5.2.0)
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.15.1 - 2012-10-17
+ * @param mixed  $date,   date to alter
+ * @param string $tzFrom, PHP valid 'from' timezone
+ * @param string $tzTo,   PHP valid 'to' timezone, default 'UTC'
+ * @param string $format, date output format, default 'Ymd\THis'
+ * @return bool
+ */
+  public static function transformDateTime( & $date, $tzFrom, $tzTo='UTC', $format = 'Ymd\THis' ) {
+    if( is_array( $date ) && isset( $date['timestamp'] )) {
+      try {
+        $d = new DateTime( "@{$date['timestamp']}" ); // set UTC date
+        $d->setTimezone(new DateTimeZone( $tzFrom )); // convert to 'from' date
+      }
+      catch( Exception $e ) { return FALSE; }
+    }
+    else {
+      if( iCalUtilityFunctions::_isArrayDate( $date )) {
+        if( isset( $date['tz'] ))
+          unset( $date['tz'] );
+        $date  = iCalUtilityFunctions::_date2strdate( iCalUtilityFunctions::_chkDateArr( $date ));
+      }
+      if( 'Z' == substr( $date, -1 ))
+        $date = substr( $date, 0, ( strlen( $date ) - 2 ));
+      try { $d = new DateTime( $date, new DateTimeZone( $tzFrom )); }
+      catch( Exception $e ) { return FALSE; }
+    }
+    try { $d->setTimezone( new DateTimeZone( $tzTo )); }
+    catch( Exception $e ) { return FALSE; }
+    $date = $d->format( $format );
+    return TRUE;
+  }
+/**
+ * convert offset, [+/-]HHmm[ss], to seconds, used when correcting UTC to localtime or v.v.
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.11.4 - 2012-01-11
+ * @param string $offset
+ * @return integer
+ */
+  public static function _tz2offset( $tz ) {
+    $tz           = trim( (string) $tz );
+    $offset       = 0;
+    if(((     5  != strlen( $tz ))       && ( 7  != strlen( $tz ))) ||
+       ((    '+' != substr( $tz, 0, 1 )) && ( '-' != substr( $tz, 0, 1 ))) ||
+       (( '0000' >= substr( $tz, 1, 4 )) && ( '9999' < substr( $tz, 1, 4 ))) ||
+           (( 7  == strlen( $tz ))       && ( '00' > substr( $tz, 5, 2 )) && ( '99' < substr( $tz, 5, 2 ))))
+      return $offset;
+    $hours2sec    = (int) substr( $tz, 1, 2 ) * 3600;
+    $min2sec      = (int) substr( $tz, 3, 2 ) *   60;
+    $sec          = ( 7  == strlen( $tz )) ? (int) substr( $tz, -2 ) : '00';
+    $offset       = $hours2sec + $min2sec + $sec;
+    $offset       = ('-' == substr( $tz, 0, 1 )) ? $offset * -1 : $offset;
+    return $offset;
+  }
+}
+/*********************************************************************************/
+/*          iCalcreator vCard helper functions                                   */
+/*********************************************************************************/
+/**
+ * convert single ATTENDEE, CONTACT or ORGANIZER (in email format) to vCard
+ * returns vCard/TRUE or if directory (if set) or file write is unvalid, FALSE
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.12.2 - 2012-07-11
+ * @param object $email
+ * $param string $version, vCard version (default 2.1)
+ * $param string $directory, where to save vCards (default FALSE)
+ * $param string $ext, vCard file extension (default 'vcf')
+ * @return mixed
+ */
+function iCal2vCard( $email, $version='2.1', $directory=FALSE, $ext='vcf' ) {
+  if( FALSE === ( $pos = strpos( $email, '@' )))
+    return FALSE;
+  if( $directory ) {
+    if( DIRECTORY_SEPARATOR != substr( $directory, ( 0 - strlen( DIRECTORY_SEPARATOR ))))
+      $directory .= DIRECTORY_SEPARATOR;
+    if( !is_dir( $directory ) || !is_writable( $directory ))
+      return FALSE;
+  }
+            /* prepare vCard */
+  $email  = str_replace( 'MAILTO:', '', $email );
+  $name   = $person = substr( $email, 0, $pos );
+  if( ctype_upper( $name ) || ctype_lower( $name ))
+    $name = array( $name );
+  else {
+    if( FALSE !== ( $pos = strpos( $name, '.' ))) {
+      $name = explode( '.', $name );
+      foreach( $name as $k => $part )
+        $name[$k] = ucfirst( $part );
+    }
+    else { // split camelCase
+      $chars = $name;
+      $name  = array( $chars[0] );
+      $k     = 0;
+      $x     = 1;
+      while( FALSE !== ( $char = substr( $chars, $x, 1 ))) {
+        if( ctype_upper( $char )) {
+          $k += 1;
+          $name[$k] = '';
+        }
+        $name[$k]  .= $char;
+        $x++;
+      }
+    }
+  }
+  $nl     = "\r\n";
+  $FN     = 'FN:'.implode( ' ', $name ).$nl;
+  $name   = array_reverse( $name );
+  $N      = 'N:'.array_shift( $name );
+  $scCnt  = 0;
+  while( NULL != ( $part = array_shift( $name ))) {
+    if(( '4.0' != $version ) || ( 4 > $scCnt ))
+      $scCnt += 1;
+    $N   .= ';'.$part;
+  }
+  while(( '4.0' == $version ) && ( 4 > $scCnt )) {
+    $N   .= ';';
+    $scCnt += 1;
+  }
+  $N     .= $nl;
+  $EMAIL  = 'EMAIL:'.$email.$nl;
+           /* create vCard */
+  $vCard  = 'BEGIN:VCARD'.$nl;
+  $vCard .= "VERSION:$version$nl";
+  $vCard .= 'PRODID:-//kigkonsult.se '.ICALCREATOR_VERSION."//$nl";
+  $vCard .= $N;
+  $vCard .= $FN;
+  $vCard .= $EMAIL;
+  $vCard .= 'REV:'.gmdate( 'Ymd\THis\Z' ).$nl;
+  $vCard .= 'END:VCARD'.$nl;
+            /* save each vCard as (unique) single file */
+  if( $directory ) {
+    $fname = $directory.preg_replace( '/[^a-z0-9.]/i', '', $email );
+    $cnt   = 1;
+    $dbl   = '';
+    while( is_file ( $fname.$dbl.'.'.$ext )) {
+      $cnt += 1;
+      $dbl = "_$cnt";
+    }
+    if( FALSE === file_put_contents( $fname, $fname.$dbl.'.'.$ext ))
+      return FALSE;
+    return TRUE;
+  }
+            /* return vCard */
+  else
+    return $vCard;
+}
+/**
+ * convert ATTENDEEs, CONTACTs and ORGANIZERs (in email format) to vCards
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.12.2 - 2012-05-07
+ * @param object $calendar, iCalcreator vcalendar instance reference
+ * $param string $version, vCard version (default 2.1)
+ * $param string $directory, where to save vCards (default FALSE)
+ * $param string $ext, vCard file extension (default 'vcf')
+ * @return mixed
+ */
+function iCal2vCards( & $calendar, $version='2.1', $directory=FALSE, $ext='vcf' ) {
+  $hits   = array();
+  $vCardP = array( 'ATTENDEE', 'CONTACT', 'ORGANIZER' );
+  foreach( $vCardP as $prop ) {
+    $hits2 = $calendar->getProperty( $prop );
+    foreach( $hits2 as $propValue => $occCnt ) {
+      if( FALSE === ( $pos = strpos( $propValue, '@' )))
+        continue;
+      $propValue = str_replace( 'MAILTO:', '', $propValue );
+      if( isset( $hits[$propValue] ))
+        $hits[$propValue] += $occCnt;
+      else
+        $hits[$propValue]  = $occCnt;
+    }
+  }
+  if( empty( $hits ))
+    return FALSE;
+  ksort( $hits );
+  $output   = '';
+  foreach( $hits as $email => $skip ) {
+    $res = iCal2vCard( $email, $version, $directory, $ext );
+    if( $directory && !$res )
+      return FALSE;
+    elseif( !$res )
+      return $res;
+    else
+      $output .= $res;
+  }
+  if( $directory )
+    return TRUE;
+  if( !empty( $output ))
+    return $output;
+  return FALSE;
+}
+/*********************************************************************************/
+/*          iCalcreator XML (rfc6321) helper functions                           */
+/*********************************************************************************/
+/**
+ * format iCal XML output, rfc6321, using PHP SimpleXMLElement
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.22 - 2013-06-27
+ * @param object $calendar, iCalcreator vcalendar instance reference
+ * @return string
+ */
+function iCal2XML( & $calendar ) {
+            /** fix an SimpleXMLElement instance and create root element */
+  $xmlstr       = '<?xml version="1.0" encoding="utf-8"?><icalendar xmlns="urn:ietf:params:xml:ns:icalendar-2.0">';
+  $xmlstr      .= '<!-- created '.date( 'Ymd\THis\Z', time());
+  $xmlstr      .= ' utilizing kigkonsult.se '.ICALCREATOR_VERSION.' iCal2XMl (rfc6321) -->';
+  $xmlstr      .= '</icalendar>';
+  $xml          = new SimpleXMLElement( $xmlstr );
+  $vcalendar    = $xml->addChild( 'vcalendar' );
+            /** fix calendar properties */
+  $properties   = $vcalendar->addChild( 'properties' );
+  $calProps     = array( 'version', 'prodid', 'calscale', 'method' );
+  foreach( $calProps as $calProp ) {
+    if( FALSE !== ( $content = $calendar->getProperty( $calProp )))
+      _addXMLchild( $properties, $calProp, 'text', $content );
+  }
+  while( FALSE !== ( $content = $calendar->getProperty( FALSE, FALSE, TRUE )))
+    _addXMLchild( $properties, $content[0], 'unknown', $content[1]['value'], $content[1]['params'] );
+  $langCal = $calendar->getConfig( 'language' );
+            /** prepare to fix components with properties */
+  $components   = $vcalendar->addChild( 'components' );
+            /** fix component properties */
+  while( FALSE !== ( $component = $calendar->getComponent())) {
+    $compName   = $component->objName;
+    $child      = $components->addChild( $compName );
+    $properties = $child->addChild( 'properties' );
+    $langComp   = $component->getConfig( 'language' );
+    $props      = $component->getConfig( 'setPropertyNames' );
+    foreach( $props as $prop ) {
+      switch( strtolower( $prop )) {
+        case 'attach':          // may occur multiple times, below
+          while( FALSE !== ( $content = $component->getProperty( $prop, FALSE, TRUE ))) {
+            $type = ( isset( $content['params']['VALUE'] ) && ( 'BINARY' == $content['params']['VALUE'] )) ? 'binary' : 'uri';
+            unset( $content['params']['VALUE'] );
+            _addXMLchild( $properties, $prop, $type, $content['value'], $content['params'] );
+          }
+          break;
+        case 'attendee':
+          while( FALSE !== ( $content = $component->getProperty( $prop, FALSE, TRUE ))) {
+            if( isset( $content['params']['CN'] ) && !isset( $content['params']['LANGUAGE'] )) {
+              if( $langComp )
+                $content['params']['LANGUAGE'] = $langComp;
+              elseif( $langCal )
+                $content['params']['LANGUAGE'] = $langCal;
+            }
+            _addXMLchild( $properties, $prop, 'cal-address', $content['value'], $content['params'] );
+          }
+          break;
+        case 'exdate':
+          while( FALSE !== ( $content = $component->getProperty( $prop, FALSE, TRUE ))) {
+            $type = ( isset( $content['params']['VALUE'] ) && ( 'DATE' == $content['params']['VALUE'] )) ? 'date' : 'date-time';
+            unset( $content['params']['VALUE'] );
+            _addXMLchild( $properties, $prop, $type, $content['value'], $content['params'] );
+          }
+          break;
+        case 'freebusy':
+          while( FALSE !== ( $content = $component->getProperty( $prop, FALSE, TRUE ))) {
+            if( is_array( $content ) && isset( $content['value']['fbtype'] )) {
+              $content['params']['FBTYPE'] = $content['value']['fbtype'];
+              unset( $content['value']['fbtype'] );
+            }
+            _addXMLchild( $properties, $prop, 'period', $content['value'], $content['params'] );
+          }
+          break;
+        case 'request-status':
+          while( FALSE !== ( $content = $component->getProperty( $prop, FALSE, TRUE ))) {
+            if( !isset( $content['params']['LANGUAGE'] )) {
+              if( $langComp )
+                $content['params']['LANGUAGE'] = $langComp;
+              elseif( $langCal )
+                $content['params']['LANGUAGE'] = $langCal;
+            }
+            _addXMLchild( $properties, $prop, 'rstatus', $content['value'], $content['params'] );
+          }
+          break;
+        case 'rdate':
+          while( FALSE !== ( $content = $component->getProperty( $prop, FALSE, TRUE ))) {
+            $type = 'date-time';
+            if( isset( $content['params']['VALUE'] )) {
+              if( 'DATE' == $content['params']['VALUE'] )
+                $type = 'date';
+              elseif( 'PERIOD' == $content['params']['VALUE'] )
+                $type = 'period';
+            }
+            unset( $content['params']['VALUE'] );
+            _addXMLchild( $properties, $prop, $type, $content['value'], $content['params'] );
+          }
+          break;
+        case 'categories':
+        case 'comment':
+        case 'contact':
+        case 'description':
+        case 'related-to':
+        case 'resources':
+          while( FALSE !== ( $content = $component->getProperty( $prop, FALSE, TRUE ))) {
+            if(( 'related-to' != $prop ) && !isset( $content['params']['LANGUAGE'] )) {
+              if( $langComp )
+                $content['params']['LANGUAGE'] = $langComp;
+              elseif( $langCal )
+                $content['params']['LANGUAGE'] = $langCal;
+            }
+            _addXMLchild( $properties, $prop, 'text', $content['value'], $content['params'] );
+          }
+          break;
+        case 'x-prop':
+          while( FALSE !== ( $content = $component->getProperty( $prop, FALSE, TRUE )))
+            _addXMLchild( $properties, $content[0], 'unknown', $content[1]['value'], $content[1]['params'] );
+          break;
+        case 'created':         // single occurence below, if set
+        case 'completed':
+        case 'dtstamp':
+        case 'last-modified':
+          $utcDate = TRUE;
+        case 'dtstart':
+        case 'dtend':
+        case 'due':
+        case 'recurrence-id':
+          if( FALSE !== ( $content = $component->getProperty( $prop, FALSE, TRUE ))) {
+            $type = ( isset( $content['params']['VALUE'] ) && ( 'DATE' == $content['params']['VALUE'] )) ? 'date' : 'date-time';
+            unset( $content['params']['VALUE'] );
+            if(( isset( $content['params']['TZID'] ) && empty( $content['params']['TZID'] )) || @is_null( $content['params']['TZID'] ))
+              unset( $content['params']['TZID'] );
+            _addXMLchild( $properties, $prop, $type, $content['value'], $content['params'] );
+          }
+          unset( $utcDate );
+          break;
+        case 'duration':
+          if( FALSE !== ( $content = $component->getProperty( $prop, FALSE, TRUE )))
+            _addXMLchild( $properties, $prop, 'duration', $content['value'], $content['params'] );
+          break;
+        case 'exrule':
+        case 'rrule':
+          while( FALSE !== ( $content = $component->getProperty( $prop, FALSE, TRUE )))
+            _addXMLchild( $properties, $prop, 'recur', $content['value'], $content['params'] );
+          break;
+        case 'class':
+        case 'location':
+        case 'status':
+        case 'summary':
+        case 'transp':
+        case 'tzid':
+        case 'uid':
+          if( FALSE !== ( $content = $component->getProperty( $prop, FALSE, TRUE ))) {
+            if((( 'location' == $prop ) || ( 'summary' == $prop )) && !isset( $content['params']['LANGUAGE'] )) {
+              if( $langComp )
+                $content['params']['LANGUAGE'] = $langComp;
+              elseif( $langCal )
+                $content['params']['LANGUAGE'] = $langCal;
+            }
+            _addXMLchild( $properties, $prop, 'text', $content['value'], $content['params'] );
+          }
+          break;
+        case 'geo':
+          if( FALSE !== ( $content = $component->getProperty( $prop, FALSE, TRUE )))
+            _addXMLchild( $properties, $prop, 'geo', $content['value'], $content['params'] );
+          break;
+        case 'organizer':
+          if( FALSE !== ( $content = $component->getProperty( $prop, FALSE, TRUE ))) {
+            if( isset( $content['params']['CN'] ) && !isset( $content['params']['LANGUAGE'] )) {
+              if( $langComp )
+                $content['params']['LANGUAGE'] = $langComp;
+              elseif( $langCal )
+                $content['params']['LANGUAGE'] = $langCal;
+            }
+            _addXMLchild( $properties, $prop, 'cal-address', $content['value'], $content['params'] );
+          }
+          break;
+        case 'percent-complete':
+        case 'priority':
+        case 'sequence':
+          if( FALSE !== ( $content = $component->getProperty( $prop, FALSE, TRUE )))
+            _addXMLchild( $properties, $prop, 'integer', $content['value'], $content['params'] );
+          break;
+        case 'tzurl':
+        case 'url':
+          if( FALSE !== ( $content = $component->getProperty( $prop, FALSE, TRUE )))
+            _addXMLchild( $properties, $prop, 'uri', $content['value'], $content['params'] );
+          break;
+      } // end switch( $prop )
+    } // end foreach( $props as $prop )
+            /** fix subComponent properties, if any */
+    while( FALSE !== ( $subcomp = $component->getComponent())) {
+      $subCompName  = $subcomp->objName;
+      $child2       = $child->addChild( $subCompName );
+      $properties   = $child2->addChild( 'properties' );
+      $langComp     = $subcomp->getConfig( 'language' );
+      $subCompProps = $subcomp->getConfig( 'setPropertyNames' );
+      foreach( $subCompProps as $prop ) {
+        switch( strtolower( $prop )) {
+          case 'attach':          // may occur multiple times, below
+            while( FALSE !== ( $content = $subcomp->getProperty( $prop, FALSE, TRUE ))) {
+              $type = ( isset( $content['params']['VALUE'] ) && ( 'BINARY' == $content['params']['VALUE'] )) ? 'binary' : 'uri';
+              unset( $content['params']['VALUE'] );
+              _addXMLchild( $properties, $prop, $type, $content['value'], $content['params'] );
+            }
+            break;
+          case 'attendee':
+            while( FALSE !== ( $content = $subcomp->getProperty( $prop, FALSE, TRUE ))) {
+              if( isset( $content['params']['CN'] ) && !isset( $content['params']['LANGUAGE'] )) {
+                if( $langComp )
+                  $content['params']['LANGUAGE'] = $langComp;
+                elseif( $langCal )
+                  $content['params']['LANGUAGE'] = $langCal;
+              }
+              _addXMLchild( $properties, $prop, 'cal-address', $content['value'], $content['params'] );
+            }
+            break;
+          case 'comment':
+          case 'tzname':
+            while( FALSE !== ( $content = $subcomp->getProperty( $prop, FALSE, TRUE ))) {
+              if( !isset( $content['params']['LANGUAGE'] )) {
+                if( $langComp )
+                  $content['params']['LANGUAGE'] = $langComp;
+                elseif( $langCal )
+                  $content['params']['LANGUAGE'] = $langCal;
+              }
+              _addXMLchild( $properties, $prop, 'text', $content['value'], $content['params'] );
+            }
+            break;
+          case 'rdate':
+            while( FALSE !== ( $content = $subcomp->getProperty( $prop, FALSE, TRUE ))) {
+              $type = 'date-time';
+              if( isset( $content['params']['VALUE'] )) {
+                if( 'DATE' == $content['params']['VALUE'] )
+                  $type = 'date';
+                elseif( 'PERIOD' == $content['params']['VALUE'] )
+                  $type = 'period';
+              }
+              unset( $content['params']['VALUE'] );
+              _addXMLchild( $properties, $prop, $type, $content['value'], $content['params'] );
+            }
+            break;
+          case 'x-prop':
+            while( FALSE !== ( $content = $subcomp->getProperty( $prop, FALSE, TRUE )))
+              _addXMLchild( $properties, $content[0], 'unknown', $content[1]['value'], $content[1]['params'] );
+            break;
+          case 'action':      // single occurence below, if set
+          case 'description':
+          case 'summary':
+            if( FALSE !== ( $content = $subcomp->getProperty( $prop, FALSE, TRUE ))) {
+              if(( 'action' != $prop ) && !isset( $content['params']['LANGUAGE'] )) {
+                if( $langComp )
+                  $content['params']['LANGUAGE'] = $langComp;
+                elseif( $langCal )
+                  $content['params']['LANGUAGE'] = $langCal;
+              }
+              _addXMLchild( $properties, $prop, 'text', $content['value'], $content['params'] );
+            }
+            break;
+          case 'dtstart':
+            if( FALSE !== ( $content = $subcomp->getProperty( $prop, FALSE, TRUE ))) {
+              unset( $content['value']['tz'], $content['params']['VALUE'] ); // always local time
+              _addXMLchild( $properties, $prop, 'date-time', $content['value'], $content['params'] );
+            }
+            break;
+          case 'duration':
+            if( FALSE !== ( $content = $subcomp->getProperty( $prop, FALSE, TRUE )))
+              _addXMLchild( $properties, $prop, 'duration', $content['value'], $content['params'] );
+            break;
+          case 'repeat':
+            if( FALSE !== ( $content = $subcomp->getProperty( $prop, FALSE, TRUE )))
+              _addXMLchild( $properties, $prop, 'integer', $content['value'], $content['params'] );
+            break;
+          case 'trigger':
+            if( FALSE !== ( $content = $subcomp->getProperty( $prop, FALSE, TRUE ))) {
+              if( isset( $content['value']['year'] )   &&
+                  isset( $content['value']['month'] )  &&
+                  isset( $content['value']['day'] ))
+                $type = 'date-time';
+              else {
+                $type = 'duration';
+                if( !isset( $content['value']['relatedStart'] ) || ( TRUE !== $content['value']['relatedStart'] ))
+                  $content['params']['RELATED'] = 'END';
+              }
+              _addXMLchild( $properties, $prop, $type, $content['value'], $content['params'] );
+            }
+            break;
+          case 'tzoffsetto':
+          case 'tzoffsetfrom':
+            if( FALSE !== ( $content = $subcomp->getProperty( $prop, FALSE, TRUE )))
+              _addXMLchild( $properties, $prop, 'utc-offset', $content['value'], $content['params'] );
+            break;
+          case 'rrule':
+            while( FALSE !== ( $content = $subcomp->getProperty( $prop, FALSE, TRUE )))
+              _addXMLchild( $properties, $prop, 'recur', $content['value'], $content['params'] );
+            break;
+        } // switch( $prop )
+      } // end foreach( $subCompProps as $prop )
+    } // end while( FALSE !== ( $subcomp = $component->getComponent()))
+  } // end while( FALSE !== ( $component = $calendar->getComponent()))
+  return $xml->asXML();
+}
+/**
+ * Add children to a SimpleXMLelement
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.22 - 2013-06-24
+ * @param object $parent,  reference to a SimpleXMLelement node
+ * @param string $name,    new element node name
+ * @param string $type,    content type, subelement(-s) name
+ * @param string $content, new subelement content
+ * @param array  $params,  new element 'attributes'
+ * @return void
+ */
+function _addXMLchild( & $parent, $name, $type, $content, $params=array()) {
+            /** create new child node */
+  $name  = strtolower( $name );
+  $child = $parent->addChild( $name );
+  if( !empty( $params )) {
+    $parameters = $child->addChild( 'parameters' );
+    foreach( $params as $param => $parVal ) {
+      if( 'VALUE' == $param )
+        continue;
+      $param = strtolower( $param );
+      if( 'x-' == substr( $param, 0, 2  )) {
+        $p1 = $parameters->addChild( $param );
+        $p2 = $p1->addChild( 'unknown', htmlspecialchars( $parVal ));
+      }
+      else {
+        $p1 = $parameters->addChild( $param );
+        switch( $param ) {
+          case 'altrep':
+          case 'dir':            $ptype = 'uri';            break;
+          case 'delegated-from':
+          case 'delegated-to':
+          case 'member':
+          case 'sent-by':        $ptype = 'cal-address';    break;
+          case 'rsvp':           $ptype = 'boolean';        break ;
+          default:               $ptype = 'text';           break;
+        }
+        if( is_array( $parVal )) {
+          foreach( $parVal as $pV )
+            $p2 = $p1->addChild( $ptype, htmlspecialchars( $pV ));
+        }
+        else
+          $p2 = $p1->addChild( $ptype, htmlspecialchars( $parVal ));
+      }
+    }
+  } // end if( !empty( $params ))
+  if(( empty( $content ) && ( '0' != $content )) || ( !is_array( $content) && ( '-' != substr( $content, 0, 1 ) && ( 0 > $content ))))
+    return;
+            /** store content */
+  switch( $type ) {
+    case 'binary':
+      $v = $child->addChild( $type, $content );
+      break;
+    case 'boolean':
+      break;
+    case 'cal-address':
+      $v = $child->addChild( $type, $content );
+      break;
+    case 'date':
+      if( array_key_exists( 'year', $content ))
+        $content = array( $content );
+      foreach( $content as $date ) {
+        $str = sprintf( '%04d-%02d-%02d', $date['year'], $date['month'], $date['day'] );
+        $v = $child->addChild( $type, $str );
+      }
+      break;
+    case 'date-time':
+      if( array_key_exists( 'year', $content ))
+        $content = array( $content );
+      foreach( $content as $dt ) {
+        if( !isset( $dt['hour'] )) $dt['hour'] = 0;
+        if( !isset( $dt['min'] ))  $dt['min']  = 0;
+        if( !isset( $dt['sec'] ))  $dt['sec']  = 0;
+        $str = sprintf( '%04d-%02d-%02dT%02d:%02d:%02d', $dt['year'], $dt['month'], $dt['day'], $dt['hour'], $dt['min'], $dt['sec'] );
+        if( isset( $dt['tz'] ) && ( 'Z' == $dt['tz'] ))
+          $str .= 'Z';
+        $v = $child->addChild( $type, $str );
+      }
+      break;
+    case 'duration':
+      $output = (( 'trigger' == $name ) && ( FALSE !== $content['before'] )) ? '-' : '';
+      $v = $child->addChild( $type, $output.iCalUtilityFunctions::_duration2str( $content ) );
+      break;
+    case 'geo':
+      if( !empty( $content )) {
+        $v1 = $child->addChild( 'latitude',  number_format( (float) $content['latitude'],  6, '.', '' ));
+        $v1 = $child->addChild( 'longitude', number_format( (float) $content['longitude'], 6, '.', '' ));
+      }
+      break;
+    case 'integer':
+      $v = $child->addChild( $type, (string) $content );
+      break;
+    case 'period':
+      if( !is_array( $content ))
+        break;
+      foreach( $content as $period ) {
+        $v1 = $child->addChild( $type );
+        $str = sprintf( '%04d-%02d-%02dT%02d:%02d:%02d', $period[0]['year'], $period[0]['month'], $period[0]['day'], $period[0]['hour'], $period[0]['min'], $period[0]['sec'] );
+        if( isset( $period[0]['tz'] ) && ( 'Z' == $period[0]['tz'] ))
+          $str .= 'Z';
+        $v2 = $v1->addChild( 'start', $str );
+        if( array_key_exists( 'year', $period[1] )) {
+          $str = sprintf( '%04d-%02d-%02dT%02d:%02d:%02d', $period[1]['year'], $period[1]['month'], $period[1]['day'], $period[1]['hour'], $period[1]['min'], $period[1]['sec'] );
+          if( isset($period[1]['tz'] ) && ( 'Z' == $period[1]['tz'] ))
+            $str .= 'Z';
+          $v2 = $v1->addChild( 'end', $str );
+        }
+        else
+          $v2 = $v1->addChild( 'duration', iCalUtilityFunctions::_duration2str( $period[1] ));
+      }
+      break;
+    case 'recur':
+      foreach( $content as $rulelabel => $rulevalue ) {
+        $rulelabel = strtolower( $rulelabel );
+        switch( $rulelabel ) {
+          case 'until':
+            if( isset( $rulevalue['hour'] ))
+              $str = sprintf( '%04d-%02d-%02dT%02d:%02d:%02dZ', $rulevalue['year'], $rulevalue['month'], $rulevalue['day'], $rulevalue['hour'], $rulevalue['min'], $rulevalue['sec'] );
+            else
+              $str = sprintf( '%04d-%02d-%02d', $rulevalue['year'], $rulevalue['month'], $rulevalue['day'] );
+            $v = $child->addChild( $rulelabel, $str );
+            break;
+          case 'bysecond':
+          case 'byminute':
+          case 'byhour':
+          case 'bymonthday':
+          case 'byyearday':
+          case 'byweekno':
+          case 'bymonth':
+          case 'bysetpos': {
+            if( is_array( $rulevalue )) {
+              foreach( $rulevalue as $vix => $valuePart )
+                $v = $child->addChild( $rulelabel, $valuePart );
+            }
+            else
+              $v = $child->addChild( $rulelabel, $rulevalue );
+            break;
+          }
+          case 'byday': {
+            if( isset( $rulevalue['DAY'] )) {
+              $str  = ( isset( $rulevalue[0] )) ? $rulevalue[0] : '';
+              $str .= $rulevalue['DAY'];
+              $p    = $child->addChild( $rulelabel, $str );
+            }
+            else {
+              foreach( $rulevalue as $valuePart ) {
+                if( isset( $valuePart['DAY'] )) {
+                  $str  = ( isset( $valuePart[0] )) ? $valuePart[0] : '';
+                  $str .= $valuePart['DAY'];
+                  $p    = $child->addChild( $rulelabel, $str );
+                }
+                else
+                  $p    = $child->addChild( $rulelabel, $valuePart );
+              }
+            }
+            break;
+          }
+          case 'freq':
+          case 'count':
+          case 'interval':
+          case 'wkst':
+          default:
+            $p = $child->addChild( $rulelabel, $rulevalue );
+            break;
+        } // end switch( $rulelabel )
+      } // end foreach( $content as $rulelabel => $rulevalue )
+      break;
+    case 'rstatus':
+      $v = $child->addChild( 'code', number_format( (float) $content['statcode'], 2, '.', ''));
+      $v = $child->addChild( 'description', htmlspecialchars( $content['text'] ));
+      if( isset( $content['extdata'] ))
+        $v = $child->addChild( 'data', htmlspecialchars( $content['extdata'] ));
+      break;
+    case 'text':
+      if( !is_array( $content ))
+        $content = array( $content );
+      foreach( $content as $part )
+        $v = $child->addChild( $type, htmlspecialchars( $part ));
+      break;
+    case 'time':
+      break;
+    case 'uri':
+      $v = $child->addChild( $type, $content );
+      break;
+    case 'utc-offset':
+      if( in_array( substr( $content, 0, 1 ), array( '-', '+' ))) {
+        $str     = substr( $content, 0, 1 );
+        $content = substr( $content, 1 );
+      }
+      else
+        $str     = '+';
+      $str .= substr( $content, 0, 2 ).':'.substr( $content, 2, 2 );
+      if( 4 < strlen( $content ))
+        $str .= ':'.substr( $content, 4 );
+      $v = $child->addChild( $type, $str );
+      break;
+    case 'unknown':
+    default:
+      if( is_array( $content ))
+        $content = implode( '', $content );
+      $v = $child->addChild( 'unknown', htmlspecialchars( $content ));
+      break;
+  }
+}
+/**
+ * parse xml file into iCalcreator instance
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.22 - 2013-06-18
+ * @param  string $xmlfile
+ * @param  array  $iCalcfg iCalcreator config array (opt)
+ * @return mixediCalcreator instance or FALSE on error
+ */
+function XMLfile2iCal( $xmlfile, $iCalcfg=array()) {
+  if( FALSE === ( $xmlstr = file_get_contents( $xmlfile )))
+    return FALSE;
+  return xml2iCal( $xmlstr, $iCalcfg );
+}
+/**
+ * parse xml string into iCalcreator instance, alias of XML2iCal
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.22 - 2013-06-18
+ * @param  string $xmlstr
+ * @param  array  $iCalcfg iCalcreator config array (opt)
+ * @return mixed  iCalcreator instance or FALSE on error
+ */
+function XMLstr2iCal( $xmlstr, $iCalcfg=array()) {
+  return XML2iCal( $xmlstr, $iCalcfg);
+}
+/**
+ * parse xml string into iCalcreator instance
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.22 - 2013-06-20
+ * @param  string $xmlstr
+ * @param  array  $iCalcfg iCalcreator config array (opt)
+ * @return mixed  iCalcreator instance or FALSE on error
+ */
+function XML2iCal( $xmlstr, $iCalcfg=array()) {
+  $xmlstr  = str_replace( array( "\r\n", "\n\r", "\n", "\r" ), '', $xmlstr );
+  $xml     = XMLgetTagContent1( $xmlstr, 'vcalendar', $endIx );
+  $iCal    = new vcalendar( $iCalcfg );
+  XMLgetComps( $iCal, $xmlstr );
+  unset( $xmlstr );
+  return $iCal;
+}
+/**
+ * parse XML string into iCalcreator components
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.22 - 2013-06-20
+ * @param object $iCal, iCalcreator vcalendar or component object instance
+ * @param string $xml
+ * @return bool
+ */
+function XMLgetComps( $iCal, $xml ) {
+  static $comps = array( 'vtimezone', 'standard', 'daylight', 'vevent', 'vtodo', 'vjournal', 'vfreebusy', 'valarm' );
+  $sx      = 0;
+  while(( FALSE !== substr( $xml, ( $sx + 11 ), 1 )) &&
+        ( '<properties>' != substr( $xml, $sx, 12 )) && ( '<components>' != substr( $xml, $sx, 12 )))
+    $sx   += 1;
+  if( FALSE === substr( $xml, ( $sx + 11 ), 1 ))
+    return FALSE;
+  if( '<properties>' == substr( $xml, $sx, 12 )) {
+    $xml2  = XMLgetTagContent1( $xml, 'properties', $endIx );
+    XMLgetProps( $iCal, $xml2 );
+    $xml   = substr( $xml, $endIx );
+  }
+  if( '<components>' == substr( $xml, 0, 12 ))
+    $xml     = XMLgetTagContent1( $xml, 'components', $endIx );
+  while( ! empty( $xml )) {
+    $xml2  = XMLgetTagContent2( $xml, $tagName, $endIx );
+    if( in_array( strtolower( $tagName ), $comps ) && ( FALSE !== ( $subComp = $iCal->newComponent( $tagName ))))
+      XMLgetComps( $subComp, $xml2 );
+    $xml   = substr( $xml, $endIx);
+  }
+  unset( $xml );
+  return $iCal;
+}
+/**
+ * parse XML into iCalcreator properties
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.21 - 2013-06-23
+ * @param  array  $iCal iCalcreator calendar/component instance
+ * @param  string $xml
+ * @return void
+ */
+function XMLgetProps( $iCal, $xml) {
+  while( ! empty( $xml )) {
+    $xml2         = XMLgetTagContent2( $xml, $propName, $endIx );
+    $propName     = strtoupper( $propName );
+    if( empty( $xml2 ) && ( '0' != $xml2 )) {
+      $iCal->setProperty( $propName );
+      $xml        = substr( $xml, $endIx);
+      continue;
+    }
+    $params       = array();
+    if( '<parameters/>' == substr( $xml2, 0, 13 ))
+      $xml2       = substr( $xml2, 13 );
+    elseif( '<parameters>' == substr( $xml2, 0, 12 )) {
+      $xml3       = XMLgetTagContent1( $xml2, 'parameters', $endIx2 );
+      while( ! empty( $xml3 )) {
+        $xml4     = XMLgetTagContent2( $xml3, $paramKey, $endIx3 );
+        $pType    = FALSE; // skip parameter valueType
+        $paramKey = strtoupper( $paramKey );
+        if( in_array( $paramKey, array( 'DELEGATED-FROM', 'DELEGATED-TO', 'MEMBER' ))) {
+          while( ! empty( $xml4 )) {
+            if( ! isset( $params[$paramKey] ))
+              $params[$paramKey]   = array( XMLgetTagContent1( $xml4, 'cal-address', $endIx4 ));
+            else
+              $params[$paramKey][] = XMLgetTagContent1( $xml4, 'cal-address', $endIx4 );
+            $xml4     = substr( $xml4, $endIx4 );
+          }
+        }
+        else {
+          if( ! isset( $params[$paramKey] ))
+            $params[$paramKey]  = html_entity_decode( XMLgetTagContent2( $xml4, $pType, $endIx4 ));
+          else
+            $params[$paramKey] .= ','.html_entity_decode( XMLgetTagContent2( $xml4, $pType, $endIx4 ));
+        }
+        $xml3     = substr( $xml3, $endIx3 );
+      }
+      $xml2       = substr( $xml2, $endIx2 );
+    } // if( '<parameters>' == substr( $xml2, 0, 12 ))
+    $valueType    = FALSE;
+    $value        = ( ! empty( $xml2 ) || ( '0' == $xml2 )) ? XMLgetTagContent2( $xml2, $valueType, $endIx3 ) : '';
+    switch( $propName ) {
+      case 'CATEGORIES':
+      case 'RESOURCES':
+        $tValue      = array();
+        while( ! empty( $xml2 )) {
+          $tValue[]  = html_entity_decode( XMLgetTagContent2( $xml2, $valueType, $endIx4 ));
+          $xml2      = substr( $xml2, $endIx4 );
+        }
+        $value       = $tValue;
+        break;
+      case 'EXDATE':   // multiple single-date(-times) may exist
+      case 'RDATE':
+        if( 'period' != $valueType ) {
+          if( 'date' == $valueType )
+            $params['VALUE'] = 'DATE';
+          $t         = array();
+          while( ! empty( $xml2 ) && ( '<date' == substr( $xml2, 0, 5 ))) {
+            $t[]     = XMLgetTagContent2( $xml2, $pType, $endIx4 );
+            $xml2    = substr( $xml2, $endIx4 );
+          }
+          $value = $t;
+          break;
+        }
+      case 'FREEBUSY':
+        if( 'RDATE' == $propName )
+          $params['VALUE'] = 'PERIOD';
+        $value       = array();
+        while( ! empty( $xml2 ) && ( '<period>' == substr( $xml2, 0, 8 ))) {
+          $xml3      = XMLgetTagContent1( $xml2, 'period', $endIx4 ); // period
+          $t         = array();
+          while( ! empty( $xml3 )) {
+            $t[]     = XMLgetTagContent2( $xml3, $pType, $endIx5 ); // start - end/duration
+            $xml3    = substr( $xml3, $endIx5 );
+          }
+          $value[]   = $t;
+          $xml2      = substr( $xml2, $endIx4 );
+        }
+        break;
+      case 'TZOFFSETTO':
+      case 'TZOFFSETFROM':
+        $value       = str_replace( ':', '', $value );
+        break;
+      case 'GEO':
+        $tValue      = array( 'latitude' => $value );
+        $tValue['longitude'] = XMLgetTagContent1( substr( $xml2, $endIx3 ), 'longitude', $endIx3 );
+        $value       = $tValue;
+        break;
+      case 'EXRULE':
+      case 'RRULE':
+        $tValue      = array( $valueType => $value );
+        $xml2        = substr( $xml2, $endIx3 );
+        $valueType   = FALSE;
+        while( ! empty( $xml2 )) {
+          $t         = XMLgetTagContent2( $xml2, $valueType, $endIx4 );
+          switch( $valueType ) {
+            case 'freq':
+            case 'count':
+            case 'until':
+            case 'interval':
+            case 'wkst':
+              $tValue[$valueType] = $t;
+              break;
+            case 'byday':
+              if( 2 == strlen( $t ))
+                $tValue[$valueType][] = array( 'DAY' => $t );
+              else {
+                $day = substr( $t, -2 );
+                $key = substr( $t, 0, ( strlen( $t ) - 2 ));
+                $tValue[$valueType][] = array( $key, 'DAY' => $day );
+              }
+              break;
+            default:
+              $tValue[$valueType][] = $t;
+          }
+          $xml2      = substr( $xml2, $endIx4 );
+        }
+        $value       = $tValue;
+        break;
+      case 'REQUEST-STATUS':
+        $tValue      = array();
+        while( ! empty( $xml2 )) {
+          $t         = html_entity_decode( XMLgetTagContent2( $xml2, $valueType, $endIx4 ));
+          $tValue[$valueType] = $t;
+          $xml2    = substr( $xml2, $endIx4 );
+        }
+        if( ! empty( $tValue ))
+          $value   = $tValue;
+        else
+          $value   = array( 'code' => null, 'description' => null );
+        break;
+      default:
+        switch( $valueType ) {
+          case 'binary':    $params['VALUE'] = 'BINARY';           break;
+          case 'date':      $params['VALUE'] = 'DATE';             break;
+          case 'date-time': $params['VALUE'] = 'DATE-TIME';        break;
+          case 'text':
+          case 'unknown':   $value = html_entity_decode( $value ); break;
+        }
+        break;
+    } // end switch( $propName )
+    if( 'FREEBUSY' == $propName ) {
+      $fbtype = $params['FBTYPE'];
+      unset( $params['FBTYPE'] );
+      $iCal->setProperty( $propName, $fbtype, $value, $params );
+    }
+    elseif( 'GEO' == $propName )
+      $iCal->setProperty( $propName, $value['latitude'], $value['longitude'], $params );
+    elseif( 'REQUEST-STATUS' == $propName ) {
+      if( !isset( $value['data'] ))
+        $value['data'] = FALSE;
+      $iCal->setProperty( $propName, $value['code'], $value['description'], $value['data'], $params );
+    }
+    else {
+      if( empty( $value ) && ( is_array( $value ) || ( '0' > $value )))
+        $value = '';
+      $iCal->setProperty( $propName, $value, $params );
+    }
+    $xml        = substr( $xml, $endIx);
+  } // end while( ! empty( $xml ))
+}
+/**
+ * fetch a specific XML tag content
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.22 - 2013-06-20
+ * @param string $xml
+ * @param string $tagName
+ * @param int $endIx
+ * @return mixed
+ */
+function XMLgetTagContent1( $xml, $tagName, & $endIx=0 ) {
+  $strlen    = strlen( $tagName );
+  $sx1       = 0;
+  while( FALSE !== substr( $xml, $sx1, 1 )) {
+    if(( FALSE !== substr( $xml, ( $sx1 + $strlen + 1 ), 1 )) &&
+       ( strtolower( "<$tagName>" )   == strtolower( substr( $xml, $sx1, ( $strlen + 2 )))))
+      break;
+    if(( FALSE !== substr( $xml, ( $sx1 + $strlen + 3 ), 1 )) &&
+       ( strtolower( "<$tagName />" ) == strtolower( substr( $xml, $sx1, ( $strlen + 4 ))))) { // empty tag
+      $endIx = $strlen + 5;
+      return '';
+    }
+    if(( FALSE !== substr( $xml, ( $sx1 + $strlen + 2 ), 1 )) &&
+       ( strtolower( "<$tagName/>" )  == strtolower( substr( $xml, $sx1, ( $strlen + 3 ))))) { // empty tag
+      $endIx = $strlen + 4;
+      return '';
+    }
+    $sx1    += 1;
+  }
+  if( FALSE === substr( $xml, $sx1, 1 )) {
+    $endIx   = ( empty( $sx )) ? 0 : $sx - 1;
+    return '';
+  }
+  if( FALSE === ( $pos = stripos( $xml, "</$tagName>" ))) { // missing end tag??
+    $endIx   = strlen( $xml ) + 1;
+    return '';
+  }
+  $endIx     = $pos + $strlen + 3;
+  return substr( $xml, ( $sx1 + $strlen + 2 ), ( $pos - $sx1 - 2 - $strlen ));
+}
+/**
+ * fetch next (unknown) XML tagname AND content
+ *
+ * @author Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @since 2.16.22 - 2013-06-20
+ * @param string $xml
+ * @param string $tagName
+ * @param int $endIx
+ * @return mixed
+ */
+function XMLgetTagContent2( $xml, & $tagName, & $endIx ) {
+  $endIx       = strlen( $xml ) + 1; // just in case.. .
+  $sx1         = 0;
+  while( FALSE !== substr( $xml, $sx1, 1 )) {
+    if( '<' == substr( $xml, $sx1, 1 )) {
+      if(( FALSE !== substr( $xml, ( $sx1 + 3 ), 1 )) && ( '<!--' == substr( $xml, $sx1, 4 ))) // skip comment
+        $sx1  += 1;
+      else
+        break; // tagname start here
+    }
+    else
+      $sx1    += 1;
+  }
+  $sx2         = $sx1;
+  while( FALSE !== substr( $xml, $sx2 )) {
+    if(( FALSE !== substr( $xml, ( $sx2 + 1 ), 1 )) && ( '/>' == substr( $xml, $sx2, 2 ))) { // empty tag
+      $tagName = trim( substr( $xml, ( $sx1 + 1 ), ( $sx2 - $sx1 - 1 )));
+      $endIx   = $sx2 + 2;
+      return '';
+    }
+    if( '>' == substr( $xml, $sx2, 1 )) // tagname ends here
+      break;
+    $sx2      += 1;
+  }
+  $tagName     = substr( $xml, ( $sx1 + 1 ), ( $sx2 - $sx1 - 1 ));
+  $endIx       = $sx2 + 1;
+  if( FALSE === substr( $xml, $sx2, 1 )) {
+    return '';
+  }
+  $strlen      = strlen( $tagName );
+  if(( 'duration' == $tagName ) &&
+     ( FALSE !== ( $pos1 = stripos( $xml, "<duration>",  $sx1+1  ))) &&
+     ( FALSE !== ( $pos2 = stripos( $xml, "</duration>", $pos1+1 ))) &&
+     ( FALSE !== ( $pos3 = stripos( $xml, "</duration>", $pos2+1 ))) &&
+     ( $pos1 < $pos2 ) && ( $pos2 < $pos3 ))
+    $pos = $pos3;
+  elseif( FALSE === ( $pos = stripos( $xml, "</$tagName>", $sx2 )))
+    return '';
+  $endIx       = $pos + $strlen + 3;
+  return substr( $xml, ( $sx1 + $strlen + 2 ), ( $pos - $strlen - 2 ));
+}
+/*********************************************************************************/
+/*          Additional functions to use with vtimezone components                */
+/*********************************************************************************/
+/**
+ * For use with
+ * iCalcreator (kigkonsult.se/iCalcreator/index.php)
+ * copyright (c) 2011 Yitzchok Lavi
+ * icalcreator@onebigsystem.com
+ *
+ * This library 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 library 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 library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+/**
+ * Additional functions to use with vtimezone components
+ *
+ * Before calling the functions, set time zone 'GMT' ('date_default_timezone_set')!
+ *
+ * @author Yitzchok Lavi <icalcreator@onebigsystem.com>
+ *         adjusted for iCalcreator Kjell-Inge Gustafsson, kigkonsult <ical@kigkonsult.se>
+ * @version 1.0.2 - 2011-02-24
+ *
+ */
+/**
+ * Returns array with the offset information from UTC for a (UTC) datetime/timestamp in the
+ * timezone, according to the VTIMEZONE information in the input array.
+ *
+ * $param array  $timezonesarray, output from function getTimezonesAsDateArrays (below)
+ * $param string $tzid,           time zone identifier
+ * $param mixed  $timestamp,      timestamp or a UTC datetime (in array format)
+ * @return array, time zone data with keys for 'offsetHis', 'offsetSec' and 'tzname'
+ *
+ */
+function getTzOffsetForDate($timezonesarray, $tzid, $timestamp) {
+    if( is_array( $timestamp )) {
+//$disp = sprintf( '%04d%02d%02d %02d%02d%02d', $timestamp['year'], $timestamp['month'], $timestamp['day'], $timestamp['hour'], $timestamp['min'], $timestamp['sec'] ); // test ###
+      $timestamp = gmmktime(
+            $timestamp['hour'],
+            $timestamp['min'],
+            $timestamp['sec'],
+            $timestamp['month'],
+            $timestamp['day'],
+            $timestamp['year']
+            ) ;
+    }
+    $tzoffset = array();
+    // something to return if all goes wrong (such as if $tzid doesn't find us an array of dates)
+    $tzoffset['offsetHis'] = '+0000';
+    $tzoffset['offsetSec'] = 0;
+    $tzoffset['tzname']    = '?';
+    if( !isset( $timezonesarray[$tzid] ))
+      return $tzoffset;
+    $tzdatearray = $timezonesarray[$tzid];
+    if ( is_array($tzdatearray) ) {
+        sort($tzdatearray); // just in case
+        if ( $timestamp < $tzdatearray[0]['timestamp'] ) {
+            // our date is before the first change
+            $tzoffset['offsetHis'] = $tzdatearray[0]['tzbefore']['offsetHis'] ;
+            $tzoffset['offsetSec'] = $tzdatearray[0]['tzbefore']['offsetSec'] ;
+            $tzoffset['tzname']    = $tzdatearray[0]['tzbefore']['offsetHis'] ; // we don't know the tzname in this case
+        } elseif ( $timestamp >= $tzdatearray[count($tzdatearray)-1]['timestamp'] ) {
+            // our date is after the last change (we do this so our scan can stop at the last record but one)
+            $tzoffset['offsetHis'] = $tzdatearray[count($tzdatearray)-1]['tzafter']['offsetHis'] ;
+            $tzoffset['offsetSec'] = $tzdatearray[count($tzdatearray)-1]['tzafter']['offsetSec'] ;
+            $tzoffset['tzname']    = $tzdatearray[count($tzdatearray)-1]['tzafter']['tzname'] ;
+        } else {
+            // our date somewhere in between
+            // loop through the list of dates and stop at the one where the timestamp is before our date and the next one is after it
+            // we don't include the last date in our loop as there isn't one after it to check
+            for ( $i = 0 ; $i <= count($tzdatearray)-2 ; $i++ ) {
+                if(( $timestamp >= $tzdatearray[$i]['timestamp'] ) && ( $timestamp < $tzdatearray[$i+1]['timestamp'] )) {
+                    $tzoffset['offsetHis'] = $tzdatearray[$i]['tzafter']['offsetHis'] ;
+                    $tzoffset['offsetSec'] = $tzdatearray[$i]['tzafter']['offsetSec'] ;
+                    $tzoffset['tzname']    = $tzdatearray[$i]['tzafter']['tzname'] ;
+                    break;
+                }
+            }
+        }
+    }
+    return $tzoffset;
+}
+/**
+ * Returns an array containing all the timezone data in the vcalendar object
+ *
+ * @param object $vcalendar, iCalcreator calendar instance
+ * @return array, time zone transition timestamp, array before(offsetHis, offsetSec), array after(offsetHis, offsetSec, tzname)
+ *                based on the timezone data in the vcalendar object
+ *
+ */
+function getTimezonesAsDateArrays($vcalendar) {
+    $timezonedata = array();
+    while( $vtz = $vcalendar->getComponent( 'vtimezone' )) {
+        $tzid       = $vtz->getProperty('tzid');
+        $alltzdates = array();
+        while ( $vtzc = $vtz->getComponent( 'standard' )) {
+            $newtzdates = expandTimezoneDates($vtzc);
+            $alltzdates = array_merge($alltzdates, $newtzdates);
+        }
+        while ( $vtzc = $vtz->getComponent( 'daylight' )) {
+            $newtzdates = expandTimezoneDates($vtzc);
+            $alltzdates = array_merge($alltzdates, $newtzdates);
+        }
+        sort($alltzdates);
+        $timezonedata[$tzid] = $alltzdates;
+    }
+    return $timezonedata;
+}
+/**
+ * Returns an array containing time zone data from vtimezone standard/daylight instances
+ *
+ * @param object $vtzc, an iCalcreator calendar standard/daylight instance
+ * @return array, time zone data; array before(offsetHis, offsetSec), array after(offsetHis, offsetSec, tzname)
+ *
+ */
+function expandTimezoneDates($vtzc) {
+    $tzdates = array();
+    // prepare time zone "description" to attach to each change
+    $tzbefore = array();
+    $tzbefore['offsetHis']  = $vtzc->getProperty('tzoffsetfrom') ;
+    $tzbefore['offsetSec'] = iCalUtilityFunctions::_tz2offset($tzbefore['offsetHis']);
+    if(( '-' != substr( (string) $tzbefore['offsetSec'], 0, 1 )) && ( '+' != substr( (string) $tzbefore['offsetSec'], 0, 1 )))
+      $tzbefore['offsetSec'] = '+'.$tzbefore['offsetSec'];
+    $tzafter = array();
+    $tzafter['offsetHis']   = $vtzc->getProperty('tzoffsetto') ;
+    $tzafter['offsetSec']  = iCalUtilityFunctions::_tz2offset($tzafter['offsetHis']);
+    if(( '-' != substr( (string) $tzafter['offsetSec'], 0, 1 )) && ( '+' != substr( (string) $tzafter['offsetSec'], 0, 1 )))
+      $tzafter['offsetSec'] = '+'.$tzafter['offsetSec'];
+    if( FALSE === ( $tzafter['tzname'] = $vtzc->getProperty('tzname')))
+      $tzafter['tzname'] = $tzafter['offsetHis'];
+    // find out where to start from
+    $dtstart = $vtzc->getProperty('dtstart');
+    $dtstarttimestamp = mktime(
+            $dtstart['hour'],
+            $dtstart['min'],
+            $dtstart['sec'],
+            $dtstart['month'],
+            $dtstart['day'],
+            $dtstart['year']
+            ) ;
+    if( !isset( $dtstart['unparsedtext'] )) // ??
+      $dtstart['unparsedtext'] = sprintf( '%04d%02d%02dT%02d%02d%02d', $dtstart['year'], $dtstart['month'], $dtstart['day'], $dtstart['hour'], $dtstart['min'], $dtstart['sec'] );
+    if ( $dtstarttimestamp == 0 ) {
+        // it seems that the dtstart string may not have parsed correctly
+        // let's set a timestamp starting from 1902, using the time part of the original string
+        // so that the time will change at the right time of day
+        // at worst we'll get midnight again
+        $origdtstartsplit = explode('T',$dtstart['unparsedtext']) ;
+        $dtstarttimestamp = strtotime("19020101",0);
+        $dtstarttimestamp = strtotime($origdtstartsplit[1],$dtstarttimestamp);
+    }
+    // the date (in dtstart and opt RDATE/RRULE) is ALWAYS LOCAL (not utc!!), adjust from 'utc' to 'local' timestamp
+    $diff  = -1 * $tzbefore['offsetSec'];
+    $dtstarttimestamp += $diff;
+                // add this (start) change to the array of changes
+    $tzdates[] = array(
+        'timestamp' => $dtstarttimestamp,
+        'tzbefore'  => $tzbefore,
+        'tzafter'   => $tzafter
+        );
+    $datearray = getdate($dtstarttimestamp);
+    // save original array to use time parts, because strtotime (used below) apparently loses the time
+    $changetime = $datearray ;
+    // generate dates according to an RRULE line
+    $rrule = $vtzc->getProperty('rrule') ;
+    if ( is_array($rrule) ) {
+        if ( $rrule['FREQ'] == 'YEARLY' ) {
+            // calculate transition dates starting from DTSTART
+            $offsetchangetimestamp = $dtstarttimestamp;
+            // calculate transition dates until 10 years in the future
+            $stoptimestamp = strtotime("+10 year",time());
+            // if UNTIL is set, calculate until then (however far ahead)
+            if ( isset( $rrule['UNTIL'] ) && ( $rrule['UNTIL'] != '' )) {
+                $stoptimestamp = mktime(
+                    $rrule['UNTIL']['hour'],
+                    $rrule['UNTIL']['min'],
+                    $rrule['UNTIL']['sec'],
+                    $rrule['UNTIL']['month'],
+                    $rrule['UNTIL']['day'],
+                    $rrule['UNTIL']['year']
+                    ) ;
+            }
+            $count = 0 ;
+            $stopcount = isset( $rrule['COUNT'] ) ? $rrule['COUNT'] : 0 ;
+            $daynames = array(
+                        'SU' => 'Sunday',
+                        'MO' => 'Monday',
+                        'TU' => 'Tuesday',
+                        'WE' => 'Wednesday',
+                        'TH' => 'Thursday',
+                        'FR' => 'Friday',
+                        'SA' => 'Saturday'
+                        );
+            // repeat so long as we're between DTSTART and UNTIL, or we haven't prepared COUNT dates
+            while ( $offsetchangetimestamp < $stoptimestamp && ( $stopcount == 0 || $count < $stopcount ) ) {
+                // break up the timestamp into its parts
+                $datearray = getdate($offsetchangetimestamp);
+                if ( isset( $rrule['BYMONTH'] ) && ( $rrule['BYMONTH'] != 0 )) {
+                    // set the month
+                    $datearray['mon'] = $rrule['BYMONTH'] ;
+                }
+                if ( isset( $rrule['BYMONTHDAY'] ) && ( $rrule['BYMONTHDAY'] != 0 )) {
+                    // set specific day of month
+                    $datearray['mday']  = $rrule['BYMONTHDAY'];
+                } elseif ( is_array($rrule['BYDAY']) ) {
+                    // find the Xth WKDAY in the month
+                    // the starting point for this process is the first of the month set above
+                    $datearray['mday'] = 1 ;
+                    // turn $datearray as it is now back into a timestamp
+                    $offsetchangetimestamp = mktime(
+                        $datearray['hours'],
+                        $datearray['minutes'],
+                        $datearray['seconds'],
+                        $datearray['mon'],
+                        $datearray['mday'],
+                        $datearray['year']
+                            );
+                    if ($rrule['BYDAY'][0] > 0) {
+                        // to find Xth WKDAY in month, we find last WKDAY in month before
+                        // we do that by finding first WKDAY in this month and going back one week
+                        // then we add X weeks (below)
+                        $offsetchangetimestamp = strtotime($daynames[$rrule['BYDAY']['DAY']],$offsetchangetimestamp);
+                        $offsetchangetimestamp = strtotime("-1 week",$offsetchangetimestamp);
+                    } else {
+                        // to find Xth WKDAY before the end of the month, we find the first WKDAY in the following month
+                        // we do that by going forward one month and going to WKDAY there
+                        // then we subtract X weeks (below)
+                        $offsetchangetimestamp = strtotime("+1 month",$offsetchangetimestamp);
+                        $offsetchangetimestamp = strtotime($daynames[$rrule['BYDAY']['DAY']],$offsetchangetimestamp);
+                    }
+                    // now move forward or back the appropriate number of weeks, into the month we want
+                    $offsetchangetimestamp = strtotime($rrule['BYDAY'][0] . " week",$offsetchangetimestamp);
+                    $datearray = getdate($offsetchangetimestamp);
+                }
+                // convert the date parts back into a timestamp, setting the time parts according to the
+                // original time data which we stored
+                $offsetchangetimestamp = mktime(
+                    $changetime['hours'],
+                    $changetime['minutes'],
+                    $changetime['seconds'] + $diff,
+                    $datearray['mon'],
+                    $datearray['mday'],
+                    $datearray['year']
+                        );
+                // add this change to the array of changes
+                $tzdates[] = array(
+                    'timestamp' => $offsetchangetimestamp,
+                    'tzbefore'  => $tzbefore,
+                    'tzafter'   => $tzafter
+                    );
+                // update counters (timestamp and count)
+                $offsetchangetimestamp = strtotime("+" . (( isset( $rrule['INTERVAL'] ) && ( $rrule['INTERVAL'] != 0 )) ? $rrule['INTERVAL'] : 1 ) . " year",$offsetchangetimestamp);
+                $count += 1 ;
+            }
+        }
+    }
+    // generate dates according to RDATE lines
+    while ($rdates = $vtzc->getProperty('rdate')) {
+        if ( is_array($rdates) ) {
+
+            foreach ( $rdates as $rdate ) {
+                // convert the explicit change date to a timestamp
+                $offsetchangetimestamp = mktime(
+                        $rdate['hour'],
+                        $rdate['min'],
+                        $rdate['sec'] + $diff,
+                        $rdate['month'],
+                        $rdate['day'],
+                        $rdate['year']
+                        ) ;
+                // add this change to the array of changes
+                $tzdates[] = array(
+                    'timestamp' => $offsetchangetimestamp,
+                    'tzbefore'  => $tzbefore,
+                    'tzafter'   => $tzafter
+                    );
+            }
+        }
+    }
+    return $tzdates;
+}
+?>
diff --git a/deployed/icagenda/libraries/ic_library/index.html b/deployed/icagenda/libraries/ic_library/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/libraries/ic_library/library/index.html b/deployed/icagenda/libraries/ic_library/library/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/library/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/libraries/ic_library/library/library.php b/deployed/icagenda/libraries/ic_library/library/library.php
new file mode 100644
index 00000000..cbe6dd73
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/library/library.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iC Library - Library by Jooml!C, for Joomla!
+ *------------------------------------------------------------------------------
+ * @package     iC Library
+ * @subpackage  color
+ * @copyright   Copyright (c)2013-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     1.3.0 2015-05-15
+ * @since       1.0.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+/**
+ * class iCLibrary
+ */
+abstract class iCLibrary
+{
+	/**
+	 * Function to set an alert message if a class from Utilities is not loaded
+	 *
+	 * @since	1.0.0
+	 */
+	static public function isLoaded($class = null)
+	{
+		if (!class_exists($class) && $class)
+		{
+			$app = JFactory::getApplication();
+
+			$alert_message = JText::sprintf('ICAGENDA_CLASS_NOT_FOUND', '<strong>' . $class . '</strong>') . '<br />'
+							. JText::_('ICAGENDA_IS_NOT_CORRECTLY_INSTALLED');
+
+			// Get the message queue
+			$messages = $app->getMessageQueue();
+
+			$display_alert_message = false;
+
+			// If we have messages
+			if (is_array($messages) && count($messages))
+			{
+				// Check each message for the one we want
+				foreach ($messages as $key => $value)
+				{
+					if ($value['message'] == $alert_message)
+					{
+						$display_alert_message = true;
+					}
+				}
+			}
+
+			if (!$display_alert_message)
+			{
+				$app->enqueueMessage($alert_message, 'error');
+			}
+
+			return false;
+		}
+		else
+		{
+			return true;
+		}
+	}
+
+	/**
+	 * Function to get microtime
+	 *
+	 * @since	1.3.0
+	 */
+	static public function getMicrotime()
+	{
+		list($usec_cal, $sec_cal) = explode(" ",microtime());
+		return ((float)$usec_cal + (float)$sec_cal);
+	}
+}
diff --git a/deployed/icagenda/libraries/ic_library/render/index.html b/deployed/icagenda/libraries/ic_library/render/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/render/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/libraries/ic_library/render/render.php b/deployed/icagenda/libraries/ic_library/render/render.php
new file mode 100644
index 00000000..d4a19bda
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/render/render.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iC Library - Library by Jooml!C, for Joomla!
+ *------------------------------------------------------------------------------
+ * @package     iC Library
+ * @subpackage  render
+ * @copyright   Copyright (c)2013-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     1.4.0 2016-05-12
+ * @since       1.4.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+/**
+ * class iCUrl
+ */
+class iCRender
+{
+	/**
+	 * Function to return Url TAG
+	 *
+	 * @since	1.4.0
+	 */
+	static public function urlTag($url, $target = null, $nofollow = true)
+	{
+		$target		= $target ? $target : '_blank';
+		$nofollow	= $nofollow ? ' rel="nofollow"' : '';
+
+		$link		= iCUrl::urlParsed($url, 'scheme');
+
+		return '<a href="' . $link . '"' . $nofollow . ' target="' . $target . '">' . $url . '</a>';
+	}
+}
diff --git a/deployed/icagenda/libraries/ic_library/string/index.html b/deployed/icagenda/libraries/ic_library/string/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/string/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/libraries/ic_library/string/string.php b/deployed/icagenda/libraries/ic_library/string/string.php
new file mode 100644
index 00000000..c1abe677
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/string/string.php
@@ -0,0 +1,164 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iC Library - Library by Jooml!C, for Joomla!
+ *------------------------------------------------------------------------------
+ * @package     iC Library
+ * @subpackage  string
+ * @copyright   Copyright (c)2013-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     1.2.4 2015-05-06
+ * @since       1.0.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+// PHP mbstring and iconv local configuration
+
+// Check if mbstring extension is loaded and attempt to load it if not present except for windows
+//if (extension_loaded('mbstring'))
+//{
+	// Make sure to suppress the output in case ini_set is disabled
+//	@ini_set('mbstring.internal_encoding', 'UTF-8');
+//	@ini_set('mbstring.http_input', 'UTF-8');
+//	@ini_set('mbstring.http_output', 'UTF-8');
+//}
+
+// Same for iconv
+//if (function_exists('iconv'))
+//{
+	// These are settings that can be set inside code
+//	iconv_set_encoding("internal_encoding", "UTF-8");
+//	iconv_set_encoding("input_encoding", "UTF-8");
+//	iconv_set_encoding("output_encoding", "UTF-8");
+//}
+
+/**
+ * Include the utf8 package
+ */
+//jimport('phputf8.utf8');
+//jimport('phputf8.strcasecmp');
+
+/**
+ * class iCString
+ *
+ * String handling class for utf-8 data
+ * Wraps the phputf8 library
+ * All functions assume the validity of utf-8 strings.
+ */
+abstract class iCString
+{
+	/**
+	 * Increment styles.
+	 *
+	 * @var    array
+	 * @since   1.0.0
+	 */
+	protected static $incrementStyles = array(
+		'default' => array(
+			array('#\((\d+)\)$#', '#\(\d+\)$#'),
+			array(' ( %d)', '(%d)'),
+		),
+		'dash' => array(
+			'#-(\d+)$#',
+			'-%d'
+		),
+		'underscore' => array(
+			'#_(\d+)$#',
+			'_%d'
+		),
+	);
+
+	/**
+	 * Increments a trailing number in a string.
+	 *
+	 * Used to easily create distinct labels when copying objects. The method has the following styles:
+	 *
+	 * default:		"Label" becomes "Label (2)"
+	 * dash:		"Label" becomes "Label-2"
+	 * underscore:	"Label" becomes "Label_2"
+	 *
+	 * @param   string   $string  The source string.
+	 * @param   string   $style   The style (default|dash|underscore).
+	 * @param   integer  $n       If supplied, this number is used for the copy, otherwise it is the 'next' number.
+	 *
+	 * @return  string  The incremented string.
+	 *
+	 * @since   1.0.0
+	 */
+	public static function increment($string, $style = 'default', $n = 0)
+	{
+		$styleSpec = isset(self::$incrementStyles[$style]) ? self::$incrementStyles[$style] : self::$incrementStyles['default'];
+
+		// Regular expression search and replace patterns.
+		if (is_array($styleSpec[0]))
+		{
+			$rxSearch = $styleSpec[0][0];
+			$rxReplace = $styleSpec[0][1];
+		}
+		else
+		{
+			$rxSearch = $rxReplace = $styleSpec[0];
+		}
+
+		// New and old (existing) sprintf formats.
+		if (is_array($styleSpec[1]))
+		{
+			$newFormat = $styleSpec[1][0];
+			$oldFormat = $styleSpec[1][1];
+		}
+		else
+		{
+			$newFormat = $oldFormat = $styleSpec[1];
+		}
+
+		// Check if we are incrementing an existing pattern, or appending a new one.
+		if (preg_match($rxSearch, $string, $matches))
+		{
+			$n = empty($n) ? ($matches[1] + 1) : $n;
+			$string = preg_replace($rxReplace, sprintf($oldFormat, $n), $string);
+		}
+		else
+		{
+			$n = empty($n) ? 2 : $n;
+			$string .= sprintf($newFormat, $n);
+		}
+
+		return $string;
+	}
+
+	/**
+	 * Tests whether a string is serialized before attempting to unserialize it
+	 *
+	 * Author : doorknob
+	 *
+	 * @since   1.0.0
+	 */
+	public static function isSerialized($str)
+	{
+		return ($str == serialize(false) || @unserialize($str) !== false);
+	}
+
+	/**
+	 * Uppercase first letter of the first word of a string (utf-8)
+	 *
+	 * @since   1.2.4
+	 */
+	public static function mb_ucfirst($str)
+	{
+    	if (preg_match('/[a-z]/ui', $str[0]))
+        	return ucfirst($str);
+
+    	$first	= mb_strtoupper($str[0].$str[1], 'utf8');
+    	$str[0]	= $first[0];
+    	$str[1]	= $first[1];
+
+    	return $str;
+	}
+}
diff --git a/deployed/icagenda/libraries/ic_library/thumb/create.php b/deployed/icagenda/libraries/ic_library/thumb/create.php
new file mode 100644
index 00000000..d9fa69ea
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/thumb/create.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iC Library - Library by Jooml!C, for Joomla!
+ *------------------------------------------------------------------------------
+ * @package     iC Library
+ * @subpackage  thumb
+ * @copyright   Copyright (c)2013-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     1.2.1 2015-02-19
+ * @since       1.0.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+/**
+ * iC Library thumb class
+ */
+class iCThumbCreate
+{
+	/**
+	 * Create thumbnail image by php using the GD Library
+	 *
+	 * @since   1.0.0
+	 */
+	static public function createThumb($source_image, $destination_image_url, $width, $height, $quality, $crop = null, $prefix = null, $checksize = null)
+	{
+		//Set image ratio
+		list($w, $h) = getimagesize($source_image);
+
+		// resize
+		if ($crop === true)
+		{
+			if ($checksize
+				&& ($w < $width or $h < $height)
+				)
+			{
+				$width	= $w+1;
+				$height	= $h+1;
+				$x		= 0;
+			}
+			else
+			{
+				$ratio	= max($width/$w, $height/$h);
+				$h		= $height / $ratio;
+				$x		= ($w - $width / $ratio) / 2;
+				$w		= $width / $ratio;
+			}
+		}
+		else
+		{
+			if ($checksize
+				&& ($w < $width or $h < $height)
+				)
+			{
+				$width	= $w;
+				$height	= $h;
+				$x		= 0;
+			}
+			else
+			{
+				$ratio	= min($width/$w, $height/$h);
+				$width	= $w * $ratio;
+				$height	= $h * $ratio;
+				$x		= 0;
+			}
+		}
+
+		if (preg_match("/.jpg/i","$source_image") OR preg_match("/.jpeg/i","$source_image"))
+		{
+			//JPEG type thumbnail
+			$destImage = imagecreatetruecolor($width, $height);
+			$sourceImage = imagecreatefromjpeg($source_image);
+			imagecopyresampled($destImage, $sourceImage, 0, 0, $x, 0, $width, $height, $w, $h);
+			imagejpeg($destImage, $destination_image_url, $quality);
+			imagedestroy($destImage);
+		}
+		elseif (preg_match("/.png/i", "$source_image"))
+		{
+			//PNG type thumbnail
+			$destImage = imagecreatetruecolor ($width, $height);
+			$sourceImage = imagecreatefrompng($source_image);
+			imagealphablending($destImage, false);
+			imagecopyresampled($destImage, $sourceImage, 0, 0, $x, 0, $width, $height, $w, $h);
+			imagesavealpha($destImage, true);
+			imagepng($destImage, $destination_image_url);
+		}
+		elseif (preg_match("/.gif/i", "$source_image"))
+		{
+			//GIF type thumbnail
+			$destImage = imagecreatetruecolor($width, $height);
+			$sourceImage = imagecreatefromgif($source_image);
+			$bgc = imagecolorallocate ($destImage, 255, 255, 255);
+			imagefilledrectangle ($destImage, 0, 0, $width, $height, $bgc);
+			imagecopyresampled($destImage, $sourceImage, 0, 0, $x, 0, $width, $height, $w, $h);
+
+			if(function_exists('imagegif'))
+			{
+				// Pour GIF
+				header('Content-Type: image/gif');
+
+				imagegif($destImage, $destination_image_url, $quality);
+			}
+
+			imagedestroy($destImage);
+		}
+		else
+		{
+			echo 'unable to load image source';
+		}
+	}
+}
diff --git a/deployed/icagenda/libraries/ic_library/thumb/get.php b/deployed/icagenda/libraries/ic_library/thumb/get.php
new file mode 100644
index 00000000..ab54b0bb
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/thumb/get.php
@@ -0,0 +1,523 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iC Library   Library by Jooml!C, for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     1.4.11 2019-10-16
+ *
+ * @package     iC Library
+ * @subpackage  Thumb
+ * @link        https://www.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * iC Library image class
+ */
+class iCThumbGet
+{
+	/**
+	 * Return the link to the thumbnail of an image
+	 *
+	 * @since   1.0.0
+	 */
+	static public function thumbnail($image, $thumbsPath, $subFolder,
+		$width, $height, $quality, $crop = null, $prefix = null, $type = null, $checksize = null, $name = null)
+	{
+		$app = JFactory::getApplication();
+
+		$file_local		= JPATH_ROOT . '/' . $image;
+		$file_distant	= $image;
+
+		$linkToImage	= filter_var($image, FILTER_VALIDATE_URL) ? $file_distant : $file_local;
+		$original_exist	= file_exists($linkToImage) ? true : false;
+
+		// Set memory_limit if possible to 512mo, and check needed memory to generate thumbnails
+		ini_set('memory_limit','512M');
+
+		// Check if fopen is allowed
+		$fopen = true;
+		$result = ini_get('allow_url_fopen');
+
+		if (empty($result))
+		{
+			$fopen = false;
+		}
+
+		// Initialize Vars
+		$Image_Link 			= '';
+		$Thumb_Link 			= '';
+		$Display_Thumb 			= false;
+		$MimeTypeOK 			= true;
+		$MimeTypeERROR			= false;
+		$Invalid_Link 			= false;
+		$Invalid_Img_Format		= false;
+		$fopen_bmp_error_msg	= false;
+
+		$Invalid_LinkMsg		= '<i class="icon-warning"></i><br /><span style="color:red;"><strong>' . JText::_('ICLIB_INVALID_PICTURE_LINK') . '</strong></span>';
+		$Wrong_img_format		= '<i class="icon-warning"></i><br/><span style="color:red;"><strong>' . JText::_('ICLIB_NOT_AUTHORIZED_IMAGE_TYPE') . '</strong><br/>' . JText::_('ICLIB_NOT_AUTHORIZED_IMAGE_TYPE_INFO') . '</span>';
+		$fopen_bmp_error		= '<i class="icon-warning"></i><br/><span style="color:red;"><strong>' . JText::_('ICLIB_PHP_ERROR_FOPEN_COPY_BMP') . '</strong><br/>' . JText::_('ICLIB_PHP_ERROR_FOPEN_COPY_BMP_INFO') . '</span>';
+		$error_icthumb			= '<i class="icon-warning"></i><br/><span style="color:red;"><strong>' . JText::_('ICLIB_ERROR_ICTHUMB') . '</strong><br/>' . JText::_('ICLIB_ERROR_ICTHUMB_INFO') . '</span>';
+
+		// Mime-Type pre-settings
+		$errorMimeTypeMsg 		= '<i class="icon-warning"></i><br /><span style="color:red;"><strong>' . JText::_('ICLIB_ERROR_MIME_TYPE') . '</strong><br/>' . JText::_('ICLIB_ERROR_MIME_TYPE_NO_THUMBNAIL');
+
+		// Folder for copy of distant images, and jpg created from bmp
+		$copyPath	 			= $thumbsPath . '/copy';
+
+		$cropped = $crop ? 'c' : '';
+
+		// Thumb Destination
+		if ($name)
+		{
+			$thumb_name				= '';
+		}
+		elseif ($prefix)
+		{
+			$thumb_name				= $prefix.'_w'.$width.'h'.$height.'q'.$quality.$cropped.'_';
+		}
+		else
+		{
+			$thumb_name				= 'w'.$width.'h'.$height.'q'.$quality.$cropped.'_';
+		}
+		$thumb_destination		= $subFolder . '/' . $thumb_name;
+
+		// Get Image File Infos
+		$image_info		= pathinfo($image);
+		$imgtitle		= $image_info['filename'];
+		$imgextension	= strtolower($image_info['extension']); // To be checked if error with uppercase extension type
+
+		// Clean file name
+		jimport( 'joomla.filter.output' );
+		$cleanFileName	= JFilterOutput::stringURLSafe($imgtitle) . '.' . $imgextension;
+		$cleanTitle		= JFilterOutput::stringURLSafe($imgtitle);
+
+		// Image pre-settings
+		$image_value 			= $image;
+		$Image_Link 			= $image;
+
+		// url to thumbnails already created
+		$Thumb_Link 			= $thumbsPath . '/' . $thumb_destination . $cleanFileName;
+		$Thumb_aftercopy_Link 	= $thumbsPath . '/' . $thumb_destination . $cleanTitle . '.jpg';
+
+		// url to copy original jpg created
+		$MAX_aftercopy_Link 	= $copyPath . '/' . $cleanTitle . '.jpg';
+
+		$file_copy		= JPATH_ROOT . '/' . $MAX_aftercopy_Link;
+
+		// Fix for previous version, if original image is too small (ic_large image only, used in event details view)
+		$original_too_small = false;
+
+		if ($prefix == 'ic_large')
+		{
+			if ($original_exist)
+			{
+				$file_to_check	= filter_var($image, FILTER_VALIDATE_URL) ? $file_copy : $file_local;
+				list($w, $h)	= getimagesize($file_to_check);
+
+				if ($w < $width or $h < $height)
+				{
+					$max_image_size		= filter_var($image, FILTER_VALIDATE_URL) ? $MAX_aftercopy_Link : $image;
+					$original_too_small	= true;
+				}
+			}
+		}
+
+		// Check if thumbnails already created
+		if (file_exists(JPATH_ROOT . '/' . $Thumb_Link)
+			|| $original_too_small)
+		{
+			$Thumb_Link = $original_too_small ? $max_image_size : $Thumb_Link;
+			$Display_Thumb = true;
+		}
+		elseif (file_exists(JPATH_ROOT . '/' . $Thumb_aftercopy_Link)
+			|| $original_too_small)
+		{
+			$Thumb_Link = $original_too_small ? $max_image_size : $Thumb_aftercopy_Link;
+			$Display_Thumb = true;
+		}
+
+		// if thumbnails not already created, create thumbnails
+		else
+		{
+			if (file_exists($linkToImage))
+			{
+				// Test Mime-Type
+				$fileinfos = getimagesize($linkToImage);
+				$mimeType = $fileinfos['mime'];
+				$extensionType = 'image/' . $imgextension;
+
+				// SETTINGS ICTHUMB
+				$errorMimeTypeInfo = '<span style="color:black;"><br/>' . JText::sprintf('ICLIB_ERROR_MIME_TYPE_INFO', $imgextension, $mimeType);
+
+				// Error message if Mime-Type is not the same as extension
+				if (($imgextension == 'jpeg') OR ($imgextension == 'jpg'))
+				{
+					if (($mimeType != 'image/jpeg') AND ($mimeType != 'image/jpg'))
+					{
+						$MimeTypeOK 	= false;
+						$MimeTypeERROR 	= true;
+					}
+				}
+				elseif ($imgextension == 'bmp')
+				{
+					if (($mimeType != 'image/bmp') AND ($mimeType != 'image/x-ms-bmp'))
+					{
+						$MimeTypeOK 	= false;
+						$MimeTypeERROR 	= true;
+					}
+				}
+				elseif ($mimeType != $extensionType)
+				{
+					$MimeTypeOK 	= false;
+					$MimeTypeERROR 	= true;
+				}
+			}
+
+			// If Error mime-type, no thumbnail creation
+			if ($MimeTypeOK)
+			{
+				// Call function and create image thumbnail for events list in admin
+
+				// If Image JPG, JPEG, PNG or GIF
+				if (($imgextension == "jpg") OR ($imgextension == "jpeg") OR ($imgextension == "png") OR ($imgextension == "gif"))
+				{
+					$Thumb_Link = $Thumb_Link;
+
+					if ( ! file_exists(JPATH_ROOT . '/' . $Thumb_Link))
+					{
+						if (filter_var($image_value, FILTER_VALIDATE_URL))
+						{
+							if ((iCUrl::url_exists($image_value)) AND ($fopen))
+							{
+								$testFile = JPATH_ROOT . '/' . $copyPath . '/' . $cleanFileName;
+
+								if ( ! file_exists($testFile))
+								{
+									// Get the file
+									$content = file_get_contents($image_value);
+
+									// Store in the filesystem.
+									$fp = fopen(JPATH_ROOT . '/' . $copyPath . '/' . $cleanFileName, "w");
+									fwrite($fp, $content);
+									fclose($fp);
+								}
+
+								$linkToImage = JPATH_ROOT . '/' . $copyPath . '/' . $cleanFileName;
+								$image_value = $copyPath . '/' . $cleanFileName;
+							}
+							else
+							{
+								$linkToImage = $image_value;
+							}
+						}
+						else
+						{
+							$linkToImage = JPATH_ROOT . '/' . $image_value;
+						}
+
+						if ((iCUrl::url_exists($linkToImage)) OR (file_exists($linkToImage)))
+						{
+							self::checkServerLimit($linkToImage);
+							iCThumbCreate::createThumb($linkToImage, JPATH_ROOT . '/' . $Thumb_Link, $width, $height, $quality, $crop, $prefix, $checksize);
+						}
+						else
+						{
+							$Invalid_Link = true;
+						}
+					}
+				}
+
+				// If Image BMP
+				elseif ($imgextension == "bmp")
+				{
+					$Image_Link = $copyPath . '/' . $cleanTitle . '.jpg';
+					$Thumb_Link = $Thumb_aftercopy_Link;
+
+					if (!file_exists(JPATH_ROOT . '/' . $Thumb_Link))
+					{
+						if (filter_var($image_value, FILTER_VALIDATE_URL))
+						{
+							if ((iCUrl::url_exists($image_value)) AND ($fopen))
+							{
+								$testFile = JPATH_ROOT . '/' . $copyPath . '/' . $cleanTitle . '.jpg';
+
+								if (!file_exists($testFile))
+								{
+									// Get the file
+									$content = file_get_contents($image_value);
+
+									// Store in the filesystem.
+									$fp = fopen(JPATH_ROOT . '/' . $copyPath . '/' . $cleanFileName, "w");
+									fwrite($fp, $content);
+									fclose($fp);
+									$imageNewValue = JPATH_ROOT . '/' . $copyPath . '/' . $cleanFileName;
+									imagejpeg(iCThumbImage::createFromBMP($imageNewValue), JPATH_ROOT . '/' . $copyPath . '/' . $cleanTitle . '.jpg', 100);
+									unlink($imageNewValue);
+								}
+							}
+							else
+							{
+								$linkToImage = $image_value;
+							}
+						}
+						else
+						{
+							imagejpeg(iCThumbImage::createFromBMP(JPATH_ROOT . '/' . $image_value), JPATH_ROOT . '/' . $copyPath . '/' . $cleanTitle . '.jpg', 100);
+						}
+
+						$image_value = $copyPath . '/' . $cleanTitle . '.jpg';
+						$linkToImage = JPATH_ROOT . '/' . $image_value;
+
+						if (!$fopen)
+						{
+							$fopen_bmp_error_msg = true;
+						}
+						elseif ((iCUrl::url_exists($linkToImage)) OR (file_exists($linkToImage)))
+						{
+							self::checkServerLimit($linkToImage);
+							iCThumbCreate::createThumb($linkToImage, JPATH_ROOT . '/' . $Thumb_Link, $width, $height, $quality, $crop, $prefix, $checksize);
+						}
+						else
+						{
+							$Invalid_Link = true;
+						}
+					}
+				}
+
+				// If Not authorized Image Format
+				else
+				{
+					if ((iCUrl::url_exists($linkToImage)) OR (file_exists($linkToImage)))
+					{
+						$Invalid_Img_Format = true;
+					}
+					else
+					{
+						$Invalid_Link = true;
+					}
+				}
+
+				if (!$Invalid_Link)
+				{
+					$Display_Thumb = true;
+				}
+			}
+			// If error Mime-Type
+			else
+			{
+				if (($imgextension == "jpg")
+					OR ($imgextension == "jpeg")
+					OR ($imgextension == "png")
+					OR ($imgextension == "gif")
+					OR ($imgextension == "bmp"))
+				{
+					$MimeTypeERROR = true;
+				}
+				else
+				{
+					$Invalid_Img_Format = true;
+					$MimeTypeERROR = false;
+				}
+			}
+		}
+
+		if ($type == 'imgTag'
+			||  $type == 'imgTagLinkModal')
+		{
+			// Display Thumbnail Image tag
+			$thumbnailImgTag = '';
+			if ($Invalid_Img_Format)
+			{
+				$thumbnailImgTag.= $app->isAdmin() ? $Wrong_img_format : '';
+			}
+
+			if ($Invalid_Link)
+			{
+				$thumbnailImgTag.= $app->isAdmin() ? $Invalid_LinkMsg : '';
+			}
+
+			if ($MimeTypeERROR)
+			{
+				$thumbnailImgTag.= $app->isAdmin() ? $errorMimeTypeMsg : '';
+				$thumbnailImgTag.= $app->isAdmin() ? $errorMimeTypeInfo : '';
+			}
+
+			if ($fopen_bmp_error_msg)
+			{
+				$thumbnailImgTag.= $app->isAdmin() ? $fopen_bmp_error : '';
+			}
+
+			if ($Display_Thumb)
+			{
+				if ($imgextension == "bmp")
+				{
+					if ($type == 'imgTagLinkModal')
+					{
+						$thumbnailImgTag.= '<a href="' . JURI::root( true ) . '/' . $MAX_aftercopy_Link.'" class="modal">';
+					}
+
+					$thumbnailImgTag.= '<img src="' . JURI::root( true ) . '/' . $Thumb_aftercopy_Link.'" alt="' . $imgtitle . '" />';
+
+					if ($type == 'imgTagLinkModal')
+					{
+						$thumbnailImgTag.= '</a>';
+					}
+				}
+				else
+				{
+					if ($type == 'imgTagLinkModal')
+					{
+						if (filter_var($Image_Link, FILTER_VALIDATE_URL))
+						{
+							$thumbnailImgTag.= '<a href="'.$Image_Link.'" class="modal">';
+						}
+						else
+						{
+							$thumbnailImgTag.= '<a href="' . JURI::root( true ) . '/' . $Image_Link.'" class="modal">';
+						}
+					}
+
+					$thumbnailImgTag.= '<img src="' . JURI::root( true ) . '/' . $Thumb_Link.'" alt="' . $imgtitle . '" />';
+
+					if ($type == 'imgTagLinkModal')
+					{
+						$thumbnailImgTag.= '</a>';
+					}
+				}
+			}
+
+			if ((!file_exists(JPATH_ROOT . '/' . $Thumb_Link)) && ($image) && (!$fopen))
+			{
+				$thumbnailImgTag.=  $app->isAdmin() ? $error_icthumb : '';
+			}
+
+			return $thumbnailImgTag;
+		}
+		else
+		{
+			// Display Thumbnail Image tag
+			$thumb_img = '';
+
+			// Set Thumbnail
+			$default_thumbnail = 'media/com_icagenda/images/nophoto.jpg';
+
+			if ( $Invalid_Img_Format
+				|| $Invalid_Link
+				|| $MimeTypeERROR
+				|| $fopen_bmp_error_msg
+				|| ((!file_exists(JPATH_ROOT . '/' . $Thumb_Link)) && ($image)) )
+			{
+				$thumb_img = $default_thumbnail;
+			}
+			elseif ($Display_Thumb)
+			{
+				$thumb_img = $Thumb_Link;
+			}
+
+			return $thumb_img;
+		}
+	}
+
+	/**
+	 * Return the thumbnail from an image, embed inside html tags
+	 *
+	 * @since   1.0.0
+	 */
+	static public function thumbnailImgTag($image, $thumbsPath, $subFolder,
+		$width, $height, $quality, $crop = null, $prefix = null)
+	{
+		$thumbnailImgTag = iCThumbGet::thumbnail($image, $thumbsPath, $subFolder, $width, $height, $quality, $crop, $prefix, 'imgTag');
+
+		return $thumbnailImgTag;
+	}
+
+	/**
+	 * Return the thumbnail from an image, embed inside html tags
+	 * Link on thumbnail opens original image in modal
+	 *
+	 * @since   1.0.0
+	 */
+	static public function thumbnailImgTagLinkModal($image, $thumbsPath, $subFolder,
+		$width, $height, $quality, $crop = null, $prefix = null)
+	{
+		$thumbnailImgTag = iCThumbGet::thumbnail($image, $thumbsPath, $subFolder, $width, $height, $quality, $crop, $prefix, 'imgTagLinkModal');
+
+		return $thumbnailImgTag;
+	}
+
+	/**
+	 * Function to estimate memory limit to generate thumbs depending on image size
+	 * $linkToImage = url to image
+	 *
+	 * @since   1.3.5
+	 */
+	static public function checkServerLimit($linkToImage)
+	{
+		$app = JFactory::getApplication();
+
+		$memory_limit 		= ini_get('memory_limit');
+		list($w, $h)		= getimagesize($linkToImage);
+		$rgba_factor		= 4;
+		$security_factor	= 1.8;
+
+		if (preg_match('/^(\d+)(.)$/', $memory_limit, $matches))
+		{
+			if ($matches[2] == 'M')
+			{
+				$memory_limit = $matches[1] * 1024 * 1024; // nnnM -> nnn MB
+			}
+			elseif ($matches[2] == 'K')
+			{
+				$memory_limit = $matches[1] * 1024; // nnnK -> nnn KB
+			}
+		}
+
+		if (function_exists('memory_get_usage')
+			&& ( (($w * $h * $rgba_factor * $security_factor) + memory_get_usage()) > $memory_limit )
+			)
+		{
+			if ( $app->isAdmin() )
+			{
+				$alert_message = JText::sprintf('ICLIB_ERROR_ALERT_IMAGE_TOO_LARGE', $image);
+
+				// Get the message queue
+				$messages = $app->getMessageQueue();
+
+				$display_alert_message = false;
+
+				// If we have messages
+				if (is_array($messages) && count($messages))
+				{
+					// Check each message for the one we want
+					foreach ($messages as $key => $value)
+					{
+						if ($value['message'] == $alert_message)
+						{
+							$display_alert_message = true;
+						}
+					}
+				}
+
+				if ( ! $display_alert_message)
+				{
+					$app->enqueueMessage($alert_message, 'Warning');
+				}
+
+				return JText::_('ICLIB_ERROR_IMAGE_TOO_LARGE');
+			}
+			else
+			{
+				return false;
+			}
+		}
+	}
+}
diff --git a/deployed/icagenda/libraries/ic_library/thumb/image.php b/deployed/icagenda/libraries/ic_library/thumb/image.php
new file mode 100644
index 00000000..67465c28
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/thumb/image.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iC Library - Library by Jooml!C, for Joomla!
+ *------------------------------------------------------------------------------
+ * @package     iC Library
+ * @subpackage  thumb
+ * @copyright   Copyright (c)2013-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     1.0.0 2014-05-08
+ * @since       1.0.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+/**
+ * iC Library image class
+ */
+class iCThumbImage
+{
+	/**
+	 * Create image from a BMP
+	 *
+	 * @since   1.0.0
+	 */
+	static public function createFromBMP($filename)
+	{
+		// Open file in binary mode
+		if (! $f1 = fopen($filename,"rb")) return FALSE;
+
+		//1 : Loads file header
+		$FILE = unpack("vfile_type/Vfile_size/Vreserved/Vbitmap_offset", fread($f1,14));
+		if ($FILE['file_type'] != 19778) return FALSE;
+
+		//2 : Loads BMP header
+		$BMP = unpack('Vheader_size/Vwidth/Vheight/vplanes/vbits_per_pixel'.
+					'/Vcompression/Vsize_bitmap/Vhoriz_resolution'.
+					'/Vvert_resolution/Vcolors_used/Vcolors_important', fread($f1,40));
+		$BMP['colors'] = pow(2,$BMP['bits_per_pixel']);
+		if ($BMP['size_bitmap'] == 0) $BMP['size_bitmap'] = $FILE['file_size'] - $FILE['bitmap_offset'];
+		$BMP['bytes_per_pixel'] = $BMP['bits_per_pixel']/8;
+		$BMP['bytes_per_pixel2'] = ceil($BMP['bytes_per_pixel']);
+		$BMP['decal'] = ($BMP['width']*$BMP['bytes_per_pixel']/4);
+		$BMP['decal'] -= floor($BMP['width']*$BMP['bytes_per_pixel']/4);
+		$BMP['decal'] = 4-(4*$BMP['decal']);
+		if ($BMP['decal'] == 4) $BMP['decal'] = 0;
+
+		//3 : Loads colors of the palette
+		$PALETTE = array();
+		if ($BMP['colors'] < 16777216 && $BMP['colors'] != 65536)
+		{
+			$PALETTE = unpack('V'.$BMP['colors'], fread($f1,$BMP['colors']*4));
+		}
+
+		//4 : Creates image
+		$IMG = fread($f1,$BMP['size_bitmap']);
+		$VIDE = chr(0);
+
+		$res = imagecreatetruecolor($BMP['width'],$BMP['height']);
+		$P = 0;
+		$Y = $BMP['height']-1;
+		while ($Y >= 0)
+		{
+			$X=0;
+			while ($X < $BMP['width'])
+			{
+				if ($BMP['bits_per_pixel'] == 24)
+				{
+					$COLOR = unpack("V",substr($IMG,$P,3).$VIDE);
+				}
+				elseif ($BMP['bits_per_pixel'] == 16)
+				{
+					$COLOR = unpack("v",substr($IMG,$P,2));
+					$blue  = ($COLOR[1] & 0x001f) << 3;
+					$green = ($COLOR[1] & 0x07e0) >> 3;
+					$red   = ($COLOR[1] & 0xf800) >> 8;
+					$COLOR[1] = $red * 65536 + $green * 256 + $blue;
+				}
+				elseif ($BMP['bits_per_pixel'] == 8)
+				{
+					$COLOR = unpack("n",$VIDE.substr($IMG,$P,1));
+					$COLOR[1] = $PALETTE[$COLOR[1]+1];
+				}
+				elseif ($BMP['bits_per_pixel'] == 4)
+				{
+					$COLOR = unpack("n",$VIDE.substr($IMG,floor($P),1));
+					if (($P*2)%2 == 0) $COLOR[1] = ($COLOR[1] >> 4) ; else $COLOR[1] = ($COLOR[1] & 0x0F);
+					$COLOR[1] = $PALETTE[$COLOR[1]+1];
+				}
+				elseif ($BMP['bits_per_pixel'] == 1)
+				{
+					$COLOR = unpack("n",$VIDE.substr($IMG,floor($P),1));
+					if     (($P*8)%8 == 0) $COLOR[1] =  $COLOR[1]        >>7;
+					elseif (($P*8)%8 == 1) $COLOR[1] = ($COLOR[1] & 0x40)>>6;
+					elseif (($P*8)%8 == 2) $COLOR[1] = ($COLOR[1] & 0x20)>>5;
+					elseif (($P*8)%8 == 3) $COLOR[1] = ($COLOR[1] & 0x10)>>4;
+					elseif (($P*8)%8 == 4) $COLOR[1] = ($COLOR[1] & 0x8)>>3;
+					elseif (($P*8)%8 == 5) $COLOR[1] = ($COLOR[1] & 0x4)>>2;
+					elseif (($P*8)%8 == 6) $COLOR[1] = ($COLOR[1] & 0x2)>>1;
+					elseif (($P*8)%8 == 7) $COLOR[1] = ($COLOR[1] & 0x1);
+					$COLOR[1] = $PALETTE[$COLOR[1]+1];
+				}
+				else
+				return FALSE;
+				imagesetpixel($res,$X,$Y,$COLOR[1]);
+				$X++;
+				$P += $BMP['bytes_per_pixel'];
+			}
+			$Y--;
+			$P+=$BMP['decal'];
+		}
+
+		// Close file
+		fclose($f1);
+
+		return $res;
+	}
+}
diff --git a/deployed/icagenda/libraries/ic_library/thumb/index.html b/deployed/icagenda/libraries/ic_library/thumb/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/thumb/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/libraries/ic_library/url/index.html b/deployed/icagenda/libraries/ic_library/url/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/url/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/libraries/ic_library/url/url.php b/deployed/icagenda/libraries/ic_library/url/url.php
new file mode 100644
index 00000000..6cc64569
--- /dev/null
+++ b/deployed/icagenda/libraries/ic_library/url/url.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ *------------------------------------------------------------------------------
+ *  iC Library - Library by Jooml!C, for Joomla!
+ *------------------------------------------------------------------------------
+ * @package     iC Library
+ * @subpackage  url
+ * @copyright   Copyright (c)2013-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     1.4.3 2017-01-05
+ * @since       1.0.0
+ *------------------------------------------------------------------------------
+*/
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+/**
+ * class iCUrl
+ */
+class iCUrl
+{
+	/**
+	 * Function to check if an url exists
+	 *
+	 * @access	public static
+	 * @param	url to be tested
+	 * @return	true or false
+	 *
+	 * @since   1.0.0
+	 */
+	static public function url_exists($url)
+	{
+		if (@file_get_contents($url))
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+
+		// Deprecated
+//		$a_url = parse_url($url);
+//		if (!isset($a_url['port'])) $a_url['port'] = 80;
+//		$errno = 0;
+//		$errstr = '';
+//		$timeout = 30;
+//		if(isset($a_url['host']) && $a_url['host']!=gethostbyname($a_url['host']))
+//		{
+//			$fid = fsockopen($a_url['host'], $a_url['port'], $errno, $errstr, $timeout);
+//			if (!$fid) return false;
+//			$page = isset($a_url['path']) ?$a_url['path']:'';
+//			$page .= isset($a_url['query'])?'?'.$a_url['query']:'';
+//			fputs($fid, 'HEAD '.$page.' HTTP/1.0'."\r\n".'Host: '.$a_url['host']."\r\n\r\n");
+//			$head = fread($fid, 4096);
+//			fclose($fid);
+//			return preg_match('#^HTTP/.*\s+[200|302]+\s#i', $head);
+//		}
+//		else
+//		{
+//			return false;
+//		}
+	}
+
+	/**
+	 * Function to parse an url and apply control of component set
+	 *
+	 * @access  public static
+	 * @param   $url        url to be parsed
+	 *          $component  component to be checked (default 'scheme')
+	 *
+	 * @return	validate url
+	 *
+	 * @since   1.0.0
+	 */
+	static public function urlParsed($url, $component = 'scheme')
+	{
+		$parsed = parse_url($url);
+
+		// Add http:// if scheme missing
+		if ($component == 'scheme' && empty($parsed['scheme']))
+		{
+			$link = 'http://' . ltrim($url, '/');
+		}
+		else
+		{
+			$link = ltrim($url, '/');
+		}
+
+		return $link;
+	}
+}
diff --git a/deployed/icagenda/media/com_icagenda/css/icagenda-back.css b/deployed/icagenda/media/com_icagenda/css/icagenda-back.css
new file mode 100644
index 00000000..9ea82109
--- /dev/null
+++ b/deployed/icagenda/media/com_icagenda/css/icagenda-back.css
@@ -0,0 +1,581 @@
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.12 2020-03-24
+ *
+ * @package     iCagenda.Media
+ * @subpackage  CSS
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2020 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.4.0
+ *----------------------------------------------------------------------------
+*/
+
+
+/* iCagenda Admin Styles */
+[class^="ic-spacer-"] label,
+[class*=" ic-spacer-"] label {
+	margin: 7px 0 -6px 0;
+	font-family: inherit;
+	font-weight: bold;
+	line-height: 18px;
+	color: inherit;
+	text-rendering: optimizelegibility;
+	cursor: none;
+}
+.ic-spacer-h3 label {
+	font-size: 18px;
+	line-height: 20px;
+}
+
+/* -- GOOGLE MAPS FIELDS ---------------------------- */
+.icmap-label {
+	float: left;
+	width: 140px;
+	padding-top: 5px;
+	padding-right: 5px;
+	text-align: left;
+}
+.icmap-field {
+	margin: 5px;
+}
+.form-validate .icmap-field input,
+.icagenda_form .icmap-field input {
+	background-color: #eee;
+/*	width: auto; */
+	color: #777;
+}
+
+/* -- FORM FIELD INVALID ---------------------------- */
+.ic-field-invalid label{
+/*	color: #9D261D; */
+	color: red !important;
+	font-weight: bold;
+}
+.ic-field-invalid input{
+	border: 1px solid red !important;
+}
+
+.ic-field-invalid-lbl{
+/*	color: #9D261D; */
+	color: red !important;
+	font-weight: bold;
+}
+.ic-field-invalid-input{
+	border: 1px solid red !important;
+}
+
+.ic-date-invalid {
+	color: red !important;
+}
+.ic-date-invalid input{
+	color: red !important;
+}
+
+/* -- ALERT MESSAGES AND NOTICES -------------------- */
+.ic-alert {
+	padding: 8px 14px 8px 14px;
+	margin-bottom: 18px;
+	text-shadow: 0px 1px 0px rgba(255, 255, 255, 0.5);
+	background-color: #FCF8E3;
+	border: 1px solid #FBEED5;
+	border-radius: 4px;
+}
+.ic-alert-note {
+    background-color: #FAFAFA;
+    border-color: #CCC;
+	color: #777;
+}
+
+/* -- CSS TO BE CHECKED ----------------------------- */
+
+#hidden {
+	display: none;
+	}
+
+/** header **/
+
+.container{
+	width: 100%;
+	position: relative;
+}
+.clr{
+	clear: both;
+	padding: 0;
+	height: 0;
+	margin: 0;
+}
+.container > header{
+	margin: 10px;
+	padding: 20px 10px 10px 10px;
+	position: relative;
+	display: block;
+	text-shadow: 1px 1px 1px rgba(0,0,0,0.2);
+    text-align: center;
+}
+.container > header h1{
+	font-size: 40px;
+	line-height: 40px;
+	margin: 0;
+	position: relative;
+	font-weight: 300;
+	/* color: #128680; */
+	color: #777777;
+	text-shadow: 1px 1px 1px rgba(255,255,255,0.7);
+}
+.container > header h1 span{
+	font-weight: 700;
+}
+.container > header h2{
+	font-size: 14px;
+	font-weight: 300;
+	margin: 0;
+	padding: 15px 0 5px 0;
+	/* color: #7c8e8d; */
+	color: #888;
+	font-family: Cambria, Georgia, serif;
+	font-style: italic;
+	text-shadow: 1px 1px 1px rgba(255,255,255,0.9);
+}
+/* Header Style */
+.iCheader-top{
+	line-height: 24px;
+	font-size: 11px;
+	background: #fff;
+	background: rgba(255, 255, 255, 0.6);
+	text-transform: uppercase;
+	/*z-index: 9999;*/
+	position: relative;
+	font-family: Cambria, Georgia, serif;
+	box-shadow: 1px 0px 2px rgba(0,0,0,0.2);
+}
+.iCheader-top a{
+	padding: 0px 10px;
+	letter-spacing: 1px;
+	color: #333;
+	display: inline-block;
+}
+.iCheader-top a:hover{
+	background: rgba(255,255,255,0.3);
+}
+.iCheader-top span.right{
+	float: right;
+}
+.iCheader-top span.right a{
+	float: left;
+	display: block;
+}
+/* Tutorial Videos Buttons Style */
+.iCheader-videos{
+    text-align:center;
+	display: block;
+	line-height: 30px;
+	padding: 5px 0px;
+}
+.iCheader-videos a{
+    display: inline-block;
+	margin: 0px 4px;
+	padding: 0px 6px;
+	color: #aaa;
+	line-height: 20px;
+	font-size: 13px;
+	text-shadow: 1px 1px 1px #fff;
+	border: 1px solid #ddd;
+	background: #ffffff; /* Old browsers */
+	background: -moz-linear-gradient(top, #ffffff 0%, #f6f6f6 47%, #ededed 100%); /* FF3.6+ */
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(47%,#f6f6f6), color-stop(100%,#ededed)); /* Chrome,Safari4+ */
+	background: -webkit-linear-gradient(top, #ffffff 0%,#f6f6f6 47%,#ededed 100%); /* Chrome10+,Safari5.1+ */
+	background: -o-linear-gradient(top, #ffffff 0%,#f6f6f6 47%,#ededed 100%); /* Opera 11.10+ */
+	background: -ms-linear-gradient(top, #ffffff 0%,#f6f6f6 47%,#ededed 100%); /* IE10+ */
+	background: linear-gradient(top, #ffffff 0%,#f6f6f6 47%,#ededed 100%); /* W3C */
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#ededed',GradientType=0 ); /* IE6-9 */
+	box-shadow: 0px 1px 1px rgba(255, 255, 255, 0.5);
+}
+.iCheader-videos a:hover{
+	color: #333;
+	box-shadow: 0px 1px 1px rgba(255, 255, 255, 0.5);
+}
+.iCheader-videos a:active{
+	background: #fff;
+}
+.iCheader-videos a.current-demo,
+.iCheader-videos a.current-demo:hover{
+	background: #f6f6f6;
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f6f6f6', endColorstr='#f6f6f6',GradientType=0 ); /* IE6-9 */
+}
+
+
+
+/** general **/
+.clr {
+	clear:both;
+}
+
+.iC-italic-grey {
+	font-style: italic;
+	color: #777
+}
+
+.iCflag {
+	padding: 0px !important;
+	margin-bottom: 3px;
+}
+
+.iCleft {
+	text-align: left;
+}
+
+
+.locandina img {
+	background:#dedede;
+	padding:5px;
+	border:1px solid #ccc;
+	max-width:150px;
+	max-height:200px;
+}
+.icon-48-events {
+	background-image: url(../media/com_icagenda/images/icon48event.png);
+}
+
+icon48icagenda {
+	background-image: none;
+}
+
+/**
+ * ChangeLog
+ **/
+
+/* Header H3 */
+h3.ic-changelog { margin-top: 20pt; font-size: 13pt; }
+h3.ic-changelog-pro { color: #990000; margin-top: 20pt; font-size: 13pt; }
+
+/* Header H4 */
+h4.ic-changelog { border-bottom: 1px solid #ccc; color: #333; margin-top: 15pt; font-size: 10pt; }
+
+/* Global */
+ul.ic-changelog { list-style-type: none; padding: 7px; margin: 3px; font-size: 10pt; border: thin solid #ccc; background-color: #fefefe; border-radius: 5px; }
+ul.ic-changelog li { line-height: 16px; padding: 0; margin: 3px 0 0 0; }
+
+/* Info */
+.ic-message-info { color:#fff; list-style-type: none; padding: 7px; margin: 10px 3px 20px 3px; font-size: 9pt; background-color: #578AD6; border-radius: 5px; }
+
+/* legend */
+.ic-box {
+	line-height: 9px;
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+    text-align: center;
+    vertical-align: middle;
+	border-radius: 3px;
+	margin: -3px 2px auto 2px;
+	padding: 1px 2px;
+	font-size: 8px;
+	font-weight: normal;
+	height: 10px;
+	width: auto;
+}
+/* legend */
+.ic-box-12 {
+	line-height: 10px;
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+    text-align: center;
+    vertical-align: middle;
+	border-radius: 3px;
+	margin: -1px 3px auto 3px;
+	font-weight: normal;
+	height: 12px;
+	width: 12px;
+}
+.ic-box-important {
+	background: #EBAD14;
+	color: #FFFFFF;
+}
+.ic-box-added {
+	background: #61BF1A;
+	color: #FFFFFF;
+}
+.ic-box-removed {
+	background: #ED2E38;
+	color: #FFFFFF;
+}
+.ic-box-changed {
+	background: #999;
+	color: #FFFFFF;
+}
+.ic-box-fixed {
+	background: #578AD6;
+	color: #FFFFFF;
+}
+.ic-important {
+	color: #cc9933;
+}
+.ic-added {
+	color: #5aa427;
+}
+.ic-removed {
+	color: #e52929;
+}
+.ic-changed {
+	color: #777;
+}
+.ic-fixed {
+	color: #0f6eac;
+}
+
+.ic-box-16 {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+    text-align: center;
+    vertical-align: middle;
+	border-radius: 3px;
+	font-weight: normal;
+	line-height: 14px;
+	height: 16px;
+	width: 16px;
+	margin-right: 6px;
+	margin-top: -2px;
+}
+.ic-bold { font-weight: bold; }
+
+/* Sub Important */
+li.ic-changelog-important-sub span {margin-left: 23px; border-left: 1px dashed #cc9933; padding-left: 5px }
+li.ic-changelog-important-sub { color: #cc9933; font-weight: normal; }
+
+
+.blockbtn {
+    display: inline-block;
+    *display: inline;
+    padding: 4px 10px 4px;
+    margin-bottom: 0;
+    *margin-left: .3em;
+    font-size: 13px;
+    line-height: 18px;
+    *line-height: 20px;
+    color: #333;
+    text-align: center;
+    text-shadow: 0 1px 1px rgba(255,255,255,0.75);
+    vertical-align: middle;
+    cursor: pointer;
+    background-color: #f5f5f5;
+    *background-color: #e6e6e6;
+    background-image: -ms-linear-gradient(top,#fff,#e6e6e6);
+    background-image: -webkit-gradient(linear,0 0,0 100%,from(#fff),to(#e6e6e6));
+    background-image: -webkit-linear-gradient(top,#fff,#e6e6e6);
+    background-image: -o-linear-gradient(top,#fff,#e6e6e6);
+    background-image: linear-gradient(top,#fff,#e6e6e6);
+    background-image: -moz-linear-gradient(top,#fff,#e6e6e6);
+    background-repeat: repeat-x;
+    border: 1px solid #ccc;
+    *border: 0;
+    border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+    border-color: #e6e6e6 #e6e6e6 #bfbfbf;
+    border-bottom-color: #b3b3b3;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+    filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffff',endColorstr='#e6e6e6',GradientType=0);
+    filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+    *zoom: 1;
+    -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);
+    -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);
+    box-shadow: inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);
+}
+
+
+/** map **/
+.ui-autocomplete {
+	background-color: white;
+	width: 300px;
+	border: 1px solid #cfcfcf;
+	list-style-type: none;
+	padding-left: 0px;
+}
+
+/** calendar **/
+fieldset.adminform textarea.date {height: 130px; }
+#add {line-height: 28px; margin-left:145px;}
+table#dTable {width: 113px; border:1px solid #cdcec9;}
+
+
+/*
+ * Params Styles
+**/
+
+/* -- STYLE_BOX ------------------- */
+.stylebox {
+	padding: 10px 13px;
+	background : transparent url(../../../media/com_icagenda/images/border_title.png) 0% 100% no-repeat;
+ 	/*font-size:12px; color:#EEE; background-color:#333; margin:10px 0px; padding:10px 5px; border-bottom:5px solid #ce0000; border-radius:3px;*/
+}
+/* -- STYLE_RED ------------------- */
+.stylered {
+	color:#cc0000; background-color:#FFFFFF; font-weight:bold; padding:10px 25px; margin:0; border:1px red dotted; text-align:center;
+}
+/* -- STYLE_BLANCK ------------------- */
+.styleblanck {
+	color:#555; background-color:transparent; font-size:14px; font-weight:bold; padding:10px 0px; margin:0; text-align:left;
+}
+/* -- STYLE_BLANCK CENTER ------------------- */
+.styleblanck-center {
+	color:#555; background-color:transparent; font-size:14px; font-weight:bold; padding:10px 0px; margin:0; text-align:center;
+}
+/* -- STYLE_NOTE ------------------- */
+.stylenote {
+	color:#666; margin:5px 0px 0px 0px; padding:5px 0px 0px 0px;
+}
+/* -- STYLE_NOTEP ------------------- */
+.stylenotep {
+	color:#666; margin:5px 0px 0px 0px; padding:0px;
+}
+/* -- STYLE_SUB ------------------- */
+.stylesub {
+	font-weight:normal; font-size:12px; text-transform:uppercase; color:#666; margin:10px 0px 0px 0px;
+}
+/* -- STYLE_COPY ------------------- */
+.stylecopy {
+	color:#666; font-size:12px; margin:0;
+}
+
+
+
+/** Control Panel **/
+
+.icpanel div.icon, #icpanel div.icon {
+    /* float: left; */
+    margin-bottom: 15px;
+    margin-left: 7px;
+    margin-right: 7px;
+    text-align: center;
+    line-height: 14px;
+}
+.icpanel table {
+    width: 100%;
+    /*background: #F4F4F4;*/
+    margin-top: 5px;
+    margin-bottom: 10px;
+}
+.icpanel .left {
+    float: left;
+}
+.icpanel .right {
+    float: right;
+}
+.icpanel div.icon a, #icpanel div.icon a {
+    background-color: #FFFFFF;
+    background-position: -30px center;
+    border: 1px solid #CCCCCC;
+    /*border-radius: 5px 5px 5px 5px;*/
+    border-radius: 5px;
+    color: #565656;
+    display: inline-block;
+    /* float: left; */
+    height: 98px;
+    text-decoration: none;
+    transition-duration: 0.5s;
+    /*transition-property: background-position, -moz-border-radius-bottomleft, -moz-box-shadow;*/
+    transition-property: all;
+    vertical-align: middle;
+    width: 108px;
+}
+#icpanel div.icon a:hover, #icpanel div.icon a:focus, #icpanel div.icon a:active, .icpanel div.icon a:hover, .icpanel div.icon a:focus, .icpanel div.icon a:active {
+    background-position: 0 center;
+    background-color: #FFFFFF;
+    /*border-bottom-left-radius: 50% 20px;*/
+    border: 1px solid #990000;
+    color: #565656;
+    box-shadow: -5px 10px 15px rgba(0, 0, 0, 0.25);
+    border-radius: 10px;
+    position: relative;
+    z-index: 10;
+}
+.icpanel div.icon.danger a {
+    border: 0;
+}
+.icpanel div.icon .btn {
+    transition-duration: 0.5s;
+    transition-property: border-radius;
+}
+.icpanel div.icon .btn:hover {
+    border-radius: 10px;
+}
+#icpanel img, .icpanel img {
+    margin: 0 auto;
+    padding: 10px 0 5px 0;
+}
+#icpanel span.iconText, .icpanel span.iconText {
+    display: block;
+    text-align: center;
+}
+#icpanel span.denied, .icpanel span.denied {
+    color: #999999;
+}
+div.icpanel-left {
+    float: left;
+    width: 54%;
+}
+div.icpanel-right {
+    float: right;
+    width: 45%;
+}
+
+/** Events List **/
+.ic-nextdate {
+	padding: 2px 5px;
+	border-radius: 5px;
+}
+.ic-upcoming {
+	color: #fff;
+	background: #555;
+	font-weight: bold;
+}
+.ic-today {
+	color: #fff;
+	background: #c30000;
+	font-weight: bold;
+}
+.ic-past {
+	color: #777;
+	background: #e4e4e4;
+	font-style: italic;
+}
+.ic-no-date {
+	background: #fbb450;
+	font-weight: bold;
+}
+
+/** Temporary fix input width for JCE media field input  (@TODO removed 4.0 with admin refactory) */
+.wf-media-input {
+	width: 90px !important;
+}
+
+/** Config Type Elements **/
+.element-title,
+.element-title-img {
+	margin-left: -180px;
+	max-width: 1000px;
+}
+.element-title-img img {
+	float: left;
+	padding: 6px 10px 10px 0px;
+}
+.stylebox {
+	margin-left: -193px;
+	float: none;
+}
+@media (max-width: 420px) {
+	.element-title,
+	.element-title-img,
+	.stylebox {
+		margin-left: 0;
+		float: none;
+	}
+}
diff --git a/deployed/icagenda/media/com_icagenda/css/icagenda-back.j25.css b/deployed/icagenda/media/com_icagenda/css/icagenda-back.j25.css
new file mode 100644
index 00000000..12e309ea
--- /dev/null
+++ b/deployed/icagenda/media/com_icagenda/css/icagenda-back.j25.css
@@ -0,0 +1,208 @@
+/**
+ *------------------------------------------------------------------------------
+ *	CSS iCagenda - Joomla 2.5
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.6.9 2017-07-05
+ * @since       3.0
+ *------------------------------------------------------------------------------
+*/
+
+
+/** general **/
+.clr {
+	clear:both;
+}
+
+/** admin forms **/
+/*
+.control-group {
+	height: 35px;
+}
+*/
+
+fieldset select {
+	max-width: 220px;
+}
+
+/* -- BUTTON STYLES ----------------------------- */
+.btn-group {
+	height: 35px;
+}
+
+.btn-group label:not(.active) {
+	width: auto;
+	line-height:24px;
+	padding: 0px 10px !important;
+	margin: 3px -3px 3px 2px !important;
+	}
+.btn-primary {
+	width: auto !important;
+	line-height:24px !important;
+	padding: 0px 10px !important;
+	margin: 3px -3px 3px 2px !important;
+	}
+.btn-danger {
+	width: auto !important;
+	line-height:24px !important;
+	padding: 0px 10px !important;
+	margin: 3px -3px 3px 2px !important;
+	}
+.btn-success {
+	width: auto !important;
+	line-height:24px !important;
+	padding: 0px 10px !important;
+	margin: 3px -3px 3px 2px !important;
+	}
+
+.btn {
+    display: inline-block;
+    *display: inline;
+    padding: 4px 10px 4px;
+    margin-bottom: 0;
+    *margin-left: .3em;
+    font-size: 13px;
+    line-height: 18px;
+    *line-height: 20px;
+    color: #333;
+    text-align: center;
+    text-shadow: 0 1px 1px rgba(255,255,255,0.75);
+    vertical-align: middle;
+    cursor: pointer;
+    background-color: #f5f5f5;
+    *background-color: #e6e6e6;
+    background-image: -ms-linear-gradient(top,#fff,#e6e6e6);
+    background-image: -webkit-gradient(linear,0 0,0 100%,from(#fff),to(#e6e6e6));
+    background-image: -webkit-linear-gradient(top,#fff,#e6e6e6);
+    background-image: -o-linear-gradient(top,#fff,#e6e6e6);
+    background-image: linear-gradient(top,#fff,#e6e6e6);
+    background-image: -moz-linear-gradient(top,#fff,#e6e6e6);
+    background-repeat: repeat-x;
+    border: 1px solid #ccc;
+    *border: 0;
+    border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+    border-color: #e6e6e6 #e6e6e6 #bfbfbf;
+    border-bottom-color: #b3b3b3;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+    filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffff',endColorstr='#e6e6e6',GradientType=0);
+    filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+    *zoom: 1;
+    -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);
+    -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);
+    box-shadow: inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);
+}
+
+.btn:hover {
+    color: #FFF;
+    text-decoration: none;
+    background-color: #333333;
+    *background-color: #333333;
+    background-position: 0 -30px;
+    -webkit-transition: background-position .1s linear;
+    -moz-transition: background-position .1s linear;
+    -ms-transition: background-position .1s linear;
+    -o-transition: background-position .1s linear;
+    transition: background-position .1s linear;
+}
+.btn:focus {
+    outline: thin dotted #333;
+    outline: 5px auto -webkit-focus-ring-color;
+    outline-offset: -2px;
+}
+
+.btn_update {
+	text-align:center;
+	background:#990000;
+	padding:5px;
+	border-radius:5px;
+	color:#FFFFFF;
+	font-weight: bold;
+}
+
+.btn_update:hover {
+	background:#333333;
+    color: #FFFFFF;
+    cursor: pointer;
+}
+.btn_update:focus {
+
+}
+
+/* -- TOOLTIP STYLES ----------------------------- */
+.tip {
+	background: none !important;
+	border: 0px !important;
+	}
+
+.tip-title {
+	background: none !important;
+	}
+
+.tip-text {
+	font-size: 1em;
+	margin: 0;
+	}
+
+/* -- ADMIN ----------------------------- */
+.lead {
+	margin-bottom: 18px;
+	font-size: 20px !important;
+	font-weight: 200;
+	line-height: 27px;
+	}
+
+.input-xxlarge {
+    width: 460px;
+    font-size: 12px;
+}
+
+div.control-label label{
+    margin-top: 0px !important;
+}
+
+textarea {
+	float: none !important; /* admin j2.5 */
+	width: 98%;
+}
+
+/** Hide not j2.5 compatible options **/
+.hidden-j25 {
+	display: none !important;
+}
+#jform_params_filters_display,
+#jform_params_filters_mode {
+	display: none !important;
+}
+
+/** Config Type Elements **/
+.element-title,
+.element-title-img {
+	margin-left: 0px;
+	max-width: 1000px;
+	width: auto;
+	display: block;
+	clear: both;
+}
+.element-title-img img {
+	float: left;
+	padding: 6px 10px 10px 0px;
+}
+.stylebox {
+	margin-left: -13px;
+}
+@media (max-width: 420px) {
+	.element-title,
+	.element-title-img,
+	.stylebox {
+		margin-left: 0;
+		float: none;
+	}
+}
diff --git a/deployed/icagenda/media/com_icagenda/css/icagenda-front.css b/deployed/icagenda/media/com_icagenda/css/icagenda-front.css
new file mode 100644
index 00000000..2ab57eee
--- /dev/null
+++ b/deployed/icagenda/media/com_icagenda/css/icagenda-front.css
@@ -0,0 +1,1197 @@
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.0 2018-05-25
+ *
+ * @package     iCagenda.Media
+ * @subpackage  CSS.frontend
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.4.0
+ *----------------------------------------------------------------------------
+*/
+
+/**
+ *----------------------------------------------------------------------------
+ *	CSS Frontend - iCagenda
+ *----------------------------------------------------------------------------
+*/
+
+/*
+ * CSS to hide a portion of the link text
+ * See: https://www.w3.org/TR/2012/NOTE-WCAG20-TECHS-20120103/C7
+ */
+.ic-hidden-link-text {
+	height: 1px;
+	width: 1px;
+	position: absolute;
+	overflow: hidden;
+	top: -10px;
+}
+
+/* -- LIST OF EVENTS PAGINATION ------------------------------ */
+/*
+ * Style Pagination
+ */
+.ic-pagination {
+	display: block;
+	font-size: 14px;
+	line-height: 18px;
+	vertical-align: middle;
+	width: 100%;
+}
+.ic-pagination a {
+	text-decoration: none;
+	background: #fff;
+}
+.ic-pagination a:hover,
+.ic-pagination a:active,
+.ic-pagination a:focus {
+	cursor: pointer;
+}
+.ic-page-mid {
+	text-align: center;
+}
+.ic-page-first {
+	text-align: left;
+}
+.ic-page-last {
+	text-align: right;
+}
+.ic-pages {
+	display: inline-block;
+}
+.ic-pagination .ic-prev {
+	display: inline-block;
+	float: left;
+}
+.ic-pagination .ic-next {
+	display: inline-block;
+	float: right;
+}
+.ic-pagination .ic-prev,
+.ic-pagination .ic-next {
+	margin: 2px 0;
+}
+.ic-pagination .ic-prev a,
+.ic-pagination .ic-next a {
+	padding: 5px;
+	background: none;
+}
+.ic-pagination .ic-prev a:hover,
+.ic-pagination .ic-next a:hover {
+	background: #f3f3f3;
+	background: rgba(221, 221, 221, 0.2);
+}
+.ic-pagination .ic-prev-text,
+.ic-pagination .ic-next-text,
+.ic-pagination .iCicon-backic,
+.ic-pagination .iCicon-nextic {
+	font-family: inherit;
+	vertical-align: middle;
+}
+.ic-pagination .ic-go-to-page {
+	padding: 2px;
+	background: none;
+}
+.ic-pagination .ic-current-page {
+	padding: 2px;
+	background: none;
+}
+.ic-pagination .ic-current-page .ic-active {
+	color: #fff;
+	font-weight: bold;
+}
+.ic-pagination .ic-hidden-pages {
+	padding: 2px;
+	background: none;
+}
+
+
+/* -- EXTENDABLE GRID SYSTEM (Search Filters) ---------------- */
+[class^="ic-col-"], [class*=" ic-col-"] {
+	display: block;
+	float: left;
+}
+
+.ic-col-16 {
+	width: 133.333333333333%;
+}
+
+.ic-col-12 {
+	width: 100%;
+}
+.ic-col-11 {
+	width: 91.666666666666%;
+}
+.ic-col-10 {
+	width: 83.333333333333%;
+}
+.ic-col-9 {
+	width: 75%;
+}
+.ic-col-8 {
+	width: 66.666666666666%;
+}
+.ic-col-7 {
+	width: 58.333333333333%;
+}
+.ic-col-6 {
+	width: 50%;
+}
+.ic-col-5 {
+	width: 41.666666666666%;
+}
+.ic-col-4 {
+	width: 33.333333333333%;
+}
+.ic-col-3 {
+	width: 25%;
+}
+.ic-col-2 {
+	width: 16.666666666666%;
+}
+.ic-col-1 {
+	width: 8.333333333333%;
+}
+
+.ic-col-full {
+	width: 100% !important;
+}
+
+.ic-row1 {
+	height: 30px;
+}
+
+.ic-cell {
+	margin: 2px;
+	padding: 0;
+}
+
+@media (max-width: 1200px) {
+	[class^="ic-col-"], [class*=" ic-col-"] {
+		width: 100%;
+	}
+	.ic-col-3, .ic-col-6 {
+		width: 50%;
+	}
+	.ic-fluid {
+		width: 100%;
+	}
+}
+@media (max-width: 480px) {
+	[class^="ic-col-"], [class*=" ic-col-"] {
+		width: 100%;
+	}
+}
+
+/* Search Filters - Main */
+.ic-filters-label {
+	font-size : 20px;
+	line-height: 20px;
+	text-align: center;
+	text-transform: uppercase;
+	word-wrap: break-word;
+	-webkit-hyphens: auto;
+	-moz-hyphens: auto;
+	-ms-hyphens: auto;
+	hyphens: auto;
+}
+.ic-filters-label-title-3 {
+	height: 128px;
+	line-height: 128px;
+}
+.ic-filters-label-title-2 {
+	height: 84px;
+	line-height: 84px;
+}
+.ic-filters-label-title-1 {
+	height: 40px;
+	line-height: 40px;
+}
+.ic-filters-btn-3 {
+	height: 128px;
+	line-height: 128px;
+}
+.ic-filters-btn-2 {
+	height: 84px;
+	line-height: 84px;
+}
+.ic-filters-btn-1 {
+	height: 40px;
+	line-height: 40px;
+}
+
+/* Search Filters - filters */
+.ic-filter-search {
+	padding: 5px 19px 5px 5px;
+}
+.ic-filter-from,
+.ic-filter-to,
+.ic-filter-category,
+.ic-filter-month,
+.ic-filter-year {
+	padding: 5px;
+}
+.ic-filter-search input {
+	width: 100%;
+}
+.ic-filter-from input,
+.ic-filter-to input,
+.ic-filter-from button,
+.ic-filter-to button {
+	display: inline-block;
+}
+.ic-filter-from .input-append,
+.ic-filter-to .input-append {
+	width: 100%;
+}
+.ic-filter-from .input-append input,
+.ic-filter-to .input-append input {
+	width: 66%;
+}
+.ic-filter-from .input-append button,
+.ic-filter-to .input-append button {
+	width: 26%;
+}
+.ic-filter-category select,
+.ic-filter-month select,
+.ic-filter-year select {
+	width: 100%;
+}
+
+/* Search Filters - buttons */
+.ic-button-more {
+	padding: 0;
+}
+.ic-button-more > .ic-filters-row1 {
+	height: 40px;
+}
+.ic-filter-more-btn {
+	display: block;
+	width: auto;
+	height: 30px;
+	line-height: 30px;
+	padding: 4px;
+	text-align: center;
+	word-wrap: break-word;
+	-webkit-hyphens: auto;
+	-moz-hyphens: auto;
+	-ms-hyphens: auto;
+	hyphens: auto;
+}
+.ic-filter-more-btn .iCicon-arrow-down,
+.ic-filter-more-btn .iCicon-arrow-up {
+	vertical-align: middle;
+}
+.ic-filter-more-btn:hover {
+	cursor: pointer;
+}
+.ic-active {
+}
+.ic-inactive {
+}
+.ic-filters-controls {
+	padding: 0;
+}
+.ic-control-submit {
+}
+.ic-control-reset {
+}
+.ic-filters-controls button {
+	width: 100%;
+	word-wrap: break-word;
+	-webkit-hyphens: auto;
+	-moz-hyphens: auto;
+	-ms-hyphens: auto;
+	hyphens: auto;
+}
+.ic-filter-submit-btn {
+}
+.ic-filter-submit-btn:hover {
+}
+.ic-filter-reset-btn {
+}
+.ic-filter-reset-btn:hover {
+}
+
+@media (max-width: 1200px) {
+	.ic-filters-label-title-2,
+	.ic-filters-label-title-3 {
+		margin-bottom: -5px;
+		min-height: 40px;
+		line-height: 40px;
+	}
+	.ic-filters-controls {
+		padding: 0;
+	}
+	.ic-search-submit,
+	.ic-search-reset {
+		width: 50%;
+	}
+	.ic-filter-submit-btn,
+	.ic-filter-reset-btn {
+		height: 40px;
+	}
+	.ic-filters-btn-2 {
+		min-height: 38px;
+		line-height: 38px;
+	}
+	.ic-filters-label {
+		margin-bottom: 8px;
+	}
+}
+@media (max-width: 480px) {
+	.ic-filters-label-title-2,
+	.ic-filters-label-title-3 {
+		margin-bottom: -5px;
+		min-height: 40px;
+		line-height: 40px;
+	}
+	.ic-filters-controls {
+		padding: 0;
+	}
+	.ic-search-submit,
+	.ic-search-reset {
+		width: 100%;
+	}
+	.ic-filter-submit-btn,
+	.ic-filter-reset-btn {
+		height: 40px;
+	}
+	.ic-filters-label {
+		margin-bottom: 8px;
+	}
+}
+
+/* Terms */
+.ic-terms-text {
+    background: #fff;
+    border: 1px solid #ccc;
+    color: #595959;
+    height: 200px;
+    margin-bottom: 15px;
+    overflow: auto;
+    padding: 5px;
+}
+.ic-terms-text iframe {
+    border: none;
+}
+.ic-terms-consent {
+	font-weight: 500;
+}
+
+.ic-checkboxes-option {
+	padding-top: 5px;
+}
+
+#icagenda-registration .hasPopover:before {
+  font-family: 'iCicons';
+  content: "\e614";
+}
+
+/* -- ICAGENDA GENERAL --------------------------------------- */
+/*
+ * Main Content Event Details
+ */
+#icagenda.ic-event-view {
+	margin-bottom: 20px;
+}
+
+/* -- ICAGENDA FORMS STYLES ---------------------------------- */
+#icagenda select,
+#icagenda textarea,
+#icagenda input:not([type=radio]),
+#icagenda .uneditable-input {
+	display: inline-block;
+}
+
+/* -- IC FORM GROUP/LABEL STYLES ----------------------------- */
+.ic-control-group {
+	padding: 5px 10px;
+}
+
+.ic-control-label {
+	float: left;
+}
+
+.ic-control-label label {
+	padding-top: 5px;
+}
+
+.ic-controls {
+}
+
+.ic-select {
+	margin-bottom: 10px;
+}
+
+
+/* -- IC RADIO BUTTON STYLES --------------------------------- */
+.ic-btn {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+	padding: 4px 14px;
+	margin-bottom: 0;
+	font-size: 13px;
+	line-height: 18px;
+	*line-height: 18px;
+	text-align: center;
+	vertical-align: middle;
+	cursor: pointer;
+	color: #333;
+	text-shadow: 0 1px 1px rgba(255,255,255,0.75);
+	background-color: #f5f5f5;
+	background-image: -moz-linear-gradient(top,#fff,#e6e6e6);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#fff),to(#e6e6e6));
+	background-image: -webkit-linear-gradient(top,#fff,#e6e6e6);
+	background-image: -o-linear-gradient(top,#fff,#e6e6e6);
+	background-image: linear-gradient(to bottom,#fff,#e6e6e6);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe5e5e5', GradientType=0);
+	border-color: #e6e6e6 #e6e6e6 #bfbfbf;
+	border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+	*background-color: #e6e6e6;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+	border: 1px solid #bbb;
+	*border: 0;
+	border-bottom-color: #a2a2a2;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+	*margin-left: .3em;
+	-webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+	-moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+	box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+}
+.ic-btn:hover,
+.ic-btn:active,
+.ic-btn.active,
+.ic-btn.disabled,
+.ic-btn[disabled] {
+	color: #333;
+	background-color: #e6e6e6;
+	*background-color: #d9d9d9;
+}
+.ic-btn:active,
+.ic-btn.active {
+	background-color: #cccccc;
+}
+.ic-btn:first-child {
+	*margin-left: 0;
+}
+.ic-btn:hover {
+	color: #333;
+	text-decoration: none;
+	background-color: #e6e6e6;
+	*background-color: #d9d9d9;
+	background-position: 0 -15px;
+	-webkit-transition: background-position .1s linear;
+	-moz-transition: background-position .1s linear;
+	-o-transition: background-position .1s linear;
+	transition: background-position .1s linear;
+}
+.ic-btn:focus {
+	outline: thin dotted #333;
+	outline: 5px auto -webkit-focus-ring-color;
+	outline-offset: -2px;
+}
+.ic-btn.active,
+.ic-btn:active {
+	background-color: #e6e6e6;
+	background-color: #d9d9d9;
+	background-image: none;
+	outline: 0;
+	-webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+	-moz-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+	box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+}
+.ic-btn.disabled,
+.ic-btn[disabled] {
+	cursor: default;
+	background-color: #e6e6e6;
+	background-image: none;
+	opacity: 0.65;
+	filter: alpha(opacity=65);
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+	box-shadow: none;
+}
+.ic-btn-large {
+	padding: 9px 14px;
+	font-size: 15px;
+	line-height: normal;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+}
+.ic-btn-large [class^="icon-"] {
+	margin-top: 2px;
+}
+.ic-btn-small {
+	padding: 3px 9px;
+	font-size: 11px;
+	line-height: 16px;
+}
+.ic-btn-small [class^="icon-"] {
+	margin-top: 0;
+}
+.ic-btn-mini {
+	padding: 2px 6px;
+	font-size: 10px;
+	line-height: 14px;
+}
+.ic-btn-block {
+	display: block;
+	width: 100%;
+	padding-left: 0;
+	padding-right: 0;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+}
+.ic-btn-block + .ic-btn-block {
+	margin-top: 5px;
+}
+.ic-btn-primary.active,
+.ic-btn-warning.active,
+.ic-btn-danger.active,
+.ic-btn-success.active,
+.ic-btn-info.active,
+.ic-btn-inverse.active {
+	color: rgba(255,255,255,0.75);
+}
+.ic-btn {
+	border-color: #c5c5c5;
+	border-color: rgba(0,0,0,0.15) rgba(0,0,0,0.15) rgba(0,0,0,0.25);
+}
+.ic-btn-primary {
+	color: #fff;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+	background-color: #1d6cb0;
+	background-image: -moz-linear-gradient(top,#2384d3,#15497c);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#2384d3),to(#15497c));
+	background-image: -webkit-linear-gradient(top,#2384d3,#15497c);
+	background-image: -o-linear-gradient(top,#2384d3,#15497c);
+	background-image: linear-gradient(to bottom,#2384d3,#15497c);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff2384d3', endColorstr='#ff15497c', GradientType=0);
+	border-color: #15497c #15497c #0a223b;
+	border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+	*background-color: #15497c;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.ic-btn-primary:hover,
+.ic-btn-primary:active,
+.ic-btn-primary.active,
+.ic-btn-primary.disabled,
+.ic-btn-primary[disabled] {
+	color: #fff;
+	background-color: #15497c;
+	*background-color: #113c66;
+}
+.ic-btn-primary:active,
+.ic-btn-primary.active {
+	background-color: #0e2f50;
+}
+.ic-btn-warning {
+	color: #fff;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+	background-color: #faa732;
+	background-image: -moz-linear-gradient(top,#fbb450,#f89406);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));
+	background-image: -webkit-linear-gradient(top,#fbb450,#f89406);
+	background-image: -o-linear-gradient(top,#fbb450,#f89406);
+	background-image: linear-gradient(to bottom,#fbb450,#f89406);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffab44f', endColorstr='#fff89406', GradientType=0);
+	border-color: #f89406 #f89406 #ad6704;
+	border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+	*background-color: #f89406;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.ic-btn-warning:hover,
+.ic-btn-warning:active,
+.ic-btn-warning.active,
+.ic-btn-warning.disabled,
+.ic-btn-warning[disabled] {
+	color: #fff;
+	background-color: #f89406;
+	*background-color: #df8505;
+}
+.ic-btn-warning:active,
+.ic-btn-warning.active {
+	background-color: #c67605;
+}
+.ic-btn-danger {
+	color: #fff;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+	background-color: #da4f49;
+	background-image: -moz-linear-gradient(top,#ee5f5b,#bd362f);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#bd362f));
+	background-image: -webkit-linear-gradient(top,#ee5f5b,#bd362f);
+	background-image: -o-linear-gradient(top,#ee5f5b,#bd362f);
+	background-image: linear-gradient(to bottom,#ee5f5b,#bd362f);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0);
+	border-color: #bd362f #bd362f #802420;
+	border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+	*background-color: #bd362f;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.ic-btn-danger:hover,
+.ic-btn-danger:active,
+.ic-btn-danger.active,
+.ic-btn-danger.disabled,
+.ic-btn-danger[disabled] {
+	color: #fff;
+	background-color: #bd362f;
+	*background-color: #a9302a;
+}
+.ic-btn-danger:active,
+.ic-btn-danger.active {
+	background-color: #942a25;
+}
+.ic-btn-success {
+	color: #fff;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+	background-color: #5bb75b;
+	background-image: -moz-linear-gradient(top,#62c462,#51a351);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#51a351));
+	background-image: -webkit-linear-gradient(top,#62c462,#51a351);
+	background-image: -o-linear-gradient(top,#62c462,#51a351);
+	background-image: linear-gradient(to bottom,#62c462,#51a351);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0);
+	border-color: #51a351 #51a351 #387038;
+	border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+	*background-color: #51a351;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.ic-btn-success:hover,
+.ic-btn-success:active,
+.ic-btn-success.active,
+.ic-btn-success.disabled,
+.ic-btn-success[disabled] {
+	color: #fff;
+	background-color: #51a351;
+	*background-color: #499249;
+}
+.ic-btn-success:active,
+.ic-btn-success.active {
+	background-color: #408140;
+}
+.ic-btn-info {
+	color: #fff;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+	background-color: #49afcd;
+	background-image: -moz-linear-gradient(top,#5bc0de,#2f96b4);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#2f96b4));
+	background-image: -webkit-linear-gradient(top,#5bc0de,#2f96b4);
+	background-image: -o-linear-gradient(top,#5bc0de,#2f96b4);
+	background-image: linear-gradient(to bottom,#5bc0de,#2f96b4);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0);
+	border-color: #2f96b4 #2f96b4 #1f6377;
+	border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+	*background-color: #2f96b4;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.ic-btn-info:hover,
+.ic-btn-info:active,
+.ic-btn-info.active,
+.ic-btn-info.disabled,
+.ic-btn-info[disabled] {
+	color: #fff;
+	background-color: #2f96b4;
+	*background-color: #2a85a0;
+}
+.ic-btn-info:active,
+.ic-btn-info.active {
+	background-color: #24748c;
+}
+.ic-btn-inverse {
+	color: #fff;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+	background-color: #363636;
+	background-image: -moz-linear-gradient(top,#444,#222);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#444),to(#222));
+	background-image: -webkit-linear-gradient(top,#444,#222);
+	background-image: -o-linear-gradient(top,#444,#222);
+	background-image: linear-gradient(to bottom,#444,#222);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0);
+	border-color: #222 #222 #000000;
+	border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+	*background-color: #222;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.ic-btn-inverse:hover,
+.ic-btn-inverse:active,
+.ic-btn-inverse.active,
+.ic-btn-inverse.disabled,
+.ic-btn-inverse[disabled] {
+	color: #fff;
+	background-color: #222;
+	*background-color: #151515;
+}
+.ic-btn-inverse:active,
+.ic-btn-inverse.active {
+	background-color: #090909;
+}
+#icagenda button.ic-btn,
+#icagenda input[type="submit"].ic-btn {
+	*padding-top: 3px;
+	*padding-bottom: 3px;
+}
+#icagenda button.ic-btn::-moz-focus-inner,
+#icagenda input[type="submit"].ic-btn::-moz-focus-inner {
+	padding: 0;
+	border: 0;
+}
+#icagenda button.ic-btn.ic-btn-large,
+#icagenda input[type="submit"].ic-btn.ic-btn-large {
+	*padding-top: 7px;
+	*padding-bottom: 7px;
+}
+#icagenda button.ic-btn.ic-btn-small,
+#icagenda input[type="submit"].ic-btn.ic-btn-small {
+	*padding-top: 3px;
+	*padding-bottom: 3px;
+}
+#icagenda button.ic-btn.ic-btn-mini,
+#icagenda input[type="submit"].ic-btn.ic-btn-mini {
+	*padding-top: 1px;
+	*padding-bottom: 1px;
+}
+.ic-btn-link,
+.ic-btn-link:active {
+	background-color: transparent;
+	background-image: none;
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+	box-shadow: none;
+}
+.ic-btn-link {
+	border-color: transparent;
+	cursor: pointer;
+	color: #08c;
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.ic-btn-link:hover {
+	color: #005580;
+	text-decoration: underline;
+	background-color: transparent;
+}
+.ic-btn-group {
+	position: relative;
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+	font-size: 0;
+	vertical-align: middle;
+	white-space: nowrap;
+	*margin-left: .3em;
+}
+.ic-btn-group:first-child {
+	*margin-left: 0;
+}
+.ic-btn-group + .ic-btn-group {
+	margin-left: 5px;
+}
+.ic-btn-toolbar {
+	font-size: 0;
+	margin-top: 9px;
+	margin-bottom: 9px;
+}
+.ic-btn-toolbar .ic-btn-group {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+}
+.ic-btn-toolbar .ic-btn + .ic-btn,
+.ic-btn-toolbar .ic-btn-group + .ic-btn,
+.ic-btn-toolbar .ic-btn + .ic-btn-group {
+	margin-left: 5px;
+}
+.ic-btn-group > .ic-btn {
+	position: relative;
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.ic-btn-group > .ic-btn + .ic-btn {
+	margin-left: -1px;
+}
+.ic-btn-group > .ic-btn,
+.ic-btn-group > #icagenda .dropdown-menu {
+	font-size: 13px;
+}
+.ic-btn-group > .ic-btn-mini {
+	font-size: 11px;
+}
+.ic-btn-group > .ic-btn-small {
+	font-size: 12px;
+}
+.ic-btn-group > .ic-btn-large {
+	font-size: 16px;
+}
+.ic-btn-group > .ic-btn:first-child {
+	margin-left: 0;
+	-webkit-border-top-left-radius: 4px;
+	-moz-border-radius-topleft: 4px;
+	border-top-left-radius: 4px;
+	-webkit-border-bottom-left-radius: 4px;
+	-moz-border-radius-bottomleft: 4px;
+	border-bottom-left-radius: 4px;
+}
+.ic-btn-group > .ic-btn:last-child,
+.ic-btn-group > #icagenda .dropdown-toggle {
+	-webkit-border-top-right-radius: 4px;
+	-moz-border-radius-topright: 4px;
+	border-top-right-radius: 4px;
+	-webkit-border-bottom-right-radius: 4px;
+	-moz-border-radius-bottomright: 4px;
+	border-bottom-right-radius: 4px;
+}
+.ic-btn-group > .ic-btn.large:first-child {
+	margin-left: 0;
+	-webkit-border-top-left-radius: 6px;
+	-moz-border-radius-topleft: 6px;
+	border-top-left-radius: 6px;
+	-webkit-border-bottom-left-radius: 6px;
+	-moz-border-radius-bottomleft: 6px;
+	border-bottom-left-radius: 6px;
+}
+.ic-btn-group > .ic-btn.large:last-child,
+.ic-btn-group > #icagenda .large.dropdown-toggle {
+	-webkit-border-top-right-radius: 6px;
+	-moz-border-radius-topright: 6px;
+	border-top-right-radius: 6px;
+	-webkit-border-bottom-right-radius: 6px;
+	-moz-border-radius-bottomright: 6px;
+	border-bottom-right-radius: 6px;
+}
+.ic-btn-group > .ic-btn:hover,
+.ic-btn-group > .ic-btn:focus,
+.ic-btn-group > .ic-btn:active,
+.ic-btn-group > .ic-btn.active {
+	z-index: 2;
+}
+.ic-btn-group .dropdown-toggle:active,
+.ic-btn-group.open .dropdown-toggle {
+	outline: 0;
+}
+.ic-btn-group > .ic-btn + #icagenda .dropdown-toggle {
+	padding-left: 8px;
+	padding-right: 8px;
+	-webkit-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+	-moz-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+	box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+	*padding-top: 5px;
+	*padding-bottom: 5px;
+}
+.ic-btn-group > .ic-btn-mini + #icagenda .dropdown-toggle {
+	padding-left: 5px;
+	padding-right: 5px;
+	*padding-top: 2px;
+	*padding-bottom: 2px;
+}
+.ic-btn-group > .ic-btn-small + #icagenda .dropdown-toggle {
+	*padding-top: 5px;
+	*padding-bottom: 4px;
+}
+.ic-btn-group > .ic-btn-large + #icagenda .dropdown-toggle {
+	padding-left: 12px;
+	padding-right: 12px;
+	*padding-top: 7px;
+	*padding-bottom: 7px;
+}
+.ic-btn-group.open .dropdown-toggle {
+	background-image: none;
+	-webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+	-moz-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+	box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+}
+.ic-btn-group.open .ic-btn.dropdown-toggle {
+	background-color: #e6e6e6;
+}
+.ic-btn-group.open .ic-btn-primary.dropdown-toggle {
+	background-color: #15497c;
+}
+.ic-btn-group.open .ic-btn-warning.dropdown-toggle {
+	background-color: #f89406;
+}
+.ic-btn-group.open .ic-btn-danger.dropdown-toggle {
+	background-color: #bd362f;
+}
+.ic-btn-group.open .ic-btn-success.dropdown-toggle {
+	background-color: #51a351;
+}
+.ic-btn-group.open .ic-btn-info.dropdown-toggle {
+	background-color: #2f96b4;
+}
+.ic-btn-group.open .ic-btn-inverse.dropdown-toggle {
+	background-color: #222;
+}
+.ic-btn .caret {
+	margin-top: 8px;
+	margin-left: 0;
+}
+.ic-btn-mini .caret,
+.ic-btn-small .caret,
+.ic-btn-large .caret {
+	margin-top: 6px;
+}
+.ic-btn-large .caret {
+	border-left-width: 5px;
+	border-right-width: 5px;
+	border-top-width: 5px;
+}
+#icagenda .dropup .ic-btn-large .caret {
+	border-bottom: 5px solid #000;
+	border-top: 0;
+}
+.ic-btn-primary .caret,
+.ic-btn-warning .caret,
+.ic-btn-danger .caret,
+.ic-btn-info .caret,
+.ic-btn-success .caret,
+.ic-btn-inverse .caret {
+	border-top-color: #fff;
+	border-bottom-color: #fff;
+}
+.ic-btn-group-vertical {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+}
+.ic-btn-group-vertical .ic-btn {
+	display: block;
+	float: none;
+	width: 100%;
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.ic-btn-group-vertical .ic-btn + .ic-btn {
+	margin-left: 0;
+	margin-top: -1px;
+}
+.ic-btn-group-vertical .ic-btn:first-child {
+	-webkit-border-radius: 4px 4px 0 0;
+	-moz-border-radius: 4px 4px 0 0;
+	border-radius: 4px 4px 0 0;
+}
+.ic-btn-group-vertical .ic-btn:last-child {
+	-webkit-border-radius: 0 0 4px 4px;
+	-moz-border-radius: 0 0 4px 4px;
+	border-radius: 0 0 4px 4px;
+}
+.ic-btn-group-vertical .ic-btn-large:first-child {
+	-webkit-border-radius: 6px 6px 0 0;
+	-moz-border-radius: 6px 6px 0 0;
+	border-radius: 6px 6px 0 0;
+}
+.ic-btn-group-vertical .ic-btn-large:last-child {
+	-webkit-border-radius: 0 0 6px 6px;
+	-moz-border-radius: 0 0 6px 6px;
+	border-radius: 0 0 6px 6px;
+}
+
+.ic-radio.ic-btn-group input[type=radio] {
+	display: none;
+}
+.ic-radio.ic-btn-group > label:first-of-type {
+	margin-left: 0;
+	-webkit-border-bottom-left-radius: 4px;
+	border-bottom-left-radius: 4px;
+	-webkit-border-top-left-radius: 4px;
+	border-top-left-radius: 4px;
+	-moz-border-radius-bottomleft: 4px;
+	-moz-border-radius-topleft: 4px;
+}
+fieldset.ic-radio.ic-btn-group {
+	padding-left: 0;
+}
+
+/* TO PREVENT SOME POSSIBLE TEMPLATE CONFLICT */
+#icagenda .ic-btn-group {
+	display: inline-block;
+}
+#icagenda .ic-radio.ic-btn-group .ic-btn {
+	width: auto;
+	margin: 0;
+}
+#icagenda .ic-btn.ic-btn-danger {
+	color: #fff;
+}
+#icagenda .ic-btn-danger:hover,
+#icagenda .ic-btn-danger:focus,
+#icagenda .ic-btn-danger:active,
+#icagenda .ic-btn-danger.active,
+#icagenda .ic-btn-danger.disabled,
+#icagenda .ic-btn-danger[disabled] {
+	color: #fff;
+}
+#icagenda .ic-btn.ic-btn-success {
+	color: #fff;
+}
+#icagenda .ic-btn-success:hover,
+#icagenda .ic-btn-success:focus,
+#icagenda .ic-btn-success:active,
+#icagenda .ic-btn-success.active,
+#icagenda .ic-btn-success.disabled,
+#icagenda .ic-btn-success[disabled] {
+	color: #fff;
+}
+
+/* TO BE REMOVED when all btn converted to ic-btn */
+.ic-btn {
+	width: auto !important;
+	margin: 0 !important;
+}
+.btn-danger {
+	color: #fff !important;
+}
+.btn-success {
+	color: #fff !important;
+}
+.btn-success:hover,
+.btn-success:focus,
+.btn-success:active,
+.btn-success.active,
+.btn-success.disabled,
+.btn-success[disabled] {
+	color: #fff !important;
+}
+.btn-success:active,
+.btn-success.active {
+	color: #fff !important;
+}
+
+
+/* -- ICAGENDA FORM ------------------------------------- */
+#icagenda form {
+	margin: 0;
+}
+
+/* -- IC FORM FIELD INVALID ----------------------------- */
+.ic-field-invalid label{
+/*	color: #9D261D; */
+	color: red !important;
+	font-weight: bold;
+}
+.ic-field-invalid input{
+	border: 1px solid red !important;
+}
+
+.ic-field-invalid-lbl{
+/*	color: #9D261D; */
+	color: red !important;
+	font-weight: bold;
+}
+.ic-field-invalid-input{
+	border: 1px solid red !important;
+}
+
+.ic-date-invalid {
+	color: red !important;
+}
+.ic-date-invalid input{
+	color: red !important;
+}
+
+
+/* -- IC IMAGE PREVIEW AND CONTROL ----------------------------- */
+#ic-upload-preview img {
+	max-width: 100%;
+}
+
+/**
+ *	GENERAL
+ **/
+
+/* Clear a div float */
+.ic-clearfix {
+	*zoom: 1;
+}
+.ic-clearfix:before,
+.ic-clearfix:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.ic-clearfix:after {
+	clear: both;
+}
+
+/* Fixed Known conflict Bootstrap/Google Maps (joomla 3.2) */
+.icagenda_map img {
+	max-width: none;
+}
+
+
+/**
+ *	ICONS
+ **/
+
+/* Hide old class used before in theme pack, to prevent double display of the back button */
+#icagenda .back {
+	display:none;
+}
+
+/* Style top buttons line (core file views/tmpl/event.php */
+.ic-top-buttons {
+	display: block;
+	height: 35px;
+}
+
+/* iCicon size 16px (approval) */
+.iCicon-16 {
+	display: inline-block;
+	height: 16px;
+	width: 16px;
+}
+
+/* Approval Icon */
+.iCicon-16.approval {
+	background-image: url(../../../../media/com_icagenda/images/manager/approval_16.png);
+	background-position: -16px 0;
+}
+
+a div.iCicon-16.approval:hover {
+	background-image: url(../../../../media/com_icagenda/images/manager/approval_16.png);
+	background-position: 16px 0;
+}
+
+
+/*
+ * STYLES for classes not presents in Theme Pack files, but in iCagenda core files
+ */
+
+/** map autocomplete **/
+.ui-autocomplete {
+	background-color: white;
+	width: 300px;
+	border: 1px solid #cfcfcf;
+	list-style-type: none;
+	padding-left: 0px;
+}
+
+/** calendar **/
+fieldset.adminform textarea.date {height: 130px; }
+#add {line-height: 28px; margin-left:145px;}
+table#dTable {width: 113px; border:1px solid #cdcec9;}
+table#dTable th {padding:5px;}
+table#dTable td {padding:5px;}
+#ui-datepicker-div{font-size:12px; padding:15px;}
+
diff --git a/deployed/icagenda/media/com_icagenda/css/icagenda-front.j25.css b/deployed/icagenda/media/com_icagenda/css/icagenda-front.j25.css
new file mode 100644
index 00000000..d3b8644c
--- /dev/null
+++ b/deployed/icagenda/media/com_icagenda/css/icagenda-front.j25.css
@@ -0,0 +1,1245 @@
+/**
+ *------------------------------------------------------------------------------
+ *	CSS iCagenda FRONTEND - Joomla 2.5
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.6.0 2016-03-04
+ * @since       3.0
+ *------------------------------------------------------------------------------
+*/
+
+
+/** general **/
+.clr {
+	clear:both;
+}
+
+
+#icagenda button,
+#icagenda input,
+#icagenda select,
+#icagenda textarea {
+	margin: 0;
+	font-size: 100%;
+	vertical-align: middle;
+}
+#icagenda button,
+#icagenda input {
+	*overflow: visible;
+	line-height: normal;
+}
+#icagenda button::-moz-focus-inner,
+#icagenda input::-moz-focus-inner {
+	padding: 0;
+	border: 0;
+}
+#icagenda button,
+#icagenda input[type="button"],
+#icagenda input[type="reset"],
+#icagenda input[type="submit"] {
+	cursor: pointer;
+	-webkit-appearance: button;
+}
+#icagenda input[type="search"] {
+	-webkit-box-sizing: content-box;
+	-moz-box-sizing: content-box;
+	box-sizing: content-box;
+	-webkit-appearance: textfield;
+}
+#icagenda input[type="search"]::-webkit-search-decoration,
+#icagenda input[type="search"]::-webkit-search-cancel-button {
+	-webkit-appearance: none;
+}
+#icagenda textarea {
+	overflow: auto;
+	vertical-align: top;
+}
+#icagenda .input-block-level {
+	display: block;
+	width: 100%;
+	min-height: 30px;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+}
+#icagenda p {
+	margin: 0 0 9px;
+}
+#icagenda .lead {
+	margin-bottom: 18px;
+	font-size: 20px;
+	font-weight: 200;
+	line-height: 27px;
+}
+#icagenda small {
+	font-size: 85%;
+}
+#icagenda strong {
+	font-weight: bold;
+}
+#icagenda em {
+	font-style: italic;
+}
+
+#icagenda form {
+	margin: 0 0 18px;
+}
+#icagenda fieldset {
+	padding: 0;
+	margin: 0;
+	border: 0;
+}
+#icagenda legend {
+	display: block;
+	width: 100%;
+	padding: 0;
+	margin-bottom: 18px;
+	font-size: 19.5px;
+	line-height: 36px;
+	color: #333;
+	border: 0;
+	border-bottom: 1px solid #e5e5e5;
+}
+#icagenda legend small {
+	font-size: 13.5px;
+	color: #999;
+}
+#icagenda label,
+#icagenda input,
+#icagenda button,
+#icagenda select,
+#icagenda textarea {
+	font-size: 13px;
+	font-weight: normal;
+	line-height: 18px;
+}
+#icagenda input,
+#icagenda button,
+#icagenda select,
+#icagenda textarea {
+	font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+#icagenda label {
+	display: block;
+	margin-bottom: 5px;
+}
+#icagenda select,
+#icagenda textarea,
+#icagenda input[type="text"],
+#icagenda input[type="password"],
+#icagenda input[type="datetime"],
+#icagenda input[type="datetime-local"],
+#icagenda input[type="date"],
+#icagenda input[type="month"],
+#icagenda input[type="time"],
+#icagenda input[type="week"],
+#icagenda input[type="number"],
+#icagenda input[type="email"],
+#icagenda input[type="url"],
+#icagenda input[type="search"],
+#icagenda input[type="tel"],
+#icagenda input[type="color"],
+#icagenda .uneditable-input {
+	display: inline-block;
+	height: 18px;
+	padding: 4px 6px;
+	margin-bottom: 9px;
+	font-size: 13px !important;
+	line-height: 18px;
+	color: #555;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+/*
+#icagenda input {
+	width: 210px;
+}
+*/
+#icagenda textarea {
+	width: 100%;
+}
+#icagenda textarea {
+	height: auto;
+}
+#icagenda textarea,
+#icagenda input[type="text"],
+#icagenda input[type="password"],
+#icagenda input[type="datetime"],
+#icagenda input[type="datetime-local"],
+#icagenda input[type="date"],
+#icagenda input[type="month"],
+#icagenda input[type="time"],
+#icagenda input[type="week"],
+#icagenda input[type="number"],
+#icagenda input[type="email"],
+#icagenda input[type="url"],
+#icagenda input[type="search"],
+#icagenda input[type="tel"],
+#icagenda input[type="color"],
+#icagenda .uneditable-input {
+	background-color: #fff;
+	border: 1px solid #ccc;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
+	-moz-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
+	box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
+	-webkit-transition: border linear .2s, box-shadow linear .2s;
+	-moz-transition: border linear .2s, box-shadow linear .2s;
+	-o-transition: border linear .2s, box-shadow linear .2s;
+	transition: border linear .2s, box-shadow linear .2s;
+}
+#icagenda textarea:focus,
+#icagenda input[type="text"]:focus,
+#icagenda input[type="password"]:focus,
+#icagenda input[type="datetime"]:focus,
+#icagenda input[type="datetime-local"]:focus,
+#icagenda input[type="date"]:focus,
+#icagenda input[type="month"]:focus,
+#icagenda input[type="time"]:focus,
+#icagenda input[type="week"]:focus,
+#icagenda input[type="number"]:focus,
+#icagenda input[type="email"]:focus,
+#icagenda input[type="url"]:focus,
+#icagenda input[type="search"]:focus,
+#icagenda input[type="tel"]:focus,
+#icagenda input[type="color"]:focus,
+#icagenda .uneditable-input:focus {
+	border-color: rgba(82,168,236,0.8);
+	outline: 0;
+	outline: thin dotted \9;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
+	-moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
+	box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
+}
+#icagenda input[type="radio"],
+#icagenda input[type="checkbox"] {
+	margin: 4px 0 0;
+	*margin-top: 0;
+	margin-top: 1px \9;
+	line-height: normal;
+	cursor: pointer;
+}
+#icagenda input[type="file"],
+#icagenda input[type="image"],
+#icagenda input[type="submit"],
+#icagenda input[type="reset"],
+#icagenda input[type="button"],
+#icagenda input[type="radio"],
+#icagenda input[type="checkbox"] {
+	width: auto;
+}
+#icagenda select,
+#icagenda input[type="file"] {
+	height: 30px;
+	*margin-top: 4px;
+	line-height: 30px;
+}
+#icagenda select {
+/*	width: 220px; */
+	border: 1px solid #bbb;
+	background-color: #fff;
+}
+#icagenda select[multiple],
+#icagenda select[size] {
+	height: auto;
+}
+#icagenda select:focus,
+#icagenda input[type="file"]:focus,
+#icagenda input[type="radio"]:focus,
+#icagenda input[type="checkbox"]:focus {
+	outline: thin dotted #333;
+	outline: 5px auto -webkit-focus-ring-color;
+	outline-offset: -2px;
+}
+#icagenda .uneditable-input,
+#icagenda .uneditable-textarea {
+	color: #999;
+	background-color: #fcfcfc;
+	border-color: #ccc;
+	-webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,0.025);
+	-moz-box-shadow: inset 0 1px 2px rgba(0,0,0,0.025);
+	box-shadow: inset 0 1px 2px rgba(0,0,0,0.025);
+	cursor: not-allowed;
+}
+#icagenda input:-moz-placeholder {
+	color: #999;
+}
+#icagenda input:-ms-input-placeholder {
+	color: #999;
+}
+#icagenda input::-webkit-input-placeholder {
+	color: #999;
+}
+#icagenda .radio,
+#icagenda .checkbox {
+	min-height: 18px;
+	padding-left: 18px;
+}
+#icagenda .radio input[type="radio"],
+#icagenda .checkbox input[type="checkbox"] {
+	float: left;
+	margin-left: -18px;
+}
+#icagenda .input-mini {
+	width: 60px;
+}
+#icagenda .input-small {
+/*	width: 90px; */
+}
+#icagenda .input-medium {
+	width: 150px;
+}
+#icagenda .input-large {
+	width: 210px;
+}
+#icagenda .input-xlarge {
+	width: 270px;
+}
+#icagenda .input-xxlarge {
+	width: 530px;
+}
+#icagenda input[class*="span"],
+#icagenda select[class*="span"],
+#icagenda textarea[class*="span"],
+#icagenda .uneditable-input[class*="span"],
+#icagenda .row-fluid input[class*="span"],
+#icagenda .row-fluid select[class*="span"],
+#icagenda .row-fluid textarea[class*="span"],
+#icagenda .row-fluid .uneditable-input[class*="span"] {
+	float: none;
+	margin-left: 0;
+}
+#icagenda .input-append input[class*="span"],
+#icagenda .input-append .uneditable-input[class*="span"],
+#icagenda .input-prepend input[class*="span"],
+#icagenda .input-prepend .uneditable-input[class*="span"],
+#icagenda .row-fluid input[class*="span"],
+#icagenda .row-fluid select[class*="span"],
+#icagenda .row-fluid textarea[class*="span"],
+#icagenda .row-fluid .uneditable-input[class*="span"],
+#icagenda .row-fluid .input-prepend [class*="span"],
+#icagenda .row-fluid .input-append [class*="span"] {
+	display: inline-block;
+}
+
+#icagenda .btn {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+	padding: 4px 14px;
+	margin-bottom: 0;
+	font-size: 13px;
+	line-height: 18px;
+	*line-height: 18px;
+	text-align: center;
+	vertical-align: middle;
+	cursor: pointer;
+	color: #333;
+	text-shadow: 0 1px 1px rgba(255,255,255,0.75);
+	background-color: #f5f5f5;
+	background-image: -moz-linear-gradient(top,#fff,#e6e6e6);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#fff),to(#e6e6e6));
+	background-image: -webkit-linear-gradient(top,#fff,#e6e6e6);
+	background-image: -o-linear-gradient(top,#fff,#e6e6e6);
+	background-image: linear-gradient(to bottom,#fff,#e6e6e6);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe5e5e5', GradientType=0);
+	border-color: #e6e6e6 #e6e6e6 #bfbfbf;
+	border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+	*background-color: #e6e6e6;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+	border: 1px solid #bbb;
+	*border: 0;
+	border-bottom-color: #a2a2a2;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+	*margin-left: .3em;
+	-webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+	-moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+	box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+}
+#icagenda .btn:hover,
+#icagenda .btn:active,
+#icagenda .btn.active,
+#icagenda .btn.disabled,
+#icagenda .btn[disabled] {
+	color: #333;
+	background-color: #e6e6e6;
+	*background-color: #d9d9d9;
+}
+#icagenda .btn:active,
+#icagenda .btn.active {
+	background-color: #cccccc \9;
+}
+#icagenda .btn:first-child {
+	*margin-left: 0;
+}
+#icagenda .btn:hover {
+	color: #333;
+	text-decoration: none;
+	background-color: #e6e6e6;
+	*background-color: #d9d9d9;
+	background-position: 0 -15px;
+	-webkit-transition: background-position .1s linear;
+	-moz-transition: background-position .1s linear;
+	-o-transition: background-position .1s linear;
+	transition: background-position .1s linear;
+}
+#icagenda .btn:focus {
+	outline: thin dotted #333;
+	outline: 5px auto -webkit-focus-ring-color;
+	outline-offset: -2px;
+}
+#icagenda .btn.active,
+#icagenda .btn:active {
+	background-color: #e6e6e6;
+	background-color: #d9d9d9 \9;
+	background-image: none;
+	outline: 0;
+	-webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+	-moz-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+	box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+}
+#icagenda .btn.disabled,
+#icagenda .btn[disabled] {
+	cursor: default;
+	background-color: #e6e6e6;
+	background-image: none;
+	opacity: 0.65;
+	filter: alpha(opacity=65);
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+	box-shadow: none;
+}
+#icagenda .btn-large {
+	padding: 9px 14px;
+	font-size: 15px;
+	line-height: normal;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+}
+#icagenda .btn-large [class^="icon-"] {
+	margin-top: 2px;
+}
+#icagenda .btn-small {
+	padding: 3px 9px;
+	font-size: 11px;
+	line-height: 16px;
+}
+#icagenda .btn-small [class^="icon-"] {
+	margin-top: 0;
+}
+#icagenda .btn-mini {
+	padding: 2px 6px;
+	font-size: 10px;
+	line-height: 14px;
+}
+#icagenda .btn-block {
+	display: block;
+	width: 100%;
+	padding-left: 0;
+	padding-right: 0;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+}
+#icagenda .btn-block + #icagenda .btn-block {
+	margin-top: 5px;
+}
+#icagenda .btn-primary.active,
+#icagenda .btn-warning.active,
+#icagenda .btn-danger.active,
+#icagenda .btn-success.active,
+#icagenda .btn-info.active,
+#icagenda .btn-inverse.active {
+	color: rgba(255,255,255,0.75);
+}
+#icagenda .btn {
+	border-color: #c5c5c5;
+	border-color: rgba(0,0,0,0.15) rgba(0,0,0,0.15) rgba(0,0,0,0.25);
+}
+#icagenda .btn-primary {
+	color: #fff;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+	background-color: #1d6cb0;
+	background-image: -moz-linear-gradient(top,#2384d3,#15497c);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#2384d3),to(#15497c));
+	background-image: -webkit-linear-gradient(top,#2384d3,#15497c);
+	background-image: -o-linear-gradient(top,#2384d3,#15497c);
+	background-image: linear-gradient(to bottom,#2384d3,#15497c);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff2384d3', endColorstr='#ff15497c', GradientType=0);
+	border-color: #15497c #15497c #0a223b;
+	border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+	*background-color: #15497c;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+#icagenda .btn-primary:hover,
+#icagenda .btn-primary:active,
+#icagenda .btn-primary.active,
+#icagenda .btn-primary.disabled,
+#icagenda .btn-primary[disabled] {
+	color: #fff;
+	background-color: #15497c;
+	*background-color: #113c66;
+}
+#icagenda .btn-primary:active,
+#icagenda .btn-primary.active {
+	background-color: #0e2f50 \9;
+}
+#icagenda .btn-warning {
+	color: #fff;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+	background-color: #faa732;
+	background-image: -moz-linear-gradient(top,#fbb450,#f89406);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));
+	background-image: -webkit-linear-gradient(top,#fbb450,#f89406);
+	background-image: -o-linear-gradient(top,#fbb450,#f89406);
+	background-image: linear-gradient(to bottom,#fbb450,#f89406);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffab44f', endColorstr='#fff89406', GradientType=0);
+	border-color: #f89406 #f89406 #ad6704;
+	border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+	*background-color: #f89406;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+#icagenda .btn-warning:hover,
+#icagenda .btn-warning:active,
+#icagenda .btn-warning.active,
+#icagenda .btn-warning.disabled,
+#icagenda .btn-warning[disabled] {
+	color: #fff;
+	background-color: #f89406;
+	*background-color: #df8505;
+}
+#icagenda .btn-warning:active,
+#icagenda .btn-warning.active {
+	background-color: #c67605 \9;
+}
+#icagenda .btn-danger {
+	color: #fff;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+	background-color: #da4f49;
+	background-image: -moz-linear-gradient(top,#ee5f5b,#bd362f);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#bd362f));
+	background-image: -webkit-linear-gradient(top,#ee5f5b,#bd362f);
+	background-image: -o-linear-gradient(top,#ee5f5b,#bd362f);
+	background-image: linear-gradient(to bottom,#ee5f5b,#bd362f);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0);
+	border-color: #bd362f #bd362f #802420;
+	border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+	*background-color: #bd362f;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+#icagenda .btn-danger:hover,
+#icagenda .btn-danger:active,
+#icagenda .btn-danger.active,
+#icagenda .btn-danger.disabled,
+#icagenda .btn-danger[disabled] {
+	color: #fff;
+	background-color: #bd362f;
+	*background-color: #a9302a;
+}
+#icagenda .btn-danger:active,
+#icagenda .btn-danger.active {
+	background-color: #942a25 \9;
+}
+#icagenda .btn-success {
+	color: #fff;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+	background-color: #5bb75b;
+	background-image: -moz-linear-gradient(top,#62c462,#51a351);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#51a351));
+	background-image: -webkit-linear-gradient(top,#62c462,#51a351);
+	background-image: -o-linear-gradient(top,#62c462,#51a351);
+	background-image: linear-gradient(to bottom,#62c462,#51a351);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0);
+	border-color: #51a351 #51a351 #387038;
+	border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+	*background-color: #51a351;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+#icagenda .btn-success:hover,
+#icagenda .btn-success:active,
+#icagenda .btn-success.active,
+#icagenda .btn-success.disabled,
+#icagenda .btn-success[disabled] {
+	color: #fff;
+	background-color: #51a351;
+	*background-color: #499249;
+}
+#icagenda .btn-success:active,
+#icagenda .btn-success.active {
+	background-color: #408140 \9;
+}
+#icagenda .btn-info {
+	color: #fff;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+	background-color: #49afcd;
+	background-image: -moz-linear-gradient(top,#5bc0de,#2f96b4);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#2f96b4));
+	background-image: -webkit-linear-gradient(top,#5bc0de,#2f96b4);
+	background-image: -o-linear-gradient(top,#5bc0de,#2f96b4);
+	background-image: linear-gradient(to bottom,#5bc0de,#2f96b4);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0);
+	border-color: #2f96b4 #2f96b4 #1f6377;
+	border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+	*background-color: #2f96b4;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+#icagenda .btn-info:hover,
+#icagenda .btn-info:active,
+#icagenda .btn-info.active,
+#icagenda .btn-info.disabled,
+#icagenda .btn-info[disabled] {
+	color: #fff;
+	background-color: #2f96b4;
+	*background-color: #2a85a0;
+}
+#icagenda .btn-info:active,
+#icagenda .btn-info.active {
+	background-color: #24748c \9;
+}
+#icagenda .btn-inverse {
+	color: #fff;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+	background-color: #363636;
+	background-image: -moz-linear-gradient(top,#444,#222);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#444),to(#222));
+	background-image: -webkit-linear-gradient(top,#444,#222);
+	background-image: -o-linear-gradient(top,#444,#222);
+	background-image: linear-gradient(to bottom,#444,#222);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0);
+	border-color: #222 #222 #000000;
+	border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+	*background-color: #222;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+#icagenda .btn-inverse:hover,
+#icagenda .btn-inverse:active,
+#icagenda .btn-inverse.active,
+#icagenda .btn-inverse.disabled,
+#icagenda .btn-inverse[disabled] {
+	color: #fff;
+	background-color: #222;
+	*background-color: #151515;
+}
+#icagenda .btn-inverse:active,
+#icagenda .btn-inverse.active {
+	background-color: #090909 \9;
+}
+#icagenda button.btn,
+#icagenda input[type="submit"].btn {
+	*padding-top: 3px;
+	*padding-bottom: 3px;
+}
+#icagenda button.btn::-moz-focus-inner,
+#icagenda input[type="submit"].btn::-moz-focus-inner {
+	padding: 0;
+	border: 0;
+}
+#icagenda button.btn.btn-large,
+#icagenda input[type="submit"].btn.btn-large {
+	*padding-top: 7px;
+	*padding-bottom: 7px;
+}
+#icagenda button.btn.btn-small,
+#icagenda input[type="submit"].btn.btn-small {
+	*padding-top: 3px;
+	*padding-bottom: 3px;
+}
+#icagenda button.btn.btn-mini,
+#icagenda input[type="submit"].btn.btn-mini {
+	*padding-top: 1px;
+	*padding-bottom: 1px;
+}
+#icagenda .btn-link,
+#icagenda .btn-link:active {
+	background-color: transparent;
+	background-image: none;
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+	box-shadow: none;
+}
+#icagenda .btn-link {
+	border-color: transparent;
+	cursor: pointer;
+	color: #08c;
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+#icagenda .btn-link:hover {
+	color: #005580;
+	text-decoration: underline;
+	background-color: transparent;
+}
+#icagenda .btn-group {
+	position: relative;
+	font-size: 0;
+	white-space: nowrap;
+	*margin-left: .3em;
+}
+#icagenda .btn-group:first-child {
+	*margin-left: 0;
+}
+#icagenda .btn-group + #icagenda .btn-group {
+	margin-left: 5px;
+}
+#icagenda .btn-toolbar {
+	font-size: 0;
+	margin-top: 9px;
+	margin-bottom: 9px;
+}
+#icagenda .btn-toolbar .btn-group {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+}
+#icagenda .btn-toolbar .btn + #icagenda .btn,
+#icagenda .btn-toolbar .btn-group + #icagenda .btn,
+#icagenda .btn-toolbar .btn + #icagenda .btn-group {
+	margin-left: 5px;
+}
+#icagenda .btn-group > #icagenda .btn {
+	position: relative;
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+#icagenda .btn-group > #icagenda .btn + .btn {
+	margin-left: -1px;
+}
+#icagenda .btn-group > #icagenda .btn,
+#icagenda .btn-group > #icagenda .dropdown-menu {
+	font-size: 13px;
+}
+#icagenda .btn-group > #icagenda .btn-mini {
+	font-size: 11px;
+}
+#icagenda .btn-group > #icagenda .btn-small {
+	font-size: 12px;
+}
+#icagenda .btn-group > #icagenda .btn-large {
+	font-size: 16px;
+}
+#icagenda .btn-group > #icagenda .btn:first-child {
+	margin-left: 0;
+	-webkit-border-top-left-radius: 4px;
+	-moz-border-radius-topleft: 4px;
+	border-top-left-radius: 4px;
+	-webkit-border-bottom-left-radius: 4px;
+	-moz-border-radius-bottomleft: 4px;
+	border-bottom-left-radius: 4px;
+}
+#icagenda .btn-group > #icagenda .btn:last-child,
+#icagenda .btn-group > #icagenda .dropdown-toggle {
+	-webkit-border-top-right-radius: 4px;
+	-moz-border-radius-topright: 4px;
+	border-top-right-radius: 4px;
+	-webkit-border-bottom-right-radius: 4px;
+	-moz-border-radius-bottomright: 4px;
+	border-bottom-right-radius: 4px;
+}
+#icagenda .btn-group > #icagenda .btn.large:first-child {
+	margin-left: 0;
+	-webkit-border-top-left-radius: 6px;
+	-moz-border-radius-topleft: 6px;
+	border-top-left-radius: 6px;
+	-webkit-border-bottom-left-radius: 6px;
+	-moz-border-radius-bottomleft: 6px;
+	border-bottom-left-radius: 6px;
+}
+#icagenda .btn-group > #icagenda .btn.large:last-child,
+#icagenda .btn-group > #icagenda .large.dropdown-toggle {
+	-webkit-border-top-right-radius: 6px;
+	-moz-border-radius-topright: 6px;
+	border-top-right-radius: 6px;
+	-webkit-border-bottom-right-radius: 6px;
+	-moz-border-radius-bottomright: 6px;
+	border-bottom-right-radius: 6px;
+}
+#icagenda .btn-group > #icagenda .btn:hover,
+#icagenda .btn-group > #icagenda .btn:focus,
+#icagenda .btn-group > #icagenda .btn:active,
+#icagenda .btn-group > #icagenda .btn.active {
+	z-index: 2;
+}
+#icagenda .btn-group .dropdown-toggle:active,
+#icagenda .btn-group.open .dropdown-toggle {
+	outline: 0;
+}
+#icagenda .btn-group > #icagenda .btn + #icagenda .dropdown-toggle {
+	padding-left: 8px;
+	padding-right: 8px;
+	-webkit-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+	-moz-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+	box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+	*padding-top: 5px;
+	*padding-bottom: 5px;
+}
+#icagenda .btn-group > #icagenda .btn-mini + #icagenda .dropdown-toggle {
+	padding-left: 5px;
+	padding-right: 5px;
+	*padding-top: 2px;
+	*padding-bottom: 2px;
+}
+#icagenda .btn-group > #icagenda .btn-small + #icagenda .dropdown-toggle {
+	*padding-top: 5px;
+	*padding-bottom: 4px;
+}
+#icagenda .btn-group > #icagenda .btn-large + #icagenda .dropdown-toggle {
+	padding-left: 12px;
+	padding-right: 12px;
+	*padding-top: 7px;
+	*padding-bottom: 7px;
+}
+#icagenda .btn-group.open .dropdown-toggle {
+	background-image: none;
+	-webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+	-moz-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+	box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+}
+#icagenda .btn-group.open .btn.dropdown-toggle {
+	background-color: #e6e6e6;
+}
+#icagenda .btn-group.open .btn-primary.dropdown-toggle {
+	background-color: #15497c;
+}
+#icagenda .btn-group.open .btn-warning.dropdown-toggle {
+	background-color: #f89406;
+}
+#icagenda .btn-group.open .btn-danger.dropdown-toggle {
+	background-color: #bd362f;
+}
+#icagenda .btn-group.open .btn-success.dropdown-toggle {
+	background-color: #51a351;
+}
+#icagenda .btn-group.open .btn-info.dropdown-toggle {
+	background-color: #2f96b4;
+}
+#icagenda .btn-group.open .btn-inverse.dropdown-toggle {
+	background-color: #222;
+}
+#icagenda .btn .caret {
+	margin-top: 8px;
+	margin-left: 0;
+}
+#icagenda .btn-mini .caret,
+#icagenda .btn-small .caret,
+#icagenda .btn-large .caret {
+	margin-top: 6px;
+}
+#icagenda .btn-large .caret {
+	border-left-width: 5px;
+	border-right-width: 5px;
+	border-top-width: 5px;
+}
+#icagenda .dropup .btn-large .caret {
+	border-bottom: 5px solid #000;
+	border-top: 0;
+}
+#icagenda .btn-primary .caret,
+#icagenda .btn-warning .caret,
+#icagenda .btn-danger .caret,
+#icagenda .btn-info .caret,
+#icagenda .btn-success .caret,
+#icagenda .btn-inverse .caret {
+	border-top-color: #fff;
+	border-bottom-color: #fff;
+}
+#icagenda .btn-group-vertical {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+}
+#icagenda .btn-group-vertical .btn {
+	display: block;
+	float: none;
+	width: 100%;
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+#icagenda .btn-group-vertical .btn + .btn {
+	margin-left: 0;
+	margin-top: -1px;
+}
+#icagenda .btn-group-vertical .btn:first-child {
+	-webkit-border-radius: 4px 4px 0 0;
+	-moz-border-radius: 4px 4px 0 0;
+	border-radius: 4px 4px 0 0;
+}
+#icagenda .btn-group-vertical .btn:last-child {
+	-webkit-border-radius: 0 0 4px 4px;
+	-moz-border-radius: 0 0 4px 4px;
+	border-radius: 0 0 4px 4px;
+}
+#icagenda .btn-group-vertical .btn-large:first-child {
+	-webkit-border-radius: 6px 6px 0 0;
+	-moz-border-radius: 6px 6px 0 0;
+	border-radius: 6px 6px 0 0;
+}
+#icagenda .btn-group-vertical .btn-large:last-child {
+	-webkit-border-radius: 0 0 6px 6px;
+	-moz-border-radius: 0 0 6px 6px;
+	border-radius: 0 0 6px 6px;
+}
+@media (max-width: 767px) {
+	.row-fluid {
+		width: 100%;
+	}
+	[class*="span"],
+	.row-fluid [class*="span"] {
+		float: none;
+		display: block;
+		width: auto;
+		margin-left: 0;
+	}
+	.span12,
+	.row-fluid .span12 {
+		width: 100%;
+		-webkit-box-sizing: border-box;
+		-moz-box-sizing: border-box;
+		box-sizing: border-box;
+	}
+	.input-large,
+	.input-xlarge,
+	.input-xxlarge,
+	input[class*="span"],
+	select[class*="span"],
+	textarea[class*="span"],
+	.uneditable-input {
+		display: block;
+		width: 100%;
+		min-height: 30px;
+		-webkit-box-sizing: border-box;
+		-moz-box-sizing: border-box;
+		box-sizing: border-box;
+	}
+}
+@media (max-width: 480px) {
+	input[type="checkbox"],
+	input[type="radio"] {
+		border: 1px solid #ccc;
+	}
+}
+@media (min-width: 768px) and (max-width: 979px) {
+	[class*="span"] {
+		float: left;
+		margin-left: 20px;
+	}
+	.span12 {
+		width: 724px;
+	}
+	.span11 {
+		width: 662px;
+	}
+	.span10 {
+		width: 600px;
+	}
+	.span9 {
+		width: 538px;
+	}
+	.span8 {
+		width: 476px;
+	}
+	.span7 {
+		width: 414px;
+	}
+	.span6 {
+		width: 352px;
+	}
+	.span5 {
+		width: 290px;
+	}
+	.span4 {
+		width: 228px;
+	}
+	.span3 {
+		width: 166px;
+	}
+	.span2 {
+		width: 104px;
+	}
+	.span1 {
+		width: 42px;
+	}
+	.row-fluid {
+		width: 100%;
+		*zoom: 1;
+	}
+	.row-fluid:before,
+	.row-fluid:after {
+		display: table;
+		content: "";
+		line-height: 0;
+	}
+	.row-fluid:after {
+		clear: both;
+	}
+	.row-fluid [class*="span"] {
+		display: block;
+		width: 100%;
+		min-height: 30px;
+		-webkit-box-sizing: border-box;
+		-moz-box-sizing: border-box;
+		box-sizing: border-box;
+		float: left;
+		margin-left: 2.7624309392265%;
+		*margin-left: 2.7092394498648%;
+	}
+	.row-fluid [class*="span"]:first-child {
+		margin-left: 0;
+	}
+	.row-fluid .span12 {
+		width: 100%;
+		*width: 99.946808510638%;
+	}
+	.row-fluid .span11 {
+		width: 91.489361702128%;
+		*width: 91.436170212766%;
+	}
+	.row-fluid .span10 {
+		width: 82.978723404255%;
+		*width: 82.925531914894%;
+	}
+	.row-fluid .span9 {
+		width: 74.468085106383%;
+		*width: 74.414893617021%;
+	}
+	.row-fluid .span8 {
+		width: 65.957446808511%;
+		*width: 65.904255319149%;
+	}
+	.row-fluid .span7 {
+		width: 57.446808510638%;
+		*width: 57.393617021277%;
+	}
+	.row-fluid .span6 {
+		width: 48.936170212766%;
+		*width: 48.882978723404%;
+	}
+	.row-fluid .span5 {
+		width: 40.425531914894%;
+		*width: 40.372340425532%;
+	}
+	.row-fluid .span4 {
+		width: 31.914893617021%;
+		*width: 31.86170212766%;
+	}
+	.row-fluid .span3 {
+		width: 23.404255319149%;
+		*width: 23.351063829787%;
+	}
+	.row-fluid .span2 {
+		width: 14.893617021277%;
+		*width: 14.840425531915%;
+	}
+	.row-fluid .span1 {
+		width: 6.3829787234043%;
+		*width: 6.3297872340426%;
+	}
+	input.span12, textarea.span12, .uneditable-input.span12 {
+		width: 710px;
+	}
+	input.span11, textarea.span11, .uneditable-input.span11 {
+		width: 648px;
+	}
+	input.span10, textarea.span10, .uneditable-input.span10 {
+		width: 586px;
+	}
+	input.span9, textarea.span9, .uneditable-input.span9 {
+		width: 524px;
+	}
+	input.span8, textarea.span8, .uneditable-input.span8 {
+		width: 462px;
+	}
+	input.span7, textarea.span7, .uneditable-input.span7 {
+		width: 400px;
+	}
+	input.span6, textarea.span6, .uneditable-input.span6 {
+		width: 338px;
+	}
+	input.span5, textarea.span5, .uneditable-input.span5 {
+		width: 276px;
+	}
+	input.span4, textarea.span4, .uneditable-input.span4 {
+		width: 214px;
+	}
+	input.span3, textarea.span3, .uneditable-input.span3 {
+		width: 152px;
+	}
+	input.span2, textarea.span2, .uneditable-input.span2 {
+		width: 90px;
+	}
+	input.span1, textarea.span1, .uneditable-input.span1 {
+		width: 28px;
+	}
+}
+@media (min-width: 1200px) {
+	.span12 {
+		width: 1170px;
+	}
+	.span11 {
+		width: 1070px;
+	}
+	.span10 {
+		width: 970px;
+	}
+	.span9 {
+		width: 870px;
+	}
+	.span8 {
+		width: 770px;
+	}
+	.span7 {
+		width: 670px;
+	}
+	.span6 {
+		width: 570px;
+	}
+	.span5 {
+		width: 470px;
+	}
+	.span4 {
+		width: 370px;
+	}
+	.span3 {
+		width: 270px;
+	}
+	.span2 {
+		width: 170px;
+	}
+	.span1 {
+		width: 70px;
+	}
+	.row-fluid {
+		width: 100%;
+		*zoom: 1;
+	}
+	.row-fluid:before,
+	.row-fluid:after {
+		display: table;
+		content: "";
+		line-height: 0;
+	}
+	.row-fluid:after {
+		clear: both;
+	}
+	.row-fluid [class*="span"] {
+		display: block;
+		width: 100%;
+		min-height: 30px;
+		-webkit-box-sizing: border-box;
+		-moz-box-sizing: border-box;
+		box-sizing: border-box;
+		float: left;
+		margin-left: 2.5641025641026%;
+		*margin-left: 2.5109110747409%;
+	}
+	.row-fluid [class*="span"]:first-child {
+		margin-left: 0;
+	}
+	.row-fluid .span12 {
+		width: 100%;
+		*width: 99.946808510638%;
+	}
+	.row-fluid .span11 {
+		width: 91.436464088398%;
+		*width: 91.383272599036%;
+	}
+	.row-fluid .span10 {
+		width: 82.872928176796%;
+		*width: 82.819736687434%;
+	}
+	.row-fluid .span9 {
+		width: 74.309392265193%;
+		*width: 74.256200775832%;
+	}
+	.row-fluid .span8 {
+		width: 65.745856353591%;
+		*width: 65.692664864229%;
+	}
+	.row-fluid .span7 {
+		width: 57.182320441989%;
+		*width: 57.129128952627%;
+	}
+	.row-fluid .span6 {
+		width: 48.618784530387%;
+		*width: 48.565593041025%;
+	}
+	.row-fluid .span5 {
+		width: 40.055248618785%;
+		*width: 40.002057129423%;
+	}
+	.row-fluid .span4 {
+		width: 31.491712707182%;
+		*width: 31.438521217821%;
+	}
+	.row-fluid .span3 {
+		width: 22.92817679558%;
+		*width: 22.874985306218%;
+	}
+	.row-fluid .span2 {
+		width: 14.364640883978%;
+		*width: 14.311449394616%;
+	}
+	.row-fluid .span1 {
+		width: 5.8011049723757%;
+		*width: 5.747913483014%;
+	}
+	input,
+	textarea,
+	.uneditable-input {
+		margin-left: 0;
+	}
+	input.span12, textarea.span12, .uneditable-input.span12 {
+		width: 1156px;
+	}
+	input.span11, textarea.span11, .uneditable-input.span11 {
+		width: 1056px;
+	}
+	input.span10, textarea.span10, .uneditable-input.span10 {
+		width: 956px;
+	}
+	input.span9, textarea.span9, .uneditable-input.span9 {
+		width: 856px;
+	}
+	input.span8, textarea.span8, .uneditable-input.span8 {
+		width: 756px;
+	}
+	input.span7, textarea.span7, .uneditable-input.span7 {
+		width: 656px;
+	}
+	input.span6, textarea.span6, .uneditable-input.span6 {
+		width: 556px;
+	}
+	input.span5, textarea.span5, .uneditable-input.span5 {
+		width: 456px;
+	}
+	input.span4, textarea.span4, .uneditable-input.span4 {
+		width: 356px;
+	}
+	input.span3, textarea.span3, .uneditable-input.span3 {
+		width: 256px;
+	}
+	input.span2, textarea.span2, .uneditable-input.span2 {
+		width: 156px;
+	}
+	input.span1, textarea.span1, .uneditable-input.span1 {
+		width: 56px;
+	}
+}
diff --git a/deployed/icagenda/media/com_icagenda/css/icagenda.css b/deployed/icagenda/media/com_icagenda/css/icagenda.css
new file mode 100644
index 00000000..b1f54c7b
--- /dev/null
+++ b/deployed/icagenda/media/com_icagenda/css/icagenda.css
@@ -0,0 +1,98 @@
+/**
+ *------------------------------------------------------------------------------
+ *	CSS Common - iCagenda v3 by Jooml!C
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.5.4 2015-04-02
+ * @since       3.5.0
+ *------------------------------------------------------------------------------
+*/
+
+/* -- IC TEXT CHARACTERS COUNTER -------------------- */
+.ic-counter-container {
+	display: block;
+	text-align: right;
+	vertical-align: bottom !important;
+	color: #777;
+	font-size: 0.9em;
+}
+.ic-counter {
+	display: inline-block;
+}
+.ic-counter input {
+	width: auto !important;
+	float: none !important; /* admin j2.5 */
+	vertical-align: bottom !important;
+	padding: 0 !important;
+	margin: 0 !important;
+	text-align: right !important;
+	background: none !important;
+	border: none !important;
+	box-shadow: none !important;
+	font-size: 1em;
+}
+.ic-counter-limit {
+	font-weight: bold;
+	color: red;
+}
+
+/* -- GOOGLE MAPS ----------------------------------- */
+.map-wrapper {
+	float:left;
+	width: 92%;
+	margin: 0 10px 0 10px;
+}
+#map {
+	border: 1px solid #DDD;
+	width: 100%;
+	height: 300px;
+	margin: 10px 0 10px 0;
+	-webkit-box-shadow: #AAA 0px 0px 15px;
+}
+/* Fixed Known conflict Bootstrap/Google Maps */
+#map img {
+	max-width: none;
+}
+#legend {
+	font-size: 12px;
+	font-style: italic;
+}
+.icmap-box {
+	margin-top: 30px;
+}
+/* For img in the map remove borders, shadow, no margin and no max-width */
+.map img, .svPanel img {
+    border: 0px;
+    box-shadow: none;
+    margin: 0px !important;
+    padding: 0px !important;
+    max-width: none !important;
+    background: none !important;
+}
+/* Fixed Known conflict Bootstrap/Google Maps (joomla 3.2) */
+.icagenda_map img {
+	max-width: none;
+}
+/* Make sure the directions are below the map */
+.directions {
+    clear: left;
+}
+.adp-directions {
+    width: 100%;
+}
+/* Solve problems in chrome with the show of the direction steps in full width */
+.adp-placemark {
+    width : 100%;
+}
+/* Padding for image overlay */
+.controlDiv {
+    padding : 5px;
+}
+.google-map-canvas,
+.google-map-canvas * { .box-sizing(content-box); }
diff --git a/deployed/icagenda/media/com_icagenda/css/images/index.html b/deployed/icagenda/media/com_icagenda/css/images/index.html
new file mode 100644
index 00000000..42682b47
--- /dev/null
+++ b/deployed/icagenda/media/com_icagenda/css/images/index.html
@@ -0,0 +1 @@
+<html><body></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/media/com_icagenda/css/images/ui-bg_flat_0_aaaaaa_40x100.png b/deployed/icagenda/media/com_icagenda/css/images/ui-bg_flat_0_aaaaaa_40x100.png
new file mode 100644
index 00000000..5b5dab2a
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/css/images/ui-bg_flat_0_aaaaaa_40x100.png differ
diff --git a/deployed/icagenda/media/com_icagenda/css/images/ui-bg_flat_0_eeeeee_40x100.png b/deployed/icagenda/media/com_icagenda/css/images/ui-bg_flat_0_eeeeee_40x100.png
new file mode 100644
index 00000000..e44f861b
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/css/images/ui-bg_flat_0_eeeeee_40x100.png differ
diff --git a/deployed/icagenda/media/com_icagenda/css/images/ui-bg_flat_55_c0402a_40x100.png b/deployed/icagenda/media/com_icagenda/css/images/ui-bg_flat_55_c0402a_40x100.png
new file mode 100644
index 00000000..881ea6bf
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/css/images/ui-bg_flat_55_c0402a_40x100.png differ
diff --git a/deployed/icagenda/media/com_icagenda/css/images/ui-bg_flat_55_eeeeee_40x100.png b/deployed/icagenda/media/com_icagenda/css/images/ui-bg_flat_55_eeeeee_40x100.png
new file mode 100644
index 00000000..e44f861b
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/css/images/ui-bg_flat_55_eeeeee_40x100.png differ
diff --git a/deployed/icagenda/media/com_icagenda/css/images/ui-bg_flat_75_ffffff_40x100.png b/deployed/icagenda/media/com_icagenda/css/images/ui-bg_flat_75_ffffff_40x100.png
new file mode 100644
index 00000000..ac8b229a
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/css/images/ui-bg_flat_75_ffffff_40x100.png differ
diff --git a/deployed/icagenda/media/com_icagenda/css/images/ui-bg_glass_100_f8f8f8_1x400.png b/deployed/icagenda/media/com_icagenda/css/images/ui-bg_glass_100_f8f8f8_1x400.png
new file mode 100644
index 00000000..0102c43d
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/css/images/ui-bg_glass_100_f8f8f8_1x400.png differ
diff --git a/deployed/icagenda/media/com_icagenda/css/images/ui-bg_glass_35_dddddd_1x400.png b/deployed/icagenda/media/com_icagenda/css/images/ui-bg_glass_35_dddddd_1x400.png
new file mode 100644
index 00000000..3550f06c
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/css/images/ui-bg_glass_35_dddddd_1x400.png differ
diff --git a/deployed/icagenda/media/com_icagenda/css/images/ui-bg_glass_55_fbf9ee_1x400.png b/deployed/icagenda/media/com_icagenda/css/images/ui-bg_glass_55_fbf9ee_1x400.png
new file mode 100644
index 00000000..ad3d6346
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/css/images/ui-bg_glass_55_fbf9ee_1x400.png differ
diff --git a/deployed/icagenda/media/com_icagenda/css/images/ui-bg_glass_60_eeeeee_1x400.png b/deployed/icagenda/media/com_icagenda/css/images/ui-bg_glass_60_eeeeee_1x400.png
new file mode 100644
index 00000000..8ad921a8
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/css/images/ui-bg_glass_60_eeeeee_1x400.png differ
diff --git a/deployed/icagenda/media/com_icagenda/css/images/ui-bg_glass_65_ffffff_1x400.png b/deployed/icagenda/media/com_icagenda/css/images/ui-bg_glass_65_ffffff_1x400.png
new file mode 100644
index 00000000..42ccba26
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/css/images/ui-bg_glass_65_ffffff_1x400.png differ
diff --git a/deployed/icagenda/media/com_icagenda/css/images/ui-bg_glass_75_dadada_1x400.png b/deployed/icagenda/media/com_icagenda/css/images/ui-bg_glass_75_dadada_1x400.png
new file mode 100644
index 00000000..5a46b47c
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/css/images/ui-bg_glass_75_dadada_1x400.png differ
diff --git a/deployed/icagenda/media/com_icagenda/css/images/ui-bg_glass_75_e6e6e6_1x400.png b/deployed/icagenda/media/com_icagenda/css/images/ui-bg_glass_75_e6e6e6_1x400.png
new file mode 100644
index 00000000..86c2baa6
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/css/images/ui-bg_glass_75_e6e6e6_1x400.png differ
diff --git a/deployed/icagenda/media/com_icagenda/css/images/ui-bg_glass_95_fef1ec_1x400.png b/deployed/icagenda/media/com_icagenda/css/images/ui-bg_glass_95_fef1ec_1x400.png
new file mode 100644
index 00000000..4443fdc1
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/css/images/ui-bg_glass_95_fef1ec_1x400.png differ
diff --git a/deployed/icagenda/media/com_icagenda/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/deployed/icagenda/media/com_icagenda/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
new file mode 100644
index 00000000..7c9fa6c6
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png differ
diff --git a/deployed/icagenda/media/com_icagenda/css/images/ui-bg_inset-hard_75_999999_1x100.png b/deployed/icagenda/media/com_icagenda/css/images/ui-bg_inset-hard_75_999999_1x100.png
new file mode 100644
index 00000000..89b88d8d
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/css/images/ui-bg_inset-hard_75_999999_1x100.png differ
diff --git a/deployed/icagenda/media/com_icagenda/css/images/ui-bg_inset-soft_50_c9c9c9_1x100.png b/deployed/icagenda/media/com_icagenda/css/images/ui-bg_inset-soft_50_c9c9c9_1x100.png
new file mode 100644
index 00000000..a265c62a
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/css/images/ui-bg_inset-soft_50_c9c9c9_1x100.png differ
diff --git a/deployed/icagenda/media/com_icagenda/css/images/ui-icons_222222_256x240.png b/deployed/icagenda/media/com_icagenda/css/images/ui-icons_222222_256x240.png
new file mode 100644
index 00000000..b273ff11
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/css/images/ui-icons_222222_256x240.png differ
diff --git a/deployed/icagenda/media/com_icagenda/css/images/ui-icons_2e83ff_256x240.png b/deployed/icagenda/media/com_icagenda/css/images/ui-icons_2e83ff_256x240.png
new file mode 100644
index 00000000..09d1cdc8
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/css/images/ui-icons_2e83ff_256x240.png differ
diff --git a/deployed/icagenda/media/com_icagenda/css/images/ui-icons_3383bb_256x240.png b/deployed/icagenda/media/com_icagenda/css/images/ui-icons_3383bb_256x240.png
new file mode 100644
index 00000000..905274f2
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/css/images/ui-icons_3383bb_256x240.png differ
diff --git a/deployed/icagenda/media/com_icagenda/css/images/ui-icons_454545_256x240.png b/deployed/icagenda/media/com_icagenda/css/images/ui-icons_454545_256x240.png
new file mode 100644
index 00000000..59bd45b9
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/css/images/ui-icons_454545_256x240.png differ
diff --git a/deployed/icagenda/media/com_icagenda/css/images/ui-icons_63a459_256x240.png b/deployed/icagenda/media/com_icagenda/css/images/ui-icons_63a459_256x240.png
new file mode 100644
index 00000000..c3f9e47c
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/css/images/ui-icons_63a459_256x240.png differ
diff --git a/deployed/icagenda/media/com_icagenda/css/images/ui-icons_888888_256x240.png b/deployed/icagenda/media/com_icagenda/css/images/ui-icons_888888_256x240.png
new file mode 100644
index 00000000..6d02426c
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/css/images/ui-icons_888888_256x240.png differ
diff --git a/deployed/icagenda/media/com_icagenda/css/images/ui-icons_999999_256x240.png b/deployed/icagenda/media/com_icagenda/css/images/ui-icons_999999_256x240.png
new file mode 100644
index 00000000..50ff803d
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/css/images/ui-icons_999999_256x240.png differ
diff --git a/deployed/icagenda/media/com_icagenda/css/images/ui-icons_cd0a0a_256x240.png b/deployed/icagenda/media/com_icagenda/css/images/ui-icons_cd0a0a_256x240.png
new file mode 100644
index 00000000..2ab019b7
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/css/images/ui-icons_cd0a0a_256x240.png differ
diff --git a/deployed/icagenda/media/com_icagenda/css/images/ui-icons_fbc856_256x240.png b/deployed/icagenda/media/com_icagenda/css/images/ui-icons_fbc856_256x240.png
new file mode 100644
index 00000000..9d1b027f
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/css/images/ui-icons_fbc856_256x240.png differ
diff --git a/deployed/icagenda/media/com_icagenda/css/index.html b/deployed/icagenda/media/com_icagenda/css/index.html
new file mode 100644
index 00000000..fa6d84e8
--- /dev/null
+++ b/deployed/icagenda/media/com_icagenda/css/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/media/com_icagenda/css/jquery-ui-1.8.17.custom.css b/deployed/icagenda/media/com_icagenda/css/jquery-ui-1.8.17.custom.css
new file mode 100644
index 00000000..a77c761f
--- /dev/null
+++ b/deployed/icagenda/media/com_icagenda/css/jquery-ui-1.8.17.custom.css
@@ -0,0 +1,570 @@
+/*
+ * jQuery UI CSS Framework 1.8.17
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ */
+
+/* Layout helpers
+----------------------------------*/
+.ui-helper-hidden { display: none; }
+.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
+.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
+.ui-helper-clearfix:before, .ui-helper-clearfix:after { content: ""; display: table; }
+.ui-helper-clearfix:after { clear: both; }
+.ui-helper-clearfix { zoom: 1; }
+.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
+
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-disabled { cursor: default !important; }
+
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Overlays */
+.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+
+
+/*
+ * jQuery UI CSS Framework 1.8.17
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ *
+ * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana,Arial,sans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=03_highlight_soft.png&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=01_flat.png&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=02_glass.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
+ */
+
+
+/* Component containers
+----------------------------------*/
+.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; }
+.ui-widget .ui-widget { font-size: 1em; }
+.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
+.ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; }
+.ui-widget-content a { color: #222222; }
+.ui-widget-header { border: 1px solid #aaaaaa; background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; }
+.ui-widget-header a { color: #222222; }
+
+/* Interaction states
+----------------------------------*/
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d3d3d3; background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #555555; }
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555; text-decoration: none; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #999999; background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
+.ui-state-hover a, .ui-state-hover a:hover { color: #212121; text-decoration: none; }
+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
+.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121; text-decoration: none; }
+.ui-widget :active { outline: none; }
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #fcefa1; background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x; color: #363636; }
+.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
+.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; color: #cd0a0a; }
+.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a; }
+.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a; }
+.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
+.ui-priority-secondary, .ui-widget-content .ui-priority-secondary,  .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
+.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-widget-header .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-state-default .ui-icon { background-image: url(images/ui-icons_888888_256x240.png); }
+.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
+.ui-state-active .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
+.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png); }
+.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png); }
+
+/* positioning */
+.ui-icon-carat-1-n { background-position: 0 0; }
+.ui-icon-carat-1-ne { background-position: -16px 0; }
+.ui-icon-carat-1-e { background-position: -32px 0; }
+.ui-icon-carat-1-se { background-position: -48px 0; }
+.ui-icon-carat-1-s { background-position: -64px 0; }
+.ui-icon-carat-1-sw { background-position: -80px 0; }
+.ui-icon-carat-1-w { background-position: -96px 0; }
+.ui-icon-carat-1-nw { background-position: -112px 0; }
+.ui-icon-carat-2-n-s { background-position: -128px 0; }
+.ui-icon-carat-2-e-w { background-position: -144px 0; }
+.ui-icon-triangle-1-n { background-position: 0 -16px; }
+.ui-icon-triangle-1-ne { background-position: -16px -16px; }
+.ui-icon-triangle-1-e { background-position: -32px -16px; }
+.ui-icon-triangle-1-se { background-position: -48px -16px; }
+.ui-icon-triangle-1-s { background-position: -64px -16px; }
+.ui-icon-triangle-1-sw { background-position: -80px -16px; }
+.ui-icon-triangle-1-w { background-position: -96px -16px; }
+.ui-icon-triangle-1-nw { background-position: -112px -16px; }
+.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
+.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
+.ui-icon-arrow-1-n { background-position: 0 -32px; }
+.ui-icon-arrow-1-ne { background-position: -16px -32px; }
+.ui-icon-arrow-1-e { background-position: -32px -32px; }
+.ui-icon-arrow-1-se { background-position: -48px -32px; }
+.ui-icon-arrow-1-s { background-position: -64px -32px; }
+.ui-icon-arrow-1-sw { background-position: -80px -32px; }
+.ui-icon-arrow-1-w { background-position: -96px -32px; }
+.ui-icon-arrow-1-nw { background-position: -112px -32px; }
+.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
+.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
+.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
+.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
+.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
+.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
+.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
+.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
+.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
+.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
+.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
+.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
+.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
+.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
+.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
+.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
+.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
+.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
+.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
+.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
+.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
+.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
+.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
+.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
+.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
+.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
+.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
+.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
+.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
+.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
+.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
+.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
+.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
+.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
+.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
+.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
+.ui-icon-arrow-4 { background-position: 0 -80px; }
+.ui-icon-arrow-4-diag { background-position: -16px -80px; }
+.ui-icon-extlink { background-position: -32px -80px; }
+.ui-icon-newwin { background-position: -48px -80px; }
+.ui-icon-refresh { background-position: -64px -80px; }
+.ui-icon-shuffle { background-position: -80px -80px; }
+.ui-icon-transfer-e-w { background-position: -96px -80px; }
+.ui-icon-transferthick-e-w { background-position: -112px -80px; }
+.ui-icon-folder-collapsed { background-position: 0 -96px; }
+.ui-icon-folder-open { background-position: -16px -96px; }
+.ui-icon-document { background-position: -32px -96px; }
+.ui-icon-document-b { background-position: -48px -96px; }
+.ui-icon-note { background-position: -64px -96px; }
+.ui-icon-mail-closed { background-position: -80px -96px; }
+.ui-icon-mail-open { background-position: -96px -96px; }
+.ui-icon-suitcase { background-position: -112px -96px; }
+.ui-icon-comment { background-position: -128px -96px; }
+.ui-icon-person { background-position: -144px -96px; }
+.ui-icon-print { background-position: -160px -96px; }
+.ui-icon-trash { background-position: -176px -96px; }
+.ui-icon-locked { background-position: -192px -96px; }
+.ui-icon-unlocked { background-position: -208px -96px; }
+.ui-icon-bookmark { background-position: -224px -96px; }
+.ui-icon-tag { background-position: -240px -96px; }
+.ui-icon-home { background-position: 0 -112px; }
+.ui-icon-flag { background-position: -16px -112px; }
+.ui-icon-calendar { background-position: -32px -112px; }
+.ui-icon-cart { background-position: -48px -112px; }
+.ui-icon-pencil { background-position: -64px -112px; }
+.ui-icon-clock { background-position: -80px -112px; }
+.ui-icon-disk { background-position: -96px -112px; }
+.ui-icon-calculator { background-position: -112px -112px; }
+.ui-icon-zoomin { background-position: -128px -112px; }
+.ui-icon-zoomout { background-position: -144px -112px; }
+.ui-icon-search { background-position: -160px -112px; }
+.ui-icon-wrench { background-position: -176px -112px; }
+.ui-icon-gear { background-position: -192px -112px; }
+.ui-icon-heart { background-position: -208px -112px; }
+.ui-icon-star { background-position: -224px -112px; }
+.ui-icon-link { background-position: -240px -112px; }
+.ui-icon-cancel { background-position: 0 -128px; }
+.ui-icon-plus { background-position: -16px -128px; }
+.ui-icon-plusthick { background-position: -32px -128px; }
+.ui-icon-minus { background-position: -48px -128px; }
+.ui-icon-minusthick { background-position: -64px -128px; }
+.ui-icon-close { background-position: -80px -128px; }
+.ui-icon-closethick { background-position: -96px -128px; }
+.ui-icon-key { background-position: -112px -128px; }
+.ui-icon-lightbulb { background-position: -128px -128px; }
+.ui-icon-scissors { background-position: -144px -128px; }
+.ui-icon-clipboard { background-position: -160px -128px; }
+.ui-icon-copy { background-position: -176px -128px; }
+.ui-icon-contact { background-position: -192px -128px; }
+.ui-icon-image { background-position: -208px -128px; }
+.ui-icon-video { background-position: -224px -128px; }
+.ui-icon-script { background-position: -240px -128px; }
+.ui-icon-alert { background-position: 0 -144px; }
+.ui-icon-info { background-position: -16px -144px; }
+.ui-icon-notice { background-position: -32px -144px; }
+.ui-icon-help { background-position: -48px -144px; }
+.ui-icon-check { background-position: -64px -144px; }
+.ui-icon-bullet { background-position: -80px -144px; }
+.ui-icon-radio-off { background-position: -96px -144px; }
+.ui-icon-radio-on { background-position: -112px -144px; }
+.ui-icon-pin-w { background-position: -128px -144px; }
+.ui-icon-pin-s { background-position: -144px -144px; }
+.ui-icon-play { background-position: 0 -160px; }
+.ui-icon-pause { background-position: -16px -160px; }
+.ui-icon-seek-next { background-position: -32px -160px; }
+.ui-icon-seek-prev { background-position: -48px -160px; }
+.ui-icon-seek-end { background-position: -64px -160px; }
+.ui-icon-seek-start { background-position: -80px -160px; }
+/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
+.ui-icon-seek-first { background-position: -80px -160px; }
+.ui-icon-stop { background-position: -96px -160px; }
+.ui-icon-eject { background-position: -112px -160px; }
+.ui-icon-volume-off { background-position: -128px -160px; }
+.ui-icon-volume-on { background-position: -144px -160px; }
+.ui-icon-power { background-position: 0 -176px; }
+.ui-icon-signal-diag { background-position: -16px -176px; }
+.ui-icon-signal { background-position: -32px -176px; }
+.ui-icon-battery-0 { background-position: -48px -176px; }
+.ui-icon-battery-1 { background-position: -64px -176px; }
+.ui-icon-battery-2 { background-position: -80px -176px; }
+.ui-icon-battery-3 { background-position: -96px -176px; }
+.ui-icon-circle-plus { background-position: 0 -192px; }
+.ui-icon-circle-minus { background-position: -16px -192px; }
+.ui-icon-circle-close { background-position: -32px -192px; }
+.ui-icon-circle-triangle-e { background-position: -48px -192px; }
+.ui-icon-circle-triangle-s { background-position: -64px -192px; }
+.ui-icon-circle-triangle-w { background-position: -80px -192px; }
+.ui-icon-circle-triangle-n { background-position: -96px -192px; }
+.ui-icon-circle-arrow-e { background-position: -112px -192px; }
+.ui-icon-circle-arrow-s { background-position: -128px -192px; }
+.ui-icon-circle-arrow-w { background-position: -144px -192px; }
+.ui-icon-circle-arrow-n { background-position: -160px -192px; }
+.ui-icon-circle-zoomin { background-position: -176px -192px; }
+.ui-icon-circle-zoomout { background-position: -192px -192px; }
+.ui-icon-circle-check { background-position: -208px -192px; }
+.ui-icon-circlesmall-plus { background-position: 0 -208px; }
+.ui-icon-circlesmall-minus { background-position: -16px -208px; }
+.ui-icon-circlesmall-close { background-position: -32px -208px; }
+.ui-icon-squaresmall-plus { background-position: -48px -208px; }
+.ui-icon-squaresmall-minus { background-position: -64px -208px; }
+.ui-icon-squaresmall-close { background-position: -80px -208px; }
+.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
+.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
+.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
+.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
+.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
+.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Corner radius */
+.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -khtml-border-top-left-radius: 4px; border-top-left-radius: 4px; }
+.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; -khtml-border-top-right-radius: 4px; border-top-right-radius: 4px; }
+.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; -khtml-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
+.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; -khtml-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
+
+/* Overlays */
+.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); }
+.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/*
+ * jQuery UI Resizable 1.8.17
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Resizable#theming
+ */
+.ui-resizable { position: relative;}
+.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block; }
+.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
+.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
+.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; }
+.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; }
+.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; }
+.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
+.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
+.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
+.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/*
+ * jQuery UI Selectable 1.8.17
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Selectable#theming
+ */
+.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; }
+/*
+ * jQuery UI Accordion 1.8.17
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Accordion#theming
+ */
+/* IE/Win - Fix animation bug - #4615 */
+.ui-accordion { width: 100%; }
+.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
+.ui-accordion .ui-accordion-li-fix { display: inline; }
+.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
+.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em .7em; }
+.ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; }
+.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
+.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; }
+.ui-accordion .ui-accordion-content-active { display: block; }
+/*
+ * jQuery UI Autocomplete 1.8.17
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Autocomplete#theming
+ */
+.ui-autocomplete { position: absolute; cursor: default; }
+
+/* workarounds */
+* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
+
+/*
+ * jQuery UI Menu 1.8.17
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Menu#theming
+ */
+.ui-menu {
+	list-style:none;
+	padding: 2px;
+	margin: 0;
+	display:block;
+	float: left;
+}
+.ui-menu .ui-menu {
+	margin-top: -3px;
+}
+.ui-menu .ui-menu-item {
+	margin:0;
+	padding: 0;
+	zoom: 1;
+	float: left;
+	clear: left;
+	width: 100%;
+}
+.ui-menu .ui-menu-item a {
+	text-decoration:none;
+	display:block;
+	padding:.2em .4em;
+	line-height:1.5;
+	zoom:1;
+}
+.ui-menu .ui-menu-item a.ui-state-hover,
+.ui-menu .ui-menu-item a.ui-state-active {
+	font-weight: normal;
+	margin: -1px;
+}
+/*
+ * jQuery UI Button 1.8.17
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Button#theming
+ */
+.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */
+.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
+button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
+.ui-button-icons-only { width: 3.4em; }
+button.ui-button-icons-only { width: 3.7em; }
+
+/*button text element */
+.ui-button .ui-button-text { display: block; line-height: 1.4;  }
+.ui-button-text-only .ui-button-text { padding: .4em 1em; }
+.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; }
+.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
+.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; }
+.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; }
+/* no icon support for input elements, provide padding by default */
+input.ui-button { padding: .4em 1em; }
+
+/*button icon element(s) */
+.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
+.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
+.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
+.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+
+/*button sets*/
+.ui-buttonset { margin-right: 7px; }
+.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; }
+
+/* workarounds */
+button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
+/*
+ * jQuery UI Dialog 1.8.17
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Dialog#theming
+ */
+.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
+.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative;  }
+.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; }
+.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
+.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
+.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
+.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
+.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; }
+.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; }
+.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
+.ui-draggable .ui-dialog-titlebar { cursor: move; }
+/*
+ * jQuery UI Slider 1.8.17
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Slider#theming
+ */
+.ui-slider { position: relative; text-align: left; }
+.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
+.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
+
+.ui-slider-horizontal { height: .8em; }
+.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
+.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
+.ui-slider-horizontal .ui-slider-range-min { left: 0; }
+.ui-slider-horizontal .ui-slider-range-max { right: 0; }
+
+.ui-slider-vertical { width: .8em; height: 100px; }
+.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
+.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
+.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
+.ui-slider-vertical .ui-slider-range-max { top: 0; }/*
+ * jQuery UI Tabs 1.8.17
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Tabs#theming
+ */
+.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
+.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
+.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; }
+.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom: 1px; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
+.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
+.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
+.ui-tabs .ui-tabs-hide { display: none !important; }
+/*
+ * jQuery UI Datepicker 1.8.17
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Datepicker#theming
+ */
+.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; font-size:1em; z-index:10000 !important;}
+.ui-datepicker dt { font-size:0.9em; }
+.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
+.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
+.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
+.ui-datepicker .ui-datepicker-prev { left:2px; }
+.ui-datepicker .ui-datepicker-next { right:2px; }
+.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
+.ui-datepicker .ui-datepicker-next-hover { right:1px; }
+.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px;  }
+.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
+.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
+.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
+.ui-datepicker select.ui-datepicker-month,
+.ui-datepicker select.ui-datepicker-year { width: 49%;}
+.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
+.ui-datepicker th { padding: .3em .3em; text-align: center; font-size:0.8em; font-weight: bold; border: 0;  }
+.ui-datepicker td { border: 0; padding: 1px; }
+.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .1em; text-align: center; text-decoration: none; }
+.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
+.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
+.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
+.ui_tpicker_hour dd,
+.ui_tpicker_minute dd { margin: 0 .3em; }
+.ui_tpicker_hour_slider,
+.ui_tpicker_minute_slider { margin-right: 0.6em; }
+
+/* with multiple calendars */
+.ui-datepicker.ui-datepicker-multi { width:auto; }
+.ui-datepicker-multi .ui-datepicker-group { float:left; }
+.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
+.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
+.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
+.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
+.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
+.ui-datepicker-row-break { clear:both; width:100%; font-size:0em; }
+
+/* RTL support */
+.ui-datepicker-rtl { direction: rtl; }
+.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+
+/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
+.ui-datepicker-cover {
+    display: none; /*sorry for IE5*/
+    display/**/: block; /*sorry for IE5*/
+    position: absolute; /*must have*/
+    z-index: -1; /*must have*/
+    filter: mask(); /*must have*/
+    top: -4px; /*must have*/
+    left: -4px; /*must have*/
+    width: 200px; /*must have*/
+    height: 200px; /*must have*/
+}/*
+ * jQuery UI Progressbar 1.8.17
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Progressbar#theming
+ */
+.ui-progressbar { height:2em; text-align: left; overflow: hidden; }
+.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
diff --git a/deployed/icagenda/media/com_icagenda/css/template.j25.css b/deployed/icagenda/media/com_icagenda/css/template.j25.css
new file mode 100644
index 00000000..bae91956
--- /dev/null
+++ b/deployed/icagenda/media/com_icagenda/css/template.j25.css
@@ -0,0 +1,6628 @@
+
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+nav,
+section {
+	display: block;
+}
+audio,
+canvas,
+video {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+}
+audio:not([controls]) {
+	display: none;
+}
+html {
+	font-size: 100%;
+	-webkit-text-size-adjust: 100%;
+	-ms-text-size-adjust: 100%;
+}
+a:focus {
+	outline: thin dotted #333;
+	outline: 5px auto -webkit-focus-ring-color;
+	outline-offset: -2px;
+}
+a:hover,
+a:active {
+	outline: 0;
+}
+sub,
+sup {
+	position: relative;
+	font-size: 75%;
+	line-height: 0;
+	vertical-align: baseline;
+}
+sup {
+	top: -0.5em;
+}
+sub {
+	bottom: -0.25em;
+}
+img {
+	max-width: 100%;
+	height: auto;
+	vertical-align: middle;
+	border: 0;
+	-ms-interpolation-mode: bicubic;
+}
+#map_canvas img {
+	max-width: none;
+}
+button,
+input,
+select,
+textarea {
+	margin: 0;
+	font-size: 100%;
+	vertical-align: middle;
+}
+button,
+input {
+	*overflow: visible;
+	line-height: normal;
+}
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+	padding: 0;
+	border: 0;
+}
+button,
+input[type="button"],
+input[type="reset"],
+input[type="submit"] {
+	cursor: pointer;
+	-webkit-appearance: button;
+}
+input[type="search"] {
+	-webkit-box-sizing: content-box;
+	-moz-box-sizing: content-box;
+	box-sizing: content-box;
+	-webkit-appearance: textfield;
+}
+input[type="search"]::-webkit-search-decoration,
+input[type="search"]::-webkit-search-cancel-button {
+	-webkit-appearance: none;
+}
+textarea {
+	overflow: auto;
+	vertical-align: top;
+}
+.clearfix {
+	*zoom: 1;
+}
+.clearfix:before,
+.clearfix:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.clearfix:after {
+	clear: both;
+}
+.hide-text {
+	font: 0/0 a;
+	color: transparent;
+	text-shadow: none;
+	background-color: transparent;
+	border: 0;
+}
+.input-block-level {
+	display: block;
+	width: 100%;
+	min-height: 30px;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+}
+body {
+	margin: 0;
+	font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+	font-size: 13px;
+	line-height: 18px;
+	color: #333;
+	background-color: #fff;
+}
+a {
+	color: #08c;
+	text-decoration: none;
+}
+a:hover {
+	color: #005580;
+	text-decoration: underline;
+}
+.img-rounded {
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+}
+.img-polaroid {
+	padding: 4px;
+	background-color: #fff;
+	border: 1px solid #ccc;
+	border: 1px solid rgba(0,0,0,0.2);
+	-webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.1);
+	-moz-box-shadow: 0 1px 3px rgba(0,0,0,0.1);
+	box-shadow: 0 1px 3px rgba(0,0,0,0.1);
+}
+.img-circle {
+	-webkit-border-radius: 500px;
+	-moz-border-radius: 500px;
+	border-radius: 500px;
+}
+.row {
+	margin-left: -20px;
+	*zoom: 1;
+}
+.row:before,
+.row:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.row:after {
+	clear: both;
+}
+[class*="span"] {
+	float: left;
+	margin-left: 20px;
+}
+.container,
+.navbar-static-top .container,
+.navbar-fixed-top .container,
+.navbar-fixed-bottom .container {
+	width: 940px;
+}
+.span12 {
+	width: 940px;
+}
+.span11 {
+	width: 860px;
+}
+.span10 {
+	width: 780px;
+}
+.span9 {
+	width: 700px;
+}
+.span8 {
+	width: 620px;
+}
+.span7 {
+	width: 540px;
+}
+.span6 {
+	width: 460px;
+}
+.span5 {
+	width: 380px;
+}
+.span4 {
+	width: 300px;
+}
+.span3 {
+	width: 220px;
+}
+.span2 {
+	width: 140px;
+}
+.span1 {
+	width: 60px;
+}
+.offset12 {
+	margin-left: 980px;
+}
+.offset11 {
+	margin-left: 900px;
+}
+.offset10 {
+	margin-left: 820px;
+}
+.offset9 {
+	margin-left: 740px;
+}
+.offset8 {
+	margin-left: 660px;
+}
+.offset7 {
+	margin-left: 580px;
+}
+.offset6 {
+	margin-left: 500px;
+}
+.offset5 {
+	margin-left: 420px;
+}
+.offset4 {
+	margin-left: 340px;
+}
+.offset3 {
+	margin-left: 260px;
+}
+.offset2 {
+	margin-left: 180px;
+}
+.offset1 {
+	margin-left: 100px;
+}
+.row-fluid {
+	width: 100%;
+	*zoom: 1;
+}
+.row-fluid:before,
+.row-fluid:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.row-fluid:after {
+	clear: both;
+}
+.row-fluid [class*="span"] {
+	display: block;
+	width: 100%;
+	min-height: 30px;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+	float: left;
+	margin-left: 2.1276595744681%;
+	*margin-left: 2.0744680851064%;
+}
+.row-fluid [class*="span"]:first-child {
+	margin-left: 0;
+}
+.row-fluid .span12 {
+	width: 100%;
+	*width: 99.946808510638%;
+}
+.row-fluid .span11 {
+	width: 91.489361702128%;
+	*width: 91.436170212766%;
+}
+.row-fluid .span10 {
+	width: 82.978723404255%;
+	*width: 82.925531914894%;
+}
+.row-fluid .span9 {
+	width: 74.468085106383%;
+	*width: 74.414893617021%;
+}
+.row-fluid .span8 {
+	width: 65.957446808511%;
+	*width: 65.904255319149%;
+}
+.row-fluid .span7 {
+	width: 57.446808510638%;
+	*width: 57.393617021277%;
+}
+.row-fluid .span6 {
+	width: 48.936170212766%;
+	*width: 48.882978723404%;
+}
+.row-fluid .span5 {
+	width: 40.425531914894%;
+	*width: 40.372340425532%;
+}
+.row-fluid .span4 {
+	width: 31.914893617021%;
+	*width: 31.86170212766%;
+}
+.row-fluid .span3 {
+	width: 23.404255319149%;
+	*width: 23.351063829787%;
+}
+.row-fluid .span2 {
+	width: 14.893617021277%;
+	*width: 14.840425531915%;
+}
+.row-fluid .span1 {
+	width: 6.3829787234043%;
+	*width: 6.3297872340426%;
+}
+.row-fluid .offset12 {
+	margin-left: 104.25531914894%;
+	*margin-left: 104.14893617021%;
+}
+.row-fluid .offset12:first-child {
+	margin-left: 102.12765957447%;
+	*margin-left: 102.02127659574%;
+}
+.row-fluid .offset11 {
+	margin-left: 95.744680851064%;
+	*margin-left: 95.63829787234%;
+}
+.row-fluid .offset11:first-child {
+	margin-left: 93.617021276596%;
+	*margin-left: 93.510638297872%;
+}
+.row-fluid .offset10 {
+	margin-left: 87.234042553191%;
+	*margin-left: 87.127659574468%;
+}
+.row-fluid .offset10:first-child {
+	margin-left: 85.106382978723%;
+	*margin-left: 85%;
+}
+.row-fluid .offset9 {
+	margin-left: 78.723404255319%;
+	*margin-left: 78.617021276596%;
+}
+.row-fluid .offset9:first-child {
+	margin-left: 76.595744680851%;
+	*margin-left: 76.489361702128%;
+}
+.row-fluid .offset8 {
+	margin-left: 70.212765957447%;
+	*margin-left: 70.106382978723%;
+}
+.row-fluid .offset8:first-child {
+	margin-left: 68.085106382979%;
+	*margin-left: 67.978723404255%;
+}
+.row-fluid .offset7 {
+	margin-left: 61.702127659574%;
+	*margin-left: 61.595744680851%;
+}
+.row-fluid .offset7:first-child {
+	margin-left: 59.574468085106%;
+	*margin-left: 59.468085106383%;
+}
+.row-fluid .offset6 {
+	margin-left: 53.191489361702%;
+	*margin-left: 53.085106382979%;
+}
+.row-fluid .offset6:first-child {
+	margin-left: 51.063829787234%;
+	*margin-left: 50.957446808511%;
+}
+.row-fluid .offset5 {
+	margin-left: 44.68085106383%;
+	*margin-left: 44.574468085106%;
+}
+.row-fluid .offset5:first-child {
+	margin-left: 42.553191489362%;
+	*margin-left: 42.446808510638%;
+}
+.row-fluid .offset4 {
+	margin-left: 36.170212765957%;
+	*margin-left: 36.063829787234%;
+}
+.row-fluid .offset4:first-child {
+	margin-left: 34.042553191489%;
+	*margin-left: 33.936170212766%;
+}
+.row-fluid .offset3 {
+	margin-left: 27.659574468085%;
+	*margin-left: 27.553191489362%;
+}
+.row-fluid .offset3:first-child {
+	margin-left: 25.531914893617%;
+	*margin-left: 25.425531914894%;
+}
+.row-fluid .offset2 {
+	margin-left: 19.148936170213%;
+	*margin-left: 19.042553191489%;
+}
+.row-fluid .offset2:first-child {
+	margin-left: 17.021276595745%;
+	*margin-left: 16.914893617021%;
+}
+.row-fluid .offset1 {
+	margin-left: 10.63829787234%;
+	*margin-left: 10.531914893617%;
+}
+.row-fluid .offset1:first-child {
+	margin-left: 8.5106382978723%;
+	*margin-left: 8.4042553191489%;
+}
+[class*="span"].hide,
+.row-fluid [class*="span"].hide {
+	display: none;
+}
+[class*="span"].pull-right,
+.row-fluid [class*="span"].pull-right {
+	float: right;
+}
+.container {
+	margin-right: auto;
+	margin-left: auto;
+	*zoom: 1;
+}
+.container:before,
+.container:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.container:after {
+	clear: both;
+}
+.container-fluid {
+	padding-right: 20px;
+	padding-left: 20px;
+	*zoom: 1;
+}
+.container-fluid:before,
+.container-fluid:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.container-fluid:after {
+	clear: both;
+}
+p {
+	margin: 0 0 9px;
+}
+.lead {
+	margin-bottom: 18px;
+	font-size: 20px;
+	font-weight: 200;
+	line-height: 27px;
+}
+small {
+	font-size: 85%;
+}
+strong {
+	font-weight: bold;
+}
+em {
+	font-style: italic;
+}
+cite {
+	font-style: normal;
+}
+.muted {
+	color: #999;
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+	margin: 9px 0;
+	font-family: inherit;
+	font-weight: bold;
+	line-height: 1;
+	color: inherit;
+	text-rendering: optimizelegibility;
+}
+h1 small,
+h2 small,
+h3 small,
+h4 small,
+h5 small,
+h6 small {
+	font-weight: normal;
+	line-height: 1;
+	color: #999;
+}
+h1 {
+	font-size: 36px;
+	line-height: 40px;
+}
+h2 {
+	font-size: 30px;
+	line-height: 40px;
+}
+h3 {
+	font-size: 24px;
+	line-height: 40px;
+}
+h4 {
+	font-size: 18px;
+	line-height: 20px;
+}
+h5 {
+	font-size: 14px;
+	line-height: 20px;
+}
+h6 {
+	font-size: 12px;
+	line-height: 20px;
+}
+h1 small {
+	font-size: 24px;
+}
+h2 small {
+	font-size: 18px;
+}
+h3 small {
+	font-size: 14px;
+}
+h4 small {
+	font-size: 14px;
+}
+.page-header {
+	padding-bottom: 8px;
+	margin: 18px 0 27px;
+	border-bottom: 1px solid #eee;
+}
+ul,
+ol {
+	padding: 0;
+	margin: 0 0 9px 25px;
+}
+ul ul,
+ul ol,
+ol ol,
+ol ul {
+	margin-bottom: 0;
+}
+li {
+	line-height: 18px;
+}
+ul.unstyled,
+ol.unstyled {
+	margin-left: 0;
+	list-style: none;
+}
+dl {
+	margin-bottom: 18px;
+}
+dt,
+dd {
+	line-height: 18px;
+}
+dt {
+	font-weight: bold;
+}
+dd {
+	margin-left: 9px;
+}
+.dl-horizontal dt {
+	float: left;
+	width: 120px;
+	clear: left;
+	text-align: right;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+.dl-horizontal dd {
+	margin-left: 130px;
+}
+hr {
+	margin: 18px 0;
+	border: 0;
+	border-top: 1px solid #eee;
+	border-bottom: 1px solid #fff;
+}
+abbr[title] {
+	cursor: help;
+	border-bottom: 1px dotted #999;
+}
+abbr.initialism {
+	font-size: 90%;
+	text-transform: uppercase;
+}
+blockquote {
+	padding: 0 0 0 15px;
+	margin: 0 0 18px;
+	border-left: 5px solid #eee;
+}
+blockquote p {
+	margin-bottom: 0;
+	font-size: 16px;
+	font-weight: 300;
+	line-height: 22.5px;
+}
+blockquote small {
+	display: block;
+	line-height: 18px;
+	color: #999;
+}
+blockquote small:before {
+	content: '\2014 \00A0';
+}
+blockquote.pull-right {
+	float: right;
+	padding-right: 15px;
+	padding-left: 0;
+	border-right: 5px solid #eee;
+	border-left: 0;
+}
+blockquote.pull-right p,
+blockquote.pull-right small {
+	text-align: right;
+}
+blockquote.pull-right small:before {
+	content: '';
+}
+blockquote.pull-right small:after {
+	content: '\00A0 \2014';
+}
+q:before,
+q:after,
+blockquote:before,
+blockquote:after {
+	content: "";
+}
+address {
+	display: block;
+	margin-bottom: 18px;
+	font-style: normal;
+	line-height: 18px;
+}
+code,
+pre {
+	padding: 0 3px 2px;
+	font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
+	font-size: 11px;
+	color: #333;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+code {
+	padding: 2px 4px;
+	color: #d14;
+	background-color: #f7f7f9;
+	border: 1px solid #e1e1e8;
+}
+pre {
+	display: block;
+	padding: 8.5px;
+	margin: 0 0 9px;
+	font-size: 12px;
+	line-height: 18px;
+	word-break: break-all;
+	word-wrap: break-word;
+	white-space: pre;
+	white-space: pre-wrap;
+	background-color: #f5f5f5;
+	border: 1px solid #ccc;
+	border: 1px solid rgba(0,0,0,0.15);
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+}
+pre.prettyprint {
+	margin-bottom: 18px;
+}
+pre code {
+	padding: 0;
+	color: inherit;
+	background-color: transparent;
+	border: 0;
+}
+.pre-scrollable {
+	max-height: 340px;
+	overflow-y: scroll;
+}
+form {
+	margin: 0 0 18px;
+}
+fieldset {
+	padding: 0;
+	margin: 0;
+	border: 0;
+}
+legend {
+	display: block;
+	width: 100%;
+	padding: 0;
+	margin-bottom: 18px;
+	font-size: 19.5px;
+	line-height: 36px;
+	color: #333;
+	border: 0;
+	border-bottom: 1px solid #e5e5e5;
+}
+legend small {
+	font-size: 13.5px;
+	color: #999;
+}
+label,
+input,
+button,
+select,
+textarea {
+	font-size: 13px;
+	font-weight: normal;
+	line-height: 18px;
+}
+input,
+button,
+select,
+textarea {
+	font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+label {
+	display: block;
+	margin-bottom: 5px;
+}
+select,
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"],
+.uneditable-input {
+	display: inline-block;
+	height: 18px;
+	padding: 4px 6px;
+	margin-bottom: 9px;
+	font-size: 13px !important;
+	line-height: 18px;
+	color: #555;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+input,
+textarea {
+	width: 210px;
+}
+textarea {
+	height: auto;
+}
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"],
+.uneditable-input {
+	background-color: #fff;
+	border: 1px solid #ccc;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
+	-moz-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
+	box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
+	-webkit-transition: border linear .2s, box-shadow linear .2s;
+	-moz-transition: border linear .2s, box-shadow linear .2s;
+	-o-transition: border linear .2s, box-shadow linear .2s;
+	transition: border linear .2s, box-shadow linear .2s;
+}
+textarea:focus,
+input[type="text"]:focus,
+input[type="password"]:focus,
+input[type="datetime"]:focus,
+input[type="datetime-local"]:focus,
+input[type="date"]:focus,
+input[type="month"]:focus,
+input[type="time"]:focus,
+input[type="week"]:focus,
+input[type="number"]:focus,
+input[type="email"]:focus,
+input[type="url"]:focus,
+input[type="search"]:focus,
+input[type="tel"]:focus,
+input[type="color"]:focus,
+.uneditable-input:focus {
+	border-color: rgba(82,168,236,0.8);
+	outline: 0;
+	outline: thin dotted \9;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
+	-moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
+	box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
+}
+input[type="radio"],
+input[type="checkbox"] {
+	margin: 4px 0 0;
+	*margin-top: 0;
+	margin-top: 1px \9;
+	line-height: normal;
+	cursor: pointer;
+}
+input[type="file"],
+input[type="image"],
+input[type="submit"],
+input[type="reset"],
+input[type="button"],
+input[type="radio"],
+input[type="checkbox"] {
+	width: auto;
+}
+select,
+input[type="file"] {
+	height: 30px;
+	*margin-top: 4px;
+	line-height: 30px;
+}
+select {
+	width: 220px;
+	border: 1px solid #bbb;
+	background-color: #fff;
+}
+select[multiple],
+select[size] {
+	height: auto;
+}
+select:focus,
+input[type="file"]:focus,
+input[type="radio"]:focus,
+input[type="checkbox"]:focus {
+	outline: thin dotted #333;
+	outline: 5px auto -webkit-focus-ring-color;
+	outline-offset: -2px;
+}
+.uneditable-input,
+.uneditable-textarea {
+	color: #999;
+	background-color: #fcfcfc;
+	border-color: #ccc;
+	-webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,0.025);
+	-moz-box-shadow: inset 0 1px 2px rgba(0,0,0,0.025);
+	box-shadow: inset 0 1px 2px rgba(0,0,0,0.025);
+	cursor: not-allowed;
+}
+.uneditable-input {
+	overflow: hidden;
+	white-space: nowrap;
+}
+.uneditable-textarea {
+	width: auto;
+	height: auto;
+}
+input:-moz-placeholder,
+textarea:-moz-placeholder {
+	color: #999;
+}
+input:-ms-input-placeholder,
+textarea:-ms-input-placeholder {
+	color: #999;
+}
+input::-webkit-input-placeholder,
+textarea::-webkit-input-placeholder {
+	color: #999;
+}
+.radio,
+.checkbox {
+	min-height: 18px;
+	padding-left: 18px;
+}
+.radio input[type="radio"],
+.checkbox input[type="checkbox"] {
+	float: left;
+	margin-left: -18px;
+}
+.controls > .radio:first-child,
+.controls > .checkbox:first-child {
+	padding-top: 5px;
+}
+.radio.inline,
+.checkbox.inline {
+	display: inline-block;
+	padding-top: 5px;
+	margin-bottom: 0;
+	vertical-align: middle;
+}
+.radio.inline + .radio.inline,
+.checkbox.inline + .checkbox.inline {
+	margin-left: 10px;
+}
+.input-mini {
+	width: 60px;
+}
+.input-small {
+	width: 90px;
+}
+.input-medium {
+	width: 150px;
+}
+.input-large {
+	width: 210px;
+}
+.input-xlarge {
+	width: 270px;
+}
+.input-xxlarge {
+	width: 530px;
+}
+input[class*="span"],
+select[class*="span"],
+textarea[class*="span"],
+.uneditable-input[class*="span"],
+.row-fluid input[class*="span"],
+.row-fluid select[class*="span"],
+.row-fluid textarea[class*="span"],
+.row-fluid .uneditable-input[class*="span"] {
+	float: none;
+	margin-left: 0;
+}
+.input-append input[class*="span"],
+.input-append .uneditable-input[class*="span"],
+.input-prepend input[class*="span"],
+.input-prepend .uneditable-input[class*="span"],
+.row-fluid input[class*="span"],
+.row-fluid select[class*="span"],
+.row-fluid textarea[class*="span"],
+.row-fluid .uneditable-input[class*="span"],
+.row-fluid .input-prepend [class*="span"],
+.row-fluid .input-append [class*="span"] {
+	display: inline-block;
+}
+input,
+textarea,
+.uneditable-input {
+	margin-left: 0;
+}
+.controls-row [class*="span"] + [class*="span"] {
+	margin-left: 20px;
+}
+input.span12, textarea.span12, .uneditable-input.span12 {
+	width: 926px;
+}
+input.span11, textarea.span11, .uneditable-input.span11 {
+	width: 846px;
+}
+input.span10, textarea.span10, .uneditable-input.span10 {
+	width: 766px;
+}
+input.span9, textarea.span9, .uneditable-input.span9 {
+	width: 686px;
+}
+input.span8, textarea.span8, .uneditable-input.span8 {
+	width: 606px;
+}
+input.span7, textarea.span7, .uneditable-input.span7 {
+	width: 526px;
+}
+input.span6, textarea.span6, .uneditable-input.span6 {
+	width: 446px;
+}
+input.span5, textarea.span5, .uneditable-input.span5 {
+	width: 366px;
+}
+input.span4, textarea.span4, .uneditable-input.span4 {
+	width: 286px;
+}
+input.span3, textarea.span3, .uneditable-input.span3 {
+	width: 206px;
+}
+input.span2, textarea.span2, .uneditable-input.span2 {
+	width: 126px;
+}
+input.span1, textarea.span1, .uneditable-input.span1 {
+	width: 46px;
+}
+.controls-row {
+	*zoom: 1;
+}
+.controls-row:before,
+.controls-row:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.controls-row:after {
+	clear: both;
+}
+.controls-row [class*="span"] {
+	float: left;
+}
+input[disabled],
+select[disabled],
+textarea[disabled],
+input[readonly],
+select[readonly],
+textarea[readonly] {
+	cursor: not-allowed;
+	background-color: #eee;
+}
+input[type="radio"][disabled],
+input[type="checkbox"][disabled],
+input[type="radio"][readonly],
+input[type="checkbox"][readonly] {
+	background-color: transparent;
+}
+.control-group.warning > label,
+.control-group.warning .help-block,
+.control-group.warning .help-inline {
+	color: #c09853;
+}
+.control-group.warning .checkbox,
+.control-group.warning .radio,
+.control-group.warning input,
+.control-group.warning select,
+.control-group.warning textarea {
+	color: #c09853;
+	border-color: #c09853;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
+	-moz-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
+	box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
+}
+.control-group.warning .checkbox:focus,
+.control-group.warning .radio:focus,
+.control-group.warning input:focus,
+.control-group.warning select:focus,
+.control-group.warning textarea:focus {
+	border-color: #a47e3c;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075), 0 0 6px #dbc59e;
+	-moz-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075), 0 0 6px #dbc59e;
+	box-shadow: inset 0 1px 1px rgba(0,0,0,0.075), 0 0 6px #dbc59e;
+}
+.control-group.warning .input-prepend .add-on,
+.control-group.warning .input-append .add-on {
+	color: #c09853;
+	background-color: #fcf8e3;
+	border-color: #c09853;
+}
+.control-group.error > label,
+.control-group.error .help-block,
+.control-group.error .help-inline {
+	color: #b94a48;
+}
+.control-group.error .checkbox,
+.control-group.error .radio,
+.control-group.error input,
+.control-group.error select,
+.control-group.error textarea {
+	color: #b94a48;
+	border-color: #b94a48;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
+	-moz-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
+	box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
+}
+.control-group.error .checkbox:focus,
+.control-group.error .radio:focus,
+.control-group.error input:focus,
+.control-group.error select:focus,
+.control-group.error textarea:focus {
+	border-color: #953b39;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075), 0 0 6px #d59392;
+	-moz-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075), 0 0 6px #d59392;
+	box-shadow: inset 0 1px 1px rgba(0,0,0,0.075), 0 0 6px #d59392;
+}
+.control-group.error .input-prepend .add-on,
+.control-group.error .input-append .add-on {
+	color: #b94a48;
+	background-color: #f2dede;
+	border-color: #b94a48;
+}
+.control-group.success > label,
+.control-group.success .help-block,
+.control-group.success .help-inline {
+	color: #468847;
+}
+.control-group.success .checkbox,
+.control-group.success .radio,
+.control-group.success input,
+.control-group.success select,
+.control-group.success textarea {
+	color: #468847;
+	border-color: #468847;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
+	-moz-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
+	box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
+}
+.control-group.success .checkbox:focus,
+.control-group.success .radio:focus,
+.control-group.success input:focus,
+.control-group.success select:focus,
+.control-group.success textarea:focus {
+	border-color: #356635;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075), 0 0 6px #7aba7b;
+	-moz-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075), 0 0 6px #7aba7b;
+	box-shadow: inset 0 1px 1px rgba(0,0,0,0.075), 0 0 6px #7aba7b;
+}
+.control-group.success .input-prepend .add-on,
+.control-group.success .input-append .add-on {
+	color: #468847;
+	background-color: #dff0d8;
+	border-color: #468847;
+}
+input:focus:required:invalid,
+textarea:focus:required:invalid,
+select:focus:required:invalid {
+	color: #b94a48;
+	border-color: #ee5f5b;
+}
+input:focus:required:invalid:focus,
+textarea:focus:required:invalid:focus,
+select:focus:required:invalid:focus {
+	border-color: #e9322d;
+	-webkit-box-shadow: 0 0 6px #f8b9b7;
+	-moz-box-shadow: 0 0 6px #f8b9b7;
+	box-shadow: 0 0 6px #f8b9b7;
+}
+.form-actions {
+	padding: 17px 20px 18px;
+	margin-top: 18px;
+	margin-bottom: 18px;
+	background-color: #f5f5f5;
+	border-top: 1px solid #e5e5e5;
+	*zoom: 1;
+}
+.form-actions:before,
+.form-actions:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.form-actions:after {
+	clear: both;
+}
+.help-block,
+.help-inline {
+	color: #595959;
+}
+.help-block {
+	display: block;
+	margin-bottom: 9px;
+}
+.help-inline {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+	vertical-align: middle;
+	padding-left: 5px;
+}
+.input-append,
+.input-prepend {
+	margin-bottom: 5px;
+	font-size: 0;
+	white-space: nowrap;
+}
+.input-append input,
+.input-append select,
+.input-append .uneditable-input,
+.input-prepend input,
+.input-prepend select,
+.input-prepend .uneditable-input {
+	position: relative;
+	margin-bottom: 0;
+	*margin-left: 0;
+	font-size: 13px;
+	vertical-align: top;
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+}
+.input-append input:focus,
+.input-append select:focus,
+.input-append .uneditable-input:focus,
+.input-prepend input:focus,
+.input-prepend select:focus,
+.input-prepend .uneditable-input:focus {
+	z-index: 2;
+}
+.input-append .add-on,
+.input-prepend .add-on {
+	display: inline-block;
+	width: auto;
+	height: 18px;
+	min-width: 16px;
+	padding: 4px 5px;
+	font-size: 13px;
+	font-weight: normal;
+	line-height: 18px;
+	text-align: center;
+	text-shadow: 0 1px 0 #fff;
+	background-color: #eee;
+	border: 1px solid #ccc;
+}
+.input-append .add-on,
+.input-append .btn,
+.input-prepend .add-on,
+.input-prepend .btn {
+	margin-left: -1px;
+	vertical-align: top;
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.input-append .active,
+.input-prepend .active {
+	background-color: #a9dba9;
+	border-color: #46a546;
+}
+.input-prepend .add-on,
+.input-prepend .btn {
+	margin-right: -1px;
+}
+.input-prepend .add-on:first-child,
+.input-prepend .btn:first-child {
+	-webkit-border-radius: 3px 0 0 3px;
+	-moz-border-radius: 3px 0 0 3px;
+	border-radius: 3px 0 0 3px;
+}
+.input-append input,
+.input-append select,
+.input-append .uneditable-input {
+	-webkit-border-radius: 3px 0 0 3px;
+	-moz-border-radius: 3px 0 0 3px;
+	border-radius: 3px 0 0 3px;
+}
+.input-append .add-on:last-child,
+.input-append .btn:last-child {
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+}
+.input-prepend.input-append input,
+.input-prepend.input-append select,
+.input-prepend.input-append .uneditable-input {
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.input-prepend.input-append .add-on:first-child,
+.input-prepend.input-append .btn:first-child {
+	margin-right: -1px;
+	-webkit-border-radius: 3px 0 0 3px;
+	-moz-border-radius: 3px 0 0 3px;
+	border-radius: 3px 0 0 3px;
+}
+.input-prepend.input-append .add-on:last-child,
+.input-prepend.input-append .btn:last-child {
+	margin-left: -1px;
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+}
+input.search-query {
+	padding-right: 14px;
+	padding-right: 4px \9;
+	padding-left: 14px;
+	padding-left: 4px \9;
+	margin-bottom: 0;
+	-webkit-border-radius: 15px;
+	-moz-border-radius: 15px;
+	border-radius: 15px;
+}
+.form-search .input-append .search-query,
+.form-search .input-prepend .search-query {
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.form-search .input-append .search-query {
+	-webkit-border-radius: 14px 0 0 14px;
+	-moz-border-radius: 14px 0 0 14px;
+	border-radius: 14px 0 0 14px;
+}
+.form-search .input-append .btn {
+	-webkit-border-radius: 0 14px 14px 0;
+	-moz-border-radius: 0 14px 14px 0;
+	border-radius: 0 14px 14px 0;
+}
+.form-search .input-prepend .search-query {
+	-webkit-border-radius: 0 14px 14px 0;
+	-moz-border-radius: 0 14px 14px 0;
+	border-radius: 0 14px 14px 0;
+}
+.form-search .input-prepend .btn {
+	-webkit-border-radius: 14px 0 0 14px;
+	-moz-border-radius: 14px 0 0 14px;
+	border-radius: 14px 0 0 14px;
+}
+.form-search input,
+.form-search textarea,
+.form-search select,
+.form-search .help-inline,
+.form-search .uneditable-input,
+.form-search .input-prepend,
+.form-search .input-append,
+.form-inline input,
+.form-inline textarea,
+.form-inline select,
+.form-inline .help-inline,
+.form-inline .uneditable-input,
+.form-inline .input-prepend,
+.form-inline .input-append,
+.form-horizontal input,
+.form-horizontal textarea,
+.form-horizontal select,
+.form-horizontal .help-inline,
+.form-horizontal .uneditable-input,
+.form-horizontal .input-prepend,
+.form-horizontal .input-append {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+	margin-bottom: 0;
+	vertical-align: middle;
+}
+.form-search .hide,
+.form-inline .hide,
+.form-horizontal .hide {
+	display: none;
+}
+.form-search label,
+.form-inline label,
+.form-search .btn-group,
+.form-inline .btn-group {
+	display: inline-block;
+}
+.form-search .input-append,
+.form-inline .input-append,
+.form-search .input-prepend,
+.form-inline .input-prepend {
+	margin-bottom: 0;
+}
+.form-search .radio,
+.form-search .checkbox,
+.form-inline .radio,
+.form-inline .checkbox {
+	padding-left: 0;
+	margin-bottom: 0;
+	vertical-align: middle;
+}
+.form-search .radio input[type="radio"],
+.form-search .checkbox input[type="checkbox"],
+.form-inline .radio input[type="radio"],
+.form-inline .checkbox input[type="checkbox"] {
+	float: left;
+	margin-right: 3px;
+	margin-left: 0;
+}
+.control-group {
+	margin-bottom: 9px;
+}
+legend + .control-group {
+	margin-top: 18px;
+	-webkit-margin-top-collapse: separate;
+}
+.form-horizontal .control-group {
+	margin-bottom: 18px;
+	*zoom: 1;
+}
+.form-horizontal .control-group:before,
+.form-horizontal .control-group:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.form-horizontal .control-group:after {
+	clear: both;
+}
+.form-horizontal .control-label {
+	float: left;
+	width: 140px;
+	padding-top: 5px;
+	text-align: right;
+}
+.form-horizontal .controls {
+	*display: inline-block;
+	*padding-left: 20px;
+	margin-left: 160px;
+	*margin-left: 0;
+}
+.form-horizontal .controls:first-child {
+	*padding-left: 160px;
+}
+.form-horizontal .help-block {
+	margin-top: 9px;
+	margin-bottom: 0;
+}
+.form-horizontal .form-actions {
+	padding-left: 160px;
+}
+table {
+	max-width: 100%;
+	background-color: transparent;
+	border-collapse: collapse;
+	border-spacing: 0;
+}
+.table {
+	width: 100%;
+	margin-bottom: 18px;
+}
+.table th,
+.table td {
+	padding: 8px;
+	line-height: 18px;
+	text-align: left;
+	vertical-align: top;
+	border-top: 1px solid #ddd;
+}
+.table th {
+	font-weight: bold;
+}
+.table thead th {
+	vertical-align: bottom;
+}
+.table caption + thead tr:first-child th,
+.table caption + thead tr:first-child td,
+.table colgroup + thead tr:first-child th,
+.table colgroup + thead tr:first-child td,
+.table thead:first-child tr:first-child th,
+.table thead:first-child tr:first-child td {
+	border-top: 0;
+}
+.table tbody + tbody {
+	border-top: 2px solid #ddd;
+}
+.table-condensed th,
+.table-condensed td {
+	padding: 4px 5px;
+}
+.table-bordered {
+	border: 1px solid #ddd;
+	border-collapse: separate;
+	*border-collapse: collapse;
+	border-left: 0;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+}
+.table-bordered th,
+.table-bordered td {
+	border-left: 1px solid #ddd;
+}
+.table-bordered caption + thead tr:first-child th,
+.table-bordered caption + tbody tr:first-child th,
+.table-bordered caption + tbody tr:first-child td,
+.table-bordered colgroup + thead tr:first-child th,
+.table-bordered colgroup + tbody tr:first-child th,
+.table-bordered colgroup + tbody tr:first-child td,
+.table-bordered thead:first-child tr:first-child th,
+.table-bordered tbody:first-child tr:first-child th,
+.table-bordered tbody:first-child tr:first-child td {
+	border-top: 0;
+}
+.table-bordered thead:first-child tr:first-child th:first-child,
+.table-bordered tbody:first-child tr:first-child td:first-child {
+	-webkit-border-top-left-radius: 4px;
+	border-top-left-radius: 4px;
+	-moz-border-radius-topleft: 4px;
+}
+.table-bordered thead:first-child tr:first-child th:last-child,
+.table-bordered tbody:first-child tr:first-child td:last-child {
+	-webkit-border-top-right-radius: 4px;
+	border-top-right-radius: 4px;
+	-moz-border-radius-topright: 4px;
+}
+.table-bordered thead:last-child tr:last-child th:first-child,
+.table-bordered tbody:last-child tr:last-child td:first-child,
+.table-bordered tfoot:last-child tr:last-child td:first-child {
+	-webkit-border-radius: 0 0 0 4px;
+	-moz-border-radius: 0 0 0 4px;
+	border-radius: 0 0 0 4px;
+	-webkit-border-bottom-left-radius: 4px;
+	border-bottom-left-radius: 4px;
+	-moz-border-radius-bottomleft: 4px;
+}
+.table-bordered thead:last-child tr:last-child th:last-child,
+.table-bordered tbody:last-child tr:last-child td:last-child,
+.table-bordered tfoot:last-child tr:last-child td:last-child {
+	-webkit-border-bottom-right-radius: 4px;
+	border-bottom-right-radius: 4px;
+	-moz-border-radius-bottomright: 4px;
+}
+.table-bordered caption + thead tr:first-child th:first-child,
+.table-bordered caption + tbody tr:first-child td:first-child,
+.table-bordered colgroup + thead tr:first-child th:first-child,
+.table-bordered colgroup + tbody tr:first-child td:first-child {
+	-webkit-border-top-left-radius: 4px;
+	border-top-left-radius: 4px;
+	-moz-border-radius-topleft: 4px;
+}
+.table-bordered caption + thead tr:first-child th:last-child,
+.table-bordered caption + tbody tr:first-child td:last-child,
+.table-bordered colgroup + thead tr:first-child th:last-child,
+.table-bordered colgroup + tbody tr:first-child td:last-child {
+	-webkit-border-top-right-radius: 4px;
+	border-top-right-radius: 4px;
+	-moz-border-right-topleft: 4px;
+}
+.table-striped tbody tr:nth-child(odd) td,
+.table-striped tbody tr:nth-child(odd) th {
+	background-color: #f9f9f9;
+}
+.table-hover tbody tr:hover td,
+.table-hover tbody tr:hover th {
+	background-color: #f5f5f5;
+}
+table [class*=span],
+.row-fluid table [class*=span] {
+	display: table-cell;
+	float: none;
+	margin-left: 0;
+}
+table .span1 {
+	float: none;
+	width: 44px;
+	margin-left: 0;
+}
+table .span2 {
+	float: none;
+	width: 124px;
+	margin-left: 0;
+}
+table .span3 {
+	float: none;
+	width: 204px;
+	margin-left: 0;
+}
+table .span4 {
+	float: none;
+	width: 284px;
+	margin-left: 0;
+}
+table .span5 {
+	float: none;
+	width: 364px;
+	margin-left: 0;
+}
+table .span6 {
+	float: none;
+	width: 444px;
+	margin-left: 0;
+}
+table .span7 {
+	float: none;
+	width: 524px;
+	margin-left: 0;
+}
+table .span8 {
+	float: none;
+	width: 604px;
+	margin-left: 0;
+}
+table .span9 {
+	float: none;
+	width: 684px;
+	margin-left: 0;
+}
+table .span10 {
+	float: none;
+	width: 764px;
+	margin-left: 0;
+}
+table .span11 {
+	float: none;
+	width: 844px;
+	margin-left: 0;
+}
+table .span12 {
+	float: none;
+	width: 924px;
+	margin-left: 0;
+}
+table .span13 {
+	float: none;
+	width: 1004px;
+	margin-left: 0;
+}
+table .span14 {
+	float: none;
+	width: 1084px;
+	margin-left: 0;
+}
+table .span15 {
+	float: none;
+	width: 1164px;
+	margin-left: 0;
+}
+table .span16 {
+	float: none;
+	width: 1244px;
+	margin-left: 0;
+}
+table .span17 {
+	float: none;
+	width: 1324px;
+	margin-left: 0;
+}
+table .span18 {
+	float: none;
+	width: 1404px;
+	margin-left: 0;
+}
+table .span19 {
+	float: none;
+	width: 1484px;
+	margin-left: 0;
+}
+table .span20 {
+	float: none;
+	width: 1564px;
+	margin-left: 0;
+}
+table .span21 {
+	float: none;
+	width: 1644px;
+	margin-left: 0;
+}
+table .span22 {
+	float: none;
+	width: 1724px;
+	margin-left: 0;
+}
+table .span23 {
+	float: none;
+	width: 1804px;
+	margin-left: 0;
+}
+table .span24 {
+	float: none;
+	width: 1884px;
+	margin-left: 0;
+}
+.table tbody tr.success td {
+	background-color: #dff0d8;
+}
+.table tbody tr.error td {
+	background-color: #f2dede;
+}
+.table tbody tr.info td {
+	background-color: #d9edf7;
+}
+.dropup,
+.dropdown {
+	position: relative;
+}
+.dropdown-toggle {
+	*margin-bottom: -3px;
+}
+.dropdown-toggle:active,
+.open .dropdown-toggle {
+	outline: 0;
+}
+.caret {
+	display: inline-block;
+	width: 0;
+	height: 0;
+	vertical-align: top;
+	border-top: 4px solid #000;
+	border-right: 4px solid transparent;
+	border-left: 4px solid transparent;
+	content: "";
+}
+.dropdown .caret {
+	margin-top: 8px;
+	margin-left: 2px;
+}
+.dropdown-menu {
+	position: absolute;
+	top: 100%;
+	left: 0;
+	z-index: 1000;
+	display: none;
+	float: left;
+	min-width: 160px;
+	padding: 5px 0;
+	margin: 2px 0 0;
+	list-style: none;
+	background-color: #fff;
+	border: 1px solid #ccc;
+	border: 1px solid rgba(0,0,0,0.2);
+	*border-right-width: 2px;
+	*border-bottom-width: 2px;
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+	-webkit-box-shadow: 0 5px 10px rgba(0,0,0,0.2);
+	-moz-box-shadow: 0 5px 10px rgba(0,0,0,0.2);
+	box-shadow: 0 5px 10px rgba(0,0,0,0.2);
+	-webkit-background-clip: padding-box;
+	-moz-background-clip: padding;
+	background-clip: padding-box;
+}
+.dropdown-menu.pull-right {
+	right: 0;
+	left: auto;
+}
+.dropdown-menu .divider {
+	*width: 100%;
+	height: 1px;
+	margin: 8px 1px;
+	*margin: -5px 0 5px;
+	overflow: hidden;
+	background-color: #e5e5e5;
+	border-bottom: 1px solid #fff;
+}
+.dropdown-menu a {
+	display: block;
+	padding: 3px 20px;
+	clear: both;
+	font-weight: normal;
+	line-height: 18px;
+	color: #333;
+	white-space: nowrap;
+}
+.dropdown-menu li > a:hover,
+.dropdown-menu li > a:focus,
+.dropdown-submenu:hover > a {
+	text-decoration: none;
+	color: #fff;
+	background-color: #08c;
+	background-color: #0081c2;
+	background-image: -moz-linear-gradient(top,#08c,#0077b3);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#08c),to(#0077b3));
+	background-image: -webkit-linear-gradient(top,#08c,#0077b3);
+	background-image: -o-linear-gradient(top,#08c,#0077b3);
+	background-image: linear-gradient(to bottom,#08c,#0077b3);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0076b2', GradientType=0);
+}
+.dropdown-menu .active > a,
+.dropdown-menu .active > a:hover {
+	color: #fff;
+	text-decoration: none;
+	outline: 0;
+	background-color: #08c;
+	background-color: #0081c2;
+	background-image: -moz-linear-gradient(top,#08c,#0077b3);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#08c),to(#0077b3));
+	background-image: -webkit-linear-gradient(top,#08c,#0077b3);
+	background-image: -o-linear-gradient(top,#08c,#0077b3);
+	background-image: linear-gradient(to bottom,#08c,#0077b3);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0076b2', GradientType=0);
+}
+.dropdown-menu .disabled > a,
+.dropdown-menu .disabled > a:hover {
+	color: #999;
+}
+.dropdown-menu .disabled > a:hover {
+	text-decoration: none;
+	background-color: transparent;
+	cursor: default;
+}
+.open {
+	*z-index: 1000;
+}
+.open > .dropdown-menu {
+	display: block;
+}
+.pull-right > .dropdown-menu {
+	right: 0;
+	left: auto;
+}
+.dropup .caret,
+.navbar-fixed-bottom .dropdown .caret {
+	border-top: 0;
+	border-bottom: 4px solid #000;
+	content: "\2191";
+}
+.dropup .dropdown-menu,
+.navbar-fixed-bottom .dropdown .dropdown-menu {
+	top: auto;
+	bottom: 100%;
+	margin-bottom: 1px;
+}
+.dropdown-submenu {
+	position: relative;
+}
+.dropdown-submenu > .dropdown-menu {
+	top: 0;
+	left: 100%;
+	margin-top: -6px;
+	margin-left: -1px;
+	-webkit-border-radius: 0 6px 6px 6px;
+	-moz-border-radius: 0 6px 6px 6px;
+	border-radius: 0 6px 6px 6px;
+}
+.dropdown-submenu:hover .dropdown-menu {
+	display: block;
+}
+.dropdown-submenu > a:after {
+	display: block;
+	content: " ";
+	float: right;
+	width: 0;
+	height: 0;
+	border-color: transparent;
+	border-style: solid;
+	border-width: 5px 0 5px 5px;
+	border-left-color: #cccccc;
+	margin-top: 5px;
+	margin-right: -10px;
+}
+.dropdown-submenu:hover > a:after {
+	border-left-color: #fff;
+}
+.dropdown .dropdown-menu .nav-header {
+	padding-left: 20px;
+	padding-right: 20px;
+}
+.typeahead {
+	margin-top: 2px;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+}
+.well {
+	min-height: 20px;
+	padding: 19px;
+	margin-bottom: 20px;
+	background-color: #f5f5f5;
+	border: 1px solid #e3e3e3;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.05);
+	-moz-box-shadow: inset 0 1px 1px rgba(0,0,0,0.05);
+	box-shadow: inset 0 1px 1px rgba(0,0,0,0.05);
+}
+.well blockquote {
+	border-color: #ddd;
+	border-color: rgba(0,0,0,0.15);
+}
+.well-large {
+	padding: 24px;
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+}
+.well-small {
+	padding: 9px;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+.fade {
+	opacity: 0;
+	-webkit-transition: opacity .15s linear;
+	-moz-transition: opacity .15s linear;
+	-o-transition: opacity .15s linear;
+	transition: opacity .15s linear;
+}
+.fade.in {
+	opacity: 1;
+}
+.collapse {
+	position: relative;
+	height: 0;
+	overflow: hidden;
+	-webkit-transition: height .35s ease;
+	-moz-transition: height .35s ease;
+	-o-transition: height .35s ease;
+	transition: height .35s ease;
+}
+.collapse.in {
+	height: auto;
+}
+.close {
+	float: right;
+	font-size: 20px;
+	font-weight: bold;
+	line-height: 18px;
+	color: #000;
+	text-shadow: 0 1px 0 #ffffff;
+	opacity: 0.2;
+	filter: alpha(opacity=20);
+}
+.close:hover {
+	color: #000;
+	text-decoration: none;
+	cursor: pointer;
+	opacity: 0.4;
+	filter: alpha(opacity=40);
+}
+button.close {
+	padding: 0;
+	cursor: pointer;
+	background: transparent;
+	border: 0;
+	-webkit-appearance: none;
+}
+.btn {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+	padding: 4px 14px;
+	margin-bottom: 0;
+	font-size: 13px;
+	line-height: 18px;
+	*line-height: 18px;
+	text-align: center;
+	vertical-align: middle;
+	cursor: pointer;
+	color: #333;
+	text-shadow: 0 1px 1px rgba(255,255,255,0.75);
+	background-color: #f5f5f5;
+	background-image: -moz-linear-gradient(top,#fff,#e6e6e6);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#fff),to(#e6e6e6));
+	background-image: -webkit-linear-gradient(top,#fff,#e6e6e6);
+	background-image: -o-linear-gradient(top,#fff,#e6e6e6);
+	background-image: linear-gradient(to bottom,#fff,#e6e6e6);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe5e5e5', GradientType=0);
+	border-color: #e6e6e6 #e6e6e6 #bfbfbf;
+	border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+	*background-color: #e6e6e6;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+	border: 1px solid #bbb;
+	*border: 0;
+	border-bottom-color: #a2a2a2;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+	*margin-left: .3em;
+	-webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+	-moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+	box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+}
+.btn:hover,
+.btn:active,
+.btn.active,
+.btn.disabled,
+.btn[disabled] {
+	color: #333;
+	background-color: #e6e6e6;
+	*background-color: #d9d9d9;
+}
+.btn:active,
+.btn.active {
+	background-color: #cccccc \9;
+}
+.btn:first-child {
+	*margin-left: 0;
+}
+.btn:hover {
+	color: #333;
+	text-decoration: none;
+	background-color: #e6e6e6;
+	*background-color: #d9d9d9;
+	background-position: 0 -15px;
+	-webkit-transition: background-position .1s linear;
+	-moz-transition: background-position .1s linear;
+	-o-transition: background-position .1s linear;
+	transition: background-position .1s linear;
+}
+.btn:focus {
+	outline: thin dotted #333;
+	outline: 5px auto -webkit-focus-ring-color;
+	outline-offset: -2px;
+}
+.btn.active,
+.btn:active {
+	background-color: #e6e6e6;
+	background-color: #d9d9d9 \9;
+	background-image: none;
+	outline: 0;
+	-webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+	-moz-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+	box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+}
+.btn.disabled,
+.btn[disabled] {
+	cursor: default;
+	background-color: #e6e6e6;
+	background-image: none;
+	opacity: 0.65;
+	filter: alpha(opacity=65);
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+	box-shadow: none;
+}
+.btn-large {
+	padding: 9px 14px;
+	font-size: 15px;
+	line-height: normal;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+}
+.btn-large [class^="icon-"] {
+	margin-top: 2px;
+}
+.btn-small {
+	padding: 3px 9px;
+	font-size: 11px;
+	line-height: 16px;
+}
+.btn-small [class^="icon-"] {
+	margin-top: 0;
+}
+.btn-mini {
+	padding: 2px 6px;
+	font-size: 10px;
+	line-height: 14px;
+}
+.btn-block {
+	display: block;
+	width: 100%;
+	padding-left: 0;
+	padding-right: 0;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+}
+.btn-block + .btn-block {
+	margin-top: 5px;
+}
+.btn-primary.active,
+.btn-warning.active,
+.btn-danger.active,
+.btn-success.active,
+.btn-info.active,
+.btn-inverse.active {
+	color: rgba(255,255,255,0.75);
+}
+.btn {
+	border-color: #c5c5c5;
+	border-color: rgba(0,0,0,0.15) rgba(0,0,0,0.15) rgba(0,0,0,0.25);
+}
+.btn-primary {
+	color: #fff;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+	background-color: #1d6cb0;
+	background-image: -moz-linear-gradient(top,#2384d3,#15497c);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#2384d3),to(#15497c));
+	background-image: -webkit-linear-gradient(top,#2384d3,#15497c);
+	background-image: -o-linear-gradient(top,#2384d3,#15497c);
+	background-image: linear-gradient(to bottom,#2384d3,#15497c);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff2384d3', endColorstr='#ff15497c', GradientType=0);
+	border-color: #15497c #15497c #0a223b;
+	border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+	*background-color: #15497c;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.btn-primary:hover,
+.btn-primary:active,
+.btn-primary.active,
+.btn-primary.disabled,
+.btn-primary[disabled] {
+	color: #fff;
+	background-color: #15497c;
+	*background-color: #113c66;
+}
+.btn-primary:active,
+.btn-primary.active {
+	background-color: #0e2f50 \9;
+}
+.btn-warning {
+	color: #fff;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+	background-color: #faa732;
+	background-image: -moz-linear-gradient(top,#fbb450,#f89406);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));
+	background-image: -webkit-linear-gradient(top,#fbb450,#f89406);
+	background-image: -o-linear-gradient(top,#fbb450,#f89406);
+	background-image: linear-gradient(to bottom,#fbb450,#f89406);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffab44f', endColorstr='#fff89406', GradientType=0);
+	border-color: #f89406 #f89406 #ad6704;
+	border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+	*background-color: #f89406;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.btn-warning:hover,
+.btn-warning:active,
+.btn-warning.active,
+.btn-warning.disabled,
+.btn-warning[disabled] {
+	color: #fff;
+	background-color: #f89406;
+	*background-color: #df8505;
+}
+.btn-warning:active,
+.btn-warning.active {
+	background-color: #c67605 \9;
+}
+.btn-danger {
+	color: #fff;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+	background-color: #da4f49;
+	background-image: -moz-linear-gradient(top,#ee5f5b,#bd362f);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#bd362f));
+	background-image: -webkit-linear-gradient(top,#ee5f5b,#bd362f);
+	background-image: -o-linear-gradient(top,#ee5f5b,#bd362f);
+	background-image: linear-gradient(to bottom,#ee5f5b,#bd362f);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0);
+	border-color: #bd362f #bd362f #802420;
+	border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+	*background-color: #bd362f;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.btn-danger:hover,
+.btn-danger:active,
+.btn-danger.active,
+.btn-danger.disabled,
+.btn-danger[disabled] {
+	color: #fff;
+	background-color: #bd362f;
+	*background-color: #a9302a;
+}
+.btn-danger:active,
+.btn-danger.active {
+	background-color: #942a25 \9;
+}
+.btn-success {
+	color: #fff;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+	background-color: #5bb75b;
+	background-image: -moz-linear-gradient(top,#62c462,#51a351);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#51a351));
+	background-image: -webkit-linear-gradient(top,#62c462,#51a351);
+	background-image: -o-linear-gradient(top,#62c462,#51a351);
+	background-image: linear-gradient(to bottom,#62c462,#51a351);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0);
+	border-color: #51a351 #51a351 #387038;
+	border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+	*background-color: #51a351;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.btn-success:hover,
+.btn-success:active,
+.btn-success.active,
+.btn-success.disabled,
+.btn-success[disabled] {
+	color: #fff;
+	background-color: #51a351;
+	*background-color: #499249;
+}
+.btn-success:active,
+.btn-success.active {
+	background-color: #408140 \9;
+}
+.btn-info {
+	color: #fff;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+	background-color: #49afcd;
+	background-image: -moz-linear-gradient(top,#5bc0de,#2f96b4);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#2f96b4));
+	background-image: -webkit-linear-gradient(top,#5bc0de,#2f96b4);
+	background-image: -o-linear-gradient(top,#5bc0de,#2f96b4);
+	background-image: linear-gradient(to bottom,#5bc0de,#2f96b4);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0);
+	border-color: #2f96b4 #2f96b4 #1f6377;
+	border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+	*background-color: #2f96b4;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.btn-info:hover,
+.btn-info:active,
+.btn-info.active,
+.btn-info.disabled,
+.btn-info[disabled] {
+	color: #fff;
+	background-color: #2f96b4;
+	*background-color: #2a85a0;
+}
+.btn-info:active,
+.btn-info.active {
+	background-color: #24748c \9;
+}
+.btn-inverse {
+	color: #fff;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+	background-color: #363636;
+	background-image: -moz-linear-gradient(top,#444,#222);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#444),to(#222));
+	background-image: -webkit-linear-gradient(top,#444,#222);
+	background-image: -o-linear-gradient(top,#444,#222);
+	background-image: linear-gradient(to bottom,#444,#222);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0);
+	border-color: #222 #222 #000000;
+	border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+	*background-color: #222;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.btn-inverse:hover,
+.btn-inverse:active,
+.btn-inverse.active,
+.btn-inverse.disabled,
+.btn-inverse[disabled] {
+	color: #fff;
+	background-color: #222;
+	*background-color: #151515;
+}
+.btn-inverse:active,
+.btn-inverse.active {
+	background-color: #090909 \9;
+}
+button.btn,
+input[type="submit"].btn {
+	*padding-top: 3px;
+	*padding-bottom: 3px;
+}
+button.btn::-moz-focus-inner,
+input[type="submit"].btn::-moz-focus-inner {
+	padding: 0;
+	border: 0;
+}
+button.btn.btn-large,
+input[type="submit"].btn.btn-large {
+	*padding-top: 7px;
+	*padding-bottom: 7px;
+}
+button.btn.btn-small,
+input[type="submit"].btn.btn-small {
+	*padding-top: 3px;
+	*padding-bottom: 3px;
+}
+button.btn.btn-mini,
+input[type="submit"].btn.btn-mini {
+	*padding-top: 1px;
+	*padding-bottom: 1px;
+}
+.btn-link,
+.btn-link:active {
+	background-color: transparent;
+	background-image: none;
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+	box-shadow: none;
+}
+.btn-link {
+	border-color: transparent;
+	cursor: pointer;
+	color: #08c;
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.btn-link:hover {
+	color: #005580;
+	text-decoration: underline;
+	background-color: transparent;
+}
+.btn-group {
+	position: relative;
+	font-size: 0;
+	white-space: nowrap;
+	*margin-left: .3em;
+}
+.btn-group:first-child {
+	*margin-left: 0;
+}
+.btn-group + .btn-group {
+	margin-left: 5px;
+}
+.btn-toolbar {
+	font-size: 0;
+	margin-top: 9px;
+	margin-bottom: 9px;
+}
+.btn-toolbar .btn-group {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+}
+.btn-toolbar .btn + .btn,
+.btn-toolbar .btn-group + .btn,
+.btn-toolbar .btn + .btn-group {
+	margin-left: 5px;
+}
+.btn-group > .btn {
+	position: relative;
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.btn-group > .btn + .btn {
+	margin-left: -1px;
+}
+.btn-group > .btn,
+.btn-group > .dropdown-menu {
+	font-size: 13px;
+}
+.btn-group > .btn-mini {
+	font-size: 11px;
+}
+.btn-group > .btn-small {
+	font-size: 12px;
+}
+.btn-group > .btn-large {
+	font-size: 16px;
+}
+.btn-group > .btn:first-child {
+	margin-left: 0;
+	-webkit-border-top-left-radius: 4px;
+	-moz-border-radius-topleft: 4px;
+	border-top-left-radius: 4px;
+	-webkit-border-bottom-left-radius: 4px;
+	-moz-border-radius-bottomleft: 4px;
+	border-bottom-left-radius: 4px;
+}
+.btn-group > .btn:last-child,
+.btn-group > .dropdown-toggle {
+	-webkit-border-top-right-radius: 4px;
+	-moz-border-radius-topright: 4px;
+	border-top-right-radius: 4px;
+	-webkit-border-bottom-right-radius: 4px;
+	-moz-border-radius-bottomright: 4px;
+	border-bottom-right-radius: 4px;
+}
+.btn-group > .btn.large:first-child {
+	margin-left: 0;
+	-webkit-border-top-left-radius: 6px;
+	-moz-border-radius-topleft: 6px;
+	border-top-left-radius: 6px;
+	-webkit-border-bottom-left-radius: 6px;
+	-moz-border-radius-bottomleft: 6px;
+	border-bottom-left-radius: 6px;
+}
+.btn-group > .btn.large:last-child,
+.btn-group > .large.dropdown-toggle {
+	-webkit-border-top-right-radius: 6px;
+	-moz-border-radius-topright: 6px;
+	border-top-right-radius: 6px;
+	-webkit-border-bottom-right-radius: 6px;
+	-moz-border-radius-bottomright: 6px;
+	border-bottom-right-radius: 6px;
+}
+.btn-group > .btn:hover,
+.btn-group > .btn:focus,
+.btn-group > .btn:active,
+.btn-group > .btn.active {
+	z-index: 2;
+}
+.btn-group .dropdown-toggle:active,
+.btn-group.open .dropdown-toggle {
+	outline: 0;
+}
+.btn-group > .btn + .dropdown-toggle {
+	padding-left: 8px;
+	padding-right: 8px;
+	-webkit-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+	-moz-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+	box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+	*padding-top: 5px;
+	*padding-bottom: 5px;
+}
+.btn-group > .btn-mini + .dropdown-toggle {
+	padding-left: 5px;
+	padding-right: 5px;
+	*padding-top: 2px;
+	*padding-bottom: 2px;
+}
+.btn-group > .btn-small + .dropdown-toggle {
+	*padding-top: 5px;
+	*padding-bottom: 4px;
+}
+.btn-group > .btn-large + .dropdown-toggle {
+	padding-left: 12px;
+	padding-right: 12px;
+	*padding-top: 7px;
+	*padding-bottom: 7px;
+}
+.btn-group.open .dropdown-toggle {
+	background-image: none;
+	-webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+	-moz-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+	box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+}
+.btn-group.open .btn.dropdown-toggle {
+	background-color: #e6e6e6;
+}
+.btn-group.open .btn-primary.dropdown-toggle {
+	background-color: #15497c;
+}
+.btn-group.open .btn-warning.dropdown-toggle {
+	background-color: #f89406;
+}
+.btn-group.open .btn-danger.dropdown-toggle {
+	background-color: #bd362f;
+}
+.btn-group.open .btn-success.dropdown-toggle {
+	background-color: #51a351;
+}
+.btn-group.open .btn-info.dropdown-toggle {
+	background-color: #2f96b4;
+}
+.btn-group.open .btn-inverse.dropdown-toggle {
+	background-color: #222;
+}
+.btn .caret {
+	margin-top: 8px;
+	margin-left: 0;
+}
+.btn-mini .caret,
+.btn-small .caret,
+.btn-large .caret {
+	margin-top: 6px;
+}
+.btn-large .caret {
+	border-left-width: 5px;
+	border-right-width: 5px;
+	border-top-width: 5px;
+}
+.dropup .btn-large .caret {
+	border-bottom: 5px solid #000;
+	border-top: 0;
+}
+.btn-primary .caret,
+.btn-warning .caret,
+.btn-danger .caret,
+.btn-info .caret,
+.btn-success .caret,
+.btn-inverse .caret {
+	border-top-color: #fff;
+	border-bottom-color: #fff;
+}
+.btn-group-vertical {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+}
+.btn-group-vertical .btn {
+	display: block;
+	float: none;
+	width: 100%;
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.btn-group-vertical .btn + .btn {
+	margin-left: 0;
+	margin-top: -1px;
+}
+.btn-group-vertical .btn:first-child {
+	-webkit-border-radius: 4px 4px 0 0;
+	-moz-border-radius: 4px 4px 0 0;
+	border-radius: 4px 4px 0 0;
+}
+.btn-group-vertical .btn:last-child {
+	-webkit-border-radius: 0 0 4px 4px;
+	-moz-border-radius: 0 0 4px 4px;
+	border-radius: 0 0 4px 4px;
+}
+.btn-group-vertical .btn-large:first-child {
+	-webkit-border-radius: 6px 6px 0 0;
+	-moz-border-radius: 6px 6px 0 0;
+	border-radius: 6px 6px 0 0;
+}
+.btn-group-vertical .btn-large:last-child {
+	-webkit-border-radius: 0 0 6px 6px;
+	-moz-border-radius: 0 0 6px 6px;
+	border-radius: 0 0 6px 6px;
+}
+.alert {
+	padding: 8px 35px 8px 14px;
+	margin-bottom: 18px;
+	text-shadow: 0 1px 0 rgba(255,255,255,0.5);
+	background-color: #fcf8e3;
+	border: 1px solid #fbeed5;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+	color: #c09853;
+	display: inline-block; /* Joomla 2.5 */
+}
+.alert h4 {
+	margin: 0;
+}
+.alert .close {
+	position: relative;
+	top: -2px;
+	right: -21px;
+	line-height: 18px;
+}
+.alert-success {
+	background-color: #dff0d8;
+	border-color: #d6e9c6;
+	color: #468847;
+}
+.alert-danger,
+.alert-error {
+	background-color: #f2dede;
+	border-color: #eed3d7;
+	color: #b94a48;
+}
+.alert-info {
+	background-color: #d9edf7;
+	border-color: #bce8f1;
+	color: #3a87ad;
+}
+.alert-block {
+	padding-top: 14px;
+	padding-bottom: 14px;
+}
+.alert-block > p,
+.alert-block > ul {
+	margin-bottom: 0;
+}
+.alert-block p + p {
+	margin-top: 5px;
+}
+.nav {
+	margin-left: 0;
+	margin-bottom: 18px;
+	list-style: none;
+}
+.nav > li > a {
+	display: block;
+}
+.nav > li > a:hover {
+	text-decoration: none;
+	background-color: #eee;
+}
+.nav > .pull-right {
+	float: right;
+}
+.nav-header {
+	display: block;
+	padding: 3px 15px;
+	font-size: 11px;
+	font-weight: bold;
+	line-height: 18px;
+	color: #999;
+	text-shadow: 0 1px 0 rgba(255,255,255,0.5);
+	text-transform: uppercase;
+}
+.nav li + .nav-header {
+	margin-top: 9px;
+}
+.nav-list {
+	padding-left: 15px;
+	padding-right: 15px;
+	margin-bottom: 0;
+}
+.nav-list > li > a,
+.nav-list .nav-header {
+	margin-left: -15px;
+	margin-right: -15px;
+	text-shadow: 0 1px 0 rgba(255,255,255,0.5);
+}
+.nav-list > li > a {
+	padding: 3px 15px;
+}
+.nav-list > .active > a,
+.nav-list > .active > a:hover {
+	color: #fff;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.2);
+	background-color: #08c;
+}
+.nav-list [class^="icon-"] {
+	margin-right: 2px;
+}
+.nav-list .divider {
+	*width: 100%;
+	height: 1px;
+	margin: 8px 1px;
+	*margin: -5px 0 5px;
+	overflow: hidden;
+	background-color: #e5e5e5;
+	border-bottom: 1px solid #fff;
+}
+
+/* -- TAB STYLES ----------------------------- */
+/* J 2.5 */
+div.current {
+	background-color: #fff;
+	padding: 10px;
+}
+
+dl.tabs dt {
+	padding-top: 8px;
+	padding-bottom: 8px;
+	line-height: 18px;
+	border: 1px solid transparent;
+	-webkit-border-radius: 4px 4px 0 0;
+	-moz-border-radius: 4px 4px 0 0;
+	border-radius: 4px 4px 0 0;
+}
+
+dl.tabs dt.open {
+	color: #fff;
+	background-color: #08c;
+}
+
+/* J 3 */
+.nav-tabs,
+.nav-pills {
+	*zoom: 1;
+}
+.nav-tabs:before,
+.nav-tabs:after,
+.nav-pills:before,
+.nav-pills:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.nav-tabs:after,
+.nav-pills:after {
+	clear: both;
+}
+.nav-tabs > li,
+.nav-pills > li {
+	float: left;
+}
+.nav-tabs > li > a,
+.nav-pills > li > a {
+	padding-right: 12px;
+	padding-left: 12px;
+	margin-right: 2px;
+	line-height: 14px;
+}
+.nav-tabs {
+	border-bottom: 1px solid #ddd;
+}
+.nav-tabs > li {
+	margin-bottom: -1px;
+}
+.nav-tabs > li > a {
+	padding-top: 8px;
+	padding-bottom: 8px;
+	line-height: 18px;
+	border: 1px solid transparent;
+	-webkit-border-radius: 4px 4px 0 0;
+	-moz-border-radius: 4px 4px 0 0;
+	border-radius: 4px 4px 0 0;
+}
+.nav-tabs > li > a:hover {
+	border-color: #eee #eee #ddd;
+}
+.nav-tabs > .active > a,
+.nav-tabs > .active > a:hover {
+	color: #555;
+	background-color: #fff;
+	border: 1px solid #ddd;
+	border-bottom-color: transparent;
+	cursor: default;
+}
+.nav-pills > li > a {
+	padding-top: 8px;
+	padding-bottom: 8px;
+	margin-top: 2px;
+	margin-bottom: 2px;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+}
+.nav-pills > .active > a,
+.nav-pills > .active > a:hover {
+	color: #fff;
+	background-color: #08c;
+}
+.nav-stacked > li {
+	float: none;
+}
+.nav-stacked > li > a {
+	margin-right: 0;
+}
+.nav-tabs.nav-stacked {
+	border-bottom: 0;
+}
+.nav-tabs.nav-stacked > li > a {
+	border: 1px solid #ddd;
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.nav-tabs.nav-stacked > li:first-child > a {
+	-webkit-border-top-right-radius: 4px;
+	-moz-border-radius-topright: 4px;
+	border-top-right-radius: 4px;
+	-webkit-border-top-left-radius: 4px;
+	-moz-border-radius-topleft: 4px;
+	border-top-left-radius: 4px;
+}
+.nav-tabs.nav-stacked > li:last-child > a {
+	-webkit-border-bottom-right-radius: 4px;
+	-moz-border-radius-bottomright: 4px;
+	border-bottom-right-radius: 4px;
+	-webkit-border-bottom-left-radius: 4px;
+	-moz-border-radius-bottomleft: 4px;
+	border-bottom-left-radius: 4px;
+}
+.nav-tabs.nav-stacked > li > a:hover {
+	border-color: #ddd;
+	z-index: 2;
+}
+.nav-pills.nav-stacked > li > a {
+	margin-bottom: 3px;
+}
+.nav-pills.nav-stacked > li:last-child > a {
+	margin-bottom: 1px;
+}
+.nav-tabs .dropdown-menu {
+	-webkit-border-radius: 0 0 6px 6px;
+	-moz-border-radius: 0 0 6px 6px;
+	border-radius: 0 0 6px 6px;
+}
+.nav-pills .dropdown-menu {
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+}
+.nav .dropdown-toggle .caret {
+	border-top-color: #08c;
+	border-bottom-color: #08c;
+	margin-top: 6px;
+}
+.nav .dropdown-toggle:hover .caret {
+	border-top-color: #005580;
+	border-bottom-color: #005580;
+}
+.nav-tabs .dropdown-toggle .caret {
+	margin-top: 8px;
+}
+.nav .active .dropdown-toggle .caret {
+	border-top-color: #fff;
+	border-bottom-color: #fff;
+}
+.nav-tabs .active .dropdown-toggle .caret {
+	border-top-color: #555;
+	border-bottom-color: #555;
+}
+.nav > .dropdown.active > a:hover {
+	cursor: pointer;
+}
+.nav-tabs .open .dropdown-toggle,
+.nav-pills .open .dropdown-toggle,
+.nav > li.dropdown.open.active > a:hover {
+	color: #fff;
+	background-color: #999;
+	border-color: #999;
+}
+.nav li.dropdown.open .caret,
+.nav li.dropdown.open.active .caret,
+.nav li.dropdown.open a:hover .caret {
+	border-top-color: #fff;
+	border-bottom-color: #fff;
+	opacity: 1;
+	filter: alpha(opacity=100);
+}
+.tabs-stacked .open > a:hover {
+	border-color: #999;
+}
+.tabbable {
+	*zoom: 1;
+}
+.tabbable:before,
+.tabbable:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.tabbable:after {
+	clear: both;
+}
+.tab-content {
+	overflow: auto;
+}
+.tabs-below > .nav-tabs,
+.tabs-right > .nav-tabs,
+.tabs-left > .nav-tabs {
+	border-bottom: 0;
+}
+.tab-content > .tab-pane,
+.pill-content > .pill-pane {
+	display: none;
+}
+.tab-content > .active,
+.pill-content > .active {
+	display: block;
+}
+.tabs-below > .nav-tabs {
+	border-top: 1px solid #ddd;
+}
+.tabs-below > .nav-tabs > li {
+	margin-top: -1px;
+	margin-bottom: 0;
+}
+.tabs-below > .nav-tabs > li > a {
+	-webkit-border-radius: 0 0 4px 4px;
+	-moz-border-radius: 0 0 4px 4px;
+	border-radius: 0 0 4px 4px;
+}
+.tabs-below > .nav-tabs > li > a:hover {
+	border-bottom-color: transparent;
+	border-top-color: #ddd;
+}
+.tabs-below > .nav-tabs > .active > a,
+.tabs-below > .nav-tabs > .active > a:hover {
+	border-color: transparent #ddd #ddd #ddd;
+}
+.tabs-left > .nav-tabs > li,
+.tabs-right > .nav-tabs > li {
+	float: none;
+}
+.tabs-left > .nav-tabs > li > a,
+.tabs-right > .nav-tabs > li > a {
+	min-width: 74px;
+	margin-right: 0;
+	margin-bottom: 3px;
+}
+.tabs-left > .nav-tabs {
+	float: left;
+	margin-right: 19px;
+	border-right: 1px solid #ddd;
+}
+.tabs-left > .nav-tabs > li > a {
+	margin-right: -1px;
+	-webkit-border-radius: 4px 0 0 4px;
+	-moz-border-radius: 4px 0 0 4px;
+	border-radius: 4px 0 0 4px;
+}
+.tabs-left > .nav-tabs > li > a:hover {
+	border-color: #eee #ddd #eee #eee;
+}
+.tabs-left > .nav-tabs .active > a,
+.tabs-left > .nav-tabs .active > a:hover {
+	border-color: #ddd transparent #ddd #ddd;
+	*border-right-color: #fff;
+}
+.tabs-right > .nav-tabs {
+	float: right;
+	margin-left: 19px;
+	border-left: 1px solid #ddd;
+}
+.tabs-right > .nav-tabs > li > a {
+	margin-left: -1px;
+	-webkit-border-radius: 0 4px 4px 0;
+	-moz-border-radius: 0 4px 4px 0;
+	border-radius: 0 4px 4px 0;
+}
+.tabs-right > .nav-tabs > li > a:hover {
+	border-color: #eee #eee #eee #ddd;
+}
+.tabs-right > .nav-tabs .active > a,
+.tabs-right > .nav-tabs .active > a:hover {
+	border-color: #ddd #ddd #ddd transparent;
+	*border-left-color: #fff;
+}
+.nav > .disabled > a {
+	color: #999;
+}
+.nav > .disabled > a:hover {
+	text-decoration: none;
+	background-color: transparent;
+	cursor: default;
+}
+.navbar {
+	overflow: visible;
+	margin-bottom: 18px;
+	color: #555;
+	*position: relative;
+	*z-index: 2;
+}
+.navbar-inner {
+	min-height: 40px;
+	padding-left: 20px;
+	padding-right: 20px;
+	background-color: #fafafa;
+	background-image: -moz-linear-gradient(top,#ffffff,#f2f2f2);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#ffffff),to(#f2f2f2));
+	background-image: -webkit-linear-gradient(top,#ffffff,#f2f2f2);
+	background-image: -o-linear-gradient(top,#ffffff,#f2f2f2);
+	background-image: linear-gradient(to bottom,#ffffff,#f2f2f2);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0);
+	border: 1px solid #d4d4d4;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+	-webkit-box-shadow: 0 1px 4px rgba(0,0,0,0.065);
+	-moz-box-shadow: 0 1px 4px rgba(0,0,0,0.065);
+	box-shadow: 0 1px 4px rgba(0,0,0,0.065);
+}
+.navbar .container {
+	width: auto;
+}
+.nav-collapse.collapse {
+	height: auto;
+}
+.navbar .brand {
+	float: left;
+	display: block;
+	padding: 11px 20px 11px;
+	margin-left: -20px;
+	font-size: 20px;
+	font-weight: 200;
+	color: #555;
+	text-shadow: 0 1px 0 #ffffff;
+}
+.navbar .brand:hover {
+	text-decoration: none;
+}
+.navbar-text {
+	margin-bottom: 0;
+	line-height: 40px;
+}
+.navbar-link {
+	color: #555;
+}
+.navbar-link:hover {
+	color: #333;
+}
+.navbar .divider-vertical {
+	height: 40px;
+	margin: 0 9px;
+	border-left: 1px solid #f2f2f2;
+	border-right: 1px solid #ffffff;
+}
+.navbar .btn,
+.navbar .btn-group {
+	margin-top: 6px;
+}
+.navbar .btn-group .btn {
+	margin: 0;
+}
+.navbar-form {
+	margin-bottom: 0;
+	*zoom: 1;
+}
+.navbar-form:before,
+.navbar-form:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.navbar-form:after {
+	clear: both;
+}
+.navbar-form input,
+.navbar-form select,
+.navbar-form .radio,
+.navbar-form .checkbox {
+	margin-top: 5px;
+}
+.navbar-form input,
+.navbar-form select,
+.navbar-form .btn {
+	display: inline-block;
+	margin-bottom: 0;
+}
+.navbar-form input[type="image"],
+.navbar-form input[type="checkbox"],
+.navbar-form input[type="radio"] {
+	margin-top: 3px;
+}
+.navbar-form .input-append,
+.navbar-form .input-prepend {
+	margin-top: 6px;
+	white-space: nowrap;
+}
+.navbar-form .input-append input,
+.navbar-form .input-prepend input {
+	margin-top: 0;
+}
+.navbar-search {
+	position: relative;
+	float: left;
+	margin-top: 5px;
+	margin-bottom: 0;
+}
+.navbar-search .search-query {
+	margin-bottom: 0;
+	padding: 4px 14px;
+	font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+	font-size: 13px;
+	font-weight: normal;
+	line-height: 1;
+	-webkit-border-radius: 15px;
+	-moz-border-radius: 15px;
+	border-radius: 15px;
+}
+.navbar-static-top {
+	position: static;
+	width: 100%;
+	margin-bottom: 0;
+}
+.navbar-static-top .navbar-inner {
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.navbar-fixed-top,
+.navbar-fixed-bottom {
+	position: fixed;
+	right: 0;
+	left: 0;
+	z-index: 1030;
+	margin-bottom: 0;
+}
+.navbar-fixed-top .navbar-inner,
+.navbar-fixed-bottom .navbar-inner,
+.navbar-static-top .navbar-inner {
+	border: 0;
+}
+.navbar-fixed-top .navbar-inner,
+.navbar-fixed-bottom .navbar-inner {
+	padding-left: 0;
+	padding-right: 0;
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.navbar-static-top .container,
+.navbar-fixed-top .container,
+.navbar-fixed-bottom .container {
+	width: 940px;
+}
+.navbar-fixed-top {
+	top: 0;
+}
+.navbar-fixed-top .navbar-inner,
+.navbar-static-top .navbar-inner {
+	-webkit-box-shadow: inset 0 -1px 0 rgba(0,0,0,.1), 0 1px 10px rgba(0,0,0,.1);
+	-moz-box-shadow: inset 0 -1px 0 rgba(0,0,0,.1), 0 1px 10px rgba(0,0,0,.1);
+	box-shadow: inset 0 -1px 0 rgba(0,0,0,.1), 0 1px 10px rgba(0,0,0,.1);
+}
+.navbar-fixed-bottom {
+	bottom: 0;
+}
+.navbar-fixed-bottom .navbar-inner {
+	-webkit-box-shadow: inset 0 1px 0 rgba(0,0,0,.1), 0 -1px 10px rgba(0,0,0,.1);
+	-moz-box-shadow: inset 0 1px 0 rgba(0,0,0,.1), 0 -1px 10px rgba(0,0,0,.1);
+	box-shadow: inset 0 1px 0 rgba(0,0,0,.1), 0 -1px 10px rgba(0,0,0,.1);
+}
+.navbar .nav {
+	position: relative;
+	left: 0;
+	display: block;
+	float: left;
+	margin: 0 10px 0 0;
+}
+.navbar .nav.pull-right {
+	float: right;
+}
+.navbar .nav > li {
+	float: left;
+}
+.navbar .nav > li > a {
+	float: none;
+	padding: 11px 15px 11px;
+	color: #555;
+	text-decoration: none;
+	text-shadow: 0 1px 0 #ffffff;
+}
+.navbar .nav .dropdown-toggle .caret {
+	margin-top: 8px;
+}
+.navbar .nav > li > a:focus,
+.navbar .nav > li > a:hover {
+	background-color: transparent;
+	color: #333;
+	text-decoration: none;
+}
+.navbar .nav > .active > a,
+.navbar .nav > .active > a:hover,
+.navbar .nav > .active > a:focus {
+	color: #555;
+	text-decoration: none;
+	background-color: #e6e6e6;
+	-webkit-box-shadow: inset 0 3px 8px rgba(0,0,0,0.125);
+	-moz-box-shadow: inset 0 3px 8px rgba(0,0,0,0.125);
+	box-shadow: inset 0 3px 8px rgba(0,0,0,0.125);
+}
+.navbar .btn-navbar {
+	display: none;
+	float: right;
+	padding: 7px 10px;
+	margin-left: 5px;
+	margin-right: 5px;
+	color: #fff;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+	background-color: #ededed;
+	background-image: -moz-linear-gradient(top,#f2f2f2,#e6e6e6);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#f2f2f2),to(#e6e6e6));
+	background-image: -webkit-linear-gradient(top,#f2f2f2,#e6e6e6);
+	background-image: -o-linear-gradient(top,#f2f2f2,#e6e6e6);
+	background-image: linear-gradient(to bottom,#f2f2f2,#e6e6e6);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0);
+	border-color: #e6e6e6 #e6e6e6 #bfbfbf;
+	border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+	*background-color: #e6e6e6;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+	-webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);
+	-moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);
+	box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);
+}
+.navbar .btn-navbar:hover,
+.navbar .btn-navbar:active,
+.navbar .btn-navbar.active,
+.navbar .btn-navbar.disabled,
+.navbar .btn-navbar[disabled] {
+	color: #fff;
+	background-color: #e6e6e6;
+	*background-color: #d9d9d9;
+}
+.navbar .btn-navbar:active,
+.navbar .btn-navbar.active {
+	background-color: #cccccc \9;
+}
+.navbar .btn-navbar .icon-bar {
+	display: block;
+	width: 18px;
+	height: 2px;
+	background-color: #f5f5f5;
+	-webkit-border-radius: 1px;
+	-moz-border-radius: 1px;
+	border-radius: 1px;
+	-webkit-box-shadow: 0 1px 0 rgba(0,0,0,0.25);
+	-moz-box-shadow: 0 1px 0 rgba(0,0,0,0.25);
+	box-shadow: 0 1px 0 rgba(0,0,0,0.25);
+}
+.btn-navbar .icon-bar + .icon-bar {
+	margin-top: 3px;
+}
+.navbar .nav > li > .dropdown-menu:before {
+	content: '';
+	display: inline-block;
+	border-left: 7px solid transparent;
+	border-right: 7px solid transparent;
+	border-bottom: 7px solid #ccc;
+	border-bottom-color: rgba(0,0,0,0.2);
+	position: absolute;
+	top: -7px;
+	left: 9px;
+}
+.navbar .nav > li > .dropdown-menu:after {
+	content: '';
+	display: inline-block;
+	border-left: 6px solid transparent;
+	border-right: 6px solid transparent;
+	border-bottom: 6px solid #fff;
+	position: absolute;
+	top: -6px;
+	left: 10px;
+}
+.navbar-fixed-bottom .nav > li > .dropdown-menu:before {
+	border-top: 7px solid #ccc;
+	border-top-color: rgba(0,0,0,0.2);
+	border-bottom: 0;
+	bottom: -7px;
+	top: auto;
+}
+.navbar-fixed-bottom .nav > li > .dropdown-menu:after {
+	border-top: 6px solid #fff;
+	border-bottom: 0;
+	bottom: -6px;
+	top: auto;
+}
+.navbar .nav li.dropdown.open > .dropdown-toggle,
+.navbar .nav li.dropdown.active > .dropdown-toggle,
+.navbar .nav li.dropdown.open.active > .dropdown-toggle {
+	background-color: #e6e6e6;
+	color: #555;
+}
+.navbar .nav li.dropdown > .dropdown-toggle .caret {
+	border-top-color: #555;
+	border-bottom-color: #555;
+}
+.navbar .nav li.dropdown.open > .dropdown-toggle .caret,
+.navbar .nav li.dropdown.active > .dropdown-toggle .caret,
+.navbar .nav li.dropdown.open.active > .dropdown-toggle .caret {
+	border-top-color: #555;
+	border-bottom-color: #555;
+}
+.navbar .pull-right > li > .dropdown-menu,
+.navbar .nav > li > .dropdown-menu.pull-right {
+	left: auto;
+	right: 0;
+}
+.navbar .pull-right > li > .dropdown-menu:before,
+.navbar .nav > li > .dropdown-menu.pull-right:before {
+	left: auto;
+	right: 12px;
+}
+.navbar .pull-right > li > .dropdown-menu:after,
+.navbar .nav > li > .dropdown-menu.pull-right:after {
+	left: auto;
+	right: 13px;
+}
+.navbar .pull-right > li > .dropdown-menu .dropdown-menu,
+.navbar .nav > li > .dropdown-menu.pull-right .dropdown-menu {
+	left: auto;
+	right: 100%;
+	margin-left: 0;
+	margin-right: -1px;
+	-webkit-border-radius: 6px 0 6px 6px;
+	-moz-border-radius: 6px 0 6px 6px;
+	border-radius: 6px 0 6px 6px;
+}
+.navbar-inverse {
+	color: #d9d9d9;
+}
+.navbar-inverse .navbar-inner {
+	background-color: #13294a;
+	background-image: -moz-linear-gradient(top,#152d53,#10223e);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#152d53),to(#10223e));
+	background-image: -webkit-linear-gradient(top,#152d53,#10223e);
+	background-image: -o-linear-gradient(top,#152d53,#10223e);
+	background-image: linear-gradient(to bottom,#152d53,#10223e);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff142c52', endColorstr='#ff0f213e', GradientType=0);
+	border-color: #0b172a;
+}
+.navbar-inverse .brand,
+.navbar-inverse .nav > li > a {
+	color: #d9d9d9;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+}
+.navbar-inverse .brand:hover,
+.navbar-inverse .nav > li > a:hover {
+	color: #fff;
+}
+.navbar-inverse .nav > li > a:focus,
+.navbar-inverse .nav > li > a:hover {
+	background-color: transparent;
+	color: #fff;
+}
+.navbar-inverse .nav .active > a,
+.navbar-inverse .nav .active > a:hover,
+.navbar-inverse .nav .active > a:focus {
+	color: #fff;
+	background-color: #10223e;
+}
+.navbar-inverse .navbar-link {
+	color: #d9d9d9;
+}
+.navbar-inverse .navbar-link:hover {
+	color: #fff;
+}
+.navbar-inverse .divider-vertical {
+	border-left-color: #10223e;
+	border-right-color: #152d53;
+}
+.navbar-inverse .nav li.dropdown.open > .dropdown-toggle,
+.navbar-inverse .nav li.dropdown.active > .dropdown-toggle,
+.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle {
+	background-color: #10223e;
+	color: #fff;
+}
+.navbar-inverse .nav li.dropdown > .dropdown-toggle .caret {
+	border-top-color: #d9d9d9;
+	border-bottom-color: #d9d9d9;
+}
+.navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret,
+.navbar-inverse .nav li.dropdown.active > .dropdown-toggle .caret,
+.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle .caret {
+	border-top-color: #fff;
+	border-bottom-color: #fff;
+}
+.navbar-inverse .navbar-search .search-query {
+	color: #fff;
+	background-color: #2959a4;
+	border-color: #10223e;
+	-webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);
+	-moz-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);
+	box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);
+	-webkit-transition: none;
+	-moz-transition: none;
+	-o-transition: none;
+	transition: none;
+}
+.navbar-inverse .navbar-search .search-query:-moz-placeholder {
+	color: #ccc;
+}
+.navbar-inverse .navbar-search .search-query:-ms-input-placeholder {
+	color: #ccc;
+}
+.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder {
+	color: #ccc;
+}
+.navbar-inverse .navbar-search .search-query:focus,
+.navbar-inverse .navbar-search .search-query.focused {
+	padding: 5px 15px;
+	color: #333;
+	text-shadow: 0 1px 0 #fff;
+	background-color: #fff;
+	border: 0;
+	-webkit-box-shadow: 0 0 3px rgba(0,0,0,0.15);
+	-moz-box-shadow: 0 0 3px rgba(0,0,0,0.15);
+	box-shadow: 0 0 3px rgba(0,0,0,0.15);
+	outline: 0;
+}
+.navbar-inverse .btn-navbar {
+	color: #fff;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+	background-color: #0e1d36;
+	background-image: -moz-linear-gradient(top,#10223e,#0b172a);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#10223e),to(#0b172a));
+	background-image: -webkit-linear-gradient(top,#10223e,#0b172a);
+	background-image: -o-linear-gradient(top,#10223e,#0b172a);
+	background-image: linear-gradient(to bottom,#10223e,#0b172a);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0f213e', endColorstr='#ff0a1629', GradientType=0);
+	border-color: #0b172a #0b172a #000000;
+	border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
+	*background-color: #0b172a;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.navbar-inverse .btn-navbar:hover,
+.navbar-inverse .btn-navbar:active,
+.navbar-inverse .btn-navbar.active,
+.navbar-inverse .btn-navbar.disabled,
+.navbar-inverse .btn-navbar[disabled] {
+	color: #fff;
+	background-color: #0b172a;
+	*background-color: #050c16;
+}
+.navbar-inverse .btn-navbar:active,
+.navbar-inverse .btn-navbar.active {
+	background-color: #000101 \9;
+}
+.breadcrumb {
+	padding: 8px 15px;
+	margin: 0 0 18px;
+	list-style: none;
+	background-color: #f5f5f5;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+}
+.breadcrumb li {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+	text-shadow: 0 1px 0 #fff;
+}
+.breadcrumb .divider {
+	padding: 0 5px;
+	color: #ccc;
+}
+.breadcrumb .active {
+	color: #999;
+}
+/*
+.pagination {
+	height: 36px;
+	margin: 18px 0;
+}
+.pagination ul {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+	margin-left: 0;
+	margin-bottom: 0;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+	-webkit-box-shadow: 0 1px 2px rgba(0,0,0,0.05);
+	-moz-box-shadow: 0 1px 2px rgba(0,0,0,0.05);
+	box-shadow: 0 1px 2px rgba(0,0,0,0.05);
+}
+.pagination li {
+	display: inline;
+}
+.pagination a,
+.pagination span {
+	float: left;
+	padding: 0 14px;
+	line-height: 34px;
+	text-decoration: none;
+	background-color: #fff;
+	border: 1px solid #ddd;
+	border-left-width: 0;
+}
+.pagination a:hover,
+.pagination .active a,
+.pagination .active span {
+	background-color: #f5f5f5;
+}
+.pagination .active a,
+.pagination .active span {
+	color: #999;
+	cursor: default;
+}
+.pagination .disabled span,
+.pagination .disabled a,
+.pagination .disabled a:hover {
+	color: #999;
+	background-color: transparent;
+	cursor: default;
+}
+.pagination li:first-child a,
+.pagination li:first-child span {
+	border-left-width: 1px;
+	-webkit-border-radius: 3px 0 0 3px;
+	-moz-border-radius: 3px 0 0 3px;
+	border-radius: 3px 0 0 3px;
+}
+.pagination li:last-child a,
+.pagination li:last-child span {
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+}
+.pagination-centered {
+	text-align: center;
+}
+.pagination-right {
+	text-align: right;
+}
+.pager {
+	margin: 18px 0;
+	list-style: none;
+	text-align: center;
+	*zoom: 1;
+}
+.pager:before,
+.pager:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.pager:after {
+	clear: both;
+}
+.pager li {
+	display: inline;
+}
+.pager a {
+	display: inline-block;
+	padding: 5px 14px;
+	background-color: #fff;
+	border: 1px solid #ddd;
+	-webkit-border-radius: 15px;
+	-moz-border-radius: 15px;
+	border-radius: 15px;
+}
+.pager a:hover {
+	text-decoration: none;
+	background-color: #f5f5f5;
+}
+.pager .next a {
+	float: right;
+}
+.pager .previous a {
+	float: left;
+}
+.pager .disabled a,
+.pager .disabled a:hover {
+	color: #999;
+	background-color: #fff;
+	cursor: default;
+}
+*/
+.modal-open .dropdown-menu {
+	z-index: 2050;
+}
+.modal-open .dropdown.open {
+	*z-index: 2050;
+}
+.modal-open .popover {
+	z-index: 2060;
+}
+.modal-open .tooltip {
+	z-index: 2080;
+}
+.modal-backdrop {
+	position: fixed;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	z-index: 1040;
+	background-color: #000;
+}
+.modal-backdrop.fade {
+	opacity: 0;
+}
+.modal-backdrop,
+.modal-backdrop.fade.in {
+	opacity: 0.8;
+	filter: alpha(opacity=80);
+}
+div.modal {
+	position: fixed;
+	top: 50%;
+	left: 50%;
+	z-index: 1050;
+	overflow: auto;
+	width: 560px;
+	margin: -250px 0 0 -280px;
+	background-color: #fff;
+	border: 1px solid #999;
+	border: 1px solid rgba(0,0,0,0.3);
+	*border: 1px solid #999;
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+	-webkit-box-shadow: 0 3px 7px rgba(0,0,0,0.3);
+	-moz-box-shadow: 0 3px 7px rgba(0,0,0,0.3);
+	box-shadow: 0 3px 7px rgba(0,0,0,0.3);
+	-webkit-background-clip: padding-box;
+	-moz-background-clip: padding-box;
+	background-clip: padding-box;
+}
+div.modal.fade {
+	-webkit-transition: opacity .3s linear, top .3s ease-out;
+	-moz-transition: opacity .3s linear, top .3s ease-out;
+	-o-transition: opacity .3s linear, top .3s ease-out;
+	transition: opacity .3s linear, top .3s ease-out;
+	top: -25%;
+}
+div.modal.fade.in {
+	top: 50%;
+}
+.modal-header {
+	padding: 9px 15px;
+	border-bottom: 1px solid #eee;
+}
+.modal-header .close {
+	margin-top: 2px;
+}
+.modal-header h3 {
+	margin: 0;
+	line-height: 30px;
+}
+.modal-body {
+	overflow-y: auto;
+	max-height: 400px;
+	padding: 15px;
+}
+.modal-form {
+	margin-bottom: 0;
+}
+.modal-footer {
+	padding: 14px 15px 15px;
+	margin-bottom: 0;
+	text-align: right;
+	background-color: #f5f5f5;
+	border-top: 1px solid #ddd;
+	-webkit-border-radius: 0 0 6px 6px;
+	-moz-border-radius: 0 0 6px 6px;
+	border-radius: 0 0 6px 6px;
+	-webkit-box-shadow: inset 0 1px 0 #fff;
+	-moz-box-shadow: inset 0 1px 0 #fff;
+	box-shadow: inset 0 1px 0 #fff;
+	*zoom: 1;
+}
+.modal-footer:before,
+.modal-footer:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.modal-footer:after {
+	clear: both;
+}
+.modal-footer .btn + .btn {
+	margin-left: 5px;
+	margin-bottom: 0;
+}
+.modal-footer .btn-group .btn + .btn {
+	margin-left: -1px;
+}
+.tooltip {
+	position: absolute;
+	z-index: 1030;
+	display: block;
+	visibility: visible;
+	padding: 5px;
+	font-size: 11px;
+	opacity: 0;
+	filter: alpha(opacity=0);
+}
+.tooltip.in {
+	opacity: 0.8;
+	filter: alpha(opacity=80);
+}
+.tooltip.top {
+	margin-top: -3px;
+}
+.tooltip.right {
+	margin-left: 3px;
+}
+.tooltip.bottom {
+	margin-top: 3px;
+}
+.tooltip.left {
+	margin-left: -3px;
+}
+.tooltip-inner {
+	max-width: 200px;
+	padding: 3px 8px;
+	color: #fff;
+	text-align: center;
+	text-decoration: none;
+	background-color: #000;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+}
+.tooltip-arrow {
+	position: absolute;
+	width: 0;
+	height: 0;
+	border-color: transparent;
+	border-style: solid;
+}
+.tooltip.top .tooltip-arrow {
+	bottom: 0;
+	left: 50%;
+	margin-left: -5px;
+	border-width: 5px 5px 0;
+	border-top-color: #000;
+}
+.tooltip.right .tooltip-arrow {
+	top: 50%;
+	left: 0;
+	margin-top: -5px;
+	border-width: 5px 5px 5px 0;
+	border-right-color: #000;
+}
+.tooltip.left .tooltip-arrow {
+	top: 50%;
+	right: 0;
+	margin-top: -5px;
+	border-width: 5px 0 5px 5px;
+	border-left-color: #000;
+}
+.tooltip.bottom .tooltip-arrow {
+	top: 0;
+	left: 50%;
+	margin-left: -5px;
+	border-width: 0 5px 5px;
+	border-bottom-color: #000;
+}
+.popover {
+	position: absolute;
+	top: 0;
+	left: 0;
+	z-index: 1010;
+	display: none;
+	width: 236px;
+	padding: 1px;
+	background-color: #fff;
+	-webkit-background-clip: padding-box;
+	-moz-background-clip: padding;
+	background-clip: padding-box;
+	border: 1px solid #ccc;
+	border: 1px solid rgba(0,0,0,0.2);
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+	-webkit-box-shadow: 0 5px 10px rgba(0,0,0,0.2);
+	-moz-box-shadow: 0 5px 10px rgba(0,0,0,0.2);
+	box-shadow: 0 5px 10px rgba(0,0,0,0.2);
+}
+.popover.top {
+	margin-bottom: 10px;
+}
+.popover.right {
+	margin-left: 10px;
+}
+.popover.bottom {
+	margin-top: 10px;
+}
+.popover.left {
+	margin-right: 10px;
+}
+.popover-title {
+	margin: 0;
+	padding: 8px 14px;
+	font-size: 14px;
+	font-weight: normal;
+	line-height: 18px;
+	background-color: #f7f7f7;
+	border-bottom: 1px solid #ebebeb;
+	-webkit-border-radius: 5px 5px 0 0;
+	-moz-border-radius: 5px 5px 0 0;
+	border-radius: 5px 5px 0 0;
+}
+.popover-content {
+	padding: 9px 14px;
+}
+.popover-content p,
+.popover-content ul,
+.popover-content ol {
+	margin-bottom: 0;
+}
+.popover .arrow,
+.popover .arrow:after {
+	position: absolute;
+	display: inline-block;
+	width: 0;
+	height: 0;
+	border-color: transparent;
+	border-style: solid;
+}
+.popover .arrow:after {
+	content: "";
+	z-index: -1;
+}
+.popover.top .arrow {
+	bottom: -10px;
+	left: 50%;
+	margin-left: -10px;
+	border-width: 10px 10px 0;
+	border-top-color: #fff;
+}
+.popover.top .arrow:after {
+	border-width: 11px 11px 0;
+	border-top-color: rgba(0,0,0,0.25);
+	bottom: -1px;
+	left: -11px;
+}
+.popover.right .arrow {
+	top: 50%;
+	left: -10px;
+	margin-top: -10px;
+	border-width: 10px 10px 10px 0;
+	border-right-color: #fff;
+}
+.popover.right .arrow:after {
+	border-width: 11px 11px 11px 0;
+	border-right-color: rgba(0,0,0,0.25);
+	bottom: -11px;
+	left: -1px;
+}
+.popover.bottom .arrow {
+	top: -10px;
+	left: 50%;
+	margin-left: -10px;
+	border-width: 0 10px 10px;
+	border-bottom-color: #fff;
+}
+.popover.bottom .arrow:after {
+	border-width: 0 11px 11px;
+	border-bottom-color: rgba(0,0,0,0.25);
+	top: -1px;
+	left: -11px;
+}
+.popover.left .arrow {
+	top: 50%;
+	right: -10px;
+	margin-top: -10px;
+	border-width: 10px 0 10px 10px;
+	border-left-color: #fff;
+}
+.popover.left .arrow:after {
+	border-width: 11px 0 11px 11px;
+	border-left-color: rgba(0,0,0,0.25);
+	bottom: -11px;
+	right: -1px;
+}
+.thumbnails {
+	margin-left: -20px;
+	list-style: none;
+	*zoom: 1;
+}
+.thumbnails:before,
+.thumbnails:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.thumbnails:after {
+	clear: both;
+}
+.row-fluid .thumbnails {
+	margin-left: 0;
+}
+.thumbnails > li {
+	float: left;
+	margin-bottom: 18px;
+	margin-left: 20px;
+}
+.thumbnail {
+	display: block;
+	padding: 4px;
+	line-height: 18px;
+	border: 1px solid #ddd;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+	-webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.055);
+	-moz-box-shadow: 0 1px 3px rgba(0,0,0,0.055);
+	box-shadow: 0 1px 3px rgba(0,0,0,0.055);
+	-webkit-transition: all .2s ease-in-out;
+	-moz-transition: all .2s ease-in-out;
+	-o-transition: all .2s ease-in-out;
+	transition: all .2s ease-in-out;
+}
+a.thumbnail:hover {
+	border-color: #08c;
+	-webkit-box-shadow: 0 1px 4px rgba(0,105,214,0.25);
+	-moz-box-shadow: 0 1px 4px rgba(0,105,214,0.25);
+	box-shadow: 0 1px 4px rgba(0,105,214,0.25);
+}
+.thumbnail > img {
+	display: block;
+	max-width: 100%;
+	margin-left: auto;
+	margin-right: auto;
+}
+.thumbnail .caption {
+	padding: 9px;
+	color: #555;
+}
+.label,
+.badge {
+	font-size: 10.998px;
+	font-weight: bold;
+	line-height: 14px;
+	color: #fff;
+	vertical-align: baseline;
+	white-space: nowrap;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+	background-color: #999;
+}
+.label {
+	padding: 1px 4px 2px;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+.badge {
+	padding: 1px 9px 2px;
+	-webkit-border-radius: 9px;
+	-moz-border-radius: 9px;
+	border-radius: 9px;
+}
+a.label:hover,
+a.badge:hover {
+	color: #fff;
+	text-decoration: none;
+	cursor: pointer;
+}
+.label-important,
+.badge-important {
+	background-color: #b94a48;
+}
+.label-important[href],
+.badge-important[href] {
+	background-color: #953b39;
+}
+.label-warning,
+.badge-warning {
+	background-color: #f89406;
+}
+.label-warning[href],
+.badge-warning[href] {
+	background-color: #c67605;
+}
+.label-success,
+.badge-success {
+	background-color: #468847;
+}
+.label-success[href],
+.badge-success[href] {
+	background-color: #356635;
+}
+.label-info,
+.badge-info {
+	background-color: #3a87ad;
+}
+.label-info[href],
+.badge-info[href] {
+	background-color: #2d6987;
+}
+.label-inverse,
+.badge-inverse {
+	background-color: #333;
+}
+.label-inverse[href],
+.badge-inverse[href] {
+	background-color: #1a1a1a;
+}
+.btn .label,
+.btn .badge {
+	position: relative;
+	top: -1px;
+}
+.btn-mini .label,
+.btn-mini .badge {
+	top: 0;
+}
+@-webkit-keyframes progress-bar-stripes {
+	from {
+		background-position: 40px 0;
+	}
+	to {
+		background-position: 0 0;
+	}
+}
+@-moz-keyframes progress-bar-stripes {
+	from {
+		background-position: 40px 0;
+	}
+	to {
+		background-position: 0 0;
+	}
+}
+@-ms-keyframes progress-bar-stripes {
+	from {
+		background-position: 40px 0;
+	}
+	to {
+		background-position: 0 0;
+	}
+}
+@-o-keyframes progress-bar-stripes {
+	from {
+		background-position: 0 0;
+	}
+	to {
+		background-position: 40px 0;
+	}
+}
+@keyframes progress-bar-stripes {
+	from {
+		background-position: 40px 0;
+	}
+	to {
+		background-position: 0 0;
+	}
+}
+.progress {
+	overflow: hidden;
+	height: 18px;
+	margin-bottom: 18px;
+	background-color: #f7f7f7;
+	background-image: -moz-linear-gradient(top,#f5f5f5,#f9f9f9);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#f5f5f5),to(#f9f9f9));
+	background-image: -webkit-linear-gradient(top,#f5f5f5,#f9f9f9);
+	background-image: -o-linear-gradient(top,#f5f5f5,#f9f9f9);
+	background-image: linear-gradient(to bottom,#f5f5f5,#f9f9f9);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0);
+	-webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,0.1);
+	-moz-box-shadow: inset 0 1px 2px rgba(0,0,0,0.1);
+	box-shadow: inset 0 1px 2px rgba(0,0,0,0.1);
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+}
+.progress .bar {
+	width: 0%;
+	height: 100%;
+	color: #fff;
+	float: left;
+	font-size: 12px;
+	text-align: center;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+	background-color: #0e90d2;
+	background-image: -moz-linear-gradient(top,#149bdf,#0480be);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#149bdf),to(#0480be));
+	background-image: -webkit-linear-gradient(top,#149bdf,#0480be);
+	background-image: -o-linear-gradient(top,#149bdf,#0480be);
+	background-image: linear-gradient(to bottom,#149bdf,#0480be);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0);
+	-webkit-box-shadow: inset 0 -1px 0 rgba(0,0,0,0.15);
+	-moz-box-shadow: inset 0 -1px 0 rgba(0,0,0,0.15);
+	box-shadow: inset 0 -1px 0 rgba(0,0,0,0.15);
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+	-webkit-transition: width .6s ease;
+	-moz-transition: width .6s ease;
+	-o-transition: width .6s ease;
+	transition: width .6s ease;
+}
+.progress .bar + .bar {
+	-webkit-box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15);
+	-moz-box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15);
+	box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15);
+}
+.progress-striped .bar {
+	background-color: #149bdf;
+	background-image: -webkit-gradient(linear,0 100%,100% 0,color-stop(.25,rgba(255,255,255,0.15)),color-stop(.25,transparent),color-stop(.5,transparent),color-stop(.5,rgba(255,255,255,0.15)),color-stop(.75,rgba(255,255,255,0.15)),color-stop(.75,transparent),to(transparent));
+	background-image: -webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: -moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: -o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	-webkit-background-size: 40px 40px;
+	-moz-background-size: 40px 40px;
+	-o-background-size: 40px 40px;
+	background-size: 40px 40px;
+}
+.progress.active .bar {
+	-webkit-animation: progress-bar-stripes 2s linear infinite;
+	-moz-animation: progress-bar-stripes 2s linear infinite;
+	-ms-animation: progress-bar-stripes 2s linear infinite;
+	-o-animation: progress-bar-stripes 2s linear infinite;
+	animation: progress-bar-stripes 2s linear infinite;
+}
+.progress-danger .bar,
+.progress .bar-danger {
+	background-color: #dd514c;
+	background-image: -moz-linear-gradient(top,#ee5f5b,#c43c35);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#c43c35));
+	background-image: -webkit-linear-gradient(top,#ee5f5b,#c43c35);
+	background-image: -o-linear-gradient(top,#ee5f5b,#c43c35);
+	background-image: linear-gradient(to bottom,#ee5f5b,#c43c35);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0);
+}
+.progress-danger.progress-striped .bar,
+.progress-striped .bar-danger {
+	background-color: #ee5f5b;
+	background-image: -webkit-gradient(linear,0 100%,100% 0,color-stop(.25,rgba(255,255,255,0.15)),color-stop(.25,transparent),color-stop(.5,transparent),color-stop(.5,rgba(255,255,255,0.15)),color-stop(.75,rgba(255,255,255,0.15)),color-stop(.75,transparent),to(transparent));
+	background-image: -webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: -moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: -o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+}
+.progress-success .bar,
+.progress .bar-success {
+	background-color: #5eb95e;
+	background-image: -moz-linear-gradient(top,#62c462,#57a957);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#57a957));
+	background-image: -webkit-linear-gradient(top,#62c462,#57a957);
+	background-image: -o-linear-gradient(top,#62c462,#57a957);
+	background-image: linear-gradient(to bottom,#62c462,#57a957);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0);
+}
+.progress-success.progress-striped .bar,
+.progress-striped .bar-success {
+	background-color: #62c462;
+	background-image: -webkit-gradient(linear,0 100%,100% 0,color-stop(.25,rgba(255,255,255,0.15)),color-stop(.25,transparent),color-stop(.5,transparent),color-stop(.5,rgba(255,255,255,0.15)),color-stop(.75,rgba(255,255,255,0.15)),color-stop(.75,transparent),to(transparent));
+	background-image: -webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: -moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: -o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+}
+.progress-info .bar,
+.progress .bar-info {
+	background-color: #4bb1cf;
+	background-image: -moz-linear-gradient(top,#5bc0de,#339bb9);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#339bb9));
+	background-image: -webkit-linear-gradient(top,#5bc0de,#339bb9);
+	background-image: -o-linear-gradient(top,#5bc0de,#339bb9);
+	background-image: linear-gradient(to bottom,#5bc0de,#339bb9);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0);
+}
+.progress-info.progress-striped .bar,
+.progress-striped .bar-info {
+	background-color: #5bc0de;
+	background-image: -webkit-gradient(linear,0 100%,100% 0,color-stop(.25,rgba(255,255,255,0.15)),color-stop(.25,transparent),color-stop(.5,transparent),color-stop(.5,rgba(255,255,255,0.15)),color-stop(.75,rgba(255,255,255,0.15)),color-stop(.75,transparent),to(transparent));
+	background-image: -webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: -moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: -o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+}
+.progress-warning .bar,
+.progress .bar-warning {
+	background-color: #faa732;
+	background-image: -moz-linear-gradient(top,#fbb450,#f89406);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));
+	background-image: -webkit-linear-gradient(top,#fbb450,#f89406);
+	background-image: -o-linear-gradient(top,#fbb450,#f89406);
+	background-image: linear-gradient(to bottom,#fbb450,#f89406);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffab44f', endColorstr='#fff89406', GradientType=0);
+}
+.progress-warning.progress-striped .bar,
+.progress-striped .bar-warning {
+	background-color: #fbb450;
+	background-image: -webkit-gradient(linear,0 100%,100% 0,color-stop(.25,rgba(255,255,255,0.15)),color-stop(.25,transparent),color-stop(.5,transparent),color-stop(.5,rgba(255,255,255,0.15)),color-stop(.75,rgba(255,255,255,0.15)),color-stop(.75,transparent),to(transparent));
+	background-image: -webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: -moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: -o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+}
+.accordion {
+	margin-bottom: 18px;
+}
+.accordion-group {
+	margin-bottom: 2px;
+	border: 1px solid #e5e5e5;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+}
+.accordion-heading {
+	border-bottom: 0;
+}
+.accordion-heading .accordion-toggle {
+	display: block;
+	padding: 8px 15px;
+}
+.accordion-toggle {
+	cursor: pointer;
+}
+.accordion-inner {
+	padding: 9px 15px;
+	border-top: 1px solid #e5e5e5;
+}
+.carousel {
+	position: relative;
+	margin-bottom: 18px;
+	line-height: 1;
+}
+.carousel-inner {
+	overflow: hidden;
+	width: 100%;
+	position: relative;
+}
+.carousel .item {
+	display: none;
+	position: relative;
+	-webkit-transition: .6s ease-in-out left;
+	-moz-transition: .6s ease-in-out left;
+	-o-transition: .6s ease-in-out left;
+	transition: .6s ease-in-out left;
+}
+.carousel .item > img {
+	display: block;
+	line-height: 1;
+}
+.carousel .active,
+.carousel .next,
+.carousel .prev {
+	display: block;
+}
+.carousel .active {
+	left: 0;
+}
+.carousel .next,
+.carousel .prev {
+	position: absolute;
+	top: 0;
+	width: 100%;
+}
+.carousel .next {
+	left: 100%;
+}
+.carousel .prev {
+	left: -100%;
+}
+.carousel .next.left,
+.carousel .prev.right {
+	left: 0;
+}
+.carousel .active.left {
+	left: -100%;
+}
+.carousel .active.right {
+	left: 100%;
+}
+.carousel-control {
+	position: absolute;
+	top: 40%;
+	left: 15px;
+	width: 40px;
+	height: 40px;
+	margin-top: -20px;
+	font-size: 60px;
+	font-weight: 100;
+	line-height: 30px;
+	color: #fff;
+	text-align: center;
+	background: #222;
+	border: 3px solid #fff;
+	-webkit-border-radius: 23px;
+	-moz-border-radius: 23px;
+	border-radius: 23px;
+	opacity: 0.5;
+	filter: alpha(opacity=50);
+}
+.carousel-control.right {
+	left: auto;
+	right: 15px;
+}
+.carousel-control:hover {
+	color: #fff;
+	text-decoration: none;
+	opacity: 0.9;
+	filter: alpha(opacity=90);
+}
+.carousel-caption {
+	position: absolute;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	padding: 15px;
+	background: #333;
+	background: rgba(0,0,0,0.75);
+}
+.carousel-caption h4,
+.carousel-caption p {
+	color: #fff;
+	line-height: 18px;
+}
+.carousel-caption h4 {
+	margin: 0 0 5px;
+}
+.carousel-caption p {
+	margin-bottom: 0;
+}
+.hero-unit {
+	padding: 60px;
+	margin-bottom: 30px;
+	background-color: #eee;
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+}
+.hero-unit h1 {
+	margin-bottom: 0;
+	font-size: 60px;
+	line-height: 1;
+	color: inherit;
+	letter-spacing: -1px;
+}
+.hero-unit p {
+	font-size: 18px;
+	font-weight: 200;
+	line-height: 27px;
+	color: inherit;
+}
+.pull-right {
+	float: right;
+}
+.pull-left {
+	float: left;
+}
+.hide {
+	display: none;
+}
+.show {
+	display: block;
+}
+.invisible {
+	visibility: hidden;
+}
+.affix {
+	position: fixed;
+}
+.hidden {
+	display: none;
+	visibility: hidden;
+}
+.visible-phone {
+	display: none !important;
+}
+.visible-tablet {
+	display: none !important;
+}
+.hidden-desktop {
+	display: none !important;
+}
+.visible-desktop {
+	display: inherit !important;
+}
+@media (min-width: 768px) and (max-width: 979px) {
+	.hidden-desktop {
+		display: inherit !important;
+	}
+	.visible-desktop {
+		display: none !important;
+	}
+	.visible-tablet {
+		display: inherit !important;
+	}
+	.hidden-tablet {
+		display: none !important;
+	}
+}
+@media (max-width: 767px) {
+	.hidden-desktop {
+		display: inherit !important;
+	}
+	.visible-desktop {
+		display: none !important;
+	}
+	.visible-phone {
+		display: inherit !important;
+	}
+	.hidden-phone {
+		display: none !important;
+	}
+}
+@media (max-width: 767px) {
+	body {
+		padding-left: 20px;
+		padding-right: 20px;
+	}
+	.navbar-fixed-top,
+	.navbar-fixed-bottom {
+		margin-left: -20px;
+		margin-right: -20px;
+	}
+	.container-fluid {
+		padding: 0;
+	}
+	.dl-horizontal dt {
+		float: none;
+		clear: none;
+		width: auto;
+		text-align: left;
+	}
+	.dl-horizontal dd {
+		margin-left: 0;
+	}
+	.container {
+		width: auto;
+	}
+	.row-fluid {
+		width: 100%;
+	}
+	.row,
+	.thumbnails {
+		margin-left: 0;
+	}
+	[class*="span"],
+	.row-fluid [class*="span"] {
+		float: none;
+		display: block;
+		width: auto;
+		margin-left: 0;
+	}
+	.span12,
+	.row-fluid .span12 {
+		width: 100%;
+		-webkit-box-sizing: border-box;
+		-moz-box-sizing: border-box;
+		box-sizing: border-box;
+	}
+	.input-large,
+	.input-xlarge,
+	.input-xxlarge,
+	input[class*="span"],
+	select[class*="span"],
+	textarea[class*="span"],
+	.uneditable-input {
+		display: block;
+		width: 100%;
+		min-height: 30px;
+		-webkit-box-sizing: border-box;
+		-moz-box-sizing: border-box;
+		box-sizing: border-box;
+	}
+	.input-prepend input,
+	.input-append input,
+	.input-prepend input[class*="span"],
+	.input-append input[class*="span"] {
+		display: inline-block;
+		width: auto;
+	}
+	div.modal {
+		position: fixed;
+		top: 20px;
+		left: 20px;
+		right: 20px;
+		width: auto;
+		margin: 0;
+	}
+	div.modal.fade.in {
+		top: auto;
+	}
+}
+@media (max-width: 480px) {
+	.nav-collapse {
+		-webkit-transform: translate3d(0,0,0);
+	}
+	.page-header h1 small {
+		display: block;
+		line-height: 18px;
+	}
+	input[type="checkbox"],
+	input[type="radio"] {
+		border: 1px solid #ccc;
+	}
+	.form-horizontal .control-group > label {
+		float: none;
+		width: auto;
+		padding-top: 0;
+		text-align: left;
+	}
+	.form-horizontal .controls {
+		margin-left: 0;
+	}
+	.form-horizontal .control-list {
+		padding-top: 0;
+	}
+	.form-horizontal .form-actions {
+		padding-left: 10px;
+		padding-right: 10px;
+	}
+	div.modal {
+		top: 10px;
+		left: 10px;
+		right: 10px;
+	}
+	.modal-header .close {
+		padding: 10px;
+		margin: -10px;
+	}
+	.carousel-caption {
+		position: static;
+	}
+}
+@media (min-width: 768px) and (max-width: 979px) {
+	.row {
+		margin-left: -20px;
+		*zoom: 1;
+	}
+	.row:before,
+	.row:after {
+		display: table;
+		content: "";
+		line-height: 0;
+	}
+	.row:after {
+		clear: both;
+	}
+	[class*="span"] {
+		float: left;
+		margin-left: 20px;
+	}
+	.container,
+	.navbar-static-top .container,
+	.navbar-fixed-top .container,
+	.navbar-fixed-bottom .container {
+		width: 724px;
+	}
+	.span12 {
+		width: 724px;
+	}
+	.span11 {
+		width: 662px;
+	}
+	.span10 {
+		width: 600px;
+	}
+	.span9 {
+		width: 538px;
+	}
+	.span8 {
+		width: 476px;
+	}
+	.span7 {
+		width: 414px;
+	}
+	.span6 {
+		width: 352px;
+	}
+	.span5 {
+		width: 290px;
+	}
+	.span4 {
+		width: 228px;
+	}
+	.span3 {
+		width: 166px;
+	}
+	.span2 {
+		width: 104px;
+	}
+	.span1 {
+		width: 42px;
+	}
+	.offset12 {
+		margin-left: 764px;
+	}
+	.offset11 {
+		margin-left: 702px;
+	}
+	.offset10 {
+		margin-left: 640px;
+	}
+	.offset9 {
+		margin-left: 578px;
+	}
+	.offset8 {
+		margin-left: 516px;
+	}
+	.offset7 {
+		margin-left: 454px;
+	}
+	.offset6 {
+		margin-left: 392px;
+	}
+	.offset5 {
+		margin-left: 330px;
+	}
+	.offset4 {
+		margin-left: 268px;
+	}
+	.offset3 {
+		margin-left: 206px;
+	}
+	.offset2 {
+		margin-left: 144px;
+	}
+	.offset1 {
+		margin-left: 82px;
+	}
+	.row-fluid {
+		width: 100%;
+		*zoom: 1;
+	}
+	.row-fluid:before,
+	.row-fluid:after {
+		display: table;
+		content: "";
+		line-height: 0;
+	}
+	.row-fluid:after {
+		clear: both;
+	}
+	.row-fluid [class*="span"] {
+		display: block;
+		width: 100%;
+		min-height: 30px;
+		-webkit-box-sizing: border-box;
+		-moz-box-sizing: border-box;
+		box-sizing: border-box;
+		float: left;
+		margin-left: 2.7624309392265%;
+		*margin-left: 2.7092394498648%;
+	}
+	.row-fluid [class*="span"]:first-child {
+		margin-left: 0;
+	}
+	.row-fluid .span12 {
+		width: 100%;
+		*width: 99.946808510638%;
+	}
+	.row-fluid .span11 {
+		width: 91.489361702128%;
+		*width: 91.436170212766%;
+	}
+	.row-fluid .span10 {
+		width: 82.978723404255%;
+		*width: 82.925531914894%;
+	}
+	.row-fluid .span9 {
+		width: 74.468085106383%;
+		*width: 74.414893617021%;
+	}
+	.row-fluid .span8 {
+		width: 65.957446808511%;
+		*width: 65.904255319149%;
+	}
+	.row-fluid .span7 {
+		width: 57.446808510638%;
+		*width: 57.393617021277%;
+	}
+	.row-fluid .span6 {
+		width: 48.936170212766%;
+		*width: 48.882978723404%;
+	}
+	.row-fluid .span5 {
+		width: 40.425531914894%;
+		*width: 40.372340425532%;
+	}
+	.row-fluid .span4 {
+		width: 31.914893617021%;
+		*width: 31.86170212766%;
+	}
+	.row-fluid .span3 {
+		width: 23.404255319149%;
+		*width: 23.351063829787%;
+	}
+	.row-fluid .span2 {
+		width: 14.893617021277%;
+		*width: 14.840425531915%;
+	}
+	.row-fluid .span1 {
+		width: 6.3829787234043%;
+		*width: 6.3297872340426%;
+	}
+	.row-fluid .offset12 {
+		margin-left: 105.52486187845%;
+		*margin-left: 105.41847889973%;
+	}
+	.row-fluid .offset12:first-child {
+		margin-left: 102.76243093923%;
+		*margin-left: 102.6560479605%;
+	}
+	.row-fluid .offset11 {
+		margin-left: 95.744680851064%;
+		*margin-left: 95.63829787234%;
+	}
+	.row-fluid .offset11:first-child {
+		margin-left: 93.617021276596%;
+		*margin-left: 93.510638297872%;
+	}
+	.row-fluid .offset10 {
+		margin-left: 87.234042553191%;
+		*margin-left: 87.127659574468%;
+	}
+	.row-fluid .offset10:first-child {
+		margin-left: 85.106382978723%;
+		*margin-left: 85%;
+	}
+	.row-fluid .offset9 {
+		margin-left: 78.723404255319%;
+		*margin-left: 78.617021276596%;
+	}
+	.row-fluid .offset9:first-child {
+		margin-left: 76.595744680851%;
+		*margin-left: 76.489361702128%;
+	}
+	.row-fluid .offset8 {
+		margin-left: 70.212765957447%;
+		*margin-left: 70.106382978723%;
+	}
+	.row-fluid .offset8:first-child {
+		margin-left: 68.085106382979%;
+		*margin-left: 67.978723404255%;
+	}
+	.row-fluid .offset7 {
+		margin-left: 61.702127659574%;
+		*margin-left: 61.595744680851%;
+	}
+	.row-fluid .offset7:first-child {
+		margin-left: 59.574468085106%;
+		*margin-left: 59.468085106383%;
+	}
+	.row-fluid .offset6 {
+		margin-left: 53.191489361702%;
+		*margin-left: 53.085106382979%;
+	}
+	.row-fluid .offset6:first-child {
+		margin-left: 51.063829787234%;
+		*margin-left: 50.957446808511%;
+	}
+	.row-fluid .offset5 {
+		margin-left: 44.68085106383%;
+		*margin-left: 44.574468085106%;
+	}
+	.row-fluid .offset5:first-child {
+		margin-left: 42.553191489362%;
+		*margin-left: 42.446808510638%;
+	}
+	.row-fluid .offset4 {
+		margin-left: 36.170212765957%;
+		*margin-left: 36.063829787234%;
+	}
+	.row-fluid .offset4:first-child {
+		margin-left: 34.042553191489%;
+		*margin-left: 33.936170212766%;
+	}
+	.row-fluid .offset3 {
+		margin-left: 27.659574468085%;
+		*margin-left: 27.553191489362%;
+	}
+	.row-fluid .offset3:first-child {
+		margin-left: 25.531914893617%;
+		*margin-left: 25.425531914894%;
+	}
+	.row-fluid .offset2 {
+		margin-left: 19.148936170213%;
+		*margin-left: 19.042553191489%;
+	}
+	.row-fluid .offset2:first-child {
+		margin-left: 17.021276595745%;
+		*margin-left: 16.914893617021%;
+	}
+	.row-fluid .offset1 {
+		margin-left: 10.63829787234%;
+		*margin-left: 10.531914893617%;
+	}
+	.row-fluid .offset1:first-child {
+		margin-left: 8.5106382978723%;
+		*margin-left: 8.4042553191489%;
+	}
+	input,
+	textarea,
+	.uneditable-input {
+		margin-left: 0;
+	}
+	.controls-row [class*="span"] + [class*="span"] {
+		margin-left: 20px;
+	}
+	input.span12, textarea.span12, .uneditable-input.span12 {
+		width: 710px;
+	}
+	input.span11, textarea.span11, .uneditable-input.span11 {
+		width: 648px;
+	}
+	input.span10, textarea.span10, .uneditable-input.span10 {
+		width: 586px;
+	}
+	input.span9, textarea.span9, .uneditable-input.span9 {
+		width: 524px;
+	}
+	input.span8, textarea.span8, .uneditable-input.span8 {
+		width: 462px;
+	}
+	input.span7, textarea.span7, .uneditable-input.span7 {
+		width: 400px;
+	}
+	input.span6, textarea.span6, .uneditable-input.span6 {
+		width: 338px;
+	}
+	input.span5, textarea.span5, .uneditable-input.span5 {
+		width: 276px;
+	}
+	input.span4, textarea.span4, .uneditable-input.span4 {
+		width: 214px;
+	}
+	input.span3, textarea.span3, .uneditable-input.span3 {
+		width: 152px;
+	}
+	input.span2, textarea.span2, .uneditable-input.span2 {
+		width: 90px;
+	}
+	input.span1, textarea.span1, .uneditable-input.span1 {
+		width: 28px;
+	}
+}
+@media (min-width: 1200px) {
+	.row {
+		margin-left: -30px;
+		*zoom: 1;
+	}
+	.row:before,
+	.row:after {
+		display: table;
+		content: "";
+		line-height: 0;
+	}
+	.row:after {
+		clear: both;
+	}
+	[class*="span"] {
+		float: left;
+		margin-left: 30px;
+	}
+	.container,
+	.navbar-static-top .container,
+	.navbar-fixed-top .container,
+	.navbar-fixed-bottom .container {
+		width: 1170px;
+	}
+	.span12 {
+		width: 1170px;
+	}
+	.span11 {
+		width: 1070px;
+	}
+	.span10 {
+		width: 970px;
+	}
+	.span9 {
+		width: 870px;
+	}
+	.span8 {
+		width: 770px;
+	}
+	.span7 {
+		width: 670px;
+	}
+	.span6 {
+		width: 570px;
+	}
+	.span5 {
+		width: 470px;
+	}
+	.span4 {
+		width: 370px;
+	}
+	.span3 {
+		width: 270px;
+	}
+	.span2 {
+		width: 170px;
+	}
+	.span1 {
+		width: 70px;
+	}
+	.offset12 {
+		margin-left: 1230px;
+	}
+	.offset11 {
+		margin-left: 1130px;
+	}
+	.offset10 {
+		margin-left: 1030px;
+	}
+	.offset9 {
+		margin-left: 930px;
+	}
+	.offset8 {
+		margin-left: 830px;
+	}
+	.offset7 {
+		margin-left: 730px;
+	}
+	.offset6 {
+		margin-left: 630px;
+	}
+	.offset5 {
+		margin-left: 530px;
+	}
+	.offset4 {
+		margin-left: 430px;
+	}
+	.offset3 {
+		margin-left: 330px;
+	}
+	.offset2 {
+		margin-left: 230px;
+	}
+	.offset1 {
+		margin-left: 130px;
+	}
+	.row-fluid {
+		width: 100%;
+		*zoom: 1;
+	}
+	.row-fluid:before,
+	.row-fluid:after {
+		display: table;
+		content: "";
+		line-height: 0;
+	}
+	.row-fluid:after {
+		clear: both;
+	}
+	.row-fluid [class*="span"] {
+		display: block;
+		width: 100%;
+		min-height: 30px;
+		-webkit-box-sizing: border-box;
+		-moz-box-sizing: border-box;
+		box-sizing: border-box;
+		float: left;
+		margin-left: 2.5641025641026%;
+		*margin-left: 2.5109110747409%;
+	}
+	.row-fluid [class*="span"]:first-child {
+		margin-left: 0;
+	}
+	.row-fluid .span12 {
+		width: 100%;
+		*width: 99.946808510638%;
+	}
+	.row-fluid .span11 {
+		width: 91.436464088398%;
+		*width: 91.383272599036%;
+	}
+	.row-fluid .span10 {
+		width: 82.872928176796%;
+		*width: 82.819736687434%;
+	}
+	.row-fluid .span9 {
+		width: 74.309392265193%;
+		*width: 74.256200775832%;
+	}
+	.row-fluid .span8 {
+		width: 65.745856353591%;
+		*width: 65.692664864229%;
+	}
+	.row-fluid .span7 {
+		width: 57.182320441989%;
+		*width: 57.129128952627%;
+	}
+	.row-fluid .span6 {
+		width: 48.618784530387%;
+		*width: 48.565593041025%;
+	}
+	.row-fluid .span5 {
+		width: 40.055248618785%;
+		*width: 40.002057129423%;
+	}
+	.row-fluid .span4 {
+		width: 31.491712707182%;
+		*width: 31.438521217821%;
+	}
+	.row-fluid .span3 {
+		width: 22.92817679558%;
+		*width: 22.874985306218%;
+	}
+	.row-fluid .span2 {
+		width: 14.364640883978%;
+		*width: 14.311449394616%;
+	}
+	.row-fluid .span1 {
+		width: 5.8011049723757%;
+		*width: 5.747913483014%;
+	}
+	.row-fluid .offset12 {
+		margin-left: 105.12820512821%;
+		*margin-left: 105.02182214948%;
+	}
+	.row-fluid .offset12:first-child {
+		margin-left: 102.5641025641%;
+		*margin-left: 102.45771958538%;
+	}
+	.row-fluid .offset11 {
+		margin-left: 96.961325966851%;
+		*margin-left: 96.854942988127%;
+	}
+	.row-fluid .offset11:first-child {
+		margin-left: 94.198895027624%;
+		*margin-left: 94.092512048901%;
+	}
+	.row-fluid .offset10 {
+		margin-left: 88.397790055249%;
+		*margin-left: 88.291407076525%;
+	}
+	.row-fluid .offset10:first-child {
+		margin-left: 85.635359116022%;
+		*margin-left: 85.528976137299%;
+	}
+	.row-fluid .offset9 {
+		margin-left: 79.834254143646%;
+		*margin-left: 79.727871164923%;
+	}
+	.row-fluid .offset9:first-child {
+		margin-left: 77.07182320442%;
+		*margin-left: 76.965440225696%;
+	}
+	.row-fluid .offset8 {
+		margin-left: 71.270718232044%;
+		*margin-left: 71.164335253321%;
+	}
+	.row-fluid .offset8:first-child {
+		margin-left: 68.508287292818%;
+		*margin-left: 68.401904314094%;
+	}
+	.row-fluid .offset7 {
+		margin-left: 62.707182320442%;
+		*margin-left: 62.600799341719%;
+	}
+	.row-fluid .offset7:first-child {
+		margin-left: 59.944751381215%;
+		*margin-left: 59.838368402492%;
+	}
+	.row-fluid .offset6 {
+		margin-left: 54.14364640884%;
+		*margin-left: 54.037263430116%;
+	}
+	.row-fluid .offset6:first-child {
+		margin-left: 51.381215469613%;
+		*margin-left: 51.27483249089%;
+	}
+	.row-fluid .offset5 {
+		margin-left: 45.580110497238%;
+		*margin-left: 45.473727518514%;
+	}
+	.row-fluid .offset5:first-child {
+		margin-left: 42.817679558011%;
+		*margin-left: 42.711296579288%;
+	}
+	.row-fluid .offset4 {
+		margin-left: 37.016574585635%;
+		*margin-left: 36.910191606912%;
+	}
+	.row-fluid .offset4:first-child {
+		margin-left: 34.254143646409%;
+		*margin-left: 34.147760667685%;
+	}
+	.row-fluid .offset3 {
+		margin-left: 28.453038674033%;
+		*margin-left: 28.34665569531%;
+	}
+	.row-fluid .offset3:first-child {
+		margin-left: 25.690607734807%;
+		*margin-left: 25.584224756083%;
+	}
+	.row-fluid .offset2 {
+		margin-left: 19.889502762431%;
+		*margin-left: 19.783119783708%;
+	}
+	.row-fluid .offset2:first-child {
+		margin-left: 17.127071823204%;
+		*margin-left: 17.020688844481%;
+	}
+	.row-fluid .offset1 {
+		margin-left: 11.325966850829%;
+		*margin-left: 11.219583872105%;
+	}
+	.row-fluid .offset1:first-child {
+		margin-left: 8.5635359116022%;
+		*margin-left: 8.4571529328788%;
+	}
+	input,
+	textarea,
+	.uneditable-input {
+		margin-left: 0;
+	}
+	.controls-row [class*="span"] + [class*="span"] {
+		margin-left: 30px;
+	}
+	input.span12, textarea.span12, .uneditable-input.span12 {
+		width: 1156px;
+	}
+	input.span11, textarea.span11, .uneditable-input.span11 {
+		width: 1056px;
+	}
+	input.span10, textarea.span10, .uneditable-input.span10 {
+		width: 956px;
+	}
+	input.span9, textarea.span9, .uneditable-input.span9 {
+		width: 856px;
+	}
+	input.span8, textarea.span8, .uneditable-input.span8 {
+		width: 756px;
+	}
+	input.span7, textarea.span7, .uneditable-input.span7 {
+		width: 656px;
+	}
+	input.span6, textarea.span6, .uneditable-input.span6 {
+		width: 556px;
+	}
+	input.span5, textarea.span5, .uneditable-input.span5 {
+		width: 456px;
+	}
+	input.span4, textarea.span4, .uneditable-input.span4 {
+		width: 356px;
+	}
+	input.span3, textarea.span3, .uneditable-input.span3 {
+		width: 256px;
+	}
+	input.span2, textarea.span2, .uneditable-input.span2 {
+		width: 156px;
+	}
+	input.span1, textarea.span1, .uneditable-input.span1 {
+		width: 56px;
+	}
+	.thumbnails {
+		margin-left: -30px;
+	}
+	.thumbnails > li {
+		margin-left: 30px;
+	}
+	.row-fluid .thumbnails {
+		margin-left: 0;
+	}
+}
+@media (max-width: 738px) {
+	body {
+		padding-top: 0;
+	}
+	.navbar-fixed-top,
+	.navbar-fixed-bottom {
+		position: static;
+	}
+	.navbar-fixed-top {
+		margin-bottom: 18px;
+	}
+	.navbar-fixed-bottom {
+		margin-top: 18px;
+	}
+	.navbar-fixed-top .navbar-inner,
+	.navbar-fixed-bottom .navbar-inner {
+		padding: 5px;
+	}
+	.navbar .container {
+		width: auto;
+		padding: 0;
+	}
+	.navbar .brand {
+		padding-left: 10px;
+		padding-right: 10px;
+		margin: 0 0 0 -5px;
+	}
+	.nav-collapse {
+		clear: both;
+	}
+	.nav-collapse .nav {
+		float: none;
+		margin: 0 0 9px;
+	}
+	.nav-collapse .nav > li {
+		float: none;
+	}
+	.nav-collapse .nav > li > a {
+		margin-bottom: 2px;
+	}
+	.nav-collapse .nav > .divider-vertical {
+		display: none;
+	}
+	.nav-collapse .nav .nav-header {
+		color: #555;
+		text-shadow: none;
+	}
+	.nav-collapse .nav > li > a,
+	.nav-collapse .dropdown-menu a {
+		padding: 9px 15px;
+		font-weight: bold;
+		color: #555;
+		-webkit-border-radius: 3px;
+		-moz-border-radius: 3px;
+		border-radius: 3px;
+	}
+	.nav-collapse .btn {
+		padding: 4px 10px 4px;
+		font-weight: normal;
+		-webkit-border-radius: 4px;
+		-moz-border-radius: 4px;
+		border-radius: 4px;
+	}
+	.nav-collapse .dropdown-menu li + li a {
+		margin-bottom: 2px;
+	}
+	.nav-collapse .nav > li > a:hover,
+	.nav-collapse .dropdown-menu a:hover {
+		background-color: #f2f2f2;
+	}
+	.navbar-inverse .nav-collapse .nav > li > a:hover,
+	.navbar-inverse .nav-collapse .dropdown-menu a:hover {
+		background-color: #10223e;
+	}
+	.nav-collapse.in .btn-group {
+		margin-top: 5px;
+		padding: 0;
+	}
+	.nav-collapse .dropdown-menu {
+		position: static;
+		top: auto;
+		left: auto;
+		float: none;
+		display: block;
+		max-width: none;
+		margin: 0 15px;
+		padding: 0;
+		background-color: transparent;
+		border: none;
+		-webkit-border-radius: 0;
+		-moz-border-radius: 0;
+		border-radius: 0;
+		-webkit-box-shadow: none;
+		-moz-box-shadow: none;
+		box-shadow: none;
+	}
+	.nav-collapse .dropdown-menu:before,
+	.nav-collapse .dropdown-menu:after {
+		display: none;
+	}
+	.nav-collapse .dropdown-menu .divider {
+		display: none;
+	}
+	.nav-collapse .navbar-form,
+	.nav-collapse .navbar-search {
+		float: none;
+		padding: 9px 15px;
+		margin: 9px 0;
+		border-top: 1px solid #f2f2f2;
+		border-bottom: 1px solid #f2f2f2;
+		-webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);
+		-moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);
+		box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);
+	}
+	.navbar .nav-collapse .nav.pull-right {
+		float: none;
+		margin-left: 0;
+	}
+	.nav-collapse,
+	.nav-collapse.collapse {
+		overflow: hidden;
+		height: 0;
+	}
+	.navbar .btn-navbar {
+		display: block;
+	}
+	.navbar-static .navbar-inner {
+		padding-left: 10px;
+		padding-right: 10px;
+	}
+}
+@media (min-width: 980px) {
+	.nav-collapse.collapse {
+		height: auto !important;
+		overflow: visible !important;
+	}
+}
+.small {
+	font-size: 11px;
+}
+iframe,
+svg {
+	max-width: 100%;
+}
+.nowrap {
+	white-space: nowrap;
+}
+.center,
+.table td.center,
+.table th.center {
+	text-align: center;
+}
+a.disabled,
+a.disabled:hover {
+	color: #999999;
+	background-color: transparent;
+	cursor: default;
+	text-decoration: none;
+}
+.hero-unit {
+	text-align: center;
+}
+.hero-unit .lead {
+	margin-bottom: 18px;
+	font-size: 20px;
+	font-weight: 200;
+	line-height: 27px;
+}
+.btn .caret {
+	margin-bottom: 7px;
+}
+.blog-row-rule,
+.blog-item-rule {
+	border: 0;
+}
+body.modal {
+	padding-top: 0;
+}
+.row-even,
+.row-odd {
+	padding: 5px;
+	width: 99%;
+	border-bottom: 1px solid #ddd;
+}
+.row-odd {
+	background-color: transparent;
+}
+.row-even {
+	background-color: #f9f9f9;
+}
+.blog-row-rule,
+.blog-item-rule {
+	border: 0;
+}
+.row-fluid .row-reveal {
+	visibility: hidden;
+}
+.row-fluid:hover .row-reveal {
+	visibility: visible;
+}
+.btn-wide {
+	width: 80%;
+}
+.nav-list > li.offset > a {
+	padding-left: 30px;
+	font-size: 12px;
+}
+.blog-row-rule,
+.blog-item-rule {
+	border: 0;
+}
+.row-fluid .offset1 {
+	margin-left: 8.382978723%;
+}
+.row-fluid .offset2 {
+	margin-left: 16.89361702%;
+}
+.row-fluid .offset3 {
+	margin-left: 25.404255317%;
+}
+.row-fluid .offset4 {
+	margin-left: 33.914893614%;
+}
+.row-fluid .offset5 {
+	margin-left: 42.425531911%;
+}
+.row-fluid .offset6 {
+	margin-left: 50.93617020799999%;
+}
+.row-fluid .offset7 {
+	margin-left: 59.446808505%;
+}
+.row-fluid .offset8 {
+	margin-left: 67.95744680199999%;
+}
+.row-fluid .offset9 {
+	margin-left: 76.468085099%;
+}
+.row-fluid .offset10 {
+	margin-left: 84.97872339599999%;
+}
+.row-fluid .offset11 {
+	margin-left: 91.489361693%;
+}
+.navbar .nav > li > a.btn {
+	padding: 4px 10px;
+	line-height: 18px;
+}
+.nav-tabs.nav-dark {
+	border-bottom: 1px solid #333;
+	text-shadow: 1px 1px 1px #000;
+}
+.nav-tabs.nav-dark > li > a {
+	color: #F8F8F8;
+}
+.nav-tabs.nav-dark > li > a:hover {
+	border-color: #333 #333 #111;
+	background-color: #777777;
+}
+.nav-tabs.nav-dark > .active > a,
+.nav-tabs.nav-dark > .active > a:hover {
+	color: #ffffff;
+	background-color: #555555;
+	border: 1px solid #222;
+	border-bottom-color: transparent;
+}
+.thumbnail.pull-left {
+	margin: 0 10px 10px 0;
+}
+.thumbnail.pull-right {
+	margin: 0 0 10px 10px;
+}
+.width-10 {
+	width: 10px;
+}
+.width-20 {
+	width: 20px;
+}
+.width-30 {
+	width: 30px;
+}
+.width-40 {
+	width: 40px;
+}
+.width-50 {
+	width: 50px;
+}
+.width-60 {
+	width: 60px;
+}
+.width-70 {
+	width: 70px;
+}
+.width-80 {
+	width: 80px;
+}
+.width-90 {
+	width: 90px;
+}
+.width-100 {
+	width: 100px;
+}
+.height-10 {
+	height: 10px;
+}
+.height-20 {
+	height: 20px;
+}
+.height-30 {
+	height: 30px;
+}
+.height-40 {
+	height: 40px;
+}
+.height-50 {
+	height: 50px;
+}
+.height-60 {
+	height: 60px;
+}
+.height-70 {
+	height: 70px;
+}
+.height-80 {
+	height: 80px;
+}
+.height-90 {
+	height: 90px;
+}
+.height-100 {
+	height: 100px;
+}
+hr.hr-condensed {
+	margin: 10px 0;
+}
+.list-striped,
+.row-striped {
+	list-style: none;
+	line-height: 18px;
+	text-align: left;
+	vertical-align: middle;
+	border-top: 1px solid #ddd;
+	margin-left: 0;
+}
+.list-striped li,
+.list-striped dd,
+.row-striped .row,
+.row-striped .row-fluid {
+	border-bottom: 1px solid #ddd;
+	padding: 8px;
+}
+.list-striped li:nth-child(odd),
+.list-striped dd:nth-child(odd),
+.row-striped .row:nth-child(odd),
+.row-striped .row-fluid:nth-child(odd) {
+	background-color: #f9f9f9;
+}
+.list-striped li:hover,
+.list-striped dd:hover,
+.row-striped .row:hover,
+.row-striped .row-fluid:hover {
+	background-color: #f5f5f5;
+}
+.row-striped .row-fluid {
+	width: 97%;
+}
+.row-striped .row-fluid [class*="span"] {
+	min-height: 10px;
+}
+.row-striped .row-fluid [class*="span"] {
+	margin-left: 8px;
+}
+.row-striped .row-fluid [class*="span"]:first-child {
+	margin-left: 0;
+}
+.list-condensed li {
+	padding: 4px 5px;
+}
+.row-condensed .row,
+.row-condensed .row-fluid {
+	padding: 4px 5px;
+}
+.list-bordered,
+.row-bordered {
+	list-style: none;
+	line-height: 18px;
+	text-align: left;
+	vertical-align: middle;
+	margin-left: 0;
+	border: 1px solid #ddd;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+}
+.radio.btn-group input[type=radio] {
+	display: none;
+}
+.radio.btn-group > label:first-of-type {
+	margin-left: 0;
+	-webkit-border-bottom-left-radius: 4px;
+	border-bottom-left-radius: 4px;
+	-webkit-border-top-left-radius: 4px;
+	border-top-left-radius: 4px;
+	-moz-border-radius-bottomleft: 4px;
+	-moz-border-radius-topleft: 4px;
+}
+fieldset.radio.btn-group {
+	padding-left: 0;
+}
+.iframe-bordered {
+	border: 1px solid #ddd;
+}
+.tab-content {
+	overflow: visible;
+}
+.tabs-left .tab-content {
+	overflow: auto;
+}
+.nav-tabs > li > span {
+	display: block;
+	margin-right: 2px;
+	padding-right: 12px;
+	padding-left: 12px;
+	padding-top: 8px;
+	padding-bottom: 8px;
+	line-height: 18px;
+	border: 1px solid transparent;
+	-webkit-border-radius: 4px 4px 0 0;
+	-moz-border-radius: 4px 4px 0 0;
+	border-radius: 4px 4px 0 0;
+}
+.btn-micro {
+	padding: 1px 4px;
+	font-size: 10px;
+	line-height: 8px;
+}
+
+
+/* ToolTip Forms iCagenda */
+.tip-wrap {
+	max-width: 400px;
+	padding: 3px 8px;
+	color: #fff;
+	text-align: center;
+	text-decoration: none;
+	background: #333;
+	background: rgba(0,0,0,0.8);
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+	z-index: 100;
+}
+
+
+.page-header {
+	margin: 2px 0px 10px 0px;
+	padding-bottom: 5px;
+}
+.input-prepend .chzn-container-single .chzn-single {
+	border-color: #ccc;
+	height: 26px;
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+	-moz-box-shadow: none;
+	-webkit-box-shadow: none;
+	box-shadow: none;
+}
+.input-prepend .chzn-container-active .chzn-single-with-drop {
+	-webkit-border-radius: 0 3px 0 0;
+	-moz-border-radius: 0 3px 0 0;
+	border-radius: 0 3px 0 0;
+}
+.input-prepend .chzn-container-single .chzn-drop {
+	border-color: #ccc;
+}
+.input-prepend > .add-on,
+.input-append > .add-on {
+	vertical-align: top;
+}
+.element-invisible {
+	position: absolute;
+	padding: 0;
+	margin: 0;
+	border: 0;
+	height: 1px;
+	width: 1px;
+	overflow: hidden;
+}
+.form-vertical .control-label {
+	float: none;
+	width: auto;
+	padding-right: 0;
+	padding-top: 0;
+	text-align: left;
+}
+.form-vertical .controls {
+	margin-left: 0;
+}
+.width-auto {
+	width: auto;
+}
+.btn-group .chzn-results {
+	white-space: normal;
+}
+.accordion-body.in:hover {
+	overflow: visible;
+}
+.invalid {
+	color: #9d261d;
+	font-weight: bold;
+}
+input.invalid {
+	border: 1px solid #9d261d;
+}
+.tip-text {
+	text-align: left;
+}
+@font-face {
+	font-family: 'IcoMoon';
+	src: url('../../../../media/jui/fonts/IcoMoon.eot');
+	src: url('../../../../media/jui/fonts/IcoMoon.eot?#iefix') format('embedded-opentype'), url('../../../../media/jui/fonts/IcoMoon.woff') format('woff'), url('../../../../media/jui/fonts/IcoMoon.ttf') format('truetype'), url('../../../../media/jui/fonts/IcoMoon.svg#IcoMoon') format('svg');
+	font-weight: normal;
+	font-style: normal;
+}
+/*
+[data-icon]:before {
+	font-family: 'IcoMoon';
+	content: attr(data-icon);
+	speak: none;
+}
+[class^="icon-"],
+[class*=" icon-"] {
+	display: inline-block;
+	width: 14px;
+	height: 14px;
+	*margin-right: .3em;
+	line-height: 14px;
+}
+[class^="icon-"]:before,
+[class*=" icon-"]:before {
+	font-family: 'IcoMoon';
+	font-style: normal;
+	speak: none;
+}
+*/
+.icon-home:before {
+	content: "\21";
+}
+.icon-user:before {
+	content: "\22";
+}
+.icon-checkedout:before,
+.icon-lock:before,
+.icon-locked:before {
+	content: "\23";
+}
+.icon-comment:before,
+.icon-comments:before {
+	content: "\24";
+}
+.icon-comments-2:before {
+	content: "\25";
+}
+.icon-share-alt:before,
+.icon-out:before {
+	content: "\26";
+}
+.icon-share:before,
+.icon-redo:before {
+	content: "\27";
+}
+.icon-undo:before {
+	content: "\28";
+}
+.icon-file-add:before {
+	content: "\29";
+}
+.icon-new:before,
+.icon-plus:before {
+	content: "\2a";
+}
+.icon-apply:before,
+.icon-edit:before,
+.icon-pencil:before {
+	content: "\2b";
+}
+.icon-edit:before,
+.icon-pencil:before {
+	color: #2f96b4;
+}
+.icon-pencil-2:before {
+	content: "\2c";
+}
+.icon-folder-open:before,
+.icon-folder:before {
+	content: "\2d";
+}
+.icon-folder-close:before,
+.icon-folder-2:before {
+	content: "\2e";
+}
+.icon-picture:before {
+	content: "\2f";
+}
+.icon-pictures:before {
+	content: "\30";
+}
+.icon-list:before,
+.icon-list-view:before {
+	content: "\31";
+}
+.icon-power-cord:before {
+	content: "\32";
+}
+.icon-cube:before {
+	content: "\33";
+}
+.icon-puzzle:before {
+	content: "\34";
+}
+.icon-flag:before {
+	content: "\35";
+}
+.icon-tools:before {
+	content: "\36";
+}
+.icon-cogs:before {
+	content: "\37";
+}
+.icon-options:before,
+.icon-cog:before {
+	content: "\38";
+}
+.icon-equalizer:before {
+	content: "\39";
+}
+.icon-wrench:before {
+	content: "\3a";
+}
+.icon-brush:before {
+	content: "\3b";
+}
+.icon-eye-open:before,
+.icon-eye:before {
+	content: "\3c";
+}
+.icon-checkbox-unchecked:before {
+	content: "\3d";
+}
+.icon-checkin:before,
+.icon-checkbox:before {
+	content: "\3e";
+}
+.icon-checkbox-partial:before {
+	content: "\3f";
+}
+.icon-asterisk:before,
+.icon-star-empty:before {
+	content: "\40";
+}
+.icon-star-2:before {
+	content: "\41";
+}
+.icon-featured:before,
+.icon-star:before {
+	content: "\42";
+	color: #f89406;
+}
+.icon-calendar:before {
+	content: "\43";
+}
+.icon-calendar-2:before {
+	content: "\44";
+}
+.icon-question-sign:before,
+.icon-help:before {
+	content: "\45";
+}
+.icon-support:before {
+	content: "\46";
+}
+.icon-pending:before,
+.icon-warning:before {
+	content: "\48";
+	color: #f89406;
+}
+.icon-publish:before,
+.icon-save:before,
+.icon-ok:before,
+.icon-checkmark:before {
+	content: "\47";
+	color: #51a351;
+}
+.icon-unpublish:before,
+.icon-cancel:before {
+	content: "\4a";
+	color: #bd362f;
+}
+.icon-eye-close:before,
+.icon-minus:before {
+	content: "\4b";
+}
+.icon-purge:before,
+.icon-trash:before {
+	content: "\4c";
+}
+.icon-envelope:before,
+.icon-mail:before {
+	content: "\4d";
+}
+.icon-mail-2:before {
+	content: "\4e";
+}
+.icon-unarchive:before,
+.icon-drawer:before {
+	content: "\4f";
+}
+.icon-archive:before,
+.icon-drawer-2:before {
+	content: "\50";
+}
+.icon-box-add:before {
+	content: "\51";
+}
+.icon-box-remove:before {
+	content: "\52";
+}
+.icon-search:before {
+	content: "\53";
+}
+.icon-filter:before {
+	content: "\54";
+}
+.icon-camera:before {
+	content: "\55";
+}
+.icon-play:before {
+	content: "\56";
+}
+.icon-music:before {
+	content: "\57";
+}
+.icon-grid-view:before {
+	content: "\58";
+}
+.icon-grid-view-2:before {
+	content: "\59";
+}
+.icon-menu:before {
+	content: "\5a";
+}
+.icon-thumbs-up:before {
+	content: "\5b";
+}
+.icon-thumbs-down:before {
+	content: "\5c";
+}
+.icon-delete:before,
+.icon-remove:before,
+.icon-cancel-2:before {
+	content: "\49";
+}
+.icon-save-new:before,
+.icon-plus-2:before {
+	content: "\5d";
+	color: #51a351;
+}
+.icon-ban-circle:before,
+.icon-minus-sign:before,
+.icon-minus-2:before {
+	content: "\5e";
+	color: #bd362f;
+}
+.icon-key:before {
+	content: "\5f";
+}
+.icon-quote:before {
+	content: "\60";
+}
+.icon-quote-2:before {
+	content: "\61";
+}
+.icon-database:before {
+	content: "\62";
+}
+.icon-location:before {
+	content: "\63";
+}
+.icon-zoom-in:before {
+	content: "\64";
+}
+.icon-zoom-out:before {
+	content: "\65";
+}
+.icon-expand:before {
+	content: "\66";
+}
+.icon-contract:before {
+	content: "\67";
+}
+.icon-expand-2:before {
+	content: "\68";
+}
+.icon-contract-2:before {
+	content: "\69";
+}
+.icon-health:before {
+	content: "\6a";
+}
+.icon-wand:before {
+	content: "\6b";
+}
+.icon-unblock:before,
+.icon-refresh:before {
+	content: "\6c";
+}
+.icon-vcard:before {
+	content: "\6d";
+}
+.icon-clock:before {
+	content: "\6e";
+}
+.icon-compass:before {
+	content: "\6f";
+}
+.icon-address:before {
+	content: "\70";
+}
+.icon-feed:before {
+	content: "\71";
+}
+.icon-flag-2:before {
+	content: "\72";
+}
+.icon-pin:before {
+	content: "\73";
+}
+.icon-lamp:before {
+	content: "\74";
+}
+.icon-chart:before {
+	content: "\75";
+}
+.icon-bars:before {
+	content: "\76";
+}
+.icon-pie:before {
+	content: "\77";
+}
+.icon-dashboard:before {
+	content: "\78";
+}
+.icon-lightning:before {
+	content: "\79";
+}
+.icon-move:before {
+	content: "\7a";
+}
+.icon-next:before {
+	content: "\7b";
+}
+.icon-previous:before {
+	content: "\7c";
+}
+.icon-first:before {
+	content: "\7d";
+}
+.icon-last:before {
+	content: "\e000";
+}
+.icon-loop:before {
+	content: "\e001";
+}
+.icon-shuffle:before {
+	content: "\e002";
+}
+.icon-arrow-first:before {
+	content: "\e003";
+}
+.icon-arrow-last:before {
+	content: "\e004";
+}
+.icon-chevron-up:before,
+.icon-uparrow:before,
+.icon-arrow-up:before {
+	content: "\e005";
+}
+.icon-chevron-right:before,
+.icon-arrow-right:before {
+	content: "\e006";
+}
+.icon-chevron-down:before,
+.icon-downarrow:before,
+.icon-arrow-down:before {
+	content: "\e007";
+}
+.icon-chevron-left:before,
+.icon-arrow-left:before {
+	content: "\e008";
+}
+.icon-arrow-up-2:before {
+	content: "\e009";
+}
+.icon-arrow-right-2:before {
+	content: "\e00a";
+}
+.icon-download:before,
+.icon-arrow-down-2:before {
+	content: "\e00b";
+}
+.icon-arrow-left-2:before {
+	content: "\e00c";
+}
+.icon-play-2:before {
+	content: "\e00d";
+}
+.icon-menu-2:before {
+	content: "\e00e";
+}
+.icon-arrow-up-3:before {
+	content: "\e00f";
+}
+.icon-arrow-right-3:before {
+	content: "\e010";
+}
+.icon-arrow-down-3:before {
+	content: "\e011";
+}
+.icon-arrow-left-3:before {
+	content: "\e012";
+}
+.icon-print:before,
+.icon-printer:before {
+	content: "\e013";
+}
+.icon-color-palette:before {
+	content: "\e014";
+}
+.icon-camera-2:before {
+	content: "\e015";
+}
+.icon-file:before {
+	content: "\e016";
+}
+.icon-file-remove:before {
+	content: "\e017";
+}
+.icon-save-copy:before,
+.icon-copy:before {
+	content: "\e018";
+	color: #51a351;
+}
+.icon-cart:before {
+	content: "\e019";
+}
+.icon-basket:before {
+	content: "\e01a";
+}
+.icon-broadcast:before {
+	content: "\e01b";
+}
+.icon-screen:before {
+	content: "\e01c";
+}
+.icon-tablet:before {
+	content: "\e01d";
+}
+.icon-mobile:before {
+	content: "\e01e";
+}
+.icon-users:before {
+	content: "\e01f";
+}
+.icon-briefcase:before {
+	content: "\e020";
+}
+.icon-download:before {
+	content: "\e021";
+}
+.icon-upload:before {
+	content: "\e022";
+}
+.icon-bookmark:before {
+	content: "\e023";
+}
+.icon-out-2:before {
+	content: "\e024";
+}
+html {
+	height: 100%;
+}
+body {
+	height: 100%;
+}
+.view-login {
+	padding-top: 0;
+	background-color: #142849;
+	background-image: -webkit-gradient(radial,center center,0,center center,460,from(#165387),to(#142849));
+	background-image: -webkit-radial-gradient(circle,#165387,#142849);
+	background-image: -moz-radial-gradient(circle,#165387,#142849);
+	background-image: -o-radial-gradient(circle,#165387,#142849);
+	background-repeat: no-repeat;
+}
+.view-login .container {
+	width: 300px;
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	margin-top: -206px;
+	margin-left: -150px;
+}
+.view-login .navbar-fixed-bottom {
+	padding-left: 20px;
+	padding-right: 20px;
+	text-align: center;
+}
+.view-login .navbar-fixed-bottom,
+.view-login .navbar-fixed-bottom a {
+	color: #FCFCFC;
+	text-shadow: 1px 1px 1px rgba(0,0,0,0.5);
+}
+.view-login .well {
+	padding-bottom: 0;
+	-webkit-box-shadow: 0px 0px 60px rgba(0, 0, 0, 0.5), 0px 1px 0px rgba(255, 255, 255, 0.9) inset;
+	-moz-box-shadow: 0px 0px 60px rgba(0, 0, 0, 0.5), 0px 1px 0px rgba(255, 255, 255, 0.9) inset;
+	box-shadow: 0px 0px 60px rgba(0, 0, 0, 0.5), 0px 1px 0px rgba(255, 255, 255, 0.9) inset;
+}
+.view-login .login-joomla {
+	display: inline-block;
+	height: 24px;
+	width: 24px;
+	text-indent: -9999px;
+	background: url('../images/login-joomla.png') no-repeat;
+	margin-left: -20px;
+}
+.view-login .navbar-fixed-bottom {
+	position: absolute;
+}
+.view-login .input-medium {
+	width: 184px;
+}
+.login .chzn-single {
+	width: 230px !important;
+}
+.login .chzn-container,
+.login .chzn-drop {
+	width: 238px !important;
+	max-width: 238px !important;
+}
+.small {
+	font-size: 11px;
+}
+.row-even .small,
+.row-odd .small,
+.row-even .small a,
+.row-odd .small a {
+	color: #888;
+}
+body .navbar,
+body .navbar-fixed-top {
+	margin-bottom: 0;
+}
+.navbar-inner {
+	min-height: 0;
+}
+.navbar-inner .container-fluid {
+	padding-left: 10px;
+	padding-right: 10px;
+}
+.navbar .navbar-text {
+	line-height: 30px;
+}
+.navbar .brand {
+	padding: 5px 12px 5px 12px;
+	font-size: 16px;
+	margin-left: 0;
+}
+.navbar .nav > li > a {
+	padding: 6px 10px;
+}
+.header {
+	background-color: #184a7d;
+	background-image: -moz-linear-gradient(top,#17568c,#1a3867);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#17568c),to(#1a3867));
+	background-image: -webkit-linear-gradient(top,#17568c,#1a3867);
+	background-image: -o-linear-gradient(top,#17568c,#1a3867);
+	background-image: linear-gradient(to bottom,#17568c,#1a3867);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff17568c', endColorstr='#ff1a3867', GradientType=0);
+	border-top: 1px solid rgba(255,255,255,0.2);
+	padding: 5px;
+}
+.navbar .btn-navbar {
+	background: #17568c;
+	background: -moz-linear-gradient(top,#17568c 0%,#1a3867 100%);
+	background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#17568c),color-stop(100%,#1a3867));
+	background: -webkit-linear-gradient(top,#17568c 0%,#1a3867 100%);
+	background: -o-linear-gradient(top,#17568c 0%,#1a3867 100%);
+	background: -ms-linear-gradient(top,#17568c 0%,#1a3867 100%);
+	background: linear-gradient(top,#17568c 0%,#1a3867 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#17568c',endColorstr='#1a3867',GradientType=0);
+	border: 1px solid #0D2242;
+	margin-bottom: 2px;
+}
+@media (max-width: 767px) {
+	.header {
+		margin-left: -20px;
+		margin-right: -20px;
+	}
+}
+.header .navbar-search {
+	margin-top: 0;
+}
+@media (max-width: 979px) {
+	.header .navbar-search {
+		border-top: 0;
+		border-bottom: 0;
+		-webkit-box-shadow: none;
+		-moz-box-shadow: none;
+		box-shadow: none;
+	}
+}
+.navbar-search .search-query {
+	background: rgba(255,255,255,0.3);
+}
+.logo {
+	width: 100%;
+	max-width: 143px;
+	height: auto;
+}
+.container-logo {
+	text-align: center;
+}
+.page-title {
+	color: white;
+	text-shadow: 1px 1px 1px rgba(0,0,0,0.8);
+	font-weight: normal;
+	font-size: 20px;
+	line-height: 36px;
+	margin: 0;
+}
+.content-title {
+	font-size: 24px;
+	font-weight: normal;
+	line-height: 26px;
+	margin-top: 0;
+}
+.subhead {
+	background: #ffffff;
+	background: -moz-linear-gradient(top,#ffffff 0%,#ededed 100%);
+	background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#ffffff),color-stop(100%,#ededed));
+	background: -webkit-linear-gradient(top,#ffffff 0%,#ededed 100%);
+	background: -o-linear-gradient(top,#ffffff 0%,#ededed 100%);
+	background: -ms-linear-gradient(top,#ffffff 0%,#ededed 100%);
+	background: linear-gradient(top,#ffffff 0%,#ededed 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff',endColorstr='#ededed',GradientType=0);
+	border-bottom: 1px solid #D3D3D3;
+	color: #0C192E;
+	text-shadow: 0 1px 0 #FFF;
+	margin-bottom: 10px;
+}
+.subhead-fixed {
+	position: fixed;
+	width: 100%;
+	top: 30px;
+	z-index: 100;
+	-moz-box-shadow: 0px 2px 5px rgba(0,0,0,0.2);
+	-webkit-box-shadow: 0px 2px 5px rgba(0,0,0,0.2);
+	box-shadow: 0px 2px 5px rgba(0,0,0,0.2);
+}
+@media (max-width: 767px) {
+	.subhead {
+		margin-left: -20px;
+		margin-right: -20px;
+		padding-left: 10px;
+		padding-right: 10px;
+	}
+}
+.subhead h1 {
+	font-size: 17px;
+	font-weight: normal;
+	margin-left: 10px;
+	margin-top: 6px;
+}
+#toolbar .btn-success {
+	width: 148px;
+}
+.well .page-header {
+	margin: -10px 0 18px 0;
+	padding-bottom: 5px;
+}
+.well .row-even p,
+.well .row-odd p {
+	margin-bottom: 0;
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+	margin: 12px 0;
+}
+h1 {
+	font-size: 26px;
+	line-height: 28px;
+}
+h2 {
+	font-size: 22px;
+	line-height: 24px;
+}
+h3 {
+	font-size: 18px;
+	line-height: 20px;
+}
+h4 {
+	font-size: 14px;
+	line-height: 16px;
+}
+h5 {
+	font-size: 13px;
+	line-height: 15px;
+}
+h6 {
+	font-size: 12px;
+	line-height: 14px;
+}
+.sidebar-nav .nav-list > li > a {
+	color: #555;
+}
+.sidebar-nav .nav-list > li.active > a {
+	color: #fff;
+}
+.container-main,
+#system-debug {
+	padding-bottom: 50px;
+}
+#status {
+	background: #EDEDED;
+	border-top: 1px solid #DDDDDD;
+	padding: 2px 10px 4px 10px;
+	-webkit-box-shadow: 0px 1px 0px rgba(255, 255, 255, 0.8) inset, 0px -15px 15px rgba(255, 255, 255, 0.6);
+	-moz-box-shadow: 0px 1px 0px rgba(255, 255, 255, 0.8) inset, 0px -15px 15px rgba(255, 255, 255, 0.6);
+	box-shadow: 0px 1px 0px rgba(255, 255, 255, 0.8) inset, 0px -15px 15px rgba(255, 255, 255, 0.6);
+	color: #999999;
+}
+#status .btn-toolbar,
+#status p {
+	margin: 0px;
+}
+#status .btn-toolbar,
+#status .btn-group {
+	font-size: 12px;
+}
+#status a {
+	color: #999999;
+}
+#status.status-top {
+	background: #1a3867;
+	-webkit-box-shadow: 0px 1px 0px rgba(255, 255, 255, 0.2) inset, 0px -1px 0px rgba(0, 0, 0, 0.3) inset, 0px -1px 0px rgba(0, 0, 0, 0.3);
+	-moz-box-shadow: 0px 1px 0px rgba(255, 255, 255, 0.2) inset, 0px -1px 0px rgba(0, 0, 0, 0.3) inset, 0px -1px 0px rgba(0, 0, 0, 0.3);
+	box-shadow: 0px 1px 0px rgba(255, 255, 255, 0.2) inset, 0px -1px 0px rgba(0, 0, 0, 0.3) inset, 0px -1px 0px rgba(0, 0, 0, 0.3);
+	border-top: 0;
+	color: #d9d9d9;
+	padding: 2px 20px 6px 20px;
+}
+#status.status-top a {
+	color: #d9d9d9;
+}
+.pagination-toolbar {
+	margin: 0;
+}
+.pagination-toolbar a {
+	line-height: 26px;
+}
+.pull-right > .dropdown-menu {
+	left: auto;
+	right: 0;
+}
+.disabled {
+	cursor: default;
+	background-image: none;
+	opacity: 0.65;
+	filter: alpha(opacity=65);
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+	box-shadow: none;
+}
+.nav-filters hr {
+	margin: 5px 0;
+}
+.view-module .tab-content {
+	overflow: visible;
+}
+#assignment.tab-pane {
+	min-height: 500px;
+}
+.btn-primary.active,
+.btn-warning.active,
+.btn-danger.active,
+.btn-success.active,
+.btn-info.active,
+.btn-inverse.active {
+	color: rgba(255,255,255,0.95);
+}
+.chzn-container,
+.chzn-drop {
+	max-width: 100% !important;
+}
+.CodeMirror-wrapping {
+	height: auto !important;
+}
+@media (max-width: 979px) {
+	.navbar .brand {
+		font-size: 13px;
+	}
+	.navbar .nav {
+		margin: 0 2px 0 0;
+	}
+	.navbar .nav > li > a {
+		padding: 6px;
+	}
+	.container-fluid {
+		padding-left: 10px;
+		padding-right: 10px;
+	}
+}
+@media (min-width: 768px) {
+	.row-fluid [class*="span"] {
+		margin-left: 15px;
+	}
+}
+@media (max-width: 767px) {
+	.page-title {
+		text-align: center;
+	}
+	.navbar-search.pull-right {
+		float: none;
+		text-align: center;
+	}
+	.subhead-fixed {
+		position: static;
+		width: auto;
+	}
+	.container-fluid {
+		padding-left: 0;
+		padding-right: 0;
+	}
+}
+@media (min-width: 738px) {
+	body {
+		padding-top: 30px;
+	}
+	body.component {
+		padding-top: 0;
+	}
+}
+@media (max-width: 738px) {
+	.navbar .brand {
+		font-size: 16px;
+	}
+}
+.btn-subhead {
+	display: none;
+}
+@media (min-width: 481px) {
+	#filter-bar {
+		height: 29px;
+	}
+}
+@media (max-width: 480px) {
+	.table th:nth-of-type(n+5),
+	.table th:nth-of-type(3),
+	.table th:nth-of-type(2),
+	.table td:nth-of-type(n+5),
+	.table td:nth-of-type(2),
+	.table td:nth-of-type(3) {
+		white-space: normal;
+	}
+	.pagination a {
+		padding: 5px;
+	}
+	.btn-group.divider,
+	.header .row-fluid .span3,
+	.header .row-fluid .span7,
+	.subhead-collapse {
+		display: none;
+	}
+	.navbar .btn {
+		margin: 0;
+	}
+	.btn-subhead {
+		display: block;
+		margin: 10px 0;
+	}
+	.chzn-container,
+	.chzn-container .chzn-results,
+	.chzn-container-single .chzn-drop,
+	.btn-toolbar > .btn-group,
+	.btn-toolbar > .btn-group > .btn {
+		width: 99% !important;
+	}
+	.login .chzn-single {
+		width: 222px !important;
+	}
+	.login .chzn-container,
+	.login .chzn-drop {
+		width: 230px !important;
+	}
+}
+@media (max-width: 320px) {
+	.view-login .navbar-fixed-bottom {
+		display: none;
+	}
+}
+.nav-collapse .nav li a,
+.dropdown-menu a {
+	background-image: none;
+}
+@media (max-width: 738px) {
+	.navbar-fixed-top .navbar-inner,
+	.navbar-fixed-top .navbar-inner .container-fluid {
+		padding: 0;
+	}
+	.navbar .brand {
+		margin-top: 2px;
+	}
+	.navbar .btn-navbar {
+		margin-top: 3px;
+		margin-right: 3px;
+		margin-bottom: 3px;
+	}
+	.nav-collapse .nav .nav-header {
+		color: #fff;
+	}
+	.nav-collapse.collapse.in {
+		height: auto !important;
+	}
+	.nav-collapse .nav,
+	.navbar .nav-collapse .nav.pull-right {
+		margin: 0;
+	}
+	.nav-collapse .dropdown-menu {
+		margin: 0;
+	}
+	.nav-collapse .nav > li > a.dropdown-toggle {
+		background-color: rgba(255,255,255,0.07);
+		background-image: -moz-linear-gradient(top,rgba(255,255,255,0.15),rgba(255,255,255,0.05));
+		background-image: -webkit-gradient(linear,0 0,0 100%,from(rgba(255,255,255,0.15)),to(rgba(255,255,255,0.05)));
+		background-image: -webkit-linear-gradient(top,rgba(255,255,255,0.15),rgba(255,255,255,0.05));
+		background-image: -o-linear-gradient(top,rgba(255,255,255,0.15),rgba(255,255,255,0.05));
+		background-image: linear-gradient(to bottom,rgba(255,255,255,0.15),rgba(255,255,255,0.05));
+		background-repeat: repeat-x;
+		filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#26ffffff', endColorstr='#0cffffff', GradientType=0);
+		font-size: 12px;
+		font-weight: bold;
+		color: #eee;
+		text-transform: uppercase;
+		padding-left: 15px;
+	}
+	.nav-collapse .nav li a {
+		margin-bottom: 0;
+		border-top: 1px solid rgba(255,255,255,0.25);
+		border-bottom: 1px solid rgba(0,0,0,0.5);
+	}
+	.nav-collapse .nav li ul li ul.dropdown-menu,
+	.nav-collapse .nav li ul li:hover ul.dropdown-menu,
+	.nav-collapse .caret {
+		display: none !important;
+	}
+	.nav-collapse .nav > li > a,
+	.nav-collapse .dropdown-menu a {
+		font-size: 15px;
+		font-weight: normal;
+		color: #fff;
+		-webkit-border-radius: 0;
+		-moz-border-radius: 0;
+		border-radius: 0;
+	}
+	.navbar .nav-collapse .nav > li > .dropdown-menu::before,
+	.navbar .nav-collapse .nav > li > .dropdown-menu::after,
+	.navbar .nav-collapse .dropdown-submenu > a::after {
+		display: none;
+	}
+	.nav-collapse .dropdown-menu li + li a {
+		margin-bottom: 0;
+	}
+}
+.sortable-handler.inactive {
+	opacity: 0.3;
+	filter: alpha(opacity=30);
+}
+.form-horizontal .control-label {
+	width: auto;
+	padding-right: 5px;
+	text-align: left;
+}
+.form-horizontal #jform_catid_chzn {
+	vertical-align: middle;
+}
+ul.manager .height-50 .icon-folder-2 {
+	height: 35px;
+	width: 35px;
+	line-height: 35px;
+	font-size: 30px;
+}
+.upload-queue > li > span,
+.upload-queue > li > a {
+	margin: 0 2px;
+}
+.upload-queue .file-remove {
+	float: right;
+}
+.moor-box {
+	z-index: 3;
+}
+.admin .chzn-container .chzn-drop {
+	z-index: 1200;
+}
+ul.treeselect,
+ul.treeselect li {
+	margin: 0;
+	padding: 0;
+}
+ul.treeselect {
+	margin-top: 8px;
+}
+ul.treeselect li {
+	padding: 2px 10px 2px;
+	list-style: none;
+}
+ul.treeselect i.treeselect-toggle {
+	line-height: 18px;
+}
+ul.treeselect label {
+	font-size: 1em;
+	margin-left: 8px;
+}
+ul.treeselect label.nav-header {
+	padding: 0;
+}
+ul.treeselect input {
+	margin: 2px 0 0 8px;
+}
+ul.treeselect .treeselect-menu {
+	margin: 0 6px;
+}
+ul.treeselect ul.dropdown-menu {
+	margin: 0;
+}
+ul.treeselect ul.dropdown-menu li {
+	padding: 0 5px;
+	border: none;
+}
+td.has-context {
+	height: 23px;
+}
diff --git a/deployed/icagenda/media/com_icagenda/css/tipTip.css b/deployed/icagenda/media/com_icagenda/css/tipTip.css
new file mode 100644
index 00000000..4fb95d37
--- /dev/null
+++ b/deployed/icagenda/media/com_icagenda/css/tipTip.css
@@ -0,0 +1,113 @@
+/* TipTip CSS - Version 1.2 */
+
+#tiptip_holder {
+	display: none;
+	position: absolute;
+	top: 0;
+	left: 0;
+	z-index: 99999;
+}
+
+#tiptip_holder.tip_top {
+	padding-bottom: 5px;
+}
+
+#tiptip_holder.tip_bottom {
+	padding-top: 5px;
+}
+
+#tiptip_holder.tip_right {
+	padding-left: 5px;
+}
+
+#tiptip_holder.tip_left {
+	padding-right: 5px;
+}
+
+#tiptip_content {
+	font-size: 11px;
+	color: #fff;
+	text-shadow: 0 0 2px #000;
+	padding: 4px 8px;
+	border: 1px solid rgba(255,255,255,0.25);
+	background-color: rgb(25,25,25);
+	background-color: rgba(25,25,25,0.92);
+	background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(transparent), to(#000));
+	border-radius: 3px;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	box-shadow: 0 0 3px #555;
+	-webkit-box-shadow: 0 0 3px #555;
+	-moz-box-shadow: 0 0 3px #555;
+}
+
+#tiptip_arrow, #tiptip_arrow_inner {
+	position: absolute;
+	border-color: transparent;
+	border-style: solid;
+	border-width: 6px;
+	height: 0;
+	width: 0;
+}
+
+#tiptip_holder.tip_top #tiptip_arrow {
+	border-top-color: #fff;
+	border-top-color: rgba(255,255,255,0.35);
+}
+
+#tiptip_holder.tip_bottom #tiptip_arrow {
+	border-bottom-color: #fff;
+	border-bottom-color: rgba(255,255,255,0.35);
+}
+
+#tiptip_holder.tip_right #tiptip_arrow {
+	border-right-color: #fff;
+	border-right-color: rgba(255,255,255,0.35);
+}
+
+#tiptip_holder.tip_left #tiptip_arrow {
+	border-left-color: #fff;
+	border-left-color: rgba(255,255,255,0.35);
+}
+
+#tiptip_holder.tip_top #tiptip_arrow_inner {
+	margin-top: -7px;
+	margin-left: -6px;
+	border-top-color: rgb(25,25,25);
+	border-top-color: rgba(25,25,25,0.92);
+}
+
+#tiptip_holder.tip_bottom #tiptip_arrow_inner {
+	margin-top: -5px;
+	margin-left: -6px;
+	border-bottom-color: rgb(25,25,25);
+	border-bottom-color: rgba(25,25,25,0.92);
+}
+
+#tiptip_holder.tip_right #tiptip_arrow_inner {
+	margin-top: -6px;
+	margin-left: -5px;
+	border-right-color: rgb(25,25,25);
+	border-right-color: rgba(25,25,25,0.92);
+}
+
+#tiptip_holder.tip_left #tiptip_arrow_inner {
+	margin-top: -6px;
+	margin-left: -7px;
+	border-left-color: rgb(25,25,25);
+	border-left-color: rgba(25,25,25,0.92);
+}
+
+/* Webkit Hacks  */
+@media screen and (-webkit-min-device-pixel-ratio:0) {	
+	#tiptip_content {
+		padding: 4px 8px 5px 8px;
+		background-color: rgba(45,45,45,0.88);
+	}
+	#tiptip_holder.tip_bottom #tiptip_arrow_inner { 
+		border-bottom-color: rgba(45,45,45,0.88);
+	}
+	#tiptip_holder.tip_top #tiptip_arrow_inner { 
+		border-top-color: rgba(20,20,20,0.92);
+	}
+}
\ No newline at end of file
diff --git a/deployed/icagenda/media/com_icagenda/icicons/fonts/iCicons.eot b/deployed/icagenda/media/com_icagenda/icicons/fonts/iCicons.eot
new file mode 100644
index 00000000..516d9b73
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/icicons/fonts/iCicons.eot differ
diff --git a/deployed/icagenda/media/com_icagenda/icicons/fonts/iCicons.svg b/deployed/icagenda/media/com_icagenda/icicons/fonts/iCicons.svg
new file mode 100644
index 00000000..2935b465
--- /dev/null
+++ b/deployed/icagenda/media/com_icagenda/icicons/fonts/iCicons.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>Generated by IcoMoon</metadata>
+<defs>
+<font id="iCicons" horiz-adv-x="1024">
+<font-face units-per-em="1024" ascent="960" descent="-64" />
+<missing-glyph horiz-adv-x="1024" />
+<glyph unicode="&#x20;" horiz-adv-x="512" d="" />
+<glyph unicode="&#x25b6;" glyph-name="nextic" d="M192 832l640-384-640-384z" />
+<glyph unicode="&#x25b7;" glyph-name="nexticY" d="M512 96v320l-320-320v704l320-320v320l352-352z" />
+<glyph unicode="&#x25c0;" glyph-name="backic" d="M832 64l-640 384 640 384z" />
+<glyph unicode="&#x25c1;" glyph-name="backicY" d="M576 800v-320l320 320v-704l-320 320v-320l-352 352z" />
+<glyph unicode="&#xe600;" glyph-name="earth" d="M874.040 810.038c96.702-96.704 149.96-225.28 149.96-362.040s-53.258-265.334-149.96-362.038c-96.706-96.702-225.28-149.96-362.040-149.96s-265.334 53.258-362.040 149.96c-96.702 96.704-149.96 225.278-149.96 362.038s53.254 265.336 149.96 362.040c96.706 96.704 225.28 149.962 362.040 149.962s265.334-53.258 362.040-149.962zM828.784 131.214c63.058 63.060 104.986 141.608 122.272 227.062-13.474-19.836-26.362-27.194-34.344 17.206-8.22 72.39-74.708 26.148-116.516 51.86-44.004-29.658-142.906 57.662-126.098-40.824 25.934-44.422 140.008 59.45 83.148-34.542-36.274-65.616-132.642-210.932-120.106-286.258 1.582-109.744-112.134-22.884-151.314 13.52-26.356 72.92-8.982 200.374-77.898 236.086-74.802 3.248-139.004 10.046-167.994 93.67-17.446 59.828 18.564 148.894 82.678 162.644 93.85 58.966 127.374-69.054 215.39-71.434 27.328 28.594 101.816 37.686 107.992 69.75-57.75 10.19 73.268 48.558-5.528 70.382-43.47-5.112-71.478-45.074-48.368-78.958-84.238-19.642-86.936 121.904-167.91 77.258-2.058-70.59-132.222-22.886-45.036-8.572 29.956 13.088-48.86 51.016-6.28 44.124 20.916 1.136 91.332 25.812 72.276 42.402 39.21 24.34 72.16-58.29 110.538 1.882 27.708 46.266-11.62 54.808-46.35 31.356-19.58 21.924 34.57 69.276 82.332 89.738 15.918 6.82 31.122 10.536 42.746 9.484 24.058-27.792 68.55-32.606 70.878 3.342-59.582 28.534-125.276 43.608-193.292 43.608-97.622 0-190.47-31.024-267.308-88.39 20.65-9.46 32.372-21.238 12.478-36.296-15.456-46.054-78.17-107.876-133.224-99.124-28.586-49.296-47.412-103.606-55.46-160.528 46.112-15.256 56.744-45.45 46.836-55.55-23.496-20.488-37.936-49.53-45.376-81.322 15.010-91.836 58.172-176.476 125.27-243.576 84.616-84.614 197.118-131.214 316.784-131.214 119.664 0 232.168 46.6 316.784 131.214z" />
+<glyph unicode="&#xe601;" glyph-name="timezone" d="M480 896c-265.096 0-480-214.904-480-480 0-265.098 214.904-480 480-480 265.098 0 480 214.902 480 480 0 265.096-214.902 480-480 480zM751.59 256c8.58 40.454 13.996 83.392 15.758 128h127.446c-3.336-44.196-13.624-87.114-30.68-128h-112.524zM208.41 576c-8.58-40.454-13.996-83.392-15.758-128h-127.444c3.336 44.194 13.622 87.114 30.678 128h112.524zM686.036 576c9.614-40.962 15.398-83.854 17.28-128h-191.316v128h174.036zM512 640v187.338c14.59-4.246 29.044-11.37 43.228-21.37 26.582-18.74 52.012-47.608 73.54-83.486 14.882-24.802 27.752-52.416 38.496-82.484h-155.264zM331.232 722.484c21.528 35.878 46.956 64.748 73.54 83.486 14.182 10 28.638 17.124 43.228 21.37v-187.34h-155.264c10.746 30.066 23.616 57.68 38.496 82.484zM448 576v-128h-191.314c1.88 44.146 7.666 87.038 17.278 128h174.036zM95.888 256c-17.056 40.886-27.342 83.804-30.678 128h127.444c1.762-44.608 7.178-87.546 15.758-128h-112.524zM256.686 384h191.314v-128h-174.036c-9.612 40.96-15.398 83.854-17.278 128zM448 192v-187.34c-14.588 4.246-29.044 11.372-43.228 21.37-26.584 18.74-52.014 47.61-73.54 83.486-14.882 24.804-27.75 52.418-38.498 82.484h155.266zM628.768 109.516c-21.528-35.876-46.958-64.746-73.54-83.486-14.184-9.998-28.638-17.124-43.228-21.37v187.34h155.266c-10.746-30.066-23.616-57.68-38.498-82.484zM512 256v128h191.314c-1.88-44.146-7.666-87.040-17.28-128h-174.034zM767.348 448c-1.762 44.608-7.178 87.546-15.758 128h112.524c17.056-40.886 27.344-83.806 30.68-128h-127.446zM830.658 640h-95.9c-18.638 58.762-44.376 110.294-75.316 151.428 42.536-20.34 81.058-47.616 114.714-81.272 21.48-21.478 40.362-44.938 56.502-70.156zM185.844 710.156c33.658 33.658 72.18 60.932 114.714 81.272-30.942-41.134-56.676-92.666-75.316-151.428h-95.898c16.138 25.218 35.022 48.678 56.5 70.156zM129.344 192h95.898c18.64-58.762 44.376-110.294 75.318-151.43-42.536 20.34-81.058 47.616-114.714 81.274-21.48 21.478-40.364 44.938-56.502 70.156zM774.156 121.844c-33.656-33.658-72.18-60.934-114.714-81.274 30.942 41.134 56.678 92.668 75.316 151.43h95.9c-16.14-25.218-35.022-48.678-56.502-70.156z" />
+<glyph unicode="&#xe602;" glyph-name="print" d="M256 896h512v-128h-512zM960 704h-896c-35.2 0-64-28.8-64-64v-320c0-35.2 28.796-64 64-64h192v-256h512v256h192c35.2 0 64 28.8 64 64v320c0 35.2-28.8 64-64 64zM704 64h-384v320h384v-320zM974.4 608c0-25.626-20.774-46.4-46.398-46.4-25.626 0-46.402 20.774-46.402 46.4s20.776 46.4 46.402 46.4c25.626 0 46.398-20.774 46.398-46.4z" />
+<glyph unicode="&#xe603;" glyph-name="calendar-2" d="M896 832h-96v-32c0-35.29-28.71-64-64-64s-64 28.71-64 64v32h-320v-32c0-35.29-28.71-64-64-64s-64 28.71-64 64v32h-96c-35.2 0-64-28.8-64-64v-704c0-35.2 28.8-64 64-64h768c35.2 0 64 28.8 64 64v704c0 35.2-28.8 64-64 64zM896 64.116c-0.034-0.040-0.076-0.082-0.116-0.116h-767.77c-0.040 0.034-0.082 0.076-0.114 0.116v575.884h768v-575.884zM288 768c17.672 0 32 14.328 32 32v128c0 17.672-14.328 32-32 32s-32-14.328-32-32v-128c0-17.672 14.328-32 32-32zM736 768c17.672 0 32 14.328 32 32v128c0 17.672-14.328 32-32 32s-32-14.328-32-32v-128c0-17.672 14.328-32 32-32zM576 576h-320v-64h256v-128h-256v-64h256v-128h-256v-64h320zM704 128h64v448h-128v-64h64zM872-24h-720c-35.2 0-64 20.8-64 56v-32c0-35.2 28.8-64 64-64h720c35.2 0 64 28.8 64 64v32c0-35.2-28.8-56-64-56z" />
+<glyph unicode="&#xe604;" glyph-name="calendar" d="M320 576h128v-128h-128zM512 576h128v-128h-128zM704 576h128v-128h-128zM128 192h128v-128h-128zM320 192h128v-128h-128zM512 192h128v-128h-128zM320 384h128v-128h-128zM512 384h128v-128h-128zM704 384h128v-128h-128zM128 384h128v-128h-128zM832 960v-64h-128v64h-448v-64h-128v64h-128v-1024h960v1024h-128zM896 0h-832v704h832v-704z" />
+<glyph unicode="&#xe605;" glyph-name="location" d="M512 960c-176.732 0-320-143.268-320-320 0-320 320-704 320-704s320 384 320 704c0 176.732-143.27 320-320 320zM512 448c-106.040 0-192 85.96-192 192s85.96 192 192 192 192-85.96 192-192-85.96-192-192-192z" />
+<glyph unicode="&#xe606;" glyph-name="iclogo" d="M893.312 822.24l24.704-90.656c-6.016-51.296-22.016-121.536-47.968-210.88-20.352 47.776-41.504 91.456-63.776 131.2-54.176 21.92-107.52 32.896-159.776 32.896-85.504 0-152.224-25.184-200.16-75.68-48.224-50.688-72.256-110.016-72.256-178.048 0-37.28 10.048-69.376 30.368-96.256 20.032-26.592 58.336-51.264 115.040-74.048 56.992-22.688 128.192-39.808 213.696-51.328 28.448-4.128 57.696-7.328 87.392-9.92 29.952-2.4 62.656-4.416 98.272-5.728 35.584-1.344 68.896-2.048 99.872-2.048l-72.384-94.944c-106.784-19.968-207.616-29.92-302.4-29.92-125.12 0-216.672 24-274.464 71.84-58.368 47.712-87.52 109.696-87.52 185.92 0 84.384 24.224 167.456 72.736 249.216 47.904 81.472 113.664 144.896 197.248 190.080 83.52 45.184 167.168 67.712 251.040 67.712 28-0.032 57.984-3.168 90.336-9.408zM75.968 822.848c54.080-2.464 92.608-7.68 115.552-15.616 22.688-7.936 34.016-23.584 34.016-46.88 0-56.832-22.592-136.544-67.616-239.072-36.672-21.984-75.776-39.456-117.312-52.288 24.64 120.672 36.992 222.688 36.992 306.144 0.032 15.36-0.608 31.232-1.632 47.712zM42.944 428.416c25.536-1.088 46.368-2.624 62.624-4.512 16.32-1.984 28.992-4 37.984-6.144 16.736-4.512 24.992-17.408 24.992-38.912 0-20.864-7.264-41.568-21.664-61.888-14.272-20.672-28.896-31.040-43.968-31.040-22.112 0-54.144 9.12-96 27.328 20.032 47.008 32 85.44 36.032 115.168z" />
+<glyph unicode="&#xe607;" glyph-name="disk" d="M896 960h-896v-1024h1024v896l-128 128zM512 832h128v-256h-128v256zM896 64h-768v768h64v-320h576v320h74.978l53.022-53.018v-714.982z" />
+<glyph unicode="&#xe608;" glyph-name="private" d="M832 512h-64v192c0 141.384-114.616 256-256 256s-256-114.616-256-256v-192h-64c-35.2 0-64-28.8-64-64v-448c0-35.2 28.8-64 64-64h640c35.2 0 64 28.8 64 64v448c0 35.2-28.8 64-64 64zM512 128c-35.346 0-64 28.654-64 64s28.654 64 64 64 64-28.654 64-64-28.654-64-64-64zM640 512h-256v192c0 70.58 57.42 128 128 128s128-57.42 128-128v-192z" />
+<glyph unicode="&#xe609;" glyph-name="register" d="M448 165.49l-205.254 237.254 58.508 58.51 146.746-114.744 274.744 242.744 58.512-58.508zM831.772 832c0.078-0.066 0.162-0.15 0.228-0.23v-767.542c-0.066-0.078-0.15-0.162-0.228-0.228h-639.544c-0.080 0.066-0.162 0.15-0.228 0.228v767.544c0.066 0.080 0.15 0.162 0.23 0.228h-128.23v-768c0-70.4 57.6-128 128-128h640c70.4 0 128 57.6 128 128v768h-128.228zM640 832v64c0 35.346-28.654 64-64 64h-128c-35.346 0-64-28.654-64-64v-64h-128v-128h512v128h-128zM576 832h-128v64h128v-64z" />
+<glyph unicode="&#xe60a;" glyph-name="blocked" d="M0 448c0-282.77 229.23-512 512-512 282.772 0 512 229.23 512 512s-229.228 512-512 512c-282.77 0-512-229.23-512-512zM896 448c0-73.236-20.512-141.68-56.088-199.912l-527.822 527.824c58.23 35.578 126.674 56.088 199.91 56.088 212.076 0 384-171.922 384-384zM128 448c0 73.236 20.512 141.678 56.090 199.912l527.822-527.824c-58.234-35.578-126.676-56.088-199.912-56.088-212.076 0-384 171.922-384 384z" />
+<glyph unicode="&#xe60b;" glyph-name="people" d="M976-64h-672c-26.51 0-48 21.49-48 48 0 68.862 29.068 152.204 77.758 222.942 40.692 59.118 90.684 103.62 144.678 129.61-23.798 21.644-44.294 48.026-60.508 78.122-26 48.262-39.746 104.048-39.746 161.328 0 79.606 26.204 154.822 73.786 211.79 49.664 59.46 116.442 92.208 188.032 92.208s138.368-32.748 188.034-92.21c47.58-56.968 73.786-132.182 73.786-211.79 0-57.28-13.744-113.066-39.744-161.328-16.214-30.096-36.71-56.478-60.51-78.122 53.994-25.99 103.986-70.492 144.678-129.61 48.688-70.736 77.756-154.078 77.756-222.94 0-26.51-21.49-48-48-48zM358.074 32h563.852c-9.226 39.34-28.52 82.384-54.762 120.51-41.454 60.226-93.176 99.622-145.638 110.926-22.106 4.764-37.888 24.31-37.888 46.924v34.292c0 17.26 9.266 33.19 24.27 41.722 59.478 33.832 97.912 108.266 97.912 189.626 0 114.692-74.384 208-165.818 208s-165.818-93.308-165.818-208c0-81.36 38.434-155.792 97.914-189.626 15.002-8.534 24.268-24.462 24.268-41.722v-34.292c0-22.614-15.784-42.16-37.888-46.924-52.462-11.304-104.184-50.7-145.64-110.926-26.246-38.126-45.536-81.17-54.764-120.51zM197.114 96h-95.040c9.228 39.34 28.518 82.384 54.76 120.51 41.456 60.226 93.178 99.622 145.64 110.926 22.106 4.764 37.888 24.31 37.888 46.924v34.292c0 17.26-9.266 33.19-24.268 41.722-59.48 33.834-97.914 108.266-97.914 189.626 0 114.692 74.384 208 165.818 208 6.254 0 12.426-0.452 18.502-1.302 26.358 29.334 56.234 53.174 88.642 71.004-33.192 17.232-69.5 26.298-107.142 26.298-71.59 0-138.368-32.748-188.034-92.21-47.58-56.968-73.784-132.184-73.784-211.79 0-57.28 13.744-113.066 39.746-161.328 16.214-30.096 36.71-56.476 60.508-78.122-53.994-25.99-103.986-70.492-144.678-129.61-48.69-70.736-77.758-154.078-77.758-222.94 0-26.51 21.49-48 48-48h132.386c1.476 31.026 7.198 63.412 16.728 96z" />
+<glyph unicode="&#xe60c;" glyph-name="thumbs" d="M128 704v-640h896v640h-896zM960 170.666l-128 213.334-145.066-120.888-110.934 184.888-384-320v512h768v-469.334zM256 480c0 53.019 42.981 96 96 96s96-42.981 96-96c0-53.019-42.981-96-96-96s-96 42.981-96 96zM896 832h-896v-640h64v576h832z" />
+<glyph unicode="&#xe60d;" glyph-name="clock" d="M512 832c-247.424 0-448-200.576-448-448s200.576-448 448-448 448 200.576 448 448-200.576 448-448 448zM512 24c-198.824 0-360 161.178-360 360 0 198.824 161.176 360 360 360 198.822 0 360-161.176 360-360 0-198.822-161.178-360-360-360zM934.784 672.826c16.042 28.052 25.216 60.542 25.216 95.174 0 106.040-85.96 192-192 192-61.818 0-116.802-29.222-151.92-74.596 131.884-27.236 245.206-105.198 318.704-212.578zM407.92 885.404c-35.116 45.374-90.102 74.596-151.92 74.596-106.040 0-192-85.96-192-192 0-34.632 9.174-67.122 25.216-95.174 73.5 107.38 186.822 185.342 318.704 212.578zM448 640h64v-320h-64v320zM512 384h192v-64h-192v64z" />
+<glyph unicode="&#xe60e;" glyph-name="screen" d="M921.6 898.56h-819.2c-56.32 0-102.4-46.080-102.4-102.4v-563.2c0-56.32 45.158-111.462 100.403-122.522l223.846-44.749c0 0-192.666-68.25-68.25-68.25h512c124.416 0-68.25 68.25-68.25 68.25l223.846 44.749c55.194 11.059 100.403 66.202 100.403 122.522v563.2c0 56.32-46.080 102.4-102.4 102.4zM921.6 238.080h-819.2v568.32h819.2v-568.32z" />
+<glyph unicode="&#xe60f;" glyph-name="options" d="M363.722 237.948l41.298 57.816-45.254 45.256-57.818-41.296c-10.722 5.994-22.204 10.774-34.266 14.192l-11.682 70.084h-64l-11.68-70.086c-12.062-3.418-23.544-8.198-34.266-14.192l-57.818 41.298-45.256-45.256 41.298-57.816c-5.994-10.72-10.774-22.206-14.192-34.266l-70.086-11.682v-64l70.086-11.682c3.418-12.060 8.198-23.544 14.192-34.266l-41.298-57.816 45.254-45.256 57.818 41.296c10.722-5.994 22.204-10.774 34.266-14.192l11.682-70.084h64l11.68 70.086c12.062 3.418 23.544 8.198 34.266 14.192l57.818-41.296 45.254 45.256-41.298 57.816c5.994 10.72 10.774 22.206 14.192 34.266l70.088 11.68v64l-70.086 11.682c-3.418 12.060-8.198 23.544-14.192 34.266zM224 96c-35.348 0-64 28.654-64 64s28.652 64 64 64 64-28.654 64-64-28.652-64-64-64zM1024 576v64l-67.382 12.25c-1.242 8.046-2.832 15.978-4.724 23.79l57.558 37.1-24.492 59.128-66.944-14.468c-4.214 6.91-8.726 13.62-13.492 20.13l39.006 56.342-45.256 45.254-56.342-39.006c-6.512 4.766-13.22 9.276-20.13 13.494l14.468 66.944-59.128 24.494-37.1-57.558c-7.812 1.892-15.744 3.482-23.79 4.724l-12.252 67.382h-64l-12.252-67.382c-8.046-1.242-15.976-2.832-23.79-4.724l-37.098 57.558-59.128-24.492 14.468-66.944c-6.91-4.216-13.62-8.728-20.13-13.494l-56.342 39.006-45.254-45.254 39.006-56.342c-4.766-6.51-9.278-13.22-13.494-20.13l-66.944 14.468-24.492-59.128 57.558-37.1c-1.892-7.812-3.482-15.742-4.724-23.79l-67.384-12.252v-64l67.382-12.25c1.242-8.046 2.832-15.978 4.724-23.79l-57.558-37.1 24.492-59.128 66.944 14.468c4.216-6.91 8.728-13.618 13.494-20.13l-39.006-56.342 45.254-45.256 56.342 39.006c6.51-4.766 13.22-9.276 20.13-13.492l-14.468-66.944 59.128-24.492 37.102 57.558c7.81-1.892 15.742-3.482 23.788-4.724l12.252-67.384h64l12.252 67.382c8.044 1.242 15.976 2.832 23.79 4.724l37.1-57.558 59.128 24.492-14.468 66.944c6.91 4.216 13.62 8.726 20.13 13.492l56.342-39.006 45.256 45.256-39.006 56.342c4.766 6.512 9.276 13.22 13.492 20.13l66.944-14.468 24.492 59.13-57.558 37.1c1.892 7.812 3.482 15.742 4.724 23.79l67.382 12.25zM672 468.8c-76.878 0-139.2 62.322-139.2 139.2s62.32 139.2 139.2 139.2 139.2-62.322 139.2-139.2c0-76.878-62.32-139.2-139.2-139.2z" />
+<glyph unicode="&#xe610;" glyph-name="icons" d="M378.88 755.2h-92.16c-56.32 0-81.92-25.6-81.92-81.92v-92.16c0-56.32 25.6-81.92 81.92-81.92h92.16c56.32 0 81.92 25.6 81.92 81.92v92.16c0 56.32-25.6 81.92-81.92 81.92zM737.28 755.2h-92.16c-56.32 0-81.92-25.6-81.92-81.92v-92.16c0-56.32 25.6-81.92 81.92-81.92h92.16c56.32 0 81.92 25.6 81.92 81.92v92.16c0 56.32-25.6 81.92-81.92 81.92zM378.88 396.8h-92.16c-56.32 0-81.92-25.6-81.92-81.92v-92.16c0-56.32 25.6-81.92 81.92-81.92h92.16c56.32 0 81.92 25.6 81.92 81.92v92.16c0 56.32-25.6 81.92-81.92 81.92zM737.28 396.8h-92.16c-56.32 0-81.92-25.6-81.92-81.92v-92.16c0-56.32 25.6-81.92 81.92-81.92h92.16c56.32 0 81.92 25.6 81.92 81.92v92.16c0 56.32-25.6 81.92-81.92 81.92z" />
+<glyph unicode="&#xe611;" glyph-name="filter" d="M512 960c-282.77 0-512-71.634-512-160v-96l384-384v-320c0-35.346 57.306-64 128-64 70.692 0 128 28.654 128 64v320l384 384v96c0 88.366-229.23 160-512 160zM94.384 821.176c23.944 13.658 57.582 26.62 97.278 37.488 87.944 24.076 201.708 37.336 320.338 37.336 118.628 0 232.394-13.26 320.338-37.336 39.696-10.868 73.334-23.83 97.28-37.488 15.792-9.006 24.324-16.624 28.296-21.176-3.972-4.552-12.506-12.168-28.296-21.176-23.946-13.658-57.584-26.62-97.28-37.488-87.942-24.076-201.708-37.336-320.338-37.336s-232.394 13.26-320.338 37.336c-39.696 10.868-73.334 23.83-97.278 37.488-15.792 9.008-24.324 16.624-28.298 21.176 3.974 4.552 12.506 12.168 28.298 21.176z" />
+<glyph unicode="&#xe612;" glyph-name="minus" d="M778.189 499.2h-532.429c-28.314 0-30.72-22.938-30.72-51.2s2.406-51.2 30.72-51.2h532.429c28.314 0 30.771 22.938 30.771 51.2s-2.458 51.2-30.771 51.2z" />
+<glyph unicode="&#xe613;" glyph-name="info" d="M636.518 960c68.608 0 102.912-46.797 102.912-100.25 0-66.765-59.597-128.563-137.114-128.563-65.024 0-102.912 38.4-101.12 101.837 0 53.504 45.056 126.976 135.322 126.976zM425.421-64c-54.17 0-93.85 33.382-55.962 180.378l62.157 260.659c10.803 41.728 12.595 58.47 0 58.47-16.282 0-86.528-28.826-128.102-57.242l-27.034 45.107c131.738 111.923 283.238 177.51 348.211 177.51 54.118 0 63.078-65.126 36.096-165.325l-71.219-274.022c-12.595-48.435-7.219-65.126 5.376-65.126 16.282 0 69.478 20.122 121.805 61.85l30.72-41.728c-128.051-130.355-267.93-180.531-322.048-180.531z" />
+<glyph unicode="&#xe614;" glyph-name="info-circle" d="M505.702 918.989c-260.096-3.482-468.173-217.19-464.691-477.338 3.482-259.994 217.19-468.122 477.286-464.64s468.173 217.19 464.691 477.338c-3.43 260.045-217.19 468.122-477.286 464.64zM557.926 762.010c47.872 0 62.003-27.75 62.003-59.546 0-39.68-31.795-76.39-86.016-76.39-45.363 0-66.918 22.835-65.638 60.518 0 31.795 26.624 75.418 89.651 75.418zM435.149 153.6c-32.717 0-56.678 19.866-33.792 107.213l37.53 154.829c6.502 24.832 7.578 34.765 0 34.765-9.779 0-52.275-17.152-77.414-34.048l-16.333 26.778c79.616 66.458 171.162 105.472 210.381 105.472 32.717 0 38.144-38.707 21.811-98.253l-43.008-162.816c-7.578-28.774-4.301-38.707 3.277-38.707 9.779 0 41.984 11.878 73.626 36.762l18.483-24.832c-77.363-77.363-161.792-107.162-194.56-107.162z" />
+<glyph unicode="&#xe615;" glyph-name="navigation" d="M0 448l373.76-235.52v470.989l-373.76-235.469zM1024 448.051l-373.76 235.469-0.051-471.040 373.811 235.571z" />
+<glyph unicode="&#xe616;" glyph-name="form" d="M864 832h-64v-64h32v-512h-256v-256h-384v768h32v64h-64c-17.602 0-32-14.4-32-32v-832c0-17.6 14.398-32 32-32h504l232 232v632c0 17.6-14.4 32-32 32zM640 0v192h192l-192-192zM768 832h-128v64c0 35.2-28.8 64-64 64h-128c-35.204 0-64-28.8-64-64v-64h-128v-128h512v128zM576 832h-128v63.886c0.034 0.038 0.072 0.078 0.114 0.114h127.768c0.042-0.036 0.082-0.076 0.118-0.114v-63.886z" />
+<glyph unicode="&#xe617;" glyph-name="header-after" d="M115.328 818.336h793.344v-189.44h-793.344v189.44z" />
+<glyph unicode="&#xe618;" glyph-name="header-before" d="M152.128 528.928h719.744v-91.552h-719.744v91.552zM908.576-56.064h-793.184c-59.264 0-107.488 48.224-107.488 107.488v793.184c0 59.264 48.224 107.488 107.488 107.488h793.184c59.264 0 107.456-48.224 107.456-107.488v-793.184c0.032-28.736-11.168-55.744-31.424-76.032s-47.296-31.456-76.032-31.456v0zM115.392 920.096c-41.632 0-75.488-33.856-75.488-75.488v-793.184c0-41.632 33.856-75.488 75.488-75.488h793.184c41.632 0 75.488 33.888 75.488 75.488l-0.032 793.184c0 41.632-33.856 75.488-75.456 75.488h-793.184zM152.128 342.656h719.744v-91.52h-719.744v91.52zM152.128 160.512h719.744v-91.52h-719.744v91.52z" />
+<glyph unicode="&#xe900;" glyph-name="reset" d="M512 896c-141.384 0-269.376-57.32-362.032-149.978l-149.968 149.978v-384h384l-143.532 143.522c69.496 69.492 165.492 112.478 271.532 112.478 212.068 0 384-171.924 384-384 0-114.696-50.292-217.636-130.018-288l84.666-96c106.302 93.816 173.352 231.076 173.352 384 0 282.77-229.23 512-512 512z" />
+<glyph unicode="&#xe901;" glyph-name="search" d="M992.262 88.604l-242.552 206.294c-25.074 22.566-51.89 32.926-73.552 31.926 57.256 67.068 91.842 154.078 91.842 249.176 0 212.078-171.922 384-384 384-212.076 0-384-171.922-384-384s171.922-384 384-384c95.098 0 182.108 34.586 249.176 91.844-1-21.662 9.36-48.478 31.926-73.552l206.294-242.552c35.322-39.246 93.022-42.554 128.22-7.356s31.892 92.898-7.354 128.22zM384 320c-141.384 0-256 114.616-256 256s114.616 256 256 256 256-114.616 256-256-114.614-256-256-256z" />
+<glyph unicode="&#xe902;" glyph-name="filter-2" d="M0 832l384-384v-384l256 64v320l384 384z" />
+<glyph unicode="&#xe903;" glyph-name="arrow-down" d="M132.198 686.029c-13.875 13.722-36.301 13.722-50.125 0-13.824-13.67-13.824-35.891 0-49.613l404.89-400.896c13.875-13.722 36.25-13.722 50.125 0l404.89 400.896c13.824 13.722 13.875 35.891 0 49.613s-36.352 13.722-50.125 0.051l-379.853-365.619-379.802 365.568z" />
+<glyph unicode="&#xe904;" glyph-name="arrow-up" d="M891.802 235.571c13.875-13.722 36.301-13.722 50.125 0 13.875 13.722 13.875 35.891 0 49.613l-404.89 400.896c-13.824 13.722-36.25 13.722-50.074 0l-404.89-400.896c-13.824-13.722-13.875-35.891 0-49.613s36.25-13.722 50.125 0l379.802 365.619 379.802-365.619z" />
+<glyph unicode="&#xe905;" glyph-name="eye" d="M512 768c-223.318 0-416.882-130.042-512-320 95.118-189.958 288.682-320 512-320 223.312 0 416.876 130.042 512 320-95.116 189.958-288.688 320-512 320zM764.45 598.296c60.162-38.374 111.142-89.774 149.434-150.296-38.292-60.522-89.274-111.922-149.436-150.296-75.594-48.218-162.89-73.704-252.448-73.704-89.56 0-176.858 25.486-252.452 73.704-60.158 38.372-111.138 89.772-149.432 150.296 38.292 60.524 89.274 111.924 149.434 150.296 3.918 2.5 7.876 4.922 11.86 7.3-9.96-27.328-15.41-56.822-15.41-87.596 0-141.382 114.616-256 256-256s256 114.618 256 256c0 30.774-5.452 60.268-15.408 87.598 3.978-2.378 7.938-4.802 11.858-7.302v0zM512 544c0-53.020-42.98-96-96-96s-96 42.98-96 96 42.98 96 96 96 96-42.982 96-96z" />
+<glyph unicode="&#xe906;" glyph-name="eye-close" d="M945.942 945.942c-18.746 18.744-49.136 18.744-67.882 0l-202.164-202.164c-51.938 15.754-106.948 24.222-163.896 24.222-223.318 0-416.882-130.042-512-320 41.122-82.124 100.648-153.040 173.022-207.096l-158.962-158.962c-18.746-18.746-18.746-49.136 0-67.882 9.372-9.374 21.656-14.060 33.94-14.060s24.568 4.686 33.942 14.058l864 864c18.744 18.746 18.744 49.138 0 67.884zM416 640c42.24 0 78.082-27.294 90.92-65.196l-121.724-121.724c-37.902 12.838-65.196 48.68-65.196 90.92 0 53.020 42.98 96 96 96zM110.116 448c38.292 60.524 89.274 111.924 149.434 150.296 3.918 2.5 7.876 4.922 11.862 7.3-9.962-27.328-15.412-56.822-15.412-87.596 0-54.89 17.286-105.738 46.7-147.418l-60.924-60.924c-52.446 36.842-97.202 83.882-131.66 138.342zM768 518c0 27.166-4.256 53.334-12.102 77.898l-321.808-321.808c24.568-7.842 50.742-12.090 77.91-12.090 141.382 0 256 114.618 256 256zM830.026 670.026l-69.362-69.362c1.264-0.786 2.53-1.568 3.786-2.368 60.162-38.374 111.142-89.774 149.434-150.296-38.292-60.522-89.274-111.922-149.436-150.296-75.594-48.218-162.89-73.704-252.448-73.704-38.664 0-76.902 4.76-113.962 14.040l-76.894-76.894c59.718-21.462 123.95-33.146 190.856-33.146 223.31 0 416.876 130.042 512 320-45.022 89.916-112.118 166.396-193.974 222.026z" />
+<glyph unicode="&#xe907;" glyph-name="avatar" d="M848-24h-672c-26.51 0-48 21.49-48 48 0 68.862 29.068 152.204 77.758 222.942 40.692 59.117 90.685 103.62 144.678 129.609-23.798 21.645-44.294 48.026-60.508 78.122-26 48.262-39.746 104.048-39.746 161.328 0 79.606 26.204 154.822 73.786 211.79 49.664 59.461 116.442 92.209 188.032 92.209s138.368-32.748 188.034-92.21c47.58-56.968 73.786-132.182 73.786-211.79 0-57.28-13.744-113.066-39.744-161.328-16.214-30.096-36.71-56.478-60.51-78.122 53.993-25.99 103.985-70.492 144.678-129.609 48.688-70.737 77.756-154.079 77.756-222.941 0-26.51-21.49-48-48-48v0z" />
+</font></defs></svg>
\ No newline at end of file
diff --git a/deployed/icagenda/media/com_icagenda/icicons/fonts/iCicons.ttf b/deployed/icagenda/media/com_icagenda/icicons/fonts/iCicons.ttf
new file mode 100644
index 00000000..ad18dd27
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/icicons/fonts/iCicons.ttf differ
diff --git a/deployed/icagenda/media/com_icagenda/icicons/fonts/iCicons.woff b/deployed/icagenda/media/com_icagenda/icicons/fonts/iCicons.woff
new file mode 100644
index 00000000..c1c65183
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/icicons/fonts/iCicons.woff differ
diff --git a/deployed/icagenda/media/com_icagenda/icicons/ie7/ie7.css b/deployed/icagenda/media/com_icagenda/icicons/ie7/ie7.css
new file mode 100644
index 00000000..42ae3910
--- /dev/null
+++ b/deployed/icagenda/media/com_icagenda/icicons/ie7/ie7.css
@@ -0,0 +1,102 @@
+.iCicon-header-before {
+	*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe618;');
+}
+.iCicon-header-after {
+	*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe617;');
+}
+.iCicon-iclogo {
+	*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe606;');
+}
+.iCicon-thumbs {
+	*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe60c;');
+}
+.iCicon-form {
+	*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe616;');
+}
+.iCicon-location {
+	*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe605;');
+}
+.iCicon-clock {
+	*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe60d;');
+}
+.iCicon-calendar {
+	*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe604;');
+}
+.iCicon-calendar-2 {
+	*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe603;');
+}
+.iCicon-print {
+	*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe602;');
+}
+.iCicon-disk {
+	*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe607;');
+}
+.iCicon-reset {
+	*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe900;');
+}
+.iCicon-people {
+	*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe60b;');
+}
+.iCicon-search {
+	*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe901;');
+}
+.iCicon-private {
+	*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe608;');
+}
+.iCicon-options {
+	*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe60f;');
+}
+.iCicon-register {
+	*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe609;');
+}
+.iCicon-timezone {
+	*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe601;');
+}
+.iCicon-earth {
+	*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe600;');
+}
+.iCicon-blocked {
+	*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe60a;');
+}
+.iCicon-nextic {
+	*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x25b6;');
+}
+.iCicon-backic {
+	*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x25c0;');
+}
+.iCicon-backicY {
+	*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x25c1;');
+}
+.iCicon-nexticY {
+	*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x25b7;');
+}
+.iCicon-filter {
+	*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe611;');
+}
+.iCicon-filter-2 {
+	*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe902;');
+}
+.iCicon-screen {
+	*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe60e;');
+}
+.iCicon-minus {
+	*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe612;');
+}
+.iCicon-info {
+	*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe613;');
+}
+.iCicon-info-circle {
+	*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe614;');
+}
+.iCicon-icons {
+	*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe610;');
+}
+.iCicon-navigation {
+	*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe615;');
+}
+.iCicon-arrow-down {
+	*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe903;');
+}
+.iCicon-arrow-up {
+	*zoom: expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe904;');
+}
diff --git a/deployed/icagenda/media/com_icagenda/icicons/ie7/ie7.js b/deployed/icagenda/media/com_icagenda/icicons/ie7/ie7.js
new file mode 100644
index 00000000..598f831d
--- /dev/null
+++ b/deployed/icagenda/media/com_icagenda/icicons/ie7/ie7.js
@@ -0,0 +1,65 @@
+/* To avoid CSS expressions while still supporting IE 7 and IE 6, use this script */
+/* The script tag referencing this file must be placed before the ending body tag. */
+
+/* Use conditional comments in order to target IE 7 and older:
+	<!--[if lt IE 8]><!-->
+	<script src="ie7/ie7.js"></script>
+	<!--<![endif]-->
+*/
+
+(function() {
+	function addIcon(el, entity) {
+		var html = el.innerHTML;
+		el.innerHTML = '<span style="font-family: \'iCicons\'">' + entity + '</span>' + html;
+	}
+	var icons = {
+		'iCicon-header-before': '&#xe618;',
+		'iCicon-header-after': '&#xe617;',
+		'iCicon-iclogo': '&#xe606;',
+		'iCicon-thumbs': '&#xe60c;',
+		'iCicon-form': '&#xe616;',
+		'iCicon-location': '&#xe605;',
+		'iCicon-clock': '&#xe60d;',
+		'iCicon-calendar': '&#xe604;',
+		'iCicon-calendar-2': '&#xe603;',
+		'iCicon-print': '&#xe602;',
+		'iCicon-disk': '&#xe607;',
+		'iCicon-reset': '&#xe900;',
+		'iCicon-people': '&#xe60b;',
+		'iCicon-search': '&#xe901;',
+		'iCicon-private': '&#xe608;',
+		'iCicon-options': '&#xe60f;',
+		'iCicon-register': '&#xe609;',
+		'iCicon-timezone': '&#xe601;',
+		'iCicon-earth': '&#xe600;',
+		'iCicon-blocked': '&#xe60a;',
+		'iCicon-nextic': '&#x25b6;',
+		'iCicon-backic': '&#x25c0;',
+		'iCicon-backicY': '&#x25c1;',
+		'iCicon-nexticY': '&#x25b7;',
+		'iCicon-filter': '&#xe611;',
+		'iCicon-filter-2': '&#xe902;',
+		'iCicon-screen': '&#xe60e;',
+		'iCicon-minus': '&#xe612;',
+		'iCicon-info': '&#xe613;',
+		'iCicon-info-circle': '&#xe614;',
+		'iCicon-icons': '&#xe610;',
+		'iCicon-navigation': '&#xe615;',
+		'iCicon-arrow-down': '&#xe903;',
+		'iCicon-arrow-up': '&#xe904;',
+		'0': 0
+		},
+		els = document.getElementsByTagName('*'),
+		i, c, el;
+	for (i = 0; ; i += 1) {
+		el = els[i];
+		if(!el) {
+			break;
+		}
+		c = el.className;
+		c = c.match(/iCicon-[^\s'"]+/);
+		if (c && icons[c[0]]) {
+			addIcon(el, icons[c[0]]);
+		}
+	}
+}());
diff --git a/deployed/icagenda/media/com_icagenda/icicons/index.html b/deployed/icagenda/media/com_icagenda/icicons/index.html
new file mode 100644
index 00000000..fa6d84e8
--- /dev/null
+++ b/deployed/icagenda/media/com_icagenda/icicons/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/media/com_icagenda/icicons/style.css b/deployed/icagenda/media/com_icagenda/icicons/style.css
new file mode 100644
index 00000000..1ca3390f
--- /dev/null
+++ b/deployed/icagenda/media/com_icagenda/icicons/style.css
@@ -0,0 +1,215 @@
+/**
+ *------------------------------------------------------------------------------
+ *  iCicons font by Jooml!C
+ *------------------------------------------------------------------------------
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        https://www.joomlic.com
+ *
+ * @version 	3.7.0 2018-05-24
+ * @since       3.2.2
+ *------------------------------------------------------------------------------
+*/
+
+@font-face {
+  font-family: 'iCicons';
+  src:  url('fonts/iCicons.eot?3kxpik');
+  src:  url('fonts/iCicons.eot?3kxpik#iefix') format('embedded-opentype'),
+    url('fonts/iCicons.ttf?3kxpik') format('truetype'),
+    url('fonts/iCicons.woff?3kxpik') format('woff'),
+    url('fonts/iCicons.svg?3kxpik#iCicons') format('svg');
+  font-weight: normal;
+  font-style: normal;
+}
+[data-icon]:before {
+	font-family: 'iCicons';
+	content: attr(data-icon);
+	speak: none;
+}
+[class^="iCicon-"], [class*=" iCicon-"] {
+  /* use !important to prevent issues with browser extensions that change fonts */
+  font-family: 'iCicons' !important;
+  speak: none;
+  font-style: normal;
+  font-weight: normal;
+  font-variant: normal;
+  text-transform: none;
+  line-height: 1;
+
+  /* Better Font Rendering =========== */
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+[class^="iCicon-"]:before,
+[class*=" iCicon-"]:before {
+	font-family: 'iCicons' !important; /* !important to fix conflict with some templates font icons */
+	font-style: normal;
+	speak: none;
+}
+[class^="iCicon-"].disabled,
+[class*=" iCicon-"].disabled {
+	font-weight: normal;
+}
+
+.iCicon-nextic:before {
+  content: "\25b6";
+}
+.iCicon-nexticY:before {
+  content: "\25b7";
+}
+.iCicon-backic:before {
+  content: "\25c0";
+}
+.iCicon-backicY:before {
+  content: "\25c1";
+}
+.iCicon-earth:before {
+  content: "\e600";
+}
+.iCicon-timezone:before {
+  content: "\e601";
+}
+.iCicon-print:before {
+  content: "\e602";
+}
+.iCicon-calendar-2:before {
+  content: "\e603";
+}
+.iCicon-calendar:before {
+  content: "\e604";
+}
+.iCicon-location:before {
+  content: "\e605";
+}
+.iCicon-iclogo:before {
+  content: "\e606";
+}
+.iCicon-disk:before {
+  content: "\e607";
+}
+.iCicon-private:before {
+  content: "\e608";
+}
+.iCicon-register:before {
+  content: "\e609";
+}
+.iCicon-blocked:before {
+  content: "\e60a";
+}
+.iCicon-people:before {
+  content: "\e60b";
+}
+.iCicon-thumbs:before {
+  content: "\e60c";
+}
+.iCicon-clock:before {
+  content: "\e60d";
+}
+.iCicon-screen:before {
+  content: "\e60e";
+}
+.iCicon-options:before {
+  content: "\e60f";
+}
+.iCicon-icons:before {
+  content: "\e610";
+}
+.iCicon-filter:before {
+  content: "\e611";
+}
+.iCicon-minus:before {
+  content: "\e612";
+}
+.iCicon-info:before {
+  content: "\e613";
+}
+.iCicon-info-circle:before {
+  content: "\e614";
+}
+.iCicon-navigation:before {
+  content: "\e615";
+}
+.iCicon-form:before {
+  content: "\e616";
+}
+.iCicon-header-after:before {
+  content: "\e617";
+}
+.iCicon-header-before:before {
+  content: "\e618";
+}
+.iCicon-reset:before {
+  content: "\e900";
+}
+.iCicon-search:before {
+  content: "\e901";
+}
+.iCicon-filter-2:before {
+  content: "\e902";
+}
+.iCicon-arrow-down:before {
+  content: "\e903";
+}
+.iCicon-arrow-up:before {
+  content: "\e904";
+}
+.iCicon-eye:before {
+  content: "\e905";
+}
+.iCicon-eye-close:before {
+  content: "\e906";
+}
+.iCicon-avatar:before {
+  content: "\e907";
+}
+
+/* Multiple icons */
+.iCicon-eyes-1:before {
+  content: "\e905\e905\e905";
+  vertical-align: middle;
+  letter-spacing: 4px;
+}
+.iCicon-eyes-2:before {
+  content: "\e906\e905\e905";
+  vertical-align: middle;
+  letter-spacing: 4px;
+}
+.iCicon-eyes-3:before {
+  content: "\e906\e906\e905";
+  vertical-align: middle;
+  letter-spacing: 4px;
+}
+.iCicon-eyes-4:before {
+  content: "\e906\e906\e906";
+  vertical-align: middle;
+  letter-spacing: 4px;
+}
+
+/* BI-COLOR ICONS */
+.iCicon-bi-color-header:before {
+	content: "\e618";
+	letter-spacing: -1em;
+	color: #bebebe;
+}
+.iCicon-bi-color-header:after {
+	content: "\e617";
+	color: #ca0000;
+}
+
+/* ONE-COLOR ICONS */
+.iCicon-iclogo:before {
+	content: "\e606";
+	color: #990000;
+}
+
+/* ADDITIONAL STYLES */
+.iCicon-info-circle:active,
+.iCicon-info-circle:hover,
+.iCicon-info-circle:focus {
+	text-decoration: none !important;
+	background: none;
+	text-shadow:0px 0px 5px rgba(0,0,0,0.3);;
+	cursor: help;
+}
diff --git a/deployed/icagenda/media/com_icagenda/images/addthis_16.png b/deployed/icagenda/media/com_icagenda/images/addthis_16.png
new file mode 100644
index 00000000..00b24676
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/addthis_16.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/addthis_16x16.png b/deployed/icagenda/media/com_icagenda/images/addthis_16x16.png
new file mode 100644
index 00000000..10970c03
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/addthis_16x16.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/addthis_32x32.png b/deployed/icagenda/media/com_icagenda/images/addthis_32x32.png
new file mode 100644
index 00000000..c139c7d6
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/addthis_32x32.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/all_cats-16.png b/deployed/icagenda/media/com_icagenda/images/all_cats-16.png
new file mode 100644
index 00000000..1f771d35
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/all_cats-16.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/all_cats-48.png b/deployed/icagenda/media/com_icagenda/images/all_cats-48.png
new file mode 100644
index 00000000..714ab06c
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/all_cats-48.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/all_events-16.png b/deployed/icagenda/media/com_icagenda/images/all_events-16.png
new file mode 100644
index 00000000..ad493be2
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/all_events-16.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/all_events-48.png b/deployed/icagenda/media/com_icagenda/images/all_events-48.png
new file mode 100644
index 00000000..20a39c97
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/all_events-48.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/blanck.png b/deployed/icagenda/media/com_icagenda/images/blanck.png
new file mode 100644
index 00000000..aa06dfeb
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/blanck.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/border_title.png b/deployed/icagenda/media/com_icagenda/images/border_title.png
new file mode 100644
index 00000000..78150d69
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/border_title.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/btn-regis.png b/deployed/icagenda/media/com_icagenda/images/btn-regis.png
new file mode 100644
index 00000000..c86dd178
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/btn-regis.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/cal/apple_ical-16.png b/deployed/icagenda/media/com_icagenda/images/cal/apple_ical-16.png
new file mode 100644
index 00000000..d21d4103
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/cal/apple_ical-16.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/cal/apple_ical-24.png b/deployed/icagenda/media/com_icagenda/images/cal/apple_ical-24.png
new file mode 100644
index 00000000..4792f407
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/cal/apple_ical-24.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/cal/apple_ical-32.png b/deployed/icagenda/media/com_icagenda/images/cal/apple_ical-32.png
new file mode 100644
index 00000000..4232975b
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/cal/apple_ical-32.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/cal/google_cal-16.png b/deployed/icagenda/media/com_icagenda/images/cal/google_cal-16.png
new file mode 100644
index 00000000..43089890
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/cal/google_cal-16.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/cal/google_cal-24.png b/deployed/icagenda/media/com_icagenda/images/cal/google_cal-24.png
new file mode 100644
index 00000000..b26585ac
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/cal/google_cal-24.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/cal/google_cal-32.png b/deployed/icagenda/media/com_icagenda/images/cal/google_cal-32.png
new file mode 100644
index 00000000..eafeaf45
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/cal/google_cal-32.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/cal/index.html b/deployed/icagenda/media/com_icagenda/images/cal/index.html
new file mode 100644
index 00000000..fa6d84e8
--- /dev/null
+++ b/deployed/icagenda/media/com_icagenda/images/cal/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/media/com_icagenda/images/cal/outlook_cal-16.png b/deployed/icagenda/media/com_icagenda/images/cal/outlook_cal-16.png
new file mode 100644
index 00000000..88d250cf
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/cal/outlook_cal-16.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/cal/outlook_cal-24.png b/deployed/icagenda/media/com_icagenda/images/cal/outlook_cal-24.png
new file mode 100644
index 00000000..c62ff94d
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/cal/outlook_cal-24.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/cal/outlook_cal-32.png b/deployed/icagenda/media/com_icagenda/images/cal/outlook_cal-32.png
new file mode 100644
index 00000000..35cbc7e1
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/cal/outlook_cal-32.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/cal/windows-live_cal-16.png b/deployed/icagenda/media/com_icagenda/images/cal/windows-live_cal-16.png
new file mode 100644
index 00000000..8833c23b
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/cal/windows-live_cal-16.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/cal/windows-live_cal-24.png b/deployed/icagenda/media/com_icagenda/images/cal/windows-live_cal-24.png
new file mode 100644
index 00000000..9bedb218
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/cal/windows-live_cal-24.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/cal/windows-live_cal-32.png b/deployed/icagenda/media/com_icagenda/images/cal/windows-live_cal-32.png
new file mode 100644
index 00000000..56e2f7ba
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/cal/windows-live_cal-32.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/cal/yahoo_cal-16.png b/deployed/icagenda/media/com_icagenda/images/cal/yahoo_cal-16.png
new file mode 100644
index 00000000..caad396a
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/cal/yahoo_cal-16.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/cal/yahoo_cal-24.png b/deployed/icagenda/media/com_icagenda/images/cal/yahoo_cal-24.png
new file mode 100644
index 00000000..961a6058
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/cal/yahoo_cal-24.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/cal/yahoo_cal-32.png b/deployed/icagenda/media/com_icagenda/images/cal/yahoo_cal-32.png
new file mode 100644
index 00000000..0fd861d1
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/cal/yahoo_cal-32.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/customfields-16.png b/deployed/icagenda/media/com_icagenda/images/customfields-16.png
new file mode 100644
index 00000000..8213f010
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/customfields-16.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/customfields-48.png b/deployed/icagenda/media/com_icagenda/images/customfields-48.png
new file mode 100644
index 00000000..5e59074b
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/customfields-48.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/features-16.png b/deployed/icagenda/media/com_icagenda/images/features-16.png
new file mode 100644
index 00000000..2e034043
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/features-16.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/features-48.png b/deployed/icagenda/media/com_icagenda/images/features-48.png
new file mode 100644
index 00000000..2d0ac40e
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/features-48.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/generic-48.png b/deployed/icagenda/media/com_icagenda/images/generic-48.png
new file mode 100644
index 00000000..8995374e
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/generic-48.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/global_options-48.png b/deployed/icagenda/media/com_icagenda/images/global_options-48.png
new file mode 100644
index 00000000..8995374e
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/global_options-48.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/icon-add-16.png b/deployed/icagenda/media/com_icagenda/images/icon-add-16.png
new file mode 100644
index 00000000..adf14cf7
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/icon-add-16.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/icon-edit.png b/deployed/icagenda/media/com_icagenda/images/icon-edit.png
new file mode 100644
index 00000000..cd2a58ef
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/icon-edit.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/icon_all-events.png b/deployed/icagenda/media/com_icagenda/images/icon_all-events.png
new file mode 100644
index 00000000..20a39c97
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/icon_all-events.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/iconevent-add48.png b/deployed/icagenda/media/com_icagenda/images/iconevent-add48.png
new file mode 100644
index 00000000..c6f86e94
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/iconevent-add48.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/iconevent48.png b/deployed/icagenda/media/com_icagenda/images/iconevent48.png
new file mode 100644
index 00000000..20a39c97
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/iconevent48.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/iconicagenda16.png b/deployed/icagenda/media/com_icagenda/images/iconicagenda16.png
new file mode 100644
index 00000000..a0aa5394
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/iconicagenda16.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/iconicagenda16_agenda.png b/deployed/icagenda/media/com_icagenda/images/iconicagenda16_agenda.png
new file mode 100644
index 00000000..bca66642
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/iconicagenda16_agenda.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/iconicagenda36.png b/deployed/icagenda/media/com_icagenda/images/iconicagenda36.png
new file mode 100644
index 00000000..13924c13
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/iconicagenda36.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/iconicagenda48.png b/deployed/icagenda/media/com_icagenda/images/iconicagenda48.png
new file mode 100644
index 00000000..13074f13
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/iconicagenda48.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/image.png b/deployed/icagenda/media/com_icagenda/images/image.png
new file mode 100644
index 00000000..0a1f8291
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/image.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/index.html b/deployed/icagenda/media/com_icagenda/images/index.html
new file mode 100644
index 00000000..fa6d84e8
--- /dev/null
+++ b/deployed/icagenda/media/com_icagenda/images/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/media/com_icagenda/images/info-16.png b/deployed/icagenda/media/com_icagenda/images/info-16.png
new file mode 100644
index 00000000..cb6b2f02
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/info-16.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/info-48.png b/deployed/icagenda/media/com_icagenda/images/info-48.png
new file mode 100644
index 00000000..cee5dbe7
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/info-48.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/info.png b/deployed/icagenda/media/com_icagenda/images/info.png
new file mode 100644
index 00000000..41e1a5be
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/info.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/joomlic_iCagenda.png b/deployed/icagenda/media/com_icagenda/images/joomlic_iCagenda.png
new file mode 100644
index 00000000..1c8c7d60
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/joomlic_iCagenda.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/loader.gif b/deployed/icagenda/media/com_icagenda/images/loader.gif
new file mode 100644
index 00000000..294e8e41
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/loader.gif differ
diff --git a/deployed/icagenda/media/com_icagenda/images/logo_icagenda.png b/deployed/icagenda/media/com_icagenda/images/logo_icagenda.png
new file mode 100644
index 00000000..ac55080a
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/logo_icagenda.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/logo_joomlic.png b/deployed/icagenda/media/com_icagenda/images/logo_joomlic.png
new file mode 100644
index 00000000..5650bdbf
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/logo_joomlic.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/manager/approval_16.png b/deployed/icagenda/media/com_icagenda/images/manager/approval_16.png
new file mode 100644
index 00000000..08a83aeb
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/manager/approval_16.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/manager/index.html b/deployed/icagenda/media/com_icagenda/images/manager/index.html
new file mode 100644
index 00000000..fa6d84e8
--- /dev/null
+++ b/deployed/icagenda/media/com_icagenda/images/manager/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/media/com_icagenda/images/new_cat-16.png b/deployed/icagenda/media/com_icagenda/images/new_cat-16.png
new file mode 100644
index 00000000..c0c3d0ec
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/new_cat-16.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/new_cat-48.png b/deployed/icagenda/media/com_icagenda/images/new_cat-48.png
new file mode 100644
index 00000000..eb85e1a4
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/new_cat-48.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/new_event-16.png b/deployed/icagenda/media/com_icagenda/images/new_event-16.png
new file mode 100644
index 00000000..746c01f5
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/new_event-16.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/new_event-48.png b/deployed/icagenda/media/com_icagenda/images/new_event-48.png
new file mode 100644
index 00000000..bdead8f0
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/new_event-48.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/newsletter-16.png b/deployed/icagenda/media/com_icagenda/images/newsletter-16.png
new file mode 100644
index 00000000..8dd73fa1
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/newsletter-16.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/newsletter-48.png b/deployed/icagenda/media/com_icagenda/images/newsletter-48.png
new file mode 100644
index 00000000..94125162
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/newsletter-48.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/no-photo.jpg b/deployed/icagenda/media/com_icagenda/images/no-photo.jpg
new file mode 100644
index 00000000..f2b2342e
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/no-photo.jpg differ
diff --git a/deployed/icagenda/media/com_icagenda/images/nophoto.jpg b/deployed/icagenda/media/com_icagenda/images/nophoto.jpg
new file mode 100644
index 00000000..d99a4f38
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/nophoto.jpg differ
diff --git a/deployed/icagenda/media/com_icagenda/images/panel_denied/all_cats-48.png b/deployed/icagenda/media/com_icagenda/images/panel_denied/all_cats-48.png
new file mode 100644
index 00000000..a9c4b19c
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/panel_denied/all_cats-48.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/panel_denied/all_events-48.png b/deployed/icagenda/media/com_icagenda/images/panel_denied/all_events-48.png
new file mode 100644
index 00000000..b7932dbb
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/panel_denied/all_events-48.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/panel_denied/customfields-48.png b/deployed/icagenda/media/com_icagenda/images/panel_denied/customfields-48.png
new file mode 100644
index 00000000..f3a646df
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/panel_denied/customfields-48.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/panel_denied/features-48.png b/deployed/icagenda/media/com_icagenda/images/panel_denied/features-48.png
new file mode 100644
index 00000000..f0004bca
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/panel_denied/features-48.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/panel_denied/global_options-48.png b/deployed/icagenda/media/com_icagenda/images/panel_denied/global_options-48.png
new file mode 100644
index 00000000..23acf549
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/panel_denied/global_options-48.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/panel_denied/index.html b/deployed/icagenda/media/com_icagenda/images/panel_denied/index.html
new file mode 100644
index 00000000..fa6d84e8
--- /dev/null
+++ b/deployed/icagenda/media/com_icagenda/images/panel_denied/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/media/com_icagenda/images/panel_denied/info-48.png b/deployed/icagenda/media/com_icagenda/images/panel_denied/info-48.png
new file mode 100644
index 00000000..01e5ffef
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/panel_denied/info-48.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/panel_denied/new_cat-48.png b/deployed/icagenda/media/com_icagenda/images/panel_denied/new_cat-48.png
new file mode 100644
index 00000000..bbe54f29
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/panel_denied/new_cat-48.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/panel_denied/new_event-48.png b/deployed/icagenda/media/com_icagenda/images/panel_denied/new_event-48.png
new file mode 100644
index 00000000..d187859e
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/panel_denied/new_event-48.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/panel_denied/newsletter-48.png b/deployed/icagenda/media/com_icagenda/images/panel_denied/newsletter-48.png
new file mode 100644
index 00000000..48810155
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/panel_denied/newsletter-48.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/panel_denied/registration-48.png b/deployed/icagenda/media/com_icagenda/images/panel_denied/registration-48.png
new file mode 100644
index 00000000..a5be9287
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/panel_denied/registration-48.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/panel_denied/themes-48.png b/deployed/icagenda/media/com_icagenda/images/panel_denied/themes-48.png
new file mode 100644
index 00000000..a1faa8a2
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/panel_denied/themes-48.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/payment/icon_cca.gif b/deployed/icagenda/media/com_icagenda/images/payment/icon_cca.gif
new file mode 100644
index 00000000..2b29e742
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/payment/icon_cca.gif differ
diff --git a/deployed/icagenda/media/com_icagenda/images/payment/icon_chk.gif b/deployed/icagenda/media/com_icagenda/images/payment/icon_chk.gif
new file mode 100644
index 00000000..5863a22b
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/payment/icon_chk.gif differ
diff --git a/deployed/icagenda/media/com_icagenda/images/payment/icon_pal.gif b/deployed/icagenda/media/com_icagenda/images/payment/icon_pal.gif
new file mode 100644
index 00000000..358c0b32
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/payment/icon_pal.gif differ
diff --git a/deployed/icagenda/media/com_icagenda/images/payment/icon_wtr.gif b/deployed/icagenda/media/com_icagenda/images/payment/icon_wtr.gif
new file mode 100644
index 00000000..1fcabccb
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/payment/icon_wtr.gif differ
diff --git a/deployed/icagenda/media/com_icagenda/images/payment/index.html b/deployed/icagenda/media/com_icagenda/images/payment/index.html
new file mode 100644
index 00000000..fa6d84e8
--- /dev/null
+++ b/deployed/icagenda/media/com_icagenda/images/payment/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/media/com_icagenda/images/photo.jpg b/deployed/icagenda/media/com_icagenda/images/photo.jpg
new file mode 100644
index 00000000..36194c57
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/photo.jpg differ
diff --git a/deployed/icagenda/media/com_icagenda/images/registration-16.png b/deployed/icagenda/media/com_icagenda/images/registration-16.png
new file mode 100644
index 00000000..3f34a605
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/registration-16.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/registration-48.png b/deployed/icagenda/media/com_icagenda/images/registration-48.png
new file mode 100644
index 00000000..6c73d735
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/registration-48.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/shadow.png b/deployed/icagenda/media/com_icagenda/images/shadow.png
new file mode 100644
index 00000000..d8dcdf0f
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/shadow.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/technical_requirements-16.png b/deployed/icagenda/media/com_icagenda/images/technical_requirements-16.png
new file mode 100644
index 00000000..bca2c6b0
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/technical_requirements-16.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/themes-16.png b/deployed/icagenda/media/com_icagenda/images/themes-16.png
new file mode 100644
index 00000000..6e6e8521
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/themes-16.png differ
diff --git a/deployed/icagenda/media/com_icagenda/images/themes-48.png b/deployed/icagenda/media/com_icagenda/images/themes-48.png
new file mode 100644
index 00000000..1be785ba
Binary files /dev/null and b/deployed/icagenda/media/com_icagenda/images/themes-48.png differ
diff --git a/deployed/icagenda/media/com_icagenda/index.html b/deployed/icagenda/media/com_icagenda/index.html
new file mode 100644
index 00000000..fa6d84e8
--- /dev/null
+++ b/deployed/icagenda/media/com_icagenda/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/media/com_icagenda/js/Chart.js b/deployed/icagenda/media/com_icagenda/js/Chart.js
new file mode 100644
index 00000000..c264262b
--- /dev/null
+++ b/deployed/icagenda/media/com_icagenda/js/Chart.js
@@ -0,0 +1,3477 @@
+/*!
+ * Chart.js
+ * http://chartjs.org/
+ * Version: 1.0.2
+ *
+ * Copyright 2015 Nick Downie
+ * Released under the MIT license
+ * https://github.com/nnnick/Chart.js/blob/master/LICENSE.md
+ */
+
+
+(function(){
+
+	"use strict";
+
+	//Declare root variable - window in the browser, global on the server
+	var root = this,
+		previous = root.Chart;
+
+	//Occupy the global variable of Chart, and create a simple base class
+	var Chart = function(context){
+		var chart = this;
+		this.canvas = context.canvas;
+
+		this.ctx = context;
+
+		//Variables global to the chart
+		var computeDimension = function(element,dimension)
+		{
+			if (element['offset'+dimension])
+			{
+				return element['offset'+dimension];
+			}
+			else
+			{
+				return document.defaultView.getComputedStyle(element).getPropertyValue(dimension);
+			}
+		}
+
+		var width = this.width = computeDimension(context.canvas,'Width');
+		var height = this.height = computeDimension(context.canvas,'Height');
+
+		// Firefox requires this to work correctly
+		context.canvas.width  = width;
+		context.canvas.height = height;
+
+		var width = this.width = context.canvas.width;
+		var height = this.height = context.canvas.height;
+		this.aspectRatio = this.width / this.height;
+		//High pixel density displays - multiply the size of the canvas height/width by the device pixel ratio, then scale.
+		helpers.retinaScale(this);
+
+		return this;
+	};
+	//Globally expose the defaults to allow for user updating/changing
+	Chart.defaults = {
+		global: {
+			// Boolean - Whether to animate the chart
+			animation: true,
+
+			// Number - Number of animation steps
+			animationSteps: 60,
+
+			// String - Animation easing effect
+			animationEasing: "easeOutQuart",
+
+			// Boolean - If we should show the scale at all
+			showScale: true,
+
+			// Boolean - If we want to override with a hard coded scale
+			scaleOverride: false,
+
+			// ** Required if scaleOverride is true **
+			// Number - The number of steps in a hard coded scale
+			scaleSteps: null,
+			// Number - The value jump in the hard coded scale
+			scaleStepWidth: null,
+			// Number - The scale starting value
+			scaleStartValue: null,
+
+			// String - Colour of the scale line
+			scaleLineColor: "rgba(0,0,0,.1)",
+
+			// Number - Pixel width of the scale line
+			scaleLineWidth: 1,
+
+			// Boolean - Whether to show labels on the scale
+			scaleShowLabels: true,
+
+			// Interpolated JS string - can access value
+			scaleLabel: "<%=value%>",
+
+			// Boolean - Whether the scale should stick to integers, and not show any floats even if drawing space is there
+			scaleIntegersOnly: true,
+
+			// Boolean - Whether the scale should start at zero, or an order of magnitude down from the lowest value
+			scaleBeginAtZero: false,
+
+			// String - Scale label font declaration for the scale label
+			scaleFontFamily: "'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",
+
+			// Number - Scale label font size in pixels
+			scaleFontSize: 12,
+
+			// String - Scale label font weight style
+			scaleFontStyle: "normal",
+
+			// String - Scale label font colour
+			scaleFontColor: "#666",
+
+			// Boolean - whether or not the chart should be responsive and resize when the browser does.
+			responsive: false,
+
+			// Boolean - whether to maintain the starting aspect ratio or not when responsive, if set to false, will take up entire container
+			maintainAspectRatio: true,
+
+			// Boolean - Determines whether to draw tooltips on the canvas or not - attaches events to touchmove & mousemove
+			showTooltips: true,
+
+			// Boolean - Determines whether to draw built-in tooltip or call custom tooltip function
+			customTooltips: false,
+
+			// Array - Array of string names to attach tooltip events
+			tooltipEvents: ["mousemove", "touchstart", "touchmove", "mouseout"],
+
+			// String - Tooltip background colour
+			tooltipFillColor: "rgba(0,0,0,0.8)",
+
+			// String - Tooltip label font declaration for the scale label
+			tooltipFontFamily: "'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",
+
+			// Number - Tooltip label font size in pixels
+			tooltipFontSize: 14,
+
+			// String - Tooltip font weight style
+			tooltipFontStyle: "normal",
+
+			// String - Tooltip label font colour
+			tooltipFontColor: "#fff",
+
+			// String - Tooltip title font declaration for the scale label
+			tooltipTitleFontFamily: "'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",
+
+			// Number - Tooltip title font size in pixels
+			tooltipTitleFontSize: 14,
+
+			// String - Tooltip title font weight style
+			tooltipTitleFontStyle: "bold",
+
+			// String - Tooltip title font colour
+			tooltipTitleFontColor: "#fff",
+
+			// Number - pixel width of padding around tooltip text
+			tooltipYPadding: 6,
+
+			// Number - pixel width of padding around tooltip text
+			tooltipXPadding: 6,
+
+			// Number - Size of the caret on the tooltip
+			tooltipCaretSize: 8,
+
+			// Number - Pixel radius of the tooltip border
+			tooltipCornerRadius: 6,
+
+			// Number - Pixel offset from point x to tooltip edge
+			tooltipXOffset: 10,
+
+			// String - Template string for single tooltips
+			tooltipTemplate: "<%if (label){%><%=label%>: <%}%><%= value %>",
+
+			// String - Template string for single tooltips
+			multiTooltipTemplate: "<%= value %>",
+
+			// String - Colour behind the legend colour block
+			multiTooltipKeyBackground: '#fff',
+
+			// Function - Will fire on animation progression.
+			onAnimationProgress: function(){},
+
+			// Function - Will fire on animation completion.
+			onAnimationComplete: function(){}
+
+		}
+	};
+
+	//Create a dictionary of chart types, to allow for extension of existing types
+	Chart.types = {};
+
+	//Global Chart helpers object for utility methods and classes
+	var helpers = Chart.helpers = {};
+
+		//-- Basic js utility methods
+	var each = helpers.each = function(loopable,callback,self){
+			var additionalArgs = Array.prototype.slice.call(arguments, 3);
+			// Check to see if null or undefined firstly.
+			if (loopable){
+				if (loopable.length === +loopable.length){
+					var i;
+					for (i=0; i<loopable.length; i++){
+						callback.apply(self,[loopable[i], i].concat(additionalArgs));
+					}
+				}
+				else{
+					for (var item in loopable){
+						callback.apply(self,[loopable[item],item].concat(additionalArgs));
+					}
+				}
+			}
+		},
+		clone = helpers.clone = function(obj){
+			var objClone = {};
+			each(obj,function(value,key){
+				if (obj.hasOwnProperty(key)) objClone[key] = value;
+			});
+			return objClone;
+		},
+		extend = helpers.extend = function(base){
+			each(Array.prototype.slice.call(arguments,1), function(extensionObject) {
+				each(extensionObject,function(value,key){
+					if (extensionObject.hasOwnProperty(key)) base[key] = value;
+				});
+			});
+			return base;
+		},
+		merge = helpers.merge = function(base,master){
+			//Merge properties in left object over to a shallow clone of object right.
+			var args = Array.prototype.slice.call(arguments,0);
+			args.unshift({});
+			return extend.apply(null, args);
+		},
+		indexOf = helpers.indexOf = function(arrayToSearch, item){
+			if (Array.prototype.indexOf) {
+				return arrayToSearch.indexOf(item);
+			}
+			else{
+				for (var i = 0; i < arrayToSearch.length; i++) {
+					if (arrayToSearch[i] === item) return i;
+				}
+				return -1;
+			}
+		},
+		where = helpers.where = function(collection, filterCallback){
+			var filtered = [];
+
+			helpers.each(collection, function(item){
+				if (filterCallback(item)){
+					filtered.push(item);
+				}
+			});
+
+			return filtered;
+		},
+		findNextWhere = helpers.findNextWhere = function(arrayToSearch, filterCallback, startIndex){
+			// Default to start of the array
+			if (!startIndex){
+				startIndex = -1;
+			}
+			for (var i = startIndex + 1; i < arrayToSearch.length; i++) {
+				var currentItem = arrayToSearch[i];
+				if (filterCallback(currentItem)){
+					return currentItem;
+				}
+			}
+		},
+		findPreviousWhere = helpers.findPreviousWhere = function(arrayToSearch, filterCallback, startIndex){
+			// Default to end of the array
+			if (!startIndex){
+				startIndex = arrayToSearch.length;
+			}
+			for (var i = startIndex - 1; i >= 0; i--) {
+				var currentItem = arrayToSearch[i];
+				if (filterCallback(currentItem)){
+					return currentItem;
+				}
+			}
+		},
+		inherits = helpers.inherits = function(extensions){
+			//Basic javascript inheritance based on the model created in Backbone.js
+			var parent = this;
+			var ChartElement = (extensions && extensions.hasOwnProperty("constructor")) ? extensions.constructor : function(){ return parent.apply(this, arguments); };
+
+			var Surrogate = function(){ this.constructor = ChartElement;};
+			Surrogate.prototype = parent.prototype;
+			ChartElement.prototype = new Surrogate();
+
+			ChartElement.extend = inherits;
+
+			if (extensions) extend(ChartElement.prototype, extensions);
+
+			ChartElement.__super__ = parent.prototype;
+
+			return ChartElement;
+		},
+		noop = helpers.noop = function(){},
+		uid = helpers.uid = (function(){
+			var id=0;
+			return function(){
+				return "chart-" + id++;
+			};
+		})(),
+		warn = helpers.warn = function(str){
+			//Method for warning of errors
+			if (window.console && typeof window.console.warn == "function") console.warn(str);
+		},
+		amd = helpers.amd = (typeof define == 'function' && define.amd),
+		//-- Math methods
+		isNumber = helpers.isNumber = function(n){
+			return !isNaN(parseFloat(n)) && isFinite(n);
+		},
+		max = helpers.max = function(array){
+			return Math.max.apply( Math, array );
+		},
+		min = helpers.min = function(array){
+			return Math.min.apply( Math, array );
+		},
+		cap = helpers.cap = function(valueToCap,maxValue,minValue){
+			if(isNumber(maxValue)) {
+				if( valueToCap > maxValue ) {
+					return maxValue;
+				}
+			}
+			else if(isNumber(minValue)){
+				if ( valueToCap < minValue ){
+					return minValue;
+				}
+			}
+			return valueToCap;
+		},
+		getDecimalPlaces = helpers.getDecimalPlaces = function(num){
+			if (num%1!==0 && isNumber(num)){
+				return num.toString().split(".")[1].length;
+			}
+			else {
+				return 0;
+			}
+		},
+		toRadians = helpers.radians = function(degrees){
+			return degrees * (Math.PI/180);
+		},
+		// Gets the angle from vertical upright to the point about a centre.
+		getAngleFromPoint = helpers.getAngleFromPoint = function(centrePoint, anglePoint){
+			var distanceFromXCenter = anglePoint.x - centrePoint.x,
+				distanceFromYCenter = anglePoint.y - centrePoint.y,
+				radialDistanceFromCenter = Math.sqrt( distanceFromXCenter * distanceFromXCenter + distanceFromYCenter * distanceFromYCenter);
+
+
+			var angle = Math.PI * 2 + Math.atan2(distanceFromYCenter, distanceFromXCenter);
+
+			//If the segment is in the top left quadrant, we need to add another rotation to the angle
+			if (distanceFromXCenter < 0 && distanceFromYCenter < 0){
+				angle += Math.PI*2;
+			}
+
+			return {
+				angle: angle,
+				distance: radialDistanceFromCenter
+			};
+		},
+		aliasPixel = helpers.aliasPixel = function(pixelWidth){
+			return (pixelWidth % 2 === 0) ? 0 : 0.5;
+		},
+		splineCurve = helpers.splineCurve = function(FirstPoint,MiddlePoint,AfterPoint,t){
+			//Props to Rob Spencer at scaled innovation for his post on splining between points
+			//http://scaledinnovation.com/analytics/splines/aboutSplines.html
+			var d01=Math.sqrt(Math.pow(MiddlePoint.x-FirstPoint.x,2)+Math.pow(MiddlePoint.y-FirstPoint.y,2)),
+				d12=Math.sqrt(Math.pow(AfterPoint.x-MiddlePoint.x,2)+Math.pow(AfterPoint.y-MiddlePoint.y,2)),
+				fa=t*d01/(d01+d12),// scaling factor for triangle Ta
+				fb=t*d12/(d01+d12);
+			return {
+				inner : {
+					x : MiddlePoint.x-fa*(AfterPoint.x-FirstPoint.x),
+					y : MiddlePoint.y-fa*(AfterPoint.y-FirstPoint.y)
+				},
+				outer : {
+					x: MiddlePoint.x+fb*(AfterPoint.x-FirstPoint.x),
+					y : MiddlePoint.y+fb*(AfterPoint.y-FirstPoint.y)
+				}
+			};
+		},
+		calculateOrderOfMagnitude = helpers.calculateOrderOfMagnitude = function(val){
+			return Math.floor(Math.log(val) / Math.LN10);
+		},
+		calculateScaleRange = helpers.calculateScaleRange = function(valuesArray, drawingSize, textSize, startFromZero, integersOnly){
+
+			//Set a minimum step of two - a point at the top of the graph, and a point at the base
+			var minSteps = 2,
+				maxSteps = Math.floor(drawingSize/(textSize * 1.5)),
+				skipFitting = (minSteps >= maxSteps);
+
+			var maxValue = max(valuesArray),
+				minValue = min(valuesArray);
+
+			// We need some degree of seperation here to calculate the scales if all the values are the same
+			// Adding/minusing 0.5 will give us a range of 1.
+			if (maxValue === minValue){
+				maxValue += 0.5;
+				// So we don't end up with a graph with a negative start value if we've said always start from zero
+				if (minValue >= 0.5 && !startFromZero){
+					minValue -= 0.5;
+				}
+				else{
+					// Make up a whole number above the values
+					maxValue += 0.5;
+				}
+			}
+
+			var	valueRange = Math.abs(maxValue - minValue),
+				rangeOrderOfMagnitude = calculateOrderOfMagnitude(valueRange),
+				graphMax = Math.ceil(maxValue / (1 * Math.pow(10, rangeOrderOfMagnitude))) * Math.pow(10, rangeOrderOfMagnitude),
+				graphMin = (startFromZero) ? 0 : Math.floor(minValue / (1 * Math.pow(10, rangeOrderOfMagnitude))) * Math.pow(10, rangeOrderOfMagnitude),
+				graphRange = graphMax - graphMin,
+				stepValue = Math.pow(10, rangeOrderOfMagnitude),
+				numberOfSteps = Math.round(graphRange / stepValue);
+
+			//If we have more space on the graph we'll use it to give more definition to the data
+			while((numberOfSteps > maxSteps || (numberOfSteps * 2) < maxSteps) && !skipFitting) {
+				if(numberOfSteps > maxSteps){
+					stepValue *=2;
+					numberOfSteps = Math.round(graphRange/stepValue);
+					// Don't ever deal with a decimal number of steps - cancel fitting and just use the minimum number of steps.
+					if (numberOfSteps % 1 !== 0){
+						skipFitting = true;
+					}
+				}
+				//We can fit in double the amount of scale points on the scale
+				else{
+					//If user has declared ints only, and the step value isn't a decimal
+					if (integersOnly && rangeOrderOfMagnitude >= 0){
+						//If the user has said integers only, we need to check that making the scale more granular wouldn't make it a float
+						if(stepValue/2 % 1 === 0){
+							stepValue /=2;
+							numberOfSteps = Math.round(graphRange/stepValue);
+						}
+						//If it would make it a float break out of the loop
+						else{
+							break;
+						}
+					}
+					//If the scale doesn't have to be an int, make the scale more granular anyway.
+					else{
+						stepValue /=2;
+						numberOfSteps = Math.round(graphRange/stepValue);
+					}
+
+				}
+			}
+
+			if (skipFitting){
+				numberOfSteps = minSteps;
+				stepValue = graphRange / numberOfSteps;
+			}
+
+			return {
+				steps : numberOfSteps,
+				stepValue : stepValue,
+				min : graphMin,
+				max	: graphMin + (numberOfSteps * stepValue)
+			};
+
+		},
+		/* jshint ignore:start */
+		// Blows up jshint errors based on the new Function constructor
+		//Templating methods
+		//Javascript micro templating by John Resig - source at http://ejohn.org/blog/javascript-micro-templating/
+		template = helpers.template = function(templateString, valuesObject){
+
+			// If templateString is function rather than string-template - call the function for valuesObject
+
+			if(templateString instanceof Function){
+			 	return templateString(valuesObject);
+		 	}
+
+			var cache = {};
+			function tmpl(str, data){
+				// Figure out if we're getting a template, or if we need to
+				// load the template - and be sure to cache the result.
+				var fn = !/\W/.test(str) ?
+				cache[str] = cache[str] :
+
+				// Generate a reusable function that will serve as a template
+				// generator (and which will be cached).
+				new Function("obj",
+					"var p=[],print=function(){p.push.apply(p,arguments);};" +
+
+					// Introduce the data as local variables using with(){}
+					"with(obj){p.push('" +
+
+					// Convert the template into pure JavaScript
+					str
+						.replace(/[\r\t\n]/g, " ")
+						.split("<%").join("\t")
+						.replace(/((^|%>)[^\t]*)'/g, "$1\r")
+						.replace(/\t=(.*?)%>/g, "',$1,'")
+						.split("\t").join("');")
+						.split("%>").join("p.push('")
+						.split("\r").join("\\'") +
+					"');}return p.join('');"
+				);
+
+				// Provide some basic currying to the user
+				return data ? fn( data ) : fn;
+			}
+			return tmpl(templateString,valuesObject);
+		},
+		/* jshint ignore:end */
+		generateLabels = helpers.generateLabels = function(templateString,numberOfSteps,graphMin,stepValue){
+			var labelsArray = new Array(numberOfSteps);
+			if (labelTemplateString){
+				each(labelsArray,function(val,index){
+					labelsArray[index] = template(templateString,{value: (graphMin + (stepValue*(index+1)))});
+				});
+			}
+			return labelsArray;
+		},
+		//--Animation methods
+		//Easing functions adapted from Robert Penner's easing equations
+		//http://www.robertpenner.com/easing/
+		easingEffects = helpers.easingEffects = {
+			linear: function (t) {
+				return t;
+			},
+			easeInQuad: function (t) {
+				return t * t;
+			},
+			easeOutQuad: function (t) {
+				return -1 * t * (t - 2);
+			},
+			easeInOutQuad: function (t) {
+				if ((t /= 1 / 2) < 1) return 1 / 2 * t * t;
+				return -1 / 2 * ((--t) * (t - 2) - 1);
+			},
+			easeInCubic: function (t) {
+				return t * t * t;
+			},
+			easeOutCubic: function (t) {
+				return 1 * ((t = t / 1 - 1) * t * t + 1);
+			},
+			easeInOutCubic: function (t) {
+				if ((t /= 1 / 2) < 1) return 1 / 2 * t * t * t;
+				return 1 / 2 * ((t -= 2) * t * t + 2);
+			},
+			easeInQuart: function (t) {
+				return t * t * t * t;
+			},
+			easeOutQuart: function (t) {
+				return -1 * ((t = t / 1 - 1) * t * t * t - 1);
+			},
+			easeInOutQuart: function (t) {
+				if ((t /= 1 / 2) < 1) return 1 / 2 * t * t * t * t;
+				return -1 / 2 * ((t -= 2) * t * t * t - 2);
+			},
+			easeInQuint: function (t) {
+				return 1 * (t /= 1) * t * t * t * t;
+			},
+			easeOutQuint: function (t) {
+				return 1 * ((t = t / 1 - 1) * t * t * t * t + 1);
+			},
+			easeInOutQuint: function (t) {
+				if ((t /= 1 / 2) < 1) return 1 / 2 * t * t * t * t * t;
+				return 1 / 2 * ((t -= 2) * t * t * t * t + 2);
+			},
+			easeInSine: function (t) {
+				return -1 * Math.cos(t / 1 * (Math.PI / 2)) + 1;
+			},
+			easeOutSine: function (t) {
+				return 1 * Math.sin(t / 1 * (Math.PI / 2));
+			},
+			easeInOutSine: function (t) {
+				return -1 / 2 * (Math.cos(Math.PI * t / 1) - 1);
+			},
+			easeInExpo: function (t) {
+				return (t === 0) ? 1 : 1 * Math.pow(2, 10 * (t / 1 - 1));
+			},
+			easeOutExpo: function (t) {
+				return (t === 1) ? 1 : 1 * (-Math.pow(2, -10 * t / 1) + 1);
+			},
+			easeInOutExpo: function (t) {
+				if (t === 0) return 0;
+				if (t === 1) return 1;
+				if ((t /= 1 / 2) < 1) return 1 / 2 * Math.pow(2, 10 * (t - 1));
+				return 1 / 2 * (-Math.pow(2, -10 * --t) + 2);
+			},
+			easeInCirc: function (t) {
+				if (t >= 1) return t;
+				return -1 * (Math.sqrt(1 - (t /= 1) * t) - 1);
+			},
+			easeOutCirc: function (t) {
+				return 1 * Math.sqrt(1 - (t = t / 1 - 1) * t);
+			},
+			easeInOutCirc: function (t) {
+				if ((t /= 1 / 2) < 1) return -1 / 2 * (Math.sqrt(1 - t * t) - 1);
+				return 1 / 2 * (Math.sqrt(1 - (t -= 2) * t) + 1);
+			},
+			easeInElastic: function (t) {
+				var s = 1.70158;
+				var p = 0;
+				var a = 1;
+				if (t === 0) return 0;
+				if ((t /= 1) == 1) return 1;
+				if (!p) p = 1 * 0.3;
+				if (a < Math.abs(1)) {
+					a = 1;
+					s = p / 4;
+				} else s = p / (2 * Math.PI) * Math.asin(1 / a);
+				return -(a * Math.pow(2, 10 * (t -= 1)) * Math.sin((t * 1 - s) * (2 * Math.PI) / p));
+			},
+			easeOutElastic: function (t) {
+				var s = 1.70158;
+				var p = 0;
+				var a = 1;
+				if (t === 0) return 0;
+				if ((t /= 1) == 1) return 1;
+				if (!p) p = 1 * 0.3;
+				if (a < Math.abs(1)) {
+					a = 1;
+					s = p / 4;
+				} else s = p / (2 * Math.PI) * Math.asin(1 / a);
+				return a * Math.pow(2, -10 * t) * Math.sin((t * 1 - s) * (2 * Math.PI) / p) + 1;
+			},
+			easeInOutElastic: function (t) {
+				var s = 1.70158;
+				var p = 0;
+				var a = 1;
+				if (t === 0) return 0;
+				if ((t /= 1 / 2) == 2) return 1;
+				if (!p) p = 1 * (0.3 * 1.5);
+				if (a < Math.abs(1)) {
+					a = 1;
+					s = p / 4;
+				} else s = p / (2 * Math.PI) * Math.asin(1 / a);
+				if (t < 1) return -0.5 * (a * Math.pow(2, 10 * (t -= 1)) * Math.sin((t * 1 - s) * (2 * Math.PI) / p));
+				return a * Math.pow(2, -10 * (t -= 1)) * Math.sin((t * 1 - s) * (2 * Math.PI) / p) * 0.5 + 1;
+			},
+			easeInBack: function (t) {
+				var s = 1.70158;
+				return 1 * (t /= 1) * t * ((s + 1) * t - s);
+			},
+			easeOutBack: function (t) {
+				var s = 1.70158;
+				return 1 * ((t = t / 1 - 1) * t * ((s + 1) * t + s) + 1);
+			},
+			easeInOutBack: function (t) {
+				var s = 1.70158;
+				if ((t /= 1 / 2) < 1) return 1 / 2 * (t * t * (((s *= (1.525)) + 1) * t - s));
+				return 1 / 2 * ((t -= 2) * t * (((s *= (1.525)) + 1) * t + s) + 2);
+			},
+			easeInBounce: function (t) {
+				return 1 - easingEffects.easeOutBounce(1 - t);
+			},
+			easeOutBounce: function (t) {
+				if ((t /= 1) < (1 / 2.75)) {
+					return 1 * (7.5625 * t * t);
+				} else if (t < (2 / 2.75)) {
+					return 1 * (7.5625 * (t -= (1.5 / 2.75)) * t + 0.75);
+				} else if (t < (2.5 / 2.75)) {
+					return 1 * (7.5625 * (t -= (2.25 / 2.75)) * t + 0.9375);
+				} else {
+					return 1 * (7.5625 * (t -= (2.625 / 2.75)) * t + 0.984375);
+				}
+			},
+			easeInOutBounce: function (t) {
+				if (t < 1 / 2) return easingEffects.easeInBounce(t * 2) * 0.5;
+				return easingEffects.easeOutBounce(t * 2 - 1) * 0.5 + 1 * 0.5;
+			}
+		},
+		//Request animation polyfill - http://www.paulirish.com/2011/requestanimationframe-for-smart-animating/
+		requestAnimFrame = helpers.requestAnimFrame = (function(){
+			return window.requestAnimationFrame ||
+				window.webkitRequestAnimationFrame ||
+				window.mozRequestAnimationFrame ||
+				window.oRequestAnimationFrame ||
+				window.msRequestAnimationFrame ||
+				function(callback) {
+					return window.setTimeout(callback, 1000 / 60);
+				};
+		})(),
+		cancelAnimFrame = helpers.cancelAnimFrame = (function(){
+			return window.cancelAnimationFrame ||
+				window.webkitCancelAnimationFrame ||
+				window.mozCancelAnimationFrame ||
+				window.oCancelAnimationFrame ||
+				window.msCancelAnimationFrame ||
+				function(callback) {
+					return window.clearTimeout(callback, 1000 / 60);
+				};
+		})(),
+		animationLoop = helpers.animationLoop = function(callback,totalSteps,easingString,onProgress,onComplete,chartInstance){
+
+			var currentStep = 0,
+				easingFunction = easingEffects[easingString] || easingEffects.linear;
+
+			var animationFrame = function(){
+				currentStep++;
+				var stepDecimal = currentStep/totalSteps;
+				var easeDecimal = easingFunction(stepDecimal);
+
+				callback.call(chartInstance,easeDecimal,stepDecimal, currentStep);
+				onProgress.call(chartInstance,easeDecimal,stepDecimal);
+				if (currentStep < totalSteps){
+					chartInstance.animationFrame = requestAnimFrame(animationFrame);
+				} else{
+					onComplete.apply(chartInstance);
+				}
+			};
+			requestAnimFrame(animationFrame);
+		},
+		//-- DOM methods
+		getRelativePosition = helpers.getRelativePosition = function(evt){
+			var mouseX, mouseY;
+			var e = evt.originalEvent || evt,
+				canvas = evt.currentTarget || evt.srcElement,
+				boundingRect = canvas.getBoundingClientRect();
+
+			if (e.touches){
+				mouseX = e.touches[0].clientX - boundingRect.left;
+				mouseY = e.touches[0].clientY - boundingRect.top;
+
+			}
+			else{
+				mouseX = e.clientX - boundingRect.left;
+				mouseY = e.clientY - boundingRect.top;
+			}
+
+			return {
+				x : mouseX,
+				y : mouseY
+			};
+
+		},
+		addEvent = helpers.addEvent = function(node,eventType,method){
+			if (node.addEventListener){
+				node.addEventListener(eventType,method);
+			} else if (node.attachEvent){
+				node.attachEvent("on"+eventType, method);
+			} else {
+				node["on"+eventType] = method;
+			}
+		},
+		removeEvent = helpers.removeEvent = function(node, eventType, handler){
+			if (node.removeEventListener){
+				node.removeEventListener(eventType, handler, false);
+			} else if (node.detachEvent){
+				node.detachEvent("on"+eventType,handler);
+			} else{
+				node["on" + eventType] = noop;
+			}
+		},
+		bindEvents = helpers.bindEvents = function(chartInstance, arrayOfEvents, handler){
+			// Create the events object if it's not already present
+			if (!chartInstance.events) chartInstance.events = {};
+
+			each(arrayOfEvents,function(eventName){
+				chartInstance.events[eventName] = function(){
+					handler.apply(chartInstance, arguments);
+				};
+				addEvent(chartInstance.chart.canvas,eventName,chartInstance.events[eventName]);
+			});
+		},
+		unbindEvents = helpers.unbindEvents = function (chartInstance, arrayOfEvents) {
+			each(arrayOfEvents, function(handler,eventName){
+				removeEvent(chartInstance.chart.canvas, eventName, handler);
+			});
+		},
+		getMaximumWidth = helpers.getMaximumWidth = function(domNode){
+			var container = domNode.parentNode;
+			// TODO = check cross browser stuff with this.
+			return container.clientWidth;
+		},
+		getMaximumHeight = helpers.getMaximumHeight = function(domNode){
+			var container = domNode.parentNode;
+			// TODO = check cross browser stuff with this.
+			return container.clientHeight;
+		},
+		getMaximumSize = helpers.getMaximumSize = helpers.getMaximumWidth, // legacy support
+		retinaScale = helpers.retinaScale = function(chart){
+			var ctx = chart.ctx,
+				width = chart.canvas.width,
+				height = chart.canvas.height;
+
+			if (window.devicePixelRatio) {
+				ctx.canvas.style.width = width + "px";
+				ctx.canvas.style.height = height + "px";
+				ctx.canvas.height = height * window.devicePixelRatio;
+				ctx.canvas.width = width * window.devicePixelRatio;
+				ctx.scale(window.devicePixelRatio, window.devicePixelRatio);
+			}
+		},
+		//-- Canvas methods
+		clear = helpers.clear = function(chart){
+			chart.ctx.clearRect(0,0,chart.width,chart.height);
+		},
+		fontString = helpers.fontString = function(pixelSize,fontStyle,fontFamily){
+			return fontStyle + " " + pixelSize+"px " + fontFamily;
+		},
+		longestText = helpers.longestText = function(ctx,font,arrayOfStrings){
+			ctx.font = font;
+			var longest = 0;
+			each(arrayOfStrings,function(string){
+				var textWidth = ctx.measureText(string).width;
+				longest = (textWidth > longest) ? textWidth : longest;
+			});
+			return longest;
+		},
+		drawRoundedRectangle = helpers.drawRoundedRectangle = function(ctx,x,y,width,height,radius){
+			ctx.beginPath();
+			ctx.moveTo(x + radius, y);
+			ctx.lineTo(x + width - radius, y);
+			ctx.quadraticCurveTo(x + width, y, x + width, y + radius);
+			ctx.lineTo(x + width, y + height - radius);
+			ctx.quadraticCurveTo(x + width, y + height, x + width - radius, y + height);
+			ctx.lineTo(x + radius, y + height);
+			ctx.quadraticCurveTo(x, y + height, x, y + height - radius);
+			ctx.lineTo(x, y + radius);
+			ctx.quadraticCurveTo(x, y, x + radius, y);
+			ctx.closePath();
+		};
+
+
+	//Store a reference to each instance - allowing us to globally resize chart instances on window resize.
+	//Destroy method on the chart will remove the instance of the chart from this reference.
+	Chart.instances = {};
+
+	Chart.Type = function(data,options,chart){
+		this.options = options;
+		this.chart = chart;
+		this.id = uid();
+		//Add the chart instance to the global namespace
+		Chart.instances[this.id] = this;
+
+		// Initialize is always called when a chart type is created
+		// By default it is a no op, but it should be extended
+		if (options.responsive){
+			this.resize();
+		}
+		this.initialize.call(this,data);
+	};
+
+	//Core methods that'll be a part of every chart type
+	extend(Chart.Type.prototype,{
+		initialize : function(){return this;},
+		clear : function(){
+			clear(this.chart);
+			return this;
+		},
+		stop : function(){
+			// Stops any current animation loop occuring
+			cancelAnimFrame(this.animationFrame);
+			return this;
+		},
+		resize : function(callback){
+			this.stop();
+			var canvas = this.chart.canvas,
+				newWidth = getMaximumWidth(this.chart.canvas),
+				newHeight = this.options.maintainAspectRatio ? newWidth / this.chart.aspectRatio : getMaximumHeight(this.chart.canvas);
+
+			canvas.width = this.chart.width = newWidth;
+			canvas.height = this.chart.height = newHeight;
+
+			retinaScale(this.chart);
+
+			if (typeof callback === "function"){
+				callback.apply(this, Array.prototype.slice.call(arguments, 1));
+			}
+			return this;
+		},
+		reflow : noop,
+		render : function(reflow){
+			if (reflow){
+				this.reflow();
+			}
+			if (this.options.animation && !reflow){
+				helpers.animationLoop(
+					this.draw,
+					this.options.animationSteps,
+					this.options.animationEasing,
+					this.options.onAnimationProgress,
+					this.options.onAnimationComplete,
+					this
+				);
+			}
+			else{
+				this.draw();
+				this.options.onAnimationComplete.call(this);
+			}
+			return this;
+		},
+		generateLegend : function(){
+			return template(this.options.legendTemplate,this);
+		},
+		destroy : function(){
+			this.clear();
+			unbindEvents(this, this.events);
+			var canvas = this.chart.canvas;
+
+			// Reset canvas height/width attributes starts a fresh with the canvas context
+			canvas.width = this.chart.width;
+			canvas.height = this.chart.height;
+
+			// < IE9 doesn't support removeProperty
+			if (canvas.style.removeProperty) {
+				canvas.style.removeProperty('width');
+				canvas.style.removeProperty('height');
+			} else {
+				canvas.style.removeAttribute('width');
+				canvas.style.removeAttribute('height');
+			}
+
+			delete Chart.instances[this.id];
+		},
+		showTooltip : function(ChartElements, forceRedraw){
+			// Only redraw the chart if we've actually changed what we're hovering on.
+			if (typeof this.activeElements === 'undefined') this.activeElements = [];
+
+			var isChanged = (function(Elements){
+				var changed = false;
+
+				if (Elements.length !== this.activeElements.length){
+					changed = true;
+					return changed;
+				}
+
+				each(Elements, function(element, index){
+					if (element !== this.activeElements[index]){
+						changed = true;
+					}
+				}, this);
+				return changed;
+			}).call(this, ChartElements);
+
+			if (!isChanged && !forceRedraw){
+				return;
+			}
+			else{
+				this.activeElements = ChartElements;
+			}
+			this.draw();
+			if(this.options.customTooltips){
+				this.options.customTooltips(false);
+			}
+			if (ChartElements.length > 0){
+				// If we have multiple datasets, show a MultiTooltip for all of the data points at that index
+				if (this.datasets && this.datasets.length > 1) {
+					var dataArray,
+						dataIndex;
+
+					for (var i = this.datasets.length - 1; i >= 0; i--) {
+						dataArray = this.datasets[i].points || this.datasets[i].bars || this.datasets[i].segments;
+						dataIndex = indexOf(dataArray, ChartElements[0]);
+						if (dataIndex !== -1){
+							break;
+						}
+					}
+					var tooltipLabels = [],
+						tooltipColors = [],
+						medianPosition = (function(index) {
+
+							// Get all the points at that particular index
+							var Elements = [],
+								dataCollection,
+								xPositions = [],
+								yPositions = [],
+								xMax,
+								yMax,
+								xMin,
+								yMin;
+							helpers.each(this.datasets, function(dataset){
+								dataCollection = dataset.points || dataset.bars || dataset.segments;
+								if (dataCollection[dataIndex] && dataCollection[dataIndex].hasValue()){
+									Elements.push(dataCollection[dataIndex]);
+								}
+							});
+
+							helpers.each(Elements, function(element) {
+								xPositions.push(element.x);
+								yPositions.push(element.y);
+
+
+								//Include any colour information about the element
+								tooltipLabels.push(helpers.template(this.options.multiTooltipTemplate, element));
+								tooltipColors.push({
+									fill: element._saved.fillColor || element.fillColor,
+									stroke: element._saved.strokeColor || element.strokeColor
+								});
+
+							}, this);
+
+							yMin = min(yPositions);
+							yMax = max(yPositions);
+
+							xMin = min(xPositions);
+							xMax = max(xPositions);
+
+							return {
+								x: (xMin > this.chart.width/2) ? xMin : xMax,
+								y: (yMin + yMax)/2
+							};
+						}).call(this, dataIndex);
+
+					new Chart.MultiTooltip({
+						x: medianPosition.x,
+						y: medianPosition.y,
+						xPadding: this.options.tooltipXPadding,
+						yPadding: this.options.tooltipYPadding,
+						xOffset: this.options.tooltipXOffset,
+						fillColor: this.options.tooltipFillColor,
+						textColor: this.options.tooltipFontColor,
+						fontFamily: this.options.tooltipFontFamily,
+						fontStyle: this.options.tooltipFontStyle,
+						fontSize: this.options.tooltipFontSize,
+						titleTextColor: this.options.tooltipTitleFontColor,
+						titleFontFamily: this.options.tooltipTitleFontFamily,
+						titleFontStyle: this.options.tooltipTitleFontStyle,
+						titleFontSize: this.options.tooltipTitleFontSize,
+						cornerRadius: this.options.tooltipCornerRadius,
+						labels: tooltipLabels,
+						legendColors: tooltipColors,
+						legendColorBackground : this.options.multiTooltipKeyBackground,
+						title: ChartElements[0].label,
+						chart: this.chart,
+						ctx: this.chart.ctx,
+						custom: this.options.customTooltips
+					}).draw();
+
+				} else {
+					each(ChartElements, function(Element) {
+						var tooltipPosition = Element.tooltipPosition();
+						new Chart.Tooltip({
+							x: Math.round(tooltipPosition.x),
+							y: Math.round(tooltipPosition.y),
+							xPadding: this.options.tooltipXPadding,
+							yPadding: this.options.tooltipYPadding,
+							fillColor: this.options.tooltipFillColor,
+							textColor: this.options.tooltipFontColor,
+							fontFamily: this.options.tooltipFontFamily,
+							fontStyle: this.options.tooltipFontStyle,
+							fontSize: this.options.tooltipFontSize,
+							caretHeight: this.options.tooltipCaretSize,
+							cornerRadius: this.options.tooltipCornerRadius,
+							text: template(this.options.tooltipTemplate, Element),
+							chart: this.chart,
+							custom: this.options.customTooltips
+						}).draw();
+					}, this);
+				}
+			}
+			return this;
+		},
+		toBase64Image : function(){
+			return this.chart.canvas.toDataURL.apply(this.chart.canvas, arguments);
+		}
+	});
+
+	Chart.Type.extend = function(extensions){
+
+		var parent = this;
+
+		var ChartType = function(){
+			return parent.apply(this,arguments);
+		};
+
+		//Copy the prototype object of the this class
+		ChartType.prototype = clone(parent.prototype);
+		//Now overwrite some of the properties in the base class with the new extensions
+		extend(ChartType.prototype, extensions);
+
+		ChartType.extend = Chart.Type.extend;
+
+		if (extensions.name || parent.prototype.name){
+
+			var chartName = extensions.name || parent.prototype.name;
+			//Assign any potential default values of the new chart type
+
+			//If none are defined, we'll use a clone of the chart type this is being extended from.
+			//I.e. if we extend a line chart, we'll use the defaults from the line chart if our new chart
+			//doesn't define some defaults of their own.
+
+			var baseDefaults = (Chart.defaults[parent.prototype.name]) ? clone(Chart.defaults[parent.prototype.name]) : {};
+
+			Chart.defaults[chartName] = extend(baseDefaults,extensions.defaults);
+
+			Chart.types[chartName] = ChartType;
+
+			//Register this new chart type in the Chart prototype
+			Chart.prototype[chartName] = function(data,options){
+				var config = merge(Chart.defaults.global, Chart.defaults[chartName], options || {});
+				return new ChartType(data,config,this);
+			};
+		} else{
+			warn("Name not provided for this chart, so it hasn't been registered");
+		}
+		return parent;
+	};
+
+	Chart.Element = function(configuration){
+		extend(this,configuration);
+		this.initialize.apply(this,arguments);
+		this.save();
+	};
+	extend(Chart.Element.prototype,{
+		initialize : function(){},
+		restore : function(props){
+			if (!props){
+				extend(this,this._saved);
+			} else {
+				each(props,function(key){
+					this[key] = this._saved[key];
+				},this);
+			}
+			return this;
+		},
+		save : function(){
+			this._saved = clone(this);
+			delete this._saved._saved;
+			return this;
+		},
+		update : function(newProps){
+			each(newProps,function(value,key){
+				this._saved[key] = this[key];
+				this[key] = value;
+			},this);
+			return this;
+		},
+		transition : function(props,ease){
+			each(props,function(value,key){
+				this[key] = ((value - this._saved[key]) * ease) + this._saved[key];
+			},this);
+			return this;
+		},
+		tooltipPosition : function(){
+			return {
+				x : this.x,
+				y : this.y
+			};
+		},
+		hasValue: function(){
+			return isNumber(this.value);
+		}
+	});
+
+	Chart.Element.extend = inherits;
+
+
+	Chart.Point = Chart.Element.extend({
+		display: true,
+		inRange: function(chartX,chartY){
+			var hitDetectionRange = this.hitDetectionRadius + this.radius;
+			return ((Math.pow(chartX-this.x, 2)+Math.pow(chartY-this.y, 2)) < Math.pow(hitDetectionRange,2));
+		},
+		draw : function(){
+			if (this.display){
+				var ctx = this.ctx;
+				ctx.beginPath();
+
+				ctx.arc(this.x, this.y, this.radius, 0, Math.PI*2);
+				ctx.closePath();
+
+				ctx.strokeStyle = this.strokeColor;
+				ctx.lineWidth = this.strokeWidth;
+
+				ctx.fillStyle = this.fillColor;
+
+				ctx.fill();
+				ctx.stroke();
+			}
+
+
+			//Quick debug for bezier curve splining
+			//Highlights control points and the line between them.
+			//Handy for dev - stripped in the min version.
+
+			// ctx.save();
+			// ctx.fillStyle = "black";
+			// ctx.strokeStyle = "black"
+			// ctx.beginPath();
+			// ctx.arc(this.controlPoints.inner.x,this.controlPoints.inner.y, 2, 0, Math.PI*2);
+			// ctx.fill();
+
+			// ctx.beginPath();
+			// ctx.arc(this.controlPoints.outer.x,this.controlPoints.outer.y, 2, 0, Math.PI*2);
+			// ctx.fill();
+
+			// ctx.moveTo(this.controlPoints.inner.x,this.controlPoints.inner.y);
+			// ctx.lineTo(this.x, this.y);
+			// ctx.lineTo(this.controlPoints.outer.x,this.controlPoints.outer.y);
+			// ctx.stroke();
+
+			// ctx.restore();
+
+
+
+		}
+	});
+
+	Chart.Arc = Chart.Element.extend({
+		inRange : function(chartX,chartY){
+
+			var pointRelativePosition = helpers.getAngleFromPoint(this, {
+				x: chartX,
+				y: chartY
+			});
+
+			//Check if within the range of the open/close angle
+			var betweenAngles = (pointRelativePosition.angle >= this.startAngle && pointRelativePosition.angle <= this.endAngle),
+				withinRadius = (pointRelativePosition.distance >= this.innerRadius && pointRelativePosition.distance <= this.outerRadius);
+
+			return (betweenAngles && withinRadius);
+			//Ensure within the outside of the arc centre, but inside arc outer
+		},
+		tooltipPosition : function(){
+			var centreAngle = this.startAngle + ((this.endAngle - this.startAngle) / 2),
+				rangeFromCentre = (this.outerRadius - this.innerRadius) / 2 + this.innerRadius;
+			return {
+				x : this.x + (Math.cos(centreAngle) * rangeFromCentre),
+				y : this.y + (Math.sin(centreAngle) * rangeFromCentre)
+			};
+		},
+		draw : function(animationPercent){
+
+			var easingDecimal = animationPercent || 1;
+
+			var ctx = this.ctx;
+
+			ctx.beginPath();
+
+			ctx.arc(this.x, this.y, this.outerRadius, this.startAngle, this.endAngle);
+
+			ctx.arc(this.x, this.y, this.innerRadius, this.endAngle, this.startAngle, true);
+
+			ctx.closePath();
+			ctx.strokeStyle = this.strokeColor;
+			ctx.lineWidth = this.strokeWidth;
+
+			ctx.fillStyle = this.fillColor;
+
+			ctx.fill();
+			ctx.lineJoin = 'bevel';
+
+			if (this.showStroke){
+				ctx.stroke();
+			}
+		}
+	});
+
+	Chart.Rectangle = Chart.Element.extend({
+		draw : function(){
+			var ctx = this.ctx,
+				halfWidth = this.width/2,
+				leftX = this.x - halfWidth,
+				rightX = this.x + halfWidth,
+				top = this.base - (this.base - this.y),
+				halfStroke = this.strokeWidth / 2;
+
+			// Canvas doesn't allow us to stroke inside the width so we can
+			// adjust the sizes to fit if we're setting a stroke on the line
+			if (this.showStroke){
+				leftX += halfStroke;
+				rightX -= halfStroke;
+				top += halfStroke;
+			}
+
+			ctx.beginPath();
+
+			ctx.fillStyle = this.fillColor;
+			ctx.strokeStyle = this.strokeColor;
+			ctx.lineWidth = this.strokeWidth;
+
+			// It'd be nice to keep this class totally generic to any rectangle
+			// and simply specify which border to miss out.
+			ctx.moveTo(leftX, this.base);
+			ctx.lineTo(leftX, top);
+			ctx.lineTo(rightX, top);
+			ctx.lineTo(rightX, this.base);
+			ctx.fill();
+			if (this.showStroke){
+				ctx.stroke();
+			}
+		},
+		height : function(){
+			return this.base - this.y;
+		},
+		inRange : function(chartX,chartY){
+			return (chartX >= this.x - this.width/2 && chartX <= this.x + this.width/2) && (chartY >= this.y && chartY <= this.base);
+		}
+	});
+
+	Chart.Tooltip = Chart.Element.extend({
+		draw : function(){
+
+			var ctx = this.chart.ctx;
+
+			ctx.font = fontString(this.fontSize,this.fontStyle,this.fontFamily);
+
+			this.xAlign = "center";
+			this.yAlign = "above";
+
+			//Distance between the actual element.y position and the start of the tooltip caret
+			var caretPadding = this.caretPadding = 2;
+
+			var tooltipWidth = ctx.measureText(this.text).width + 2*this.xPadding,
+				tooltipRectHeight = this.fontSize + 2*this.yPadding,
+				tooltipHeight = tooltipRectHeight + this.caretHeight + caretPadding;
+
+			if (this.x + tooltipWidth/2 >this.chart.width){
+				this.xAlign = "left";
+			} else if (this.x - tooltipWidth/2 < 0){
+				this.xAlign = "right";
+			}
+
+			if (this.y - tooltipHeight < 0){
+				this.yAlign = "below";
+			}
+
+
+			var tooltipX = this.x - tooltipWidth/2,
+				tooltipY = this.y - tooltipHeight;
+
+			ctx.fillStyle = this.fillColor;
+
+			// Custom Tooltips
+			if(this.custom){
+				this.custom(this);
+			}
+			else{
+				switch(this.yAlign)
+				{
+				case "above":
+					//Draw a caret above the x/y
+					ctx.beginPath();
+					ctx.moveTo(this.x,this.y - caretPadding);
+					ctx.lineTo(this.x + this.caretHeight, this.y - (caretPadding + this.caretHeight));
+					ctx.lineTo(this.x - this.caretHeight, this.y - (caretPadding + this.caretHeight));
+					ctx.closePath();
+					ctx.fill();
+					break;
+				case "below":
+					tooltipY = this.y + caretPadding + this.caretHeight;
+					//Draw a caret below the x/y
+					ctx.beginPath();
+					ctx.moveTo(this.x, this.y + caretPadding);
+					ctx.lineTo(this.x + this.caretHeight, this.y + caretPadding + this.caretHeight);
+					ctx.lineTo(this.x - this.caretHeight, this.y + caretPadding + this.caretHeight);
+					ctx.closePath();
+					ctx.fill();
+					break;
+				}
+
+				switch(this.xAlign)
+				{
+				case "left":
+					tooltipX = this.x - tooltipWidth + (this.cornerRadius + this.caretHeight);
+					break;
+				case "right":
+					tooltipX = this.x - (this.cornerRadius + this.caretHeight);
+					break;
+				}
+
+				drawRoundedRectangle(ctx,tooltipX,tooltipY,tooltipWidth,tooltipRectHeight,this.cornerRadius);
+
+				ctx.fill();
+
+				ctx.fillStyle = this.textColor;
+				ctx.textAlign = "center";
+				ctx.textBaseline = "middle";
+				ctx.fillText(this.text, tooltipX + tooltipWidth/2, tooltipY + tooltipRectHeight/2);
+			}
+		}
+	});
+
+	Chart.MultiTooltip = Chart.Element.extend({
+		initialize : function(){
+			this.font = fontString(this.fontSize,this.fontStyle,this.fontFamily);
+
+			this.titleFont = fontString(this.titleFontSize,this.titleFontStyle,this.titleFontFamily);
+
+			this.height = (this.labels.length * this.fontSize) + ((this.labels.length-1) * (this.fontSize/2)) + (this.yPadding*2) + this.titleFontSize *1.5;
+
+			this.ctx.font = this.titleFont;
+
+			var titleWidth = this.ctx.measureText(this.title).width,
+				//Label has a legend square as well so account for this.
+				labelWidth = longestText(this.ctx,this.font,this.labels) + this.fontSize + 3,
+				longestTextWidth = max([labelWidth,titleWidth]);
+
+			this.width = longestTextWidth + (this.xPadding*2);
+
+
+			var halfHeight = this.height/2;
+
+			//Check to ensure the height will fit on the canvas
+			if (this.y - halfHeight < 0 ){
+				this.y = halfHeight;
+			} else if (this.y + halfHeight > this.chart.height){
+				this.y = this.chart.height - halfHeight;
+			}
+
+			//Decide whether to align left or right based on position on canvas
+			if (this.x > this.chart.width/2){
+				this.x -= this.xOffset + this.width;
+			} else {
+				this.x += this.xOffset;
+			}
+
+
+		},
+		getLineHeight : function(index){
+			var baseLineHeight = this.y - (this.height/2) + this.yPadding,
+				afterTitleIndex = index-1;
+
+			//If the index is zero, we're getting the title
+			if (index === 0){
+				return baseLineHeight + this.titleFontSize/2;
+			} else{
+				return baseLineHeight + ((this.fontSize*1.5*afterTitleIndex) + this.fontSize/2) + this.titleFontSize * 1.5;
+			}
+
+		},
+		draw : function(){
+			// Custom Tooltips
+			if(this.custom){
+				this.custom(this);
+			}
+			else{
+				drawRoundedRectangle(this.ctx,this.x,this.y - this.height/2,this.width,this.height,this.cornerRadius);
+				var ctx = this.ctx;
+				ctx.fillStyle = this.fillColor;
+				ctx.fill();
+				ctx.closePath();
+
+				ctx.textAlign = "left";
+				ctx.textBaseline = "middle";
+				ctx.fillStyle = this.titleTextColor;
+				ctx.font = this.titleFont;
+
+				ctx.fillText(this.title,this.x + this.xPadding, this.getLineHeight(0));
+
+				ctx.font = this.font;
+				helpers.each(this.labels,function(label,index){
+					ctx.fillStyle = this.textColor;
+					ctx.fillText(label,this.x + this.xPadding + this.fontSize + 3, this.getLineHeight(index + 1));
+
+					//A bit gnarly, but clearing this rectangle breaks when using explorercanvas (clears whole canvas)
+					//ctx.clearRect(this.x + this.xPadding, this.getLineHeight(index + 1) - this.fontSize/2, this.fontSize, this.fontSize);
+					//Instead we'll make a white filled block to put the legendColour palette over.
+
+					ctx.fillStyle = this.legendColorBackground;
+					ctx.fillRect(this.x + this.xPadding, this.getLineHeight(index + 1) - this.fontSize/2, this.fontSize, this.fontSize);
+
+					ctx.fillStyle = this.legendColors[index].fill;
+					ctx.fillRect(this.x + this.xPadding, this.getLineHeight(index + 1) - this.fontSize/2, this.fontSize, this.fontSize);
+
+
+				},this);
+			}
+		}
+	});
+
+	Chart.Scale = Chart.Element.extend({
+		initialize : function(){
+			this.fit();
+		},
+		buildYLabels : function(){
+			this.yLabels = [];
+
+			var stepDecimalPlaces = getDecimalPlaces(this.stepValue);
+
+			for (var i=0; i<=this.steps; i++){
+				this.yLabels.push(template(this.templateString,{value:(this.min + (i * this.stepValue)).toFixed(stepDecimalPlaces)}));
+			}
+			this.yLabelWidth = (this.display && this.showLabels) ? longestText(this.ctx,this.font,this.yLabels) : 0;
+		},
+		addXLabel : function(label){
+			this.xLabels.push(label);
+			this.valuesCount++;
+			this.fit();
+		},
+		removeXLabel : function(){
+			this.xLabels.shift();
+			this.valuesCount--;
+			this.fit();
+		},
+		// Fitting loop to rotate x Labels and figure out what fits there, and also calculate how many Y steps to use
+		fit: function(){
+			// First we need the width of the yLabels, assuming the xLabels aren't rotated
+
+			// To do that we need the base line at the top and base of the chart, assuming there is no x label rotation
+			this.startPoint = (this.display) ? this.fontSize : 0;
+			this.endPoint = (this.display) ? this.height - (this.fontSize * 1.5) - 5 : this.height; // -5 to pad labels
+
+			// Apply padding settings to the start and end point.
+			this.startPoint += this.padding;
+			this.endPoint -= this.padding;
+
+			// Cache the starting height, so can determine if we need to recalculate the scale yAxis
+			var cachedHeight = this.endPoint - this.startPoint,
+				cachedYLabelWidth;
+
+			// Build the current yLabels so we have an idea of what size they'll be to start
+			/*
+			 *	This sets what is returned from calculateScaleRange as static properties of this class:
+			 *
+				this.steps;
+				this.stepValue;
+				this.min;
+				this.max;
+			 *
+			 */
+			this.calculateYRange(cachedHeight);
+
+			// With these properties set we can now build the array of yLabels
+			// and also the width of the largest yLabel
+			this.buildYLabels();
+
+			this.calculateXLabelRotation();
+
+			while((cachedHeight > this.endPoint - this.startPoint)){
+				cachedHeight = this.endPoint - this.startPoint;
+				cachedYLabelWidth = this.yLabelWidth;
+
+				this.calculateYRange(cachedHeight);
+				this.buildYLabels();
+
+				// Only go through the xLabel loop again if the yLabel width has changed
+				if (cachedYLabelWidth < this.yLabelWidth){
+					this.calculateXLabelRotation();
+				}
+			}
+
+		},
+		calculateXLabelRotation : function(){
+			//Get the width of each grid by calculating the difference
+			//between x offsets between 0 and 1.
+
+			this.ctx.font = this.font;
+
+			var firstWidth = this.ctx.measureText(this.xLabels[0]).width,
+				lastWidth = this.ctx.measureText(this.xLabels[this.xLabels.length - 1]).width,
+				firstRotated,
+				lastRotated;
+
+
+			this.xScalePaddingRight = lastWidth/2 + 3;
+			this.xScalePaddingLeft = (firstWidth/2 > this.yLabelWidth + 10) ? firstWidth/2 : this.yLabelWidth + 10;
+
+			this.xLabelRotation = 0;
+			if (this.display){
+				var originalLabelWidth = longestText(this.ctx,this.font,this.xLabels),
+					cosRotation,
+					firstRotatedWidth;
+				this.xLabelWidth = originalLabelWidth;
+				//Allow 3 pixels x2 padding either side for label readability
+				var xGridWidth = Math.floor(this.calculateX(1) - this.calculateX(0)) - 6;
+
+				//Max label rotate should be 90 - also act as a loop counter
+				while ((this.xLabelWidth > xGridWidth && this.xLabelRotation === 0) || (this.xLabelWidth > xGridWidth && this.xLabelRotation <= 90 && this.xLabelRotation > 0)){
+					cosRotation = Math.cos(toRadians(this.xLabelRotation));
+
+					firstRotated = cosRotation * firstWidth;
+					lastRotated = cosRotation * lastWidth;
+
+					// We're right aligning the text now.
+					if (firstRotated + this.fontSize / 2 > this.yLabelWidth + 8){
+						this.xScalePaddingLeft = firstRotated + this.fontSize / 2;
+					}
+					this.xScalePaddingRight = this.fontSize/2;
+
+
+					this.xLabelRotation++;
+					this.xLabelWidth = cosRotation * originalLabelWidth;
+
+				}
+				if (this.xLabelRotation > 0){
+					this.endPoint -= Math.sin(toRadians(this.xLabelRotation))*originalLabelWidth + 3;
+				}
+			}
+			else{
+				this.xLabelWidth = 0;
+				this.xScalePaddingRight = this.padding;
+				this.xScalePaddingLeft = this.padding;
+			}
+
+		},
+		// Needs to be overidden in each Chart type
+		// Otherwise we need to pass all the data into the scale class
+		calculateYRange: noop,
+		drawingArea: function(){
+			return this.startPoint - this.endPoint;
+		},
+		calculateY : function(value){
+			var scalingFactor = this.drawingArea() / (this.min - this.max);
+			return this.endPoint - (scalingFactor * (value - this.min));
+		},
+		calculateX : function(index){
+			var isRotated = (this.xLabelRotation > 0),
+				// innerWidth = (this.offsetGridLines) ? this.width - offsetLeft - this.padding : this.width - (offsetLeft + halfLabelWidth * 2) - this.padding,
+				innerWidth = this.width - (this.xScalePaddingLeft + this.xScalePaddingRight),
+				valueWidth = innerWidth/Math.max((this.valuesCount - ((this.offsetGridLines) ? 0 : 1)), 1),
+				valueOffset = (valueWidth * index) + this.xScalePaddingLeft;
+
+			if (this.offsetGridLines){
+				valueOffset += (valueWidth/2);
+			}
+
+			return Math.round(valueOffset);
+		},
+		update : function(newProps){
+			helpers.extend(this, newProps);
+			this.fit();
+		},
+		draw : function(){
+			var ctx = this.ctx,
+				yLabelGap = (this.endPoint - this.startPoint) / this.steps,
+				xStart = Math.round(this.xScalePaddingLeft);
+			if (this.display){
+				ctx.fillStyle = this.textColor;
+				ctx.font = this.font;
+				each(this.yLabels,function(labelString,index){
+					var yLabelCenter = this.endPoint - (yLabelGap * index),
+						linePositionY = Math.round(yLabelCenter),
+						drawHorizontalLine = this.showHorizontalLines;
+
+					ctx.textAlign = "right";
+					ctx.textBaseline = "middle";
+					if (this.showLabels){
+						ctx.fillText(labelString,xStart - 10,yLabelCenter);
+					}
+
+					// This is X axis, so draw it
+					if (index === 0 && !drawHorizontalLine){
+						drawHorizontalLine = true;
+					}
+
+					if (drawHorizontalLine){
+						ctx.beginPath();
+					}
+
+					if (index > 0){
+						// This is a grid line in the centre, so drop that
+						ctx.lineWidth = this.gridLineWidth;
+						ctx.strokeStyle = this.gridLineColor;
+					} else {
+						// This is the first line on the scale
+						ctx.lineWidth = this.lineWidth;
+						ctx.strokeStyle = this.lineColor;
+					}
+
+					linePositionY += helpers.aliasPixel(ctx.lineWidth);
+
+					if(drawHorizontalLine){
+						ctx.moveTo(xStart, linePositionY);
+						ctx.lineTo(this.width, linePositionY);
+						ctx.stroke();
+						ctx.closePath();
+					}
+
+					ctx.lineWidth = this.lineWidth;
+					ctx.strokeStyle = this.lineColor;
+					ctx.beginPath();
+					ctx.moveTo(xStart - 5, linePositionY);
+					ctx.lineTo(xStart, linePositionY);
+					ctx.stroke();
+					ctx.closePath();
+
+				},this);
+
+				each(this.xLabels,function(label,index){
+					var xPos = this.calculateX(index) + aliasPixel(this.lineWidth),
+						// Check to see if line/bar here and decide where to place the line
+						linePos = this.calculateX(index - (this.offsetGridLines ? 0.5 : 0)) + aliasPixel(this.lineWidth),
+						isRotated = (this.xLabelRotation > 0),
+						drawVerticalLine = this.showVerticalLines;
+
+					// This is Y axis, so draw it
+					if (index === 0 && !drawVerticalLine){
+						drawVerticalLine = true;
+					}
+
+					if (drawVerticalLine){
+						ctx.beginPath();
+					}
+
+					if (index > 0){
+						// This is a grid line in the centre, so drop that
+						ctx.lineWidth = this.gridLineWidth;
+						ctx.strokeStyle = this.gridLineColor;
+					} else {
+						// This is the first line on the scale
+						ctx.lineWidth = this.lineWidth;
+						ctx.strokeStyle = this.lineColor;
+					}
+
+					if (drawVerticalLine){
+						ctx.moveTo(linePos,this.endPoint);
+						ctx.lineTo(linePos,this.startPoint - 3);
+						ctx.stroke();
+						ctx.closePath();
+					}
+
+
+					ctx.lineWidth = this.lineWidth;
+					ctx.strokeStyle = this.lineColor;
+
+
+					// Small lines at the bottom of the base grid line
+					ctx.beginPath();
+					ctx.moveTo(linePos,this.endPoint);
+					ctx.lineTo(linePos,this.endPoint + 5);
+					ctx.stroke();
+					ctx.closePath();
+
+					ctx.save();
+					ctx.translate(xPos,(isRotated) ? this.endPoint + 12 : this.endPoint + 8);
+					ctx.rotate(toRadians(this.xLabelRotation)*-1);
+					ctx.font = this.font;
+					ctx.textAlign = (isRotated) ? "right" : "center";
+					ctx.textBaseline = (isRotated) ? "middle" : "top";
+					ctx.fillText(label, 0, 0);
+					ctx.restore();
+				},this);
+
+			}
+		}
+
+	});
+
+	Chart.RadialScale = Chart.Element.extend({
+		initialize: function(){
+			this.size = min([this.height, this.width]);
+			this.drawingArea = (this.display) ? (this.size/2) - (this.fontSize/2 + this.backdropPaddingY) : (this.size/2);
+		},
+		calculateCenterOffset: function(value){
+			// Take into account half font size + the yPadding of the top value
+			var scalingFactor = this.drawingArea / (this.max - this.min);
+
+			return (value - this.min) * scalingFactor;
+		},
+		update : function(){
+			if (!this.lineArc){
+				this.setScaleSize();
+			} else {
+				this.drawingArea = (this.display) ? (this.size/2) - (this.fontSize/2 + this.backdropPaddingY) : (this.size/2);
+			}
+			this.buildYLabels();
+		},
+		buildYLabels: function(){
+			this.yLabels = [];
+
+			var stepDecimalPlaces = getDecimalPlaces(this.stepValue);
+
+			for (var i=0; i<=this.steps; i++){
+				this.yLabels.push(template(this.templateString,{value:(this.min + (i * this.stepValue)).toFixed(stepDecimalPlaces)}));
+			}
+		},
+		getCircumference : function(){
+			return ((Math.PI*2) / this.valuesCount);
+		},
+		setScaleSize: function(){
+			/*
+			 * Right, this is really confusing and there is a lot of maths going on here
+			 * The gist of the problem is here: https://gist.github.com/nnnick/696cc9c55f4b0beb8fe9
+			 *
+			 * Reaction: https://dl.dropboxusercontent.com/u/34601363/toomuchscience.gif
+			 *
+			 * Solution:
+			 *
+			 * We assume the radius of the polygon is half the size of the canvas at first
+			 * at each index we check if the text overlaps.
+			 *
+			 * Where it does, we store that angle and that index.
+			 *
+			 * After finding the largest index and angle we calculate how much we need to remove
+			 * from the shape radius to move the point inwards by that x.
+			 *
+			 * We average the left and right distances to get the maximum shape radius that can fit in the box
+			 * along with labels.
+			 *
+			 * Once we have that, we can find the centre point for the chart, by taking the x text protrusion
+			 * on each side, removing that from the size, halving it and adding the left x protrusion width.
+			 *
+			 * This will mean we have a shape fitted to the canvas, as large as it can be with the labels
+			 * and position it in the most space efficient manner
+			 *
+			 * https://dl.dropboxusercontent.com/u/34601363/yeahscience.gif
+			 */
+
+
+			// Get maximum radius of the polygon. Either half the height (minus the text width) or half the width.
+			// Use this to calculate the offset + change. - Make sure L/R protrusion is at least 0 to stop issues with centre points
+			var largestPossibleRadius = min([(this.height/2 - this.pointLabelFontSize - 5), this.width/2]),
+				pointPosition,
+				i,
+				textWidth,
+				halfTextWidth,
+				furthestRight = this.width,
+				furthestRightIndex,
+				furthestRightAngle,
+				furthestLeft = 0,
+				furthestLeftIndex,
+				furthestLeftAngle,
+				xProtrusionLeft,
+				xProtrusionRight,
+				radiusReductionRight,
+				radiusReductionLeft,
+				maxWidthRadius;
+			this.ctx.font = fontString(this.pointLabelFontSize,this.pointLabelFontStyle,this.pointLabelFontFamily);
+			for (i=0;i<this.valuesCount;i++){
+				// 5px to space the text slightly out - similar to what we do in the draw function.
+				pointPosition = this.getPointPosition(i, largestPossibleRadius);
+				textWidth = this.ctx.measureText(template(this.templateString, { value: this.labels[i] })).width + 5;
+				if (i === 0 || i === this.valuesCount/2){
+					// If we're at index zero, or exactly the middle, we're at exactly the top/bottom
+					// of the radar chart, so text will be aligned centrally, so we'll half it and compare
+					// w/left and right text sizes
+					halfTextWidth = textWidth/2;
+					if (pointPosition.x + halfTextWidth > furthestRight) {
+						furthestRight = pointPosition.x + halfTextWidth;
+						furthestRightIndex = i;
+					}
+					if (pointPosition.x - halfTextWidth < furthestLeft) {
+						furthestLeft = pointPosition.x - halfTextWidth;
+						furthestLeftIndex = i;
+					}
+				}
+				else if (i < this.valuesCount/2) {
+					// Less than half the values means we'll left align the text
+					if (pointPosition.x + textWidth > furthestRight) {
+						furthestRight = pointPosition.x + textWidth;
+						furthestRightIndex = i;
+					}
+				}
+				else if (i > this.valuesCount/2){
+					// More than half the values means we'll right align the text
+					if (pointPosition.x - textWidth < furthestLeft) {
+						furthestLeft = pointPosition.x - textWidth;
+						furthestLeftIndex = i;
+					}
+				}
+			}
+
+			xProtrusionLeft = furthestLeft;
+
+			xProtrusionRight = Math.ceil(furthestRight - this.width);
+
+			furthestRightAngle = this.getIndexAngle(furthestRightIndex);
+
+			furthestLeftAngle = this.getIndexAngle(furthestLeftIndex);
+
+			radiusReductionRight = xProtrusionRight / Math.sin(furthestRightAngle + Math.PI/2);
+
+			radiusReductionLeft = xProtrusionLeft / Math.sin(furthestLeftAngle + Math.PI/2);
+
+			// Ensure we actually need to reduce the size of the chart
+			radiusReductionRight = (isNumber(radiusReductionRight)) ? radiusReductionRight : 0;
+			radiusReductionLeft = (isNumber(radiusReductionLeft)) ? radiusReductionLeft : 0;
+
+			this.drawingArea = largestPossibleRadius - (radiusReductionLeft + radiusReductionRight)/2;
+
+			//this.drawingArea = min([maxWidthRadius, (this.height - (2 * (this.pointLabelFontSize + 5)))/2])
+			this.setCenterPoint(radiusReductionLeft, radiusReductionRight);
+
+		},
+		setCenterPoint: function(leftMovement, rightMovement){
+
+			var maxRight = this.width - rightMovement - this.drawingArea,
+				maxLeft = leftMovement + this.drawingArea;
+
+			this.xCenter = (maxLeft + maxRight)/2;
+			// Always vertically in the centre as the text height doesn't change
+			this.yCenter = (this.height/2);
+		},
+
+		getIndexAngle : function(index){
+			var angleMultiplier = (Math.PI * 2) / this.valuesCount;
+			// Start from the top instead of right, so remove a quarter of the circle
+
+			return index * angleMultiplier - (Math.PI/2);
+		},
+		getPointPosition : function(index, distanceFromCenter){
+			var thisAngle = this.getIndexAngle(index);
+			return {
+				x : (Math.cos(thisAngle) * distanceFromCenter) + this.xCenter,
+				y : (Math.sin(thisAngle) * distanceFromCenter) + this.yCenter
+			};
+		},
+		draw: function(){
+			if (this.display){
+				var ctx = this.ctx;
+				each(this.yLabels, function(label, index){
+					// Don't draw a centre value
+					if (index > 0){
+						var yCenterOffset = index * (this.drawingArea/this.steps),
+							yHeight = this.yCenter - yCenterOffset,
+							pointPosition;
+
+						// Draw circular lines around the scale
+						if (this.lineWidth > 0){
+							ctx.strokeStyle = this.lineColor;
+							ctx.lineWidth = this.lineWidth;
+
+							if(this.lineArc){
+								ctx.beginPath();
+								ctx.arc(this.xCenter, this.yCenter, yCenterOffset, 0, Math.PI*2);
+								ctx.closePath();
+								ctx.stroke();
+							} else{
+								ctx.beginPath();
+								for (var i=0;i<this.valuesCount;i++)
+								{
+									pointPosition = this.getPointPosition(i, this.calculateCenterOffset(this.min + (index * this.stepValue)));
+									if (i === 0){
+										ctx.moveTo(pointPosition.x, pointPosition.y);
+									} else {
+										ctx.lineTo(pointPosition.x, pointPosition.y);
+									}
+								}
+								ctx.closePath();
+								ctx.stroke();
+							}
+						}
+						if(this.showLabels){
+							ctx.font = fontString(this.fontSize,this.fontStyle,this.fontFamily);
+							if (this.showLabelBackdrop){
+								var labelWidth = ctx.measureText(label).width;
+								ctx.fillStyle = this.backdropColor;
+								ctx.fillRect(
+									this.xCenter - labelWidth/2 - this.backdropPaddingX,
+									yHeight - this.fontSize/2 - this.backdropPaddingY,
+									labelWidth + this.backdropPaddingX*2,
+									this.fontSize + this.backdropPaddingY*2
+								);
+							}
+							ctx.textAlign = 'center';
+							ctx.textBaseline = "middle";
+							ctx.fillStyle = this.fontColor;
+							ctx.fillText(label, this.xCenter, yHeight);
+						}
+					}
+				}, this);
+
+				if (!this.lineArc){
+					ctx.lineWidth = this.angleLineWidth;
+					ctx.strokeStyle = this.angleLineColor;
+					for (var i = this.valuesCount - 1; i >= 0; i--) {
+						if (this.angleLineWidth > 0){
+							var outerPosition = this.getPointPosition(i, this.calculateCenterOffset(this.max));
+							ctx.beginPath();
+							ctx.moveTo(this.xCenter, this.yCenter);
+							ctx.lineTo(outerPosition.x, outerPosition.y);
+							ctx.stroke();
+							ctx.closePath();
+						}
+						// Extra 3px out for some label spacing
+						var pointLabelPosition = this.getPointPosition(i, this.calculateCenterOffset(this.max) + 5);
+						ctx.font = fontString(this.pointLabelFontSize,this.pointLabelFontStyle,this.pointLabelFontFamily);
+						ctx.fillStyle = this.pointLabelFontColor;
+
+						var labelsCount = this.labels.length,
+							halfLabelsCount = this.labels.length/2,
+							quarterLabelsCount = halfLabelsCount/2,
+							upperHalf = (i < quarterLabelsCount || i > labelsCount - quarterLabelsCount),
+							exactQuarter = (i === quarterLabelsCount || i === labelsCount - quarterLabelsCount);
+						if (i === 0){
+							ctx.textAlign = 'center';
+						} else if(i === halfLabelsCount){
+							ctx.textAlign = 'center';
+						} else if (i < halfLabelsCount){
+							ctx.textAlign = 'left';
+						} else {
+							ctx.textAlign = 'right';
+						}
+
+						// Set the correct text baseline based on outer positioning
+						if (exactQuarter){
+							ctx.textBaseline = 'middle';
+						} else if (upperHalf){
+							ctx.textBaseline = 'bottom';
+						} else {
+							ctx.textBaseline = 'top';
+						}
+
+						ctx.fillText(this.labels[i], pointLabelPosition.x, pointLabelPosition.y);
+					}
+				}
+			}
+		}
+	});
+
+	// Attach global event to resize each chart instance when the browser resizes
+	helpers.addEvent(window, "resize", (function(){
+		// Basic debounce of resize function so it doesn't hurt performance when resizing browser.
+		var timeout;
+		return function(){
+			clearTimeout(timeout);
+			timeout = setTimeout(function(){
+				each(Chart.instances,function(instance){
+					// If the responsive flag is set in the chart instance config
+					// Cascade the resize event down to the chart.
+					if (instance.options.responsive){
+						instance.resize(instance.render, true);
+					}
+				});
+			}, 50);
+		};
+	})());
+
+
+	if (amd) {
+		define(function(){
+			return Chart;
+		});
+	} else if (typeof module === 'object' && module.exports) {
+		module.exports = Chart;
+	}
+
+	root.Chart = Chart;
+
+	Chart.noConflict = function(){
+		root.Chart = previous;
+		return Chart;
+	};
+
+}).call(this);
+
+(function(){
+	"use strict";
+
+	var root = this,
+		Chart = root.Chart,
+		helpers = Chart.helpers;
+
+
+	var defaultConfig = {
+		//Boolean - Whether the scale should start at zero, or an order of magnitude down from the lowest value
+		scaleBeginAtZero : true,
+
+		//Boolean - Whether grid lines are shown across the chart
+		scaleShowGridLines : true,
+
+		//String - Colour of the grid lines
+		scaleGridLineColor : "rgba(0,0,0,.05)",
+
+		//Number - Width of the grid lines
+		scaleGridLineWidth : 1,
+
+		//Boolean - Whether to show horizontal lines (except X axis)
+		scaleShowHorizontalLines: true,
+
+		//Boolean - Whether to show vertical lines (except Y axis)
+		scaleShowVerticalLines: true,
+
+		//Boolean - If there is a stroke on each bar
+		barShowStroke : true,
+
+		//Number - Pixel width of the bar stroke
+		barStrokeWidth : 2,
+
+		//Number - Spacing between each of the X value sets
+		barValueSpacing : 5,
+
+		//Number - Spacing between data sets within X values
+		barDatasetSpacing : 1,
+
+		//String - A legend template
+		legendTemplate : "<ul class=\"<%=name.toLowerCase()%>-legend\"><% for (var i=0; i<datasets.length; i++){%><li><span style=\"background-color:<%=datasets[i].fillColor%>\"></span><%if(datasets[i].label){%><%=datasets[i].label%><%}%></li><%}%></ul>"
+
+	};
+
+
+	Chart.Type.extend({
+		name: "Bar",
+		defaults : defaultConfig,
+		initialize:  function(data){
+
+			//Expose options as a scope variable here so we can access it in the ScaleClass
+			var options = this.options;
+
+			this.ScaleClass = Chart.Scale.extend({
+				offsetGridLines : true,
+				calculateBarX : function(datasetCount, datasetIndex, barIndex){
+					//Reusable method for calculating the xPosition of a given bar based on datasetIndex & width of the bar
+					var xWidth = this.calculateBaseWidth(),
+						xAbsolute = this.calculateX(barIndex) - (xWidth/2),
+						barWidth = this.calculateBarWidth(datasetCount);
+
+					return xAbsolute + (barWidth * datasetIndex) + (datasetIndex * options.barDatasetSpacing) + barWidth/2;
+				},
+				calculateBaseWidth : function(){
+					return (this.calculateX(1) - this.calculateX(0)) - (2*options.barValueSpacing);
+				},
+				calculateBarWidth : function(datasetCount){
+					//The padding between datasets is to the right of each bar, providing that there are more than 1 dataset
+					var baseWidth = this.calculateBaseWidth() - ((datasetCount - 1) * options.barDatasetSpacing);
+
+					return (baseWidth / datasetCount);
+				}
+			});
+
+			this.datasets = [];
+
+			//Set up tooltip events on the chart
+			if (this.options.showTooltips){
+				helpers.bindEvents(this, this.options.tooltipEvents, function(evt){
+					var activeBars = (evt.type !== 'mouseout') ? this.getBarsAtEvent(evt) : [];
+
+					this.eachBars(function(bar){
+						bar.restore(['fillColor', 'strokeColor']);
+					});
+					helpers.each(activeBars, function(activeBar){
+						activeBar.fillColor = activeBar.highlightFill;
+						activeBar.strokeColor = activeBar.highlightStroke;
+					});
+					this.showTooltip(activeBars);
+				});
+			}
+
+			//Declare the extension of the default point, to cater for the options passed in to the constructor
+			this.BarClass = Chart.Rectangle.extend({
+				strokeWidth : this.options.barStrokeWidth,
+				showStroke : this.options.barShowStroke,
+				ctx : this.chart.ctx
+			});
+
+			//Iterate through each of the datasets, and build this into a property of the chart
+			helpers.each(data.datasets,function(dataset,datasetIndex){
+
+				var datasetObject = {
+					label : dataset.label || null,
+					fillColor : dataset.fillColor,
+					strokeColor : dataset.strokeColor,
+					bars : []
+				};
+
+				this.datasets.push(datasetObject);
+
+				helpers.each(dataset.data,function(dataPoint,index){
+					//Add a new point for each piece of data, passing any required data to draw.
+					datasetObject.bars.push(new this.BarClass({
+						value : dataPoint,
+						label : data.labels[index],
+						datasetLabel: dataset.label,
+						strokeColor : dataset.strokeColor,
+						fillColor : dataset.fillColor,
+						highlightFill : dataset.highlightFill || dataset.fillColor,
+						highlightStroke : dataset.highlightStroke || dataset.strokeColor
+					}));
+				},this);
+
+			},this);
+
+			this.buildScale(data.labels);
+
+			this.BarClass.prototype.base = this.scale.endPoint;
+
+			this.eachBars(function(bar, index, datasetIndex){
+				helpers.extend(bar, {
+					width : this.scale.calculateBarWidth(this.datasets.length),
+					x: this.scale.calculateBarX(this.datasets.length, datasetIndex, index),
+					y: this.scale.endPoint
+				});
+				bar.save();
+			}, this);
+
+			this.render();
+		},
+		update : function(){
+			this.scale.update();
+			// Reset any highlight colours before updating.
+			helpers.each(this.activeElements, function(activeElement){
+				activeElement.restore(['fillColor', 'strokeColor']);
+			});
+
+			this.eachBars(function(bar){
+				bar.save();
+			});
+			this.render();
+		},
+		eachBars : function(callback){
+			helpers.each(this.datasets,function(dataset, datasetIndex){
+				helpers.each(dataset.bars, callback, this, datasetIndex);
+			},this);
+		},
+		getBarsAtEvent : function(e){
+			var barsArray = [],
+				eventPosition = helpers.getRelativePosition(e),
+				datasetIterator = function(dataset){
+					barsArray.push(dataset.bars[barIndex]);
+				},
+				barIndex;
+
+			for (var datasetIndex = 0; datasetIndex < this.datasets.length; datasetIndex++) {
+				for (barIndex = 0; barIndex < this.datasets[datasetIndex].bars.length; barIndex++) {
+					if (this.datasets[datasetIndex].bars[barIndex].inRange(eventPosition.x,eventPosition.y)){
+						helpers.each(this.datasets, datasetIterator);
+						return barsArray;
+					}
+				}
+			}
+
+			return barsArray;
+		},
+		buildScale : function(labels){
+			var self = this;
+
+			var dataTotal = function(){
+				var values = [];
+				self.eachBars(function(bar){
+					values.push(bar.value);
+				});
+				return values;
+			};
+
+			var scaleOptions = {
+				templateString : this.options.scaleLabel,
+				height : this.chart.height,
+				width : this.chart.width,
+				ctx : this.chart.ctx,
+				textColor : this.options.scaleFontColor,
+				fontSize : this.options.scaleFontSize,
+				fontStyle : this.options.scaleFontStyle,
+				fontFamily : this.options.scaleFontFamily,
+				valuesCount : labels.length,
+				beginAtZero : this.options.scaleBeginAtZero,
+				integersOnly : this.options.scaleIntegersOnly,
+				calculateYRange: function(currentHeight){
+					var updatedRanges = helpers.calculateScaleRange(
+						dataTotal(),
+						currentHeight,
+						this.fontSize,
+						this.beginAtZero,
+						this.integersOnly
+					);
+					helpers.extend(this, updatedRanges);
+				},
+				xLabels : labels,
+				font : helpers.fontString(this.options.scaleFontSize, this.options.scaleFontStyle, this.options.scaleFontFamily),
+				lineWidth : this.options.scaleLineWidth,
+				lineColor : this.options.scaleLineColor,
+				showHorizontalLines : this.options.scaleShowHorizontalLines,
+				showVerticalLines : this.options.scaleShowVerticalLines,
+				gridLineWidth : (this.options.scaleShowGridLines) ? this.options.scaleGridLineWidth : 0,
+				gridLineColor : (this.options.scaleShowGridLines) ? this.options.scaleGridLineColor : "rgba(0,0,0,0)",
+				padding : (this.options.showScale) ? 0 : (this.options.barShowStroke) ? this.options.barStrokeWidth : 0,
+				showLabels : this.options.scaleShowLabels,
+				display : this.options.showScale
+			};
+
+			if (this.options.scaleOverride){
+				helpers.extend(scaleOptions, {
+					calculateYRange: helpers.noop,
+					steps: this.options.scaleSteps,
+					stepValue: this.options.scaleStepWidth,
+					min: this.options.scaleStartValue,
+					max: this.options.scaleStartValue + (this.options.scaleSteps * this.options.scaleStepWidth)
+				});
+			}
+
+			this.scale = new this.ScaleClass(scaleOptions);
+		},
+		addData : function(valuesArray,label){
+			//Map the values array for each of the datasets
+			helpers.each(valuesArray,function(value,datasetIndex){
+				//Add a new point for each piece of data, passing any required data to draw.
+				this.datasets[datasetIndex].bars.push(new this.BarClass({
+					value : value,
+					label : label,
+					x: this.scale.calculateBarX(this.datasets.length, datasetIndex, this.scale.valuesCount+1),
+					y: this.scale.endPoint,
+					width : this.scale.calculateBarWidth(this.datasets.length),
+					base : this.scale.endPoint,
+					strokeColor : this.datasets[datasetIndex].strokeColor,
+					fillColor : this.datasets[datasetIndex].fillColor
+				}));
+			},this);
+
+			this.scale.addXLabel(label);
+			//Then re-render the chart.
+			this.update();
+		},
+		removeData : function(){
+			this.scale.removeXLabel();
+			//Then re-render the chart.
+			helpers.each(this.datasets,function(dataset){
+				dataset.bars.shift();
+			},this);
+			this.update();
+		},
+		reflow : function(){
+			helpers.extend(this.BarClass.prototype,{
+				y: this.scale.endPoint,
+				base : this.scale.endPoint
+			});
+			var newScaleProps = helpers.extend({
+				height : this.chart.height,
+				width : this.chart.width
+			});
+			this.scale.update(newScaleProps);
+		},
+		draw : function(ease){
+			var easingDecimal = ease || 1;
+			this.clear();
+
+			var ctx = this.chart.ctx;
+
+			this.scale.draw(easingDecimal);
+
+			//Draw all the bars for each dataset
+			helpers.each(this.datasets,function(dataset,datasetIndex){
+				helpers.each(dataset.bars,function(bar,index){
+					if (bar.hasValue()){
+						bar.base = this.scale.endPoint;
+						//Transition then draw
+						bar.transition({
+							x : this.scale.calculateBarX(this.datasets.length, datasetIndex, index),
+							y : this.scale.calculateY(bar.value),
+							width : this.scale.calculateBarWidth(this.datasets.length)
+						}, easingDecimal).draw();
+					}
+				},this);
+
+			},this);
+		}
+	});
+
+
+}).call(this);
+
+(function(){
+	"use strict";
+
+	var root = this,
+		Chart = root.Chart,
+		//Cache a local reference to Chart.helpers
+		helpers = Chart.helpers;
+
+	var defaultConfig = {
+		//Boolean - Whether we should show a stroke on each segment
+		segmentShowStroke : true,
+
+		//String - The colour of each segment stroke
+		segmentStrokeColor : "#fff",
+
+		//Number - The width of each segment stroke
+		segmentStrokeWidth : 2,
+
+		//The percentage of the chart that we cut out of the middle.
+		percentageInnerCutout : 50,
+
+		//Number - Amount of animation steps
+		animationSteps : 100,
+
+		//String - Animation easing effect
+		animationEasing : "easeOutBounce",
+
+		//Boolean - Whether we animate the rotation of the Doughnut
+		animateRotate : true,
+
+		//Boolean - Whether we animate scaling the Doughnut from the centre
+		animateScale : false,
+
+		//String - A legend template
+		legendTemplate : "<ul class=\"<%=name.toLowerCase()%>-legend\"><% for (var i=0; i<segments.length; i++){%><li><span style=\"background-color:<%=segments[i].fillColor%>\"></span><%if(segments[i].label){%><%=segments[i].label%><%}%></li><%}%></ul>"
+
+	};
+
+
+	Chart.Type.extend({
+		//Passing in a name registers this chart in the Chart namespace
+		name: "Doughnut",
+		//Providing a defaults will also register the deafults in the chart namespace
+		defaults : defaultConfig,
+		//Initialize is fired when the chart is initialized - Data is passed in as a parameter
+		//Config is automatically merged by the core of Chart.js, and is available at this.options
+		initialize:  function(data){
+
+			//Declare segments as a static property to prevent inheriting across the Chart type prototype
+			this.segments = [];
+			this.outerRadius = (helpers.min([this.chart.width,this.chart.height]) -	this.options.segmentStrokeWidth/2)/2;
+
+			this.SegmentArc = Chart.Arc.extend({
+				ctx : this.chart.ctx,
+				x : this.chart.width/2,
+				y : this.chart.height/2
+			});
+
+			//Set up tooltip events on the chart
+			if (this.options.showTooltips){
+				helpers.bindEvents(this, this.options.tooltipEvents, function(evt){
+					var activeSegments = (evt.type !== 'mouseout') ? this.getSegmentsAtEvent(evt) : [];
+
+					helpers.each(this.segments,function(segment){
+						segment.restore(["fillColor"]);
+					});
+					helpers.each(activeSegments,function(activeSegment){
+						activeSegment.fillColor = activeSegment.highlightColor;
+					});
+					this.showTooltip(activeSegments);
+				});
+			}
+			this.calculateTotal(data);
+
+			helpers.each(data,function(datapoint, index){
+				this.addData(datapoint, index, true);
+			},this);
+
+			this.render();
+		},
+		getSegmentsAtEvent : function(e){
+			var segmentsArray = [];
+
+			var location = helpers.getRelativePosition(e);
+
+			helpers.each(this.segments,function(segment){
+				if (segment.inRange(location.x,location.y)) segmentsArray.push(segment);
+			},this);
+			return segmentsArray;
+		},
+		addData : function(segment, atIndex, silent){
+			var index = atIndex || this.segments.length;
+			this.segments.splice(index, 0, new this.SegmentArc({
+				value : segment.value,
+				outerRadius : (this.options.animateScale) ? 0 : this.outerRadius,
+				innerRadius : (this.options.animateScale) ? 0 : (this.outerRadius/100) * this.options.percentageInnerCutout,
+				fillColor : segment.color,
+				highlightColor : segment.highlight || segment.color,
+				showStroke : this.options.segmentShowStroke,
+				strokeWidth : this.options.segmentStrokeWidth,
+				strokeColor : this.options.segmentStrokeColor,
+				startAngle : Math.PI * 1.5,
+				circumference : (this.options.animateRotate) ? 0 : this.calculateCircumference(segment.value),
+				label : segment.label
+			}));
+			if (!silent){
+				this.reflow();
+				this.update();
+			}
+		},
+		calculateCircumference : function(value){
+			return (Math.PI*2)*(Math.abs(value) / this.total);
+		},
+		calculateTotal : function(data){
+			this.total = 0;
+			helpers.each(data,function(segment){
+				this.total += Math.abs(segment.value);
+			},this);
+		},
+		update : function(){
+			this.calculateTotal(this.segments);
+
+			// Reset any highlight colours before updating.
+			helpers.each(this.activeElements, function(activeElement){
+				activeElement.restore(['fillColor']);
+			});
+
+			helpers.each(this.segments,function(segment){
+				segment.save();
+			});
+			this.render();
+		},
+
+		removeData: function(atIndex){
+			var indexToDelete = (helpers.isNumber(atIndex)) ? atIndex : this.segments.length-1;
+			this.segments.splice(indexToDelete, 1);
+			this.reflow();
+			this.update();
+		},
+
+		reflow : function(){
+			helpers.extend(this.SegmentArc.prototype,{
+				x : this.chart.width/2,
+				y : this.chart.height/2
+			});
+			this.outerRadius = (helpers.min([this.chart.width,this.chart.height]) -	this.options.segmentStrokeWidth/2)/2;
+			helpers.each(this.segments, function(segment){
+				segment.update({
+					outerRadius : this.outerRadius,
+					innerRadius : (this.outerRadius/100) * this.options.percentageInnerCutout
+				});
+			}, this);
+		},
+		draw : function(easeDecimal){
+			var animDecimal = (easeDecimal) ? easeDecimal : 1;
+			this.clear();
+			helpers.each(this.segments,function(segment,index){
+				segment.transition({
+					circumference : this.calculateCircumference(segment.value),
+					outerRadius : this.outerRadius,
+					innerRadius : (this.outerRadius/100) * this.options.percentageInnerCutout
+				},animDecimal);
+
+				segment.endAngle = segment.startAngle + segment.circumference;
+
+				segment.draw();
+				if (index === 0){
+					segment.startAngle = Math.PI * 1.5;
+				}
+				//Check to see if it's the last segment, if not get the next and update the start angle
+				if (index < this.segments.length-1){
+					this.segments[index+1].startAngle = segment.endAngle;
+				}
+			},this);
+
+		}
+	});
+
+	Chart.types.Doughnut.extend({
+		name : "Pie",
+		defaults : helpers.merge(defaultConfig,{percentageInnerCutout : 0})
+	});
+
+}).call(this);
+(function(){
+	"use strict";
+
+	var root = this,
+		Chart = root.Chart,
+		helpers = Chart.helpers;
+
+	var defaultConfig = {
+
+		///Boolean - Whether grid lines are shown across the chart
+		scaleShowGridLines : true,
+
+		//String - Colour of the grid lines
+		scaleGridLineColor : "rgba(0,0,0,.05)",
+
+		//Number - Width of the grid lines
+		scaleGridLineWidth : 1,
+
+		//Boolean - Whether to show horizontal lines (except X axis)
+		scaleShowHorizontalLines: true,
+
+		//Boolean - Whether to show vertical lines (except Y axis)
+		scaleShowVerticalLines: true,
+
+		//Boolean - Whether the line is curved between points
+		bezierCurve : true,
+
+		//Number - Tension of the bezier curve between points
+		bezierCurveTension : 0.4,
+
+		//Boolean - Whether to show a dot for each point
+		pointDot : true,
+
+		//Number - Radius of each point dot in pixels
+		pointDotRadius : 4,
+
+		//Number - Pixel width of point dot stroke
+		pointDotStrokeWidth : 1,
+
+		//Number - amount extra to add to the radius to cater for hit detection outside the drawn point
+		pointHitDetectionRadius : 20,
+
+		//Boolean - Whether to show a stroke for datasets
+		datasetStroke : true,
+
+		//Number - Pixel width of dataset stroke
+		datasetStrokeWidth : 2,
+
+		//Boolean - Whether to fill the dataset with a colour
+		datasetFill : true,
+
+		//String - A legend template
+		legendTemplate : "<ul class=\"<%=name.toLowerCase()%>-legend\"><% for (var i=0; i<datasets.length; i++){%><li><span style=\"background-color:<%=datasets[i].strokeColor%>\"></span><%if(datasets[i].label){%><%=datasets[i].label%><%}%></li><%}%></ul>"
+
+	};
+
+
+	Chart.Type.extend({
+		name: "Line",
+		defaults : defaultConfig,
+		initialize:  function(data){
+			//Declare the extension of the default point, to cater for the options passed in to the constructor
+			this.PointClass = Chart.Point.extend({
+				strokeWidth : this.options.pointDotStrokeWidth,
+				radius : this.options.pointDotRadius,
+				display: this.options.pointDot,
+				hitDetectionRadius : this.options.pointHitDetectionRadius,
+				ctx : this.chart.ctx,
+				inRange : function(mouseX){
+					return (Math.pow(mouseX-this.x, 2) < Math.pow(this.radius + this.hitDetectionRadius,2));
+				}
+			});
+
+			this.datasets = [];
+
+			//Set up tooltip events on the chart
+			if (this.options.showTooltips){
+				helpers.bindEvents(this, this.options.tooltipEvents, function(evt){
+					var activePoints = (evt.type !== 'mouseout') ? this.getPointsAtEvent(evt) : [];
+					this.eachPoints(function(point){
+						point.restore(['fillColor', 'strokeColor']);
+					});
+					helpers.each(activePoints, function(activePoint){
+						activePoint.fillColor = activePoint.highlightFill;
+						activePoint.strokeColor = activePoint.highlightStroke;
+					});
+					this.showTooltip(activePoints);
+				});
+			}
+
+			//Iterate through each of the datasets, and build this into a property of the chart
+			helpers.each(data.datasets,function(dataset){
+
+				var datasetObject = {
+					label : dataset.label || null,
+					fillColor : dataset.fillColor,
+					strokeColor : dataset.strokeColor,
+					pointColor : dataset.pointColor,
+					pointStrokeColor : dataset.pointStrokeColor,
+					points : []
+				};
+
+				this.datasets.push(datasetObject);
+
+
+				helpers.each(dataset.data,function(dataPoint,index){
+					//Add a new point for each piece of data, passing any required data to draw.
+					datasetObject.points.push(new this.PointClass({
+						value : dataPoint,
+						label : data.labels[index],
+						datasetLabel: dataset.label,
+						strokeColor : dataset.pointStrokeColor,
+						fillColor : dataset.pointColor,
+						highlightFill : dataset.pointHighlightFill || dataset.pointColor,
+						highlightStroke : dataset.pointHighlightStroke || dataset.pointStrokeColor
+					}));
+				},this);
+
+				this.buildScale(data.labels);
+
+
+				this.eachPoints(function(point, index){
+					helpers.extend(point, {
+						x: this.scale.calculateX(index),
+						y: this.scale.endPoint
+					});
+					point.save();
+				}, this);
+
+			},this);
+
+
+			this.render();
+		},
+		update : function(){
+			this.scale.update();
+			// Reset any highlight colours before updating.
+			helpers.each(this.activeElements, function(activeElement){
+				activeElement.restore(['fillColor', 'strokeColor']);
+			});
+			this.eachPoints(function(point){
+				point.save();
+			});
+			this.render();
+		},
+		eachPoints : function(callback){
+			helpers.each(this.datasets,function(dataset){
+				helpers.each(dataset.points,callback,this);
+			},this);
+		},
+		getPointsAtEvent : function(e){
+			var pointsArray = [],
+				eventPosition = helpers.getRelativePosition(e);
+			helpers.each(this.datasets,function(dataset){
+				helpers.each(dataset.points,function(point){
+					if (point.inRange(eventPosition.x,eventPosition.y)) pointsArray.push(point);
+				});
+			},this);
+			return pointsArray;
+		},
+		buildScale : function(labels){
+			var self = this;
+
+			var dataTotal = function(){
+				var values = [];
+				self.eachPoints(function(point){
+					values.push(point.value);
+				});
+
+				return values;
+			};
+
+			var scaleOptions = {
+				templateString : this.options.scaleLabel,
+				height : this.chart.height,
+				width : this.chart.width,
+				ctx : this.chart.ctx,
+				textColor : this.options.scaleFontColor,
+				fontSize : this.options.scaleFontSize,
+				fontStyle : this.options.scaleFontStyle,
+				fontFamily : this.options.scaleFontFamily,
+				valuesCount : labels.length,
+				beginAtZero : this.options.scaleBeginAtZero,
+				integersOnly : this.options.scaleIntegersOnly,
+				calculateYRange : function(currentHeight){
+					var updatedRanges = helpers.calculateScaleRange(
+						dataTotal(),
+						currentHeight,
+						this.fontSize,
+						this.beginAtZero,
+						this.integersOnly
+					);
+					helpers.extend(this, updatedRanges);
+				},
+				xLabels : labels,
+				font : helpers.fontString(this.options.scaleFontSize, this.options.scaleFontStyle, this.options.scaleFontFamily),
+				lineWidth : this.options.scaleLineWidth,
+				lineColor : this.options.scaleLineColor,
+				showHorizontalLines : this.options.scaleShowHorizontalLines,
+				showVerticalLines : this.options.scaleShowVerticalLines,
+				gridLineWidth : (this.options.scaleShowGridLines) ? this.options.scaleGridLineWidth : 0,
+				gridLineColor : (this.options.scaleShowGridLines) ? this.options.scaleGridLineColor : "rgba(0,0,0,0)",
+				padding: (this.options.showScale) ? 0 : this.options.pointDotRadius + this.options.pointDotStrokeWidth,
+				showLabels : this.options.scaleShowLabels,
+				display : this.options.showScale
+			};
+
+			if (this.options.scaleOverride){
+				helpers.extend(scaleOptions, {
+					calculateYRange: helpers.noop,
+					steps: this.options.scaleSteps,
+					stepValue: this.options.scaleStepWidth,
+					min: this.options.scaleStartValue,
+					max: this.options.scaleStartValue + (this.options.scaleSteps * this.options.scaleStepWidth)
+				});
+			}
+
+
+			this.scale = new Chart.Scale(scaleOptions);
+		},
+		addData : function(valuesArray,label){
+			//Map the values array for each of the datasets
+
+			helpers.each(valuesArray,function(value,datasetIndex){
+				//Add a new point for each piece of data, passing any required data to draw.
+				this.datasets[datasetIndex].points.push(new this.PointClass({
+					value : value,
+					label : label,
+					x: this.scale.calculateX(this.scale.valuesCount+1),
+					y: this.scale.endPoint,
+					strokeColor : this.datasets[datasetIndex].pointStrokeColor,
+					fillColor : this.datasets[datasetIndex].pointColor
+				}));
+			},this);
+
+			this.scale.addXLabel(label);
+			//Then re-render the chart.
+			this.update();
+		},
+		removeData : function(){
+			this.scale.removeXLabel();
+			//Then re-render the chart.
+			helpers.each(this.datasets,function(dataset){
+				dataset.points.shift();
+			},this);
+			this.update();
+		},
+		reflow : function(){
+			var newScaleProps = helpers.extend({
+				height : this.chart.height,
+				width : this.chart.width
+			});
+			this.scale.update(newScaleProps);
+		},
+		draw : function(ease){
+			var easingDecimal = ease || 1;
+			this.clear();
+
+			var ctx = this.chart.ctx;
+
+			// Some helper methods for getting the next/prev points
+			var hasValue = function(item){
+				return item.value !== null;
+			},
+			nextPoint = function(point, collection, index){
+				return helpers.findNextWhere(collection, hasValue, index) || point;
+			},
+			previousPoint = function(point, collection, index){
+				return helpers.findPreviousWhere(collection, hasValue, index) || point;
+			};
+
+			this.scale.draw(easingDecimal);
+
+
+			helpers.each(this.datasets,function(dataset){
+				var pointsWithValues = helpers.where(dataset.points, hasValue);
+
+				//Transition each point first so that the line and point drawing isn't out of sync
+				//We can use this extra loop to calculate the control points of this dataset also in this loop
+
+				helpers.each(dataset.points, function(point, index){
+					if (point.hasValue()){
+						point.transition({
+							y : this.scale.calculateY(point.value),
+							x : this.scale.calculateX(index)
+						}, easingDecimal);
+					}
+				},this);
+
+
+				// Control points need to be calculated in a seperate loop, because we need to know the current x/y of the point
+				// This would cause issues when there is no animation, because the y of the next point would be 0, so beziers would be skewed
+				if (this.options.bezierCurve){
+					helpers.each(pointsWithValues, function(point, index){
+						var tension = (index > 0 && index < pointsWithValues.length - 1) ? this.options.bezierCurveTension : 0;
+						point.controlPoints = helpers.splineCurve(
+							previousPoint(point, pointsWithValues, index),
+							point,
+							nextPoint(point, pointsWithValues, index),
+							tension
+						);
+
+						// Prevent the bezier going outside of the bounds of the graph
+
+						// Cap puter bezier handles to the upper/lower scale bounds
+						if (point.controlPoints.outer.y > this.scale.endPoint){
+							point.controlPoints.outer.y = this.scale.endPoint;
+						}
+						else if (point.controlPoints.outer.y < this.scale.startPoint){
+							point.controlPoints.outer.y = this.scale.startPoint;
+						}
+
+						// Cap inner bezier handles to the upper/lower scale bounds
+						if (point.controlPoints.inner.y > this.scale.endPoint){
+							point.controlPoints.inner.y = this.scale.endPoint;
+						}
+						else if (point.controlPoints.inner.y < this.scale.startPoint){
+							point.controlPoints.inner.y = this.scale.startPoint;
+						}
+					},this);
+				}
+
+
+				//Draw the line between all the points
+				ctx.lineWidth = this.options.datasetStrokeWidth;
+				ctx.strokeStyle = dataset.strokeColor;
+				ctx.beginPath();
+
+				helpers.each(pointsWithValues, function(point, index){
+					if (index === 0){
+						ctx.moveTo(point.x, point.y);
+					}
+					else{
+						if(this.options.bezierCurve){
+							var previous = previousPoint(point, pointsWithValues, index);
+
+							ctx.bezierCurveTo(
+								previous.controlPoints.outer.x,
+								previous.controlPoints.outer.y,
+								point.controlPoints.inner.x,
+								point.controlPoints.inner.y,
+								point.x,
+								point.y
+							);
+						}
+						else{
+							ctx.lineTo(point.x,point.y);
+						}
+					}
+				}, this);
+
+				ctx.stroke();
+
+				if (this.options.datasetFill && pointsWithValues.length > 0){
+					//Round off the line by going to the base of the chart, back to the start, then fill.
+					ctx.lineTo(pointsWithValues[pointsWithValues.length - 1].x, this.scale.endPoint);
+					ctx.lineTo(pointsWithValues[0].x, this.scale.endPoint);
+					ctx.fillStyle = dataset.fillColor;
+					ctx.closePath();
+					ctx.fill();
+				}
+
+				//Now draw the points over the line
+				//A little inefficient double looping, but better than the line
+				//lagging behind the point positions
+				helpers.each(pointsWithValues,function(point){
+					point.draw();
+				});
+			},this);
+		}
+	});
+
+
+}).call(this);
+
+(function(){
+	"use strict";
+
+	var root = this,
+		Chart = root.Chart,
+		//Cache a local reference to Chart.helpers
+		helpers = Chart.helpers;
+
+	var defaultConfig = {
+		//Boolean - Show a backdrop to the scale label
+		scaleShowLabelBackdrop : true,
+
+		//String - The colour of the label backdrop
+		scaleBackdropColor : "rgba(255,255,255,0.75)",
+
+		// Boolean - Whether the scale should begin at zero
+		scaleBeginAtZero : true,
+
+		//Number - The backdrop padding above & below the label in pixels
+		scaleBackdropPaddingY : 2,
+
+		//Number - The backdrop padding to the side of the label in pixels
+		scaleBackdropPaddingX : 2,
+
+		//Boolean - Show line for each value in the scale
+		scaleShowLine : true,
+
+		//Boolean - Stroke a line around each segment in the chart
+		segmentShowStroke : true,
+
+		//String - The colour of the stroke on each segement.
+		segmentStrokeColor : "#fff",
+
+		//Number - The width of the stroke value in pixels
+		segmentStrokeWidth : 2,
+
+		//Number - Amount of animation steps
+		animationSteps : 100,
+
+		//String - Animation easing effect.
+		animationEasing : "easeOutBounce",
+
+		//Boolean - Whether to animate the rotation of the chart
+		animateRotate : true,
+
+		//Boolean - Whether to animate scaling the chart from the centre
+		animateScale : false,
+
+		//String - A legend template
+		legendTemplate : "<ul class=\"<%=name.toLowerCase()%>-legend\"><% for (var i=0; i<segments.length; i++){%><li><span style=\"background-color:<%=segments[i].fillColor%>\"></span><%if(segments[i].label){%><%=segments[i].label%><%}%></li><%}%></ul>"
+	};
+
+
+	Chart.Type.extend({
+		//Passing in a name registers this chart in the Chart namespace
+		name: "PolarArea",
+		//Providing a defaults will also register the deafults in the chart namespace
+		defaults : defaultConfig,
+		//Initialize is fired when the chart is initialized - Data is passed in as a parameter
+		//Config is automatically merged by the core of Chart.js, and is available at this.options
+		initialize:  function(data){
+			this.segments = [];
+			//Declare segment class as a chart instance specific class, so it can share props for this instance
+			this.SegmentArc = Chart.Arc.extend({
+				showStroke : this.options.segmentShowStroke,
+				strokeWidth : this.options.segmentStrokeWidth,
+				strokeColor : this.options.segmentStrokeColor,
+				ctx : this.chart.ctx,
+				innerRadius : 0,
+				x : this.chart.width/2,
+				y : this.chart.height/2
+			});
+			this.scale = new Chart.RadialScale({
+				display: this.options.showScale,
+				fontStyle: this.options.scaleFontStyle,
+				fontSize: this.options.scaleFontSize,
+				fontFamily: this.options.scaleFontFamily,
+				fontColor: this.options.scaleFontColor,
+				showLabels: this.options.scaleShowLabels,
+				showLabelBackdrop: this.options.scaleShowLabelBackdrop,
+				backdropColor: this.options.scaleBackdropColor,
+				backdropPaddingY : this.options.scaleBackdropPaddingY,
+				backdropPaddingX: this.options.scaleBackdropPaddingX,
+				lineWidth: (this.options.scaleShowLine) ? this.options.scaleLineWidth : 0,
+				lineColor: this.options.scaleLineColor,
+				lineArc: true,
+				width: this.chart.width,
+				height: this.chart.height,
+				xCenter: this.chart.width/2,
+				yCenter: this.chart.height/2,
+				ctx : this.chart.ctx,
+				templateString: this.options.scaleLabel,
+				valuesCount: data.length
+			});
+
+			this.updateScaleRange(data);
+
+			this.scale.update();
+
+			helpers.each(data,function(segment,index){
+				this.addData(segment,index,true);
+			},this);
+
+			//Set up tooltip events on the chart
+			if (this.options.showTooltips){
+				helpers.bindEvents(this, this.options.tooltipEvents, function(evt){
+					var activeSegments = (evt.type !== 'mouseout') ? this.getSegmentsAtEvent(evt) : [];
+					helpers.each(this.segments,function(segment){
+						segment.restore(["fillColor"]);
+					});
+					helpers.each(activeSegments,function(activeSegment){
+						activeSegment.fillColor = activeSegment.highlightColor;
+					});
+					this.showTooltip(activeSegments);
+				});
+			}
+
+			this.render();
+		},
+		getSegmentsAtEvent : function(e){
+			var segmentsArray = [];
+
+			var location = helpers.getRelativePosition(e);
+
+			helpers.each(this.segments,function(segment){
+				if (segment.inRange(location.x,location.y)) segmentsArray.push(segment);
+			},this);
+			return segmentsArray;
+		},
+		addData : function(segment, atIndex, silent){
+			var index = atIndex || this.segments.length;
+
+			this.segments.splice(index, 0, new this.SegmentArc({
+				fillColor: segment.color,
+				highlightColor: segment.highlight || segment.color,
+				label: segment.label,
+				value: segment.value,
+				outerRadius: (this.options.animateScale) ? 0 : this.scale.calculateCenterOffset(segment.value),
+				circumference: (this.options.animateRotate) ? 0 : this.scale.getCircumference(),
+				startAngle: Math.PI * 1.5
+			}));
+			if (!silent){
+				this.reflow();
+				this.update();
+			}
+		},
+		removeData: function(atIndex){
+			var indexToDelete = (helpers.isNumber(atIndex)) ? atIndex : this.segments.length-1;
+			this.segments.splice(indexToDelete, 1);
+			this.reflow();
+			this.update();
+		},
+		calculateTotal: function(data){
+			this.total = 0;
+			helpers.each(data,function(segment){
+				this.total += segment.value;
+			},this);
+			this.scale.valuesCount = this.segments.length;
+		},
+		updateScaleRange: function(datapoints){
+			var valuesArray = [];
+			helpers.each(datapoints,function(segment){
+				valuesArray.push(segment.value);
+			});
+
+			var scaleSizes = (this.options.scaleOverride) ?
+				{
+					steps: this.options.scaleSteps,
+					stepValue: this.options.scaleStepWidth,
+					min: this.options.scaleStartValue,
+					max: this.options.scaleStartValue + (this.options.scaleSteps * this.options.scaleStepWidth)
+				} :
+				helpers.calculateScaleRange(
+					valuesArray,
+					helpers.min([this.chart.width, this.chart.height])/2,
+					this.options.scaleFontSize,
+					this.options.scaleBeginAtZero,
+					this.options.scaleIntegersOnly
+				);
+
+			helpers.extend(
+				this.scale,
+				scaleSizes,
+				{
+					size: helpers.min([this.chart.width, this.chart.height]),
+					xCenter: this.chart.width/2,
+					yCenter: this.chart.height/2
+				}
+			);
+
+		},
+		update : function(){
+			this.calculateTotal(this.segments);
+
+			helpers.each(this.segments,function(segment){
+				segment.save();
+			});
+			
+			this.reflow();
+			this.render();
+		},
+		reflow : function(){
+			helpers.extend(this.SegmentArc.prototype,{
+				x : this.chart.width/2,
+				y : this.chart.height/2
+			});
+			this.updateScaleRange(this.segments);
+			this.scale.update();
+
+			helpers.extend(this.scale,{
+				xCenter: this.chart.width/2,
+				yCenter: this.chart.height/2
+			});
+
+			helpers.each(this.segments, function(segment){
+				segment.update({
+					outerRadius : this.scale.calculateCenterOffset(segment.value)
+				});
+			}, this);
+
+		},
+		draw : function(ease){
+			var easingDecimal = ease || 1;
+			//Clear & draw the canvas
+			this.clear();
+			helpers.each(this.segments,function(segment, index){
+				segment.transition({
+					circumference : this.scale.getCircumference(),
+					outerRadius : this.scale.calculateCenterOffset(segment.value)
+				},easingDecimal);
+
+				segment.endAngle = segment.startAngle + segment.circumference;
+
+				// If we've removed the first segment we need to set the first one to
+				// start at the top.
+				if (index === 0){
+					segment.startAngle = Math.PI * 1.5;
+				}
+
+				//Check to see if it's the last segment, if not get the next and update the start angle
+				if (index < this.segments.length - 1){
+					this.segments[index+1].startAngle = segment.endAngle;
+				}
+				segment.draw();
+			}, this);
+			this.scale.draw();
+		}
+	});
+
+}).call(this);
+(function(){
+	"use strict";
+
+	var root = this,
+		Chart = root.Chart,
+		helpers = Chart.helpers;
+
+
+
+	Chart.Type.extend({
+		name: "Radar",
+		defaults:{
+			//Boolean - Whether to show lines for each scale point
+			scaleShowLine : true,
+
+			//Boolean - Whether we show the angle lines out of the radar
+			angleShowLineOut : true,
+
+			//Boolean - Whether to show labels on the scale
+			scaleShowLabels : false,
+
+			// Boolean - Whether the scale should begin at zero
+			scaleBeginAtZero : true,
+
+			//String - Colour of the angle line
+			angleLineColor : "rgba(0,0,0,.1)",
+
+			//Number - Pixel width of the angle line
+			angleLineWidth : 1,
+
+			//String - Point label font declaration
+			pointLabelFontFamily : "'Arial'",
+
+			//String - Point label font weight
+			pointLabelFontStyle : "normal",
+
+			//Number - Point label font size in pixels
+			pointLabelFontSize : 10,
+
+			//String - Point label font colour
+			pointLabelFontColor : "#666",
+
+			//Boolean - Whether to show a dot for each point
+			pointDot : true,
+
+			//Number - Radius of each point dot in pixels
+			pointDotRadius : 3,
+
+			//Number - Pixel width of point dot stroke
+			pointDotStrokeWidth : 1,
+
+			//Number - amount extra to add to the radius to cater for hit detection outside the drawn point
+			pointHitDetectionRadius : 20,
+
+			//Boolean - Whether to show a stroke for datasets
+			datasetStroke : true,
+
+			//Number - Pixel width of dataset stroke
+			datasetStrokeWidth : 2,
+
+			//Boolean - Whether to fill the dataset with a colour
+			datasetFill : true,
+
+			//String - A legend template
+			legendTemplate : "<ul class=\"<%=name.toLowerCase()%>-legend\"><% for (var i=0; i<datasets.length; i++){%><li><span style=\"background-color:<%=datasets[i].strokeColor%>\"></span><%if(datasets[i].label){%><%=datasets[i].label%><%}%></li><%}%></ul>"
+
+		},
+
+		initialize: function(data){
+			this.PointClass = Chart.Point.extend({
+				strokeWidth : this.options.pointDotStrokeWidth,
+				radius : this.options.pointDotRadius,
+				display: this.options.pointDot,
+				hitDetectionRadius : this.options.pointHitDetectionRadius,
+				ctx : this.chart.ctx
+			});
+
+			this.datasets = [];
+
+			this.buildScale(data);
+
+			//Set up tooltip events on the chart
+			if (this.options.showTooltips){
+				helpers.bindEvents(this, this.options.tooltipEvents, function(evt){
+					var activePointsCollection = (evt.type !== 'mouseout') ? this.getPointsAtEvent(evt) : [];
+
+					this.eachPoints(function(point){
+						point.restore(['fillColor', 'strokeColor']);
+					});
+					helpers.each(activePointsCollection, function(activePoint){
+						activePoint.fillColor = activePoint.highlightFill;
+						activePoint.strokeColor = activePoint.highlightStroke;
+					});
+
+					this.showTooltip(activePointsCollection);
+				});
+			}
+
+			//Iterate through each of the datasets, and build this into a property of the chart
+			helpers.each(data.datasets,function(dataset){
+
+				var datasetObject = {
+					label: dataset.label || null,
+					fillColor : dataset.fillColor,
+					strokeColor : dataset.strokeColor,
+					pointColor : dataset.pointColor,
+					pointStrokeColor : dataset.pointStrokeColor,
+					points : []
+				};
+
+				this.datasets.push(datasetObject);
+
+				helpers.each(dataset.data,function(dataPoint,index){
+					//Add a new point for each piece of data, passing any required data to draw.
+					var pointPosition;
+					if (!this.scale.animation){
+						pointPosition = this.scale.getPointPosition(index, this.scale.calculateCenterOffset(dataPoint));
+					}
+					datasetObject.points.push(new this.PointClass({
+						value : dataPoint,
+						label : data.labels[index],
+						datasetLabel: dataset.label,
+						x: (this.options.animation) ? this.scale.xCenter : pointPosition.x,
+						y: (this.options.animation) ? this.scale.yCenter : pointPosition.y,
+						strokeColor : dataset.pointStrokeColor,
+						fillColor : dataset.pointColor,
+						highlightFill : dataset.pointHighlightFill || dataset.pointColor,
+						highlightStroke : dataset.pointHighlightStroke || dataset.pointStrokeColor
+					}));
+				},this);
+
+			},this);
+
+			this.render();
+		},
+		eachPoints : function(callback){
+			helpers.each(this.datasets,function(dataset){
+				helpers.each(dataset.points,callback,this);
+			},this);
+		},
+
+		getPointsAtEvent : function(evt){
+			var mousePosition = helpers.getRelativePosition(evt),
+				fromCenter = helpers.getAngleFromPoint({
+					x: this.scale.xCenter,
+					y: this.scale.yCenter
+				}, mousePosition);
+
+			var anglePerIndex = (Math.PI * 2) /this.scale.valuesCount,
+				pointIndex = Math.round((fromCenter.angle - Math.PI * 1.5) / anglePerIndex),
+				activePointsCollection = [];
+
+			// If we're at the top, make the pointIndex 0 to get the first of the array.
+			if (pointIndex >= this.scale.valuesCount || pointIndex < 0){
+				pointIndex = 0;
+			}
+
+			if (fromCenter.distance <= this.scale.drawingArea){
+				helpers.each(this.datasets, function(dataset){
+					activePointsCollection.push(dataset.points[pointIndex]);
+				});
+			}
+
+			return activePointsCollection;
+		},
+
+		buildScale : function(data){
+			this.scale = new Chart.RadialScale({
+				display: this.options.showScale,
+				fontStyle: this.options.scaleFontStyle,
+				fontSize: this.options.scaleFontSize,
+				fontFamily: this.options.scaleFontFamily,
+				fontColor: this.options.scaleFontColor,
+				showLabels: this.options.scaleShowLabels,
+				showLabelBackdrop: this.options.scaleShowLabelBackdrop,
+				backdropColor: this.options.scaleBackdropColor,
+				backdropPaddingY : this.options.scaleBackdropPaddingY,
+				backdropPaddingX: this.options.scaleBackdropPaddingX,
+				lineWidth: (this.options.scaleShowLine) ? this.options.scaleLineWidth : 0,
+				lineColor: this.options.scaleLineColor,
+				angleLineColor : this.options.angleLineColor,
+				angleLineWidth : (this.options.angleShowLineOut) ? this.options.angleLineWidth : 0,
+				// Point labels at the edge of each line
+				pointLabelFontColor : this.options.pointLabelFontColor,
+				pointLabelFontSize : this.options.pointLabelFontSize,
+				pointLabelFontFamily : this.options.pointLabelFontFamily,
+				pointLabelFontStyle : this.options.pointLabelFontStyle,
+				height : this.chart.height,
+				width: this.chart.width,
+				xCenter: this.chart.width/2,
+				yCenter: this.chart.height/2,
+				ctx : this.chart.ctx,
+				templateString: this.options.scaleLabel,
+				labels: data.labels,
+				valuesCount: data.datasets[0].data.length
+			});
+
+			this.scale.setScaleSize();
+			this.updateScaleRange(data.datasets);
+			this.scale.buildYLabels();
+		},
+		updateScaleRange: function(datasets){
+			var valuesArray = (function(){
+				var totalDataArray = [];
+				helpers.each(datasets,function(dataset){
+					if (dataset.data){
+						totalDataArray = totalDataArray.concat(dataset.data);
+					}
+					else {
+						helpers.each(dataset.points, function(point){
+							totalDataArray.push(point.value);
+						});
+					}
+				});
+				return totalDataArray;
+			})();
+
+
+			var scaleSizes = (this.options.scaleOverride) ?
+				{
+					steps: this.options.scaleSteps,
+					stepValue: this.options.scaleStepWidth,
+					min: this.options.scaleStartValue,
+					max: this.options.scaleStartValue + (this.options.scaleSteps * this.options.scaleStepWidth)
+				} :
+				helpers.calculateScaleRange(
+					valuesArray,
+					helpers.min([this.chart.width, this.chart.height])/2,
+					this.options.scaleFontSize,
+					this.options.scaleBeginAtZero,
+					this.options.scaleIntegersOnly
+				);
+
+			helpers.extend(
+				this.scale,
+				scaleSizes
+			);
+
+		},
+		addData : function(valuesArray,label){
+			//Map the values array for each of the datasets
+			this.scale.valuesCount++;
+			helpers.each(valuesArray,function(value,datasetIndex){
+				var pointPosition = this.scale.getPointPosition(this.scale.valuesCount, this.scale.calculateCenterOffset(value));
+				this.datasets[datasetIndex].points.push(new this.PointClass({
+					value : value,
+					label : label,
+					x: pointPosition.x,
+					y: pointPosition.y,
+					strokeColor : this.datasets[datasetIndex].pointStrokeColor,
+					fillColor : this.datasets[datasetIndex].pointColor
+				}));
+			},this);
+
+			this.scale.labels.push(label);
+
+			this.reflow();
+
+			this.update();
+		},
+		removeData : function(){
+			this.scale.valuesCount--;
+			this.scale.labels.shift();
+			helpers.each(this.datasets,function(dataset){
+				dataset.points.shift();
+			},this);
+			this.reflow();
+			this.update();
+		},
+		update : function(){
+			this.eachPoints(function(point){
+				point.save();
+			});
+			this.reflow();
+			this.render();
+		},
+		reflow: function(){
+			helpers.extend(this.scale, {
+				width : this.chart.width,
+				height: this.chart.height,
+				size : helpers.min([this.chart.width, this.chart.height]),
+				xCenter: this.chart.width/2,
+				yCenter: this.chart.height/2
+			});
+			this.updateScaleRange(this.datasets);
+			this.scale.setScaleSize();
+			this.scale.buildYLabels();
+		},
+		draw : function(ease){
+			var easeDecimal = ease || 1,
+				ctx = this.chart.ctx;
+			this.clear();
+			this.scale.draw();
+
+			helpers.each(this.datasets,function(dataset){
+
+				//Transition each point first so that the line and point drawing isn't out of sync
+				helpers.each(dataset.points,function(point,index){
+					if (point.hasValue()){
+						point.transition(this.scale.getPointPosition(index, this.scale.calculateCenterOffset(point.value)), easeDecimal);
+					}
+				},this);
+
+
+
+				//Draw the line between all the points
+				ctx.lineWidth = this.options.datasetStrokeWidth;
+				ctx.strokeStyle = dataset.strokeColor;
+				ctx.beginPath();
+				helpers.each(dataset.points,function(point,index){
+					if (index === 0){
+						ctx.moveTo(point.x,point.y);
+					}
+					else{
+						ctx.lineTo(point.x,point.y);
+					}
+				},this);
+				ctx.closePath();
+				ctx.stroke();
+
+				ctx.fillStyle = dataset.fillColor;
+				ctx.fill();
+
+				//Now draw the points over the line
+				//A little inefficient double looping, but better than the line
+				//lagging behind the point positions
+				helpers.each(dataset.points,function(point){
+					if (point.hasValue()){
+						point.draw();
+					}
+				});
+
+			},this);
+
+		}
+
+	});
+
+
+
+
+
+}).call(this);
\ No newline at end of file
diff --git a/deployed/icagenda/media/com_icagenda/js/Chart.min.js b/deployed/icagenda/media/com_icagenda/js/Chart.min.js
new file mode 100644
index 00000000..3a0a2c87
--- /dev/null
+++ b/deployed/icagenda/media/com_icagenda/js/Chart.min.js
@@ -0,0 +1,11 @@
+/*!
+ * Chart.js
+ * http://chartjs.org/
+ * Version: 1.0.2
+ *
+ * Copyright 2015 Nick Downie
+ * Released under the MIT license
+ * https://github.com/nnnick/Chart.js/blob/master/LICENSE.md
+ */
+(function(){"use strict";var t=this,i=t.Chart,e=function(t){this.canvas=t.canvas,this.ctx=t;var i=function(t,i){return t["offset"+i]?t["offset"+i]:document.defaultView.getComputedStyle(t).getPropertyValue(i)},e=this.width=i(t.canvas,"Width"),n=this.height=i(t.canvas,"Height");t.canvas.width=e,t.canvas.height=n;var e=this.width=t.canvas.width,n=this.height=t.canvas.height;return this.aspectRatio=this.width/this.height,s.retinaScale(this),this};e.defaults={global:{animation:!0,animationSteps:60,animationEasing:"easeOutQuart",showScale:!0,scaleOverride:!1,scaleSteps:null,scaleStepWidth:null,scaleStartValue:null,scaleLineColor:"rgba(0,0,0,.1)",scaleLineWidth:1,scaleShowLabels:!0,scaleLabel:"<%=value%>",scaleIntegersOnly:!0,scaleBeginAtZero:!1,scaleFontFamily:"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",scaleFontSize:12,scaleFontStyle:"normal",scaleFontColor:"#666",responsive:!1,maintainAspectRatio:!0,showTooltips:!0,customTooltips:!1,tooltipEvents:["mousemove","touchstart","touchmove","mouseout"],tooltipFillColor:"rgba(0,0,0,0.8)",tooltipFontFamily:"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",tooltipFontSize:14,tooltipFontStyle:"normal",tooltipFontColor:"#fff",tooltipTitleFontFamily:"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",tooltipTitleFontSize:14,tooltipTitleFontStyle:"bold",tooltipTitleFontColor:"#fff",tooltipYPadding:6,tooltipXPadding:6,tooltipCaretSize:8,tooltipCornerRadius:6,tooltipXOffset:10,tooltipTemplate:"<%if (label){%><%=label%>: <%}%><%= value %>",multiTooltipTemplate:"<%= value %>",multiTooltipKeyBackground:"#fff",onAnimationProgress:function(){},onAnimationComplete:function(){}}},e.types={};var s=e.helpers={},n=s.each=function(t,i,e){var s=Array.prototype.slice.call(arguments,3);if(t)if(t.length===+t.length){var n;for(n=0;n<t.length;n++)i.apply(e,[t[n],n].concat(s))}else for(var o in t)i.apply(e,[t[o],o].concat(s))},o=s.clone=function(t){var i={};return n(t,function(e,s){t.hasOwnProperty(s)&&(i[s]=e)}),i},a=s.extend=function(t){return n(Array.prototype.slice.call(arguments,1),function(i){n(i,function(e,s){i.hasOwnProperty(s)&&(t[s]=e)})}),t},h=s.merge=function(){var t=Array.prototype.slice.call(arguments,0);return t.unshift({}),a.apply(null,t)},l=s.indexOf=function(t,i){if(Array.prototype.indexOf)return t.indexOf(i);for(var e=0;e<t.length;e++)if(t[e]===i)return e;return-1},r=(s.where=function(t,i){var e=[];return s.each(t,function(t){i(t)&&e.push(t)}),e},s.findNextWhere=function(t,i,e){e||(e=-1);for(var s=e+1;s<t.length;s++){var n=t[s];if(i(n))return n}},s.findPreviousWhere=function(t,i,e){e||(e=t.length);for(var s=e-1;s>=0;s--){var n=t[s];if(i(n))return n}},s.inherits=function(t){var i=this,e=t&&t.hasOwnProperty("constructor")?t.constructor:function(){return i.apply(this,arguments)},s=function(){this.constructor=e};return s.prototype=i.prototype,e.prototype=new s,e.extend=r,t&&a(e.prototype,t),e.__super__=i.prototype,e}),c=s.noop=function(){},u=s.uid=function(){var t=0;return function(){return"chart-"+t++}}(),d=s.warn=function(t){window.console&&"function"==typeof window.console.warn&&console.warn(t)},p=s.amd="function"==typeof define&&define.amd,f=s.isNumber=function(t){return!isNaN(parseFloat(t))&&isFinite(t)},g=s.max=function(t){return Math.max.apply(Math,t)},m=s.min=function(t){return Math.min.apply(Math,t)},v=(s.cap=function(t,i,e){if(f(i)){if(t>i)return i}else if(f(e)&&e>t)return e;return t},s.getDecimalPlaces=function(t){return t%1!==0&&f(t)?t.toString().split(".")[1].length:0}),S=s.radians=function(t){return t*(Math.PI/180)},x=(s.getAngleFromPoint=function(t,i){var e=i.x-t.x,s=i.y-t.y,n=Math.sqrt(e*e+s*s),o=2*Math.PI+Math.atan2(s,e);return 0>e&&0>s&&(o+=2*Math.PI),{angle:o,distance:n}},s.aliasPixel=function(t){return t%2===0?0:.5}),y=(s.splineCurve=function(t,i,e,s){var n=Math.sqrt(Math.pow(i.x-t.x,2)+Math.pow(i.y-t.y,2)),o=Math.sqrt(Math.pow(e.x-i.x,2)+Math.pow(e.y-i.y,2)),a=s*n/(n+o),h=s*o/(n+o);return{inner:{x:i.x-a*(e.x-t.x),y:i.y-a*(e.y-t.y)},outer:{x:i.x+h*(e.x-t.x),y:i.y+h*(e.y-t.y)}}},s.calculateOrderOfMagnitude=function(t){return Math.floor(Math.log(t)/Math.LN10)}),C=(s.calculateScaleRange=function(t,i,e,s,n){var o=2,a=Math.floor(i/(1.5*e)),h=o>=a,l=g(t),r=m(t);l===r&&(l+=.5,r>=.5&&!s?r-=.5:l+=.5);for(var c=Math.abs(l-r),u=y(c),d=Math.ceil(l/(1*Math.pow(10,u)))*Math.pow(10,u),p=s?0:Math.floor(r/(1*Math.pow(10,u)))*Math.pow(10,u),f=d-p,v=Math.pow(10,u),S=Math.round(f/v);(S>a||a>2*S)&&!h;)if(S>a)v*=2,S=Math.round(f/v),S%1!==0&&(h=!0);else if(n&&u>=0){if(v/2%1!==0)break;v/=2,S=Math.round(f/v)}else v/=2,S=Math.round(f/v);return h&&(S=o,v=f/S),{steps:S,stepValue:v,min:p,max:p+S*v}},s.template=function(t,i){function e(t,i){var e=/\W/.test(t)?new Function("obj","var p=[],print=function(){p.push.apply(p,arguments);};with(obj){p.push('"+t.replace(/[\r\t\n]/g," ").split("<%").join("	").replace(/((^|%>)[^\t]*)'/g,"$1\r").replace(/\t=(.*?)%>/g,"',$1,'").split("	").join("');").split("%>").join("p.push('").split("\r").join("\\'")+"');}return p.join('');"):s[t]=s[t];return i?e(i):e}if(t instanceof Function)return t(i);var s={};return e(t,i)}),w=(s.generateLabels=function(t,i,e,s){var o=new Array(i);return labelTemplateString&&n(o,function(i,n){o[n]=C(t,{value:e+s*(n+1)})}),o},s.easingEffects={linear:function(t){return t},easeInQuad:function(t){return t*t},easeOutQuad:function(t){return-1*t*(t-2)},easeInOutQuad:function(t){return(t/=.5)<1?.5*t*t:-0.5*(--t*(t-2)-1)},easeInCubic:function(t){return t*t*t},easeOutCubic:function(t){return 1*((t=t/1-1)*t*t+1)},easeInOutCubic:function(t){return(t/=.5)<1?.5*t*t*t:.5*((t-=2)*t*t+2)},easeInQuart:function(t){return t*t*t*t},easeOutQuart:function(t){return-1*((t=t/1-1)*t*t*t-1)},easeInOutQuart:function(t){return(t/=.5)<1?.5*t*t*t*t:-0.5*((t-=2)*t*t*t-2)},easeInQuint:function(t){return 1*(t/=1)*t*t*t*t},easeOutQuint:function(t){return 1*((t=t/1-1)*t*t*t*t+1)},easeInOutQuint:function(t){return(t/=.5)<1?.5*t*t*t*t*t:.5*((t-=2)*t*t*t*t+2)},easeInSine:function(t){return-1*Math.cos(t/1*(Math.PI/2))+1},easeOutSine:function(t){return 1*Math.sin(t/1*(Math.PI/2))},easeInOutSine:function(t){return-0.5*(Math.cos(Math.PI*t/1)-1)},easeInExpo:function(t){return 0===t?1:1*Math.pow(2,10*(t/1-1))},easeOutExpo:function(t){return 1===t?1:1*(-Math.pow(2,-10*t/1)+1)},easeInOutExpo:function(t){return 0===t?0:1===t?1:(t/=.5)<1?.5*Math.pow(2,10*(t-1)):.5*(-Math.pow(2,-10*--t)+2)},easeInCirc:function(t){return t>=1?t:-1*(Math.sqrt(1-(t/=1)*t)-1)},easeOutCirc:function(t){return 1*Math.sqrt(1-(t=t/1-1)*t)},easeInOutCirc:function(t){return(t/=.5)<1?-0.5*(Math.sqrt(1-t*t)-1):.5*(Math.sqrt(1-(t-=2)*t)+1)},easeInElastic:function(t){var i=1.70158,e=0,s=1;return 0===t?0:1==(t/=1)?1:(e||(e=.3),s<Math.abs(1)?(s=1,i=e/4):i=e/(2*Math.PI)*Math.asin(1/s),-(s*Math.pow(2,10*(t-=1))*Math.sin(2*(1*t-i)*Math.PI/e)))},easeOutElastic:function(t){var i=1.70158,e=0,s=1;return 0===t?0:1==(t/=1)?1:(e||(e=.3),s<Math.abs(1)?(s=1,i=e/4):i=e/(2*Math.PI)*Math.asin(1/s),s*Math.pow(2,-10*t)*Math.sin(2*(1*t-i)*Math.PI/e)+1)},easeInOutElastic:function(t){var i=1.70158,e=0,s=1;return 0===t?0:2==(t/=.5)?1:(e||(e=.3*1.5),s<Math.abs(1)?(s=1,i=e/4):i=e/(2*Math.PI)*Math.asin(1/s),1>t?-.5*s*Math.pow(2,10*(t-=1))*Math.sin(2*(1*t-i)*Math.PI/e):s*Math.pow(2,-10*(t-=1))*Math.sin(2*(1*t-i)*Math.PI/e)*.5+1)},easeInBack:function(t){var i=1.70158;return 1*(t/=1)*t*((i+1)*t-i)},easeOutBack:function(t){var i=1.70158;return 1*((t=t/1-1)*t*((i+1)*t+i)+1)},easeInOutBack:function(t){var i=1.70158;return(t/=.5)<1?.5*t*t*(((i*=1.525)+1)*t-i):.5*((t-=2)*t*(((i*=1.525)+1)*t+i)+2)},easeInBounce:function(t){return 1-w.easeOutBounce(1-t)},easeOutBounce:function(t){return(t/=1)<1/2.75?7.5625*t*t:2/2.75>t?1*(7.5625*(t-=1.5/2.75)*t+.75):2.5/2.75>t?1*(7.5625*(t-=2.25/2.75)*t+.9375):1*(7.5625*(t-=2.625/2.75)*t+.984375)},easeInOutBounce:function(t){return.5>t?.5*w.easeInBounce(2*t):.5*w.easeOutBounce(2*t-1)+.5}}),b=s.requestAnimFrame=function(){return window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||function(t){return window.setTimeout(t,1e3/60)}}(),P=s.cancelAnimFrame=function(){return window.cancelAnimationFrame||window.webkitCancelAnimationFrame||window.mozCancelAnimationFrame||window.oCancelAnimationFrame||window.msCancelAnimationFrame||function(t){return window.clearTimeout(t,1e3/60)}}(),L=(s.animationLoop=function(t,i,e,s,n,o){var a=0,h=w[e]||w.linear,l=function(){a++;var e=a/i,r=h(e);t.call(o,r,e,a),s.call(o,r,e),i>a?o.animationFrame=b(l):n.apply(o)};b(l)},s.getRelativePosition=function(t){var i,e,s=t.originalEvent||t,n=t.currentTarget||t.srcElement,o=n.getBoundingClientRect();return s.touches?(i=s.touches[0].clientX-o.left,e=s.touches[0].clientY-o.top):(i=s.clientX-o.left,e=s.clientY-o.top),{x:i,y:e}},s.addEvent=function(t,i,e){t.addEventListener?t.addEventListener(i,e):t.attachEvent?t.attachEvent("on"+i,e):t["on"+i]=e}),k=s.removeEvent=function(t,i,e){t.removeEventListener?t.removeEventListener(i,e,!1):t.detachEvent?t.detachEvent("on"+i,e):t["on"+i]=c},F=(s.bindEvents=function(t,i,e){t.events||(t.events={}),n(i,function(i){t.events[i]=function(){e.apply(t,arguments)},L(t.chart.canvas,i,t.events[i])})},s.unbindEvents=function(t,i){n(i,function(i,e){k(t.chart.canvas,e,i)})}),R=s.getMaximumWidth=function(t){var i=t.parentNode;return i.clientWidth},T=s.getMaximumHeight=function(t){var i=t.parentNode;return i.clientHeight},A=(s.getMaximumSize=s.getMaximumWidth,s.retinaScale=function(t){var i=t.ctx,e=t.canvas.width,s=t.canvas.height;window.devicePixelRatio&&(i.canvas.style.width=e+"px",i.canvas.style.height=s+"px",i.canvas.height=s*window.devicePixelRatio,i.canvas.width=e*window.devicePixelRatio,i.scale(window.devicePixelRatio,window.devicePixelRatio))}),M=s.clear=function(t){t.ctx.clearRect(0,0,t.width,t.height)},W=s.fontString=function(t,i,e){return i+" "+t+"px "+e},z=s.longestText=function(t,i,e){t.font=i;var s=0;return n(e,function(i){var e=t.measureText(i).width;s=e>s?e:s}),s},B=s.drawRoundedRectangle=function(t,i,e,s,n,o){t.beginPath(),t.moveTo(i+o,e),t.lineTo(i+s-o,e),t.quadraticCurveTo(i+s,e,i+s,e+o),t.lineTo(i+s,e+n-o),t.quadraticCurveTo(i+s,e+n,i+s-o,e+n),t.lineTo(i+o,e+n),t.quadraticCurveTo(i,e+n,i,e+n-o),t.lineTo(i,e+o),t.quadraticCurveTo(i,e,i+o,e),t.closePath()};e.instances={},e.Type=function(t,i,s){this.options=i,this.chart=s,this.id=u(),e.instances[this.id]=this,i.responsive&&this.resize(),this.initialize.call(this,t)},a(e.Type.prototype,{initialize:function(){return this},clear:function(){return M(this.chart),this},stop:function(){return P(this.animationFrame),this},resize:function(t){this.stop();var i=this.chart.canvas,e=R(this.chart.canvas),s=this.options.maintainAspectRatio?e/this.chart.aspectRatio:T(this.chart.canvas);return i.width=this.chart.width=e,i.height=this.chart.height=s,A(this.chart),"function"==typeof t&&t.apply(this,Array.prototype.slice.call(arguments,1)),this},reflow:c,render:function(t){return t&&this.reflow(),this.options.animation&&!t?s.animationLoop(this.draw,this.options.animationSteps,this.options.animationEasing,this.options.onAnimationProgress,this.options.onAnimationComplete,this):(this.draw(),this.options.onAnimationComplete.call(this)),this},generateLegend:function(){return C(this.options.legendTemplate,this)},destroy:function(){this.clear(),F(this,this.events);var t=this.chart.canvas;t.width=this.chart.width,t.height=this.chart.height,t.style.removeProperty?(t.style.removeProperty("width"),t.style.removeProperty("height")):(t.style.removeAttribute("width"),t.style.removeAttribute("height")),delete e.instances[this.id]},showTooltip:function(t,i){"undefined"==typeof this.activeElements&&(this.activeElements=[]);var o=function(t){var i=!1;return t.length!==this.activeElements.length?i=!0:(n(t,function(t,e){t!==this.activeElements[e]&&(i=!0)},this),i)}.call(this,t);if(o||i){if(this.activeElements=t,this.draw(),this.options.customTooltips&&this.options.customTooltips(!1),t.length>0)if(this.datasets&&this.datasets.length>1){for(var a,h,r=this.datasets.length-1;r>=0&&(a=this.datasets[r].points||this.datasets[r].bars||this.datasets[r].segments,h=l(a,t[0]),-1===h);r--);var c=[],u=[],d=function(){var t,i,e,n,o,a=[],l=[],r=[];return s.each(this.datasets,function(i){t=i.points||i.bars||i.segments,t[h]&&t[h].hasValue()&&a.push(t[h])}),s.each(a,function(t){l.push(t.x),r.push(t.y),c.push(s.template(this.options.multiTooltipTemplate,t)),u.push({fill:t._saved.fillColor||t.fillColor,stroke:t._saved.strokeColor||t.strokeColor})},this),o=m(r),e=g(r),n=m(l),i=g(l),{x:n>this.chart.width/2?n:i,y:(o+e)/2}}.call(this,h);new e.MultiTooltip({x:d.x,y:d.y,xPadding:this.options.tooltipXPadding,yPadding:this.options.tooltipYPadding,xOffset:this.options.tooltipXOffset,fillColor:this.options.tooltipFillColor,textColor:this.options.tooltipFontColor,fontFamily:this.options.tooltipFontFamily,fontStyle:this.options.tooltipFontStyle,fontSize:this.options.tooltipFontSize,titleTextColor:this.options.tooltipTitleFontColor,titleFontFamily:this.options.tooltipTitleFontFamily,titleFontStyle:this.options.tooltipTitleFontStyle,titleFontSize:this.options.tooltipTitleFontSize,cornerRadius:this.options.tooltipCornerRadius,labels:c,legendColors:u,legendColorBackground:this.options.multiTooltipKeyBackground,title:t[0].label,chart:this.chart,ctx:this.chart.ctx,custom:this.options.customTooltips}).draw()}else n(t,function(t){var i=t.tooltipPosition();new e.Tooltip({x:Math.round(i.x),y:Math.round(i.y),xPadding:this.options.tooltipXPadding,yPadding:this.options.tooltipYPadding,fillColor:this.options.tooltipFillColor,textColor:this.options.tooltipFontColor,fontFamily:this.options.tooltipFontFamily,fontStyle:this.options.tooltipFontStyle,fontSize:this.options.tooltipFontSize,caretHeight:this.options.tooltipCaretSize,cornerRadius:this.options.tooltipCornerRadius,text:C(this.options.tooltipTemplate,t),chart:this.chart,custom:this.options.customTooltips}).draw()},this);return this}},toBase64Image:function(){return this.chart.canvas.toDataURL.apply(this.chart.canvas,arguments)}}),e.Type.extend=function(t){var i=this,s=function(){return i.apply(this,arguments)};if(s.prototype=o(i.prototype),a(s.prototype,t),s.extend=e.Type.extend,t.name||i.prototype.name){var n=t.name||i.prototype.name,l=e.defaults[i.prototype.name]?o(e.defaults[i.prototype.name]):{};e.defaults[n]=a(l,t.defaults),e.types[n]=s,e.prototype[n]=function(t,i){var o=h(e.defaults.global,e.defaults[n],i||{});return new s(t,o,this)}}else d("Name not provided for this chart, so it hasn't been registered");return i},e.Element=function(t){a(this,t),this.initialize.apply(this,arguments),this.save()},a(e.Element.prototype,{initialize:function(){},restore:function(t){return t?n(t,function(t){this[t]=this._saved[t]},this):a(this,this._saved),this},save:function(){return this._saved=o(this),delete this._saved._saved,this},update:function(t){return n(t,function(t,i){this._saved[i]=this[i],this[i]=t},this),this},transition:function(t,i){return n(t,function(t,e){this[e]=(t-this._saved[e])*i+this._saved[e]},this),this},tooltipPosition:function(){return{x:this.x,y:this.y}},hasValue:function(){return f(this.value)}}),e.Element.extend=r,e.Point=e.Element.extend({display:!0,inRange:function(t,i){var e=this.hitDetectionRadius+this.radius;return Math.pow(t-this.x,2)+Math.pow(i-this.y,2)<Math.pow(e,2)},draw:function(){if(this.display){var t=this.ctx;t.beginPath(),t.arc(this.x,this.y,this.radius,0,2*Math.PI),t.closePath(),t.strokeStyle=this.strokeColor,t.lineWidth=this.strokeWidth,t.fillStyle=this.fillColor,t.fill(),t.stroke()}}}),e.Arc=e.Element.extend({inRange:function(t,i){var e=s.getAngleFromPoint(this,{x:t,y:i}),n=e.angle>=this.startAngle&&e.angle<=this.endAngle,o=e.distance>=this.innerRadius&&e.distance<=this.outerRadius;return n&&o},tooltipPosition:function(){var t=this.startAngle+(this.endAngle-this.startAngle)/2,i=(this.outerRadius-this.innerRadius)/2+this.innerRadius;return{x:this.x+Math.cos(t)*i,y:this.y+Math.sin(t)*i}},draw:function(t){var i=this.ctx;i.beginPath(),i.arc(this.x,this.y,this.outerRadius,this.startAngle,this.endAngle),i.arc(this.x,this.y,this.innerRadius,this.endAngle,this.startAngle,!0),i.closePath(),i.strokeStyle=this.strokeColor,i.lineWidth=this.strokeWidth,i.fillStyle=this.fillColor,i.fill(),i.lineJoin="bevel",this.showStroke&&i.stroke()}}),e.Rectangle=e.Element.extend({draw:function(){var t=this.ctx,i=this.width/2,e=this.x-i,s=this.x+i,n=this.base-(this.base-this.y),o=this.strokeWidth/2;this.showStroke&&(e+=o,s-=o,n+=o),t.beginPath(),t.fillStyle=this.fillColor,t.strokeStyle=this.strokeColor,t.lineWidth=this.strokeWidth,t.moveTo(e,this.base),t.lineTo(e,n),t.lineTo(s,n),t.lineTo(s,this.base),t.fill(),this.showStroke&&t.stroke()},height:function(){return this.base-this.y},inRange:function(t,i){return t>=this.x-this.width/2&&t<=this.x+this.width/2&&i>=this.y&&i<=this.base}}),e.Tooltip=e.Element.extend({draw:function(){var t=this.chart.ctx;t.font=W(this.fontSize,this.fontStyle,this.fontFamily),this.xAlign="center",this.yAlign="above";var i=this.caretPadding=2,e=t.measureText(this.text).width+2*this.xPadding,s=this.fontSize+2*this.yPadding,n=s+this.caretHeight+i;this.x+e/2>this.chart.width?this.xAlign="left":this.x-e/2<0&&(this.xAlign="right"),this.y-n<0&&(this.yAlign="below");var o=this.x-e/2,a=this.y-n;if(t.fillStyle=this.fillColor,this.custom)this.custom(this);else{switch(this.yAlign){case"above":t.beginPath(),t.moveTo(this.x,this.y-i),t.lineTo(this.x+this.caretHeight,this.y-(i+this.caretHeight)),t.lineTo(this.x-this.caretHeight,this.y-(i+this.caretHeight)),t.closePath(),t.fill();break;case"below":a=this.y+i+this.caretHeight,t.beginPath(),t.moveTo(this.x,this.y+i),t.lineTo(this.x+this.caretHeight,this.y+i+this.caretHeight),t.lineTo(this.x-this.caretHeight,this.y+i+this.caretHeight),t.closePath(),t.fill()}switch(this.xAlign){case"left":o=this.x-e+(this.cornerRadius+this.caretHeight);break;case"right":o=this.x-(this.cornerRadius+this.caretHeight)}B(t,o,a,e,s,this.cornerRadius),t.fill(),t.fillStyle=this.textColor,t.textAlign="center",t.textBaseline="middle",t.fillText(this.text,o+e/2,a+s/2)}}}),e.MultiTooltip=e.Element.extend({initialize:function(){this.font=W(this.fontSize,this.fontStyle,this.fontFamily),this.titleFont=W(this.titleFontSize,this.titleFontStyle,this.titleFontFamily),this.height=this.labels.length*this.fontSize+(this.labels.length-1)*(this.fontSize/2)+2*this.yPadding+1.5*this.titleFontSize,this.ctx.font=this.titleFont;var t=this.ctx.measureText(this.title).width,i=z(this.ctx,this.font,this.labels)+this.fontSize+3,e=g([i,t]);this.width=e+2*this.xPadding;var s=this.height/2;this.y-s<0?this.y=s:this.y+s>this.chart.height&&(this.y=this.chart.height-s),this.x>this.chart.width/2?this.x-=this.xOffset+this.width:this.x+=this.xOffset},getLineHeight:function(t){var i=this.y-this.height/2+this.yPadding,e=t-1;return 0===t?i+this.titleFontSize/2:i+(1.5*this.fontSize*e+this.fontSize/2)+1.5*this.titleFontSize},draw:function(){if(this.custom)this.custom(this);else{B(this.ctx,this.x,this.y-this.height/2,this.width,this.height,this.cornerRadius);var t=this.ctx;t.fillStyle=this.fillColor,t.fill(),t.closePath(),t.textAlign="left",t.textBaseline="middle",t.fillStyle=this.titleTextColor,t.font=this.titleFont,t.fillText(this.title,this.x+this.xPadding,this.getLineHeight(0)),t.font=this.font,s.each(this.labels,function(i,e){t.fillStyle=this.textColor,t.fillText(i,this.x+this.xPadding+this.fontSize+3,this.getLineHeight(e+1)),t.fillStyle=this.legendColorBackground,t.fillRect(this.x+this.xPadding,this.getLineHeight(e+1)-this.fontSize/2,this.fontSize,this.fontSize),t.fillStyle=this.legendColors[e].fill,t.fillRect(this.x+this.xPadding,this.getLineHeight(e+1)-this.fontSize/2,this.fontSize,this.fontSize)},this)}}}),e.Scale=e.Element.extend({initialize:function(){this.fit()},buildYLabels:function(){this.yLabels=[];for(var t=v(this.stepValue),i=0;i<=this.steps;i++)this.yLabels.push(C(this.templateString,{value:(this.min+i*this.stepValue).toFixed(t)}));this.yLabelWidth=this.display&&this.showLabels?z(this.ctx,this.font,this.yLabels):0},addXLabel:function(t){this.xLabels.push(t),this.valuesCount++,this.fit()},removeXLabel:function(){this.xLabels.shift(),this.valuesCount--,this.fit()},fit:function(){this.startPoint=this.display?this.fontSize:0,this.endPoint=this.display?this.height-1.5*this.fontSize-5:this.height,this.startPoint+=this.padding,this.endPoint-=this.padding;var t,i=this.endPoint-this.startPoint;for(this.calculateYRange(i),this.buildYLabels(),this.calculateXLabelRotation();i>this.endPoint-this.startPoint;)i=this.endPoint-this.startPoint,t=this.yLabelWidth,this.calculateYRange(i),this.buildYLabels(),t<this.yLabelWidth&&this.calculateXLabelRotation()},calculateXLabelRotation:function(){this.ctx.font=this.font;var t,i,e=this.ctx.measureText(this.xLabels[0]).width,s=this.ctx.measureText(this.xLabels[this.xLabels.length-1]).width;if(this.xScalePaddingRight=s/2+3,this.xScalePaddingLeft=e/2>this.yLabelWidth+10?e/2:this.yLabelWidth+10,this.xLabelRotation=0,this.display){var n,o=z(this.ctx,this.font,this.xLabels);this.xLabelWidth=o;for(var a=Math.floor(this.calculateX(1)-this.calculateX(0))-6;this.xLabelWidth>a&&0===this.xLabelRotation||this.xLabelWidth>a&&this.xLabelRotation<=90&&this.xLabelRotation>0;)n=Math.cos(S(this.xLabelRotation)),t=n*e,i=n*s,t+this.fontSize/2>this.yLabelWidth+8&&(this.xScalePaddingLeft=t+this.fontSize/2),this.xScalePaddingRight=this.fontSize/2,this.xLabelRotation++,this.xLabelWidth=n*o;this.xLabelRotation>0&&(this.endPoint-=Math.sin(S(this.xLabelRotation))*o+3)}else this.xLabelWidth=0,this.xScalePaddingRight=this.padding,this.xScalePaddingLeft=this.padding},calculateYRange:c,drawingArea:function(){return this.startPoint-this.endPoint},calculateY:function(t){var i=this.drawingArea()/(this.min-this.max);return this.endPoint-i*(t-this.min)},calculateX:function(t){var i=(this.xLabelRotation>0,this.width-(this.xScalePaddingLeft+this.xScalePaddingRight)),e=i/Math.max(this.valuesCount-(this.offsetGridLines?0:1),1),s=e*t+this.xScalePaddingLeft;return this.offsetGridLines&&(s+=e/2),Math.round(s)},update:function(t){s.extend(this,t),this.fit()},draw:function(){var t=this.ctx,i=(this.endPoint-this.startPoint)/this.steps,e=Math.round(this.xScalePaddingLeft);this.display&&(t.fillStyle=this.textColor,t.font=this.font,n(this.yLabels,function(n,o){var a=this.endPoint-i*o,h=Math.round(a),l=this.showHorizontalLines;t.textAlign="right",t.textBaseline="middle",this.showLabels&&t.fillText(n,e-10,a),0!==o||l||(l=!0),l&&t.beginPath(),o>0?(t.lineWidth=this.gridLineWidth,t.strokeStyle=this.gridLineColor):(t.lineWidth=this.lineWidth,t.strokeStyle=this.lineColor),h+=s.aliasPixel(t.lineWidth),l&&(t.moveTo(e,h),t.lineTo(this.width,h),t.stroke(),t.closePath()),t.lineWidth=this.lineWidth,t.strokeStyle=this.lineColor,t.beginPath(),t.moveTo(e-5,h),t.lineTo(e,h),t.stroke(),t.closePath()},this),n(this.xLabels,function(i,e){var s=this.calculateX(e)+x(this.lineWidth),n=this.calculateX(e-(this.offsetGridLines?.5:0))+x(this.lineWidth),o=this.xLabelRotation>0,a=this.showVerticalLines;0!==e||a||(a=!0),a&&t.beginPath(),e>0?(t.lineWidth=this.gridLineWidth,t.strokeStyle=this.gridLineColor):(t.lineWidth=this.lineWidth,t.strokeStyle=this.lineColor),a&&(t.moveTo(n,this.endPoint),t.lineTo(n,this.startPoint-3),t.stroke(),t.closePath()),t.lineWidth=this.lineWidth,t.strokeStyle=this.lineColor,t.beginPath(),t.moveTo(n,this.endPoint),t.lineTo(n,this.endPoint+5),t.stroke(),t.closePath(),t.save(),t.translate(s,o?this.endPoint+12:this.endPoint+8),t.rotate(-1*S(this.xLabelRotation)),t.font=this.font,t.textAlign=o?"right":"center",t.textBaseline=o?"middle":"top",t.fillText(i,0,0),t.restore()},this))}}),e.RadialScale=e.Element.extend({initialize:function(){this.size=m([this.height,this.width]),this.drawingArea=this.display?this.size/2-(this.fontSize/2+this.backdropPaddingY):this.size/2},calculateCenterOffset:function(t){var i=this.drawingArea/(this.max-this.min);return(t-this.min)*i},update:function(){this.lineArc?this.drawingArea=this.display?this.size/2-(this.fontSize/2+this.backdropPaddingY):this.size/2:this.setScaleSize(),this.buildYLabels()},buildYLabels:function(){this.yLabels=[];for(var t=v(this.stepValue),i=0;i<=this.steps;i++)this.yLabels.push(C(this.templateString,{value:(this.min+i*this.stepValue).toFixed(t)}))},getCircumference:function(){return 2*Math.PI/this.valuesCount},setScaleSize:function(){var t,i,e,s,n,o,a,h,l,r,c,u,d=m([this.height/2-this.pointLabelFontSize-5,this.width/2]),p=this.width,g=0;for(this.ctx.font=W(this.pointLabelFontSize,this.pointLabelFontStyle,this.pointLabelFontFamily),i=0;i<this.valuesCount;i++)t=this.getPointPosition(i,d),e=this.ctx.measureText(C(this.templateString,{value:this.labels[i]})).width+5,0===i||i===this.valuesCount/2?(s=e/2,t.x+s>p&&(p=t.x+s,n=i),t.x-s<g&&(g=t.x-s,a=i)):i<this.valuesCount/2?t.x+e>p&&(p=t.x+e,n=i):i>this.valuesCount/2&&t.x-e<g&&(g=t.x-e,a=i);l=g,r=Math.ceil(p-this.width),o=this.getIndexAngle(n),h=this.getIndexAngle(a),c=r/Math.sin(o+Math.PI/2),u=l/Math.sin(h+Math.PI/2),c=f(c)?c:0,u=f(u)?u:0,this.drawingArea=d-(u+c)/2,this.setCenterPoint(u,c)},setCenterPoint:function(t,i){var e=this.width-i-this.drawingArea,s=t+this.drawingArea;this.xCenter=(s+e)/2,this.yCenter=this.height/2},getIndexAngle:function(t){var i=2*Math.PI/this.valuesCount;return t*i-Math.PI/2},getPointPosition:function(t,i){var e=this.getIndexAngle(t);return{x:Math.cos(e)*i+this.xCenter,y:Math.sin(e)*i+this.yCenter}},draw:function(){if(this.display){var t=this.ctx;if(n(this.yLabels,function(i,e){if(e>0){var s,n=e*(this.drawingArea/this.steps),o=this.yCenter-n;if(this.lineWidth>0)if(t.strokeStyle=this.lineColor,t.lineWidth=this.lineWidth,this.lineArc)t.beginPath(),t.arc(this.xCenter,this.yCenter,n,0,2*Math.PI),t.closePath(),t.stroke();else{t.beginPath();for(var a=0;a<this.valuesCount;a++)s=this.getPointPosition(a,this.calculateCenterOffset(this.min+e*this.stepValue)),0===a?t.moveTo(s.x,s.y):t.lineTo(s.x,s.y);t.closePath(),t.stroke()}if(this.showLabels){if(t.font=W(this.fontSize,this.fontStyle,this.fontFamily),this.showLabelBackdrop){var h=t.measureText(i).width;t.fillStyle=this.backdropColor,t.fillRect(this.xCenter-h/2-this.backdropPaddingX,o-this.fontSize/2-this.backdropPaddingY,h+2*this.backdropPaddingX,this.fontSize+2*this.backdropPaddingY)}t.textAlign="center",t.textBaseline="middle",t.fillStyle=this.fontColor,t.fillText(i,this.xCenter,o)}}},this),!this.lineArc){t.lineWidth=this.angleLineWidth,t.strokeStyle=this.angleLineColor;for(var i=this.valuesCount-1;i>=0;i--){if(this.angleLineWidth>0){var e=this.getPointPosition(i,this.calculateCenterOffset(this.max));t.beginPath(),t.moveTo(this.xCenter,this.yCenter),t.lineTo(e.x,e.y),t.stroke(),t.closePath()}var s=this.getPointPosition(i,this.calculateCenterOffset(this.max)+5);t.font=W(this.pointLabelFontSize,this.pointLabelFontStyle,this.pointLabelFontFamily),t.fillStyle=this.pointLabelFontColor;var o=this.labels.length,a=this.labels.length/2,h=a/2,l=h>i||i>o-h,r=i===h||i===o-h;t.textAlign=0===i?"center":i===a?"center":a>i?"left":"right",t.textBaseline=r?"middle":l?"bottom":"top",t.fillText(this.labels[i],s.x,s.y)}}}}}),s.addEvent(window,"resize",function(){var t;return function(){clearTimeout(t),t=setTimeout(function(){n(e.instances,function(t){t.options.responsive&&t.resize(t.render,!0)})},50)}}()),p?define(function(){return e}):"object"==typeof module&&module.exports&&(module.exports=e),t.Chart=e,e.noConflict=function(){return t.Chart=i,e}}).call(this),function(){"use strict";var t=this,i=t.Chart,e=i.helpers,s={scaleBeginAtZero:!0,scaleShowGridLines:!0,scaleGridLineColor:"rgba(0,0,0,.05)",scaleGridLineWidth:1,scaleShowHorizontalLines:!0,scaleShowVerticalLines:!0,barShowStroke:!0,barStrokeWidth:2,barValueSpacing:5,barDatasetSpacing:1,legendTemplate:'<ul class="<%=name.toLowerCase()%>-legend"><% for (var i=0; i<datasets.length; i++){%><li><span style="background-color:<%=datasets[i].fillColor%>"></span><%if(datasets[i].label){%><%=datasets[i].label%><%}%></li><%}%></ul>'};i.Type.extend({name:"Bar",defaults:s,initialize:function(t){var s=this.options;this.ScaleClass=i.Scale.extend({offsetGridLines:!0,calculateBarX:function(t,i,e){var n=this.calculateBaseWidth(),o=this.calculateX(e)-n/2,a=this.calculateBarWidth(t);return o+a*i+i*s.barDatasetSpacing+a/2},calculateBaseWidth:function(){return this.calculateX(1)-this.calculateX(0)-2*s.barValueSpacing},calculateBarWidth:function(t){var i=this.calculateBaseWidth()-(t-1)*s.barDatasetSpacing;return i/t}}),this.datasets=[],this.options.showTooltips&&e.bindEvents(this,this.options.tooltipEvents,function(t){var i="mouseout"!==t.type?this.getBarsAtEvent(t):[];this.eachBars(function(t){t.restore(["fillColor","strokeColor"])}),e.each(i,function(t){t.fillColor=t.highlightFill,t.strokeColor=t.highlightStroke}),this.showTooltip(i)}),this.BarClass=i.Rectangle.extend({strokeWidth:this.options.barStrokeWidth,showStroke:this.options.barShowStroke,ctx:this.chart.ctx}),e.each(t.datasets,function(i){var s={label:i.label||null,fillColor:i.fillColor,strokeColor:i.strokeColor,bars:[]};this.datasets.push(s),e.each(i.data,function(e,n){s.bars.push(new this.BarClass({value:e,label:t.labels[n],datasetLabel:i.label,strokeColor:i.strokeColor,fillColor:i.fillColor,highlightFill:i.highlightFill||i.fillColor,highlightStroke:i.highlightStroke||i.strokeColor}))},this)},this),this.buildScale(t.labels),this.BarClass.prototype.base=this.scale.endPoint,this.eachBars(function(t,i,s){e.extend(t,{width:this.scale.calculateBarWidth(this.datasets.length),x:this.scale.calculateBarX(this.datasets.length,s,i),y:this.scale.endPoint}),t.save()},this),this.render()},update:function(){this.scale.update(),e.each(this.activeElements,function(t){t.restore(["fillColor","strokeColor"])}),this.eachBars(function(t){t.save()}),this.render()},eachBars:function(t){e.each(this.datasets,function(i,s){e.each(i.bars,t,this,s)},this)},getBarsAtEvent:function(t){for(var i,s=[],n=e.getRelativePosition(t),o=function(t){s.push(t.bars[i])},a=0;a<this.datasets.length;a++)for(i=0;i<this.datasets[a].bars.length;i++)if(this.datasets[a].bars[i].inRange(n.x,n.y))return e.each(this.datasets,o),s;return s},buildScale:function(t){var i=this,s=function(){var t=[];return i.eachBars(function(i){t.push(i.value)}),t},n={templateString:this.options.scaleLabel,height:this.chart.height,width:this.chart.width,ctx:this.chart.ctx,textColor:this.options.scaleFontColor,fontSize:this.options.scaleFontSize,fontStyle:this.options.scaleFontStyle,fontFamily:this.options.scaleFontFamily,valuesCount:t.length,beginAtZero:this.options.scaleBeginAtZero,integersOnly:this.options.scaleIntegersOnly,calculateYRange:function(t){var i=e.calculateScaleRange(s(),t,this.fontSize,this.beginAtZero,this.integersOnly);e.extend(this,i)},xLabels:t,font:e.fontString(this.options.scaleFontSize,this.options.scaleFontStyle,this.options.scaleFontFamily),lineWidth:this.options.scaleLineWidth,lineColor:this.options.scaleLineColor,showHorizontalLines:this.options.scaleShowHorizontalLines,showVerticalLines:this.options.scaleShowVerticalLines,gridLineWidth:this.options.scaleShowGridLines?this.options.scaleGridLineWidth:0,gridLineColor:this.options.scaleShowGridLines?this.options.scaleGridLineColor:"rgba(0,0,0,0)",padding:this.options.showScale?0:this.options.barShowStroke?this.options.barStrokeWidth:0,showLabels:this.options.scaleShowLabels,display:this.options.showScale};this.options.scaleOverride&&e.extend(n,{calculateYRange:e.noop,steps:this.options.scaleSteps,stepValue:this.options.scaleStepWidth,min:this.options.scaleStartValue,max:this.options.scaleStartValue+this.options.scaleSteps*this.options.scaleStepWidth}),this.scale=new this.ScaleClass(n)},addData:function(t,i){e.each(t,function(t,e){this.datasets[e].bars.push(new this.BarClass({value:t,label:i,x:this.scale.calculateBarX(this.datasets.length,e,this.scale.valuesCount+1),y:this.scale.endPoint,width:this.scale.calculateBarWidth(this.datasets.length),base:this.scale.endPoint,strokeColor:this.datasets[e].strokeColor,fillColor:this.datasets[e].fillColor}))
+},this),this.scale.addXLabel(i),this.update()},removeData:function(){this.scale.removeXLabel(),e.each(this.datasets,function(t){t.bars.shift()},this),this.update()},reflow:function(){e.extend(this.BarClass.prototype,{y:this.scale.endPoint,base:this.scale.endPoint});var t=e.extend({height:this.chart.height,width:this.chart.width});this.scale.update(t)},draw:function(t){var i=t||1;this.clear();this.chart.ctx;this.scale.draw(i),e.each(this.datasets,function(t,s){e.each(t.bars,function(t,e){t.hasValue()&&(t.base=this.scale.endPoint,t.transition({x:this.scale.calculateBarX(this.datasets.length,s,e),y:this.scale.calculateY(t.value),width:this.scale.calculateBarWidth(this.datasets.length)},i).draw())},this)},this)}})}.call(this),function(){"use strict";var t=this,i=t.Chart,e=i.helpers,s={segmentShowStroke:!0,segmentStrokeColor:"#fff",segmentStrokeWidth:2,percentageInnerCutout:50,animationSteps:100,animationEasing:"easeOutBounce",animateRotate:!0,animateScale:!1,legendTemplate:'<ul class="<%=name.toLowerCase()%>-legend"><% for (var i=0; i<segments.length; i++){%><li><span style="background-color:<%=segments[i].fillColor%>"></span><%if(segments[i].label){%><%=segments[i].label%><%}%></li><%}%></ul>'};i.Type.extend({name:"Doughnut",defaults:s,initialize:function(t){this.segments=[],this.outerRadius=(e.min([this.chart.width,this.chart.height])-this.options.segmentStrokeWidth/2)/2,this.SegmentArc=i.Arc.extend({ctx:this.chart.ctx,x:this.chart.width/2,y:this.chart.height/2}),this.options.showTooltips&&e.bindEvents(this,this.options.tooltipEvents,function(t){var i="mouseout"!==t.type?this.getSegmentsAtEvent(t):[];e.each(this.segments,function(t){t.restore(["fillColor"])}),e.each(i,function(t){t.fillColor=t.highlightColor}),this.showTooltip(i)}),this.calculateTotal(t),e.each(t,function(t,i){this.addData(t,i,!0)},this),this.render()},getSegmentsAtEvent:function(t){var i=[],s=e.getRelativePosition(t);return e.each(this.segments,function(t){t.inRange(s.x,s.y)&&i.push(t)},this),i},addData:function(t,i,e){var s=i||this.segments.length;this.segments.splice(s,0,new this.SegmentArc({value:t.value,outerRadius:this.options.animateScale?0:this.outerRadius,innerRadius:this.options.animateScale?0:this.outerRadius/100*this.options.percentageInnerCutout,fillColor:t.color,highlightColor:t.highlight||t.color,showStroke:this.options.segmentShowStroke,strokeWidth:this.options.segmentStrokeWidth,strokeColor:this.options.segmentStrokeColor,startAngle:1.5*Math.PI,circumference:this.options.animateRotate?0:this.calculateCircumference(t.value),label:t.label})),e||(this.reflow(),this.update())},calculateCircumference:function(t){return 2*Math.PI*(Math.abs(t)/this.total)},calculateTotal:function(t){this.total=0,e.each(t,function(t){this.total+=Math.abs(t.value)},this)},update:function(){this.calculateTotal(this.segments),e.each(this.activeElements,function(t){t.restore(["fillColor"])}),e.each(this.segments,function(t){t.save()}),this.render()},removeData:function(t){var i=e.isNumber(t)?t:this.segments.length-1;this.segments.splice(i,1),this.reflow(),this.update()},reflow:function(){e.extend(this.SegmentArc.prototype,{x:this.chart.width/2,y:this.chart.height/2}),this.outerRadius=(e.min([this.chart.width,this.chart.height])-this.options.segmentStrokeWidth/2)/2,e.each(this.segments,function(t){t.update({outerRadius:this.outerRadius,innerRadius:this.outerRadius/100*this.options.percentageInnerCutout})},this)},draw:function(t){var i=t?t:1;this.clear(),e.each(this.segments,function(t,e){t.transition({circumference:this.calculateCircumference(t.value),outerRadius:this.outerRadius,innerRadius:this.outerRadius/100*this.options.percentageInnerCutout},i),t.endAngle=t.startAngle+t.circumference,t.draw(),0===e&&(t.startAngle=1.5*Math.PI),e<this.segments.length-1&&(this.segments[e+1].startAngle=t.endAngle)},this)}}),i.types.Doughnut.extend({name:"Pie",defaults:e.merge(s,{percentageInnerCutout:0})})}.call(this),function(){"use strict";var t=this,i=t.Chart,e=i.helpers,s={scaleShowGridLines:!0,scaleGridLineColor:"rgba(0,0,0,.05)",scaleGridLineWidth:1,scaleShowHorizontalLines:!0,scaleShowVerticalLines:!0,bezierCurve:!0,bezierCurveTension:.4,pointDot:!0,pointDotRadius:4,pointDotStrokeWidth:1,pointHitDetectionRadius:20,datasetStroke:!0,datasetStrokeWidth:2,datasetFill:!0,legendTemplate:'<ul class="<%=name.toLowerCase()%>-legend"><% for (var i=0; i<datasets.length; i++){%><li><span style="background-color:<%=datasets[i].strokeColor%>"></span><%if(datasets[i].label){%><%=datasets[i].label%><%}%></li><%}%></ul>'};i.Type.extend({name:"Line",defaults:s,initialize:function(t){this.PointClass=i.Point.extend({strokeWidth:this.options.pointDotStrokeWidth,radius:this.options.pointDotRadius,display:this.options.pointDot,hitDetectionRadius:this.options.pointHitDetectionRadius,ctx:this.chart.ctx,inRange:function(t){return Math.pow(t-this.x,2)<Math.pow(this.radius+this.hitDetectionRadius,2)}}),this.datasets=[],this.options.showTooltips&&e.bindEvents(this,this.options.tooltipEvents,function(t){var i="mouseout"!==t.type?this.getPointsAtEvent(t):[];this.eachPoints(function(t){t.restore(["fillColor","strokeColor"])}),e.each(i,function(t){t.fillColor=t.highlightFill,t.strokeColor=t.highlightStroke}),this.showTooltip(i)}),e.each(t.datasets,function(i){var s={label:i.label||null,fillColor:i.fillColor,strokeColor:i.strokeColor,pointColor:i.pointColor,pointStrokeColor:i.pointStrokeColor,points:[]};this.datasets.push(s),e.each(i.data,function(e,n){s.points.push(new this.PointClass({value:e,label:t.labels[n],datasetLabel:i.label,strokeColor:i.pointStrokeColor,fillColor:i.pointColor,highlightFill:i.pointHighlightFill||i.pointColor,highlightStroke:i.pointHighlightStroke||i.pointStrokeColor}))},this),this.buildScale(t.labels),this.eachPoints(function(t,i){e.extend(t,{x:this.scale.calculateX(i),y:this.scale.endPoint}),t.save()},this)},this),this.render()},update:function(){this.scale.update(),e.each(this.activeElements,function(t){t.restore(["fillColor","strokeColor"])}),this.eachPoints(function(t){t.save()}),this.render()},eachPoints:function(t){e.each(this.datasets,function(i){e.each(i.points,t,this)},this)},getPointsAtEvent:function(t){var i=[],s=e.getRelativePosition(t);return e.each(this.datasets,function(t){e.each(t.points,function(t){t.inRange(s.x,s.y)&&i.push(t)})},this),i},buildScale:function(t){var s=this,n=function(){var t=[];return s.eachPoints(function(i){t.push(i.value)}),t},o={templateString:this.options.scaleLabel,height:this.chart.height,width:this.chart.width,ctx:this.chart.ctx,textColor:this.options.scaleFontColor,fontSize:this.options.scaleFontSize,fontStyle:this.options.scaleFontStyle,fontFamily:this.options.scaleFontFamily,valuesCount:t.length,beginAtZero:this.options.scaleBeginAtZero,integersOnly:this.options.scaleIntegersOnly,calculateYRange:function(t){var i=e.calculateScaleRange(n(),t,this.fontSize,this.beginAtZero,this.integersOnly);e.extend(this,i)},xLabels:t,font:e.fontString(this.options.scaleFontSize,this.options.scaleFontStyle,this.options.scaleFontFamily),lineWidth:this.options.scaleLineWidth,lineColor:this.options.scaleLineColor,showHorizontalLines:this.options.scaleShowHorizontalLines,showVerticalLines:this.options.scaleShowVerticalLines,gridLineWidth:this.options.scaleShowGridLines?this.options.scaleGridLineWidth:0,gridLineColor:this.options.scaleShowGridLines?this.options.scaleGridLineColor:"rgba(0,0,0,0)",padding:this.options.showScale?0:this.options.pointDotRadius+this.options.pointDotStrokeWidth,showLabels:this.options.scaleShowLabels,display:this.options.showScale};this.options.scaleOverride&&e.extend(o,{calculateYRange:e.noop,steps:this.options.scaleSteps,stepValue:this.options.scaleStepWidth,min:this.options.scaleStartValue,max:this.options.scaleStartValue+this.options.scaleSteps*this.options.scaleStepWidth}),this.scale=new i.Scale(o)},addData:function(t,i){e.each(t,function(t,e){this.datasets[e].points.push(new this.PointClass({value:t,label:i,x:this.scale.calculateX(this.scale.valuesCount+1),y:this.scale.endPoint,strokeColor:this.datasets[e].pointStrokeColor,fillColor:this.datasets[e].pointColor}))},this),this.scale.addXLabel(i),this.update()},removeData:function(){this.scale.removeXLabel(),e.each(this.datasets,function(t){t.points.shift()},this),this.update()},reflow:function(){var t=e.extend({height:this.chart.height,width:this.chart.width});this.scale.update(t)},draw:function(t){var i=t||1;this.clear();var s=this.chart.ctx,n=function(t){return null!==t.value},o=function(t,i,s){return e.findNextWhere(i,n,s)||t},a=function(t,i,s){return e.findPreviousWhere(i,n,s)||t};this.scale.draw(i),e.each(this.datasets,function(t){var h=e.where(t.points,n);e.each(t.points,function(t,e){t.hasValue()&&t.transition({y:this.scale.calculateY(t.value),x:this.scale.calculateX(e)},i)},this),this.options.bezierCurve&&e.each(h,function(t,i){var s=i>0&&i<h.length-1?this.options.bezierCurveTension:0;t.controlPoints=e.splineCurve(a(t,h,i),t,o(t,h,i),s),t.controlPoints.outer.y>this.scale.endPoint?t.controlPoints.outer.y=this.scale.endPoint:t.controlPoints.outer.y<this.scale.startPoint&&(t.controlPoints.outer.y=this.scale.startPoint),t.controlPoints.inner.y>this.scale.endPoint?t.controlPoints.inner.y=this.scale.endPoint:t.controlPoints.inner.y<this.scale.startPoint&&(t.controlPoints.inner.y=this.scale.startPoint)},this),s.lineWidth=this.options.datasetStrokeWidth,s.strokeStyle=t.strokeColor,s.beginPath(),e.each(h,function(t,i){if(0===i)s.moveTo(t.x,t.y);else if(this.options.bezierCurve){var e=a(t,h,i);s.bezierCurveTo(e.controlPoints.outer.x,e.controlPoints.outer.y,t.controlPoints.inner.x,t.controlPoints.inner.y,t.x,t.y)}else s.lineTo(t.x,t.y)},this),s.stroke(),this.options.datasetFill&&h.length>0&&(s.lineTo(h[h.length-1].x,this.scale.endPoint),s.lineTo(h[0].x,this.scale.endPoint),s.fillStyle=t.fillColor,s.closePath(),s.fill()),e.each(h,function(t){t.draw()})},this)}})}.call(this),function(){"use strict";var t=this,i=t.Chart,e=i.helpers,s={scaleShowLabelBackdrop:!0,scaleBackdropColor:"rgba(255,255,255,0.75)",scaleBeginAtZero:!0,scaleBackdropPaddingY:2,scaleBackdropPaddingX:2,scaleShowLine:!0,segmentShowStroke:!0,segmentStrokeColor:"#fff",segmentStrokeWidth:2,animationSteps:100,animationEasing:"easeOutBounce",animateRotate:!0,animateScale:!1,legendTemplate:'<ul class="<%=name.toLowerCase()%>-legend"><% for (var i=0; i<segments.length; i++){%><li><span style="background-color:<%=segments[i].fillColor%>"></span><%if(segments[i].label){%><%=segments[i].label%><%}%></li><%}%></ul>'};i.Type.extend({name:"PolarArea",defaults:s,initialize:function(t){this.segments=[],this.SegmentArc=i.Arc.extend({showStroke:this.options.segmentShowStroke,strokeWidth:this.options.segmentStrokeWidth,strokeColor:this.options.segmentStrokeColor,ctx:this.chart.ctx,innerRadius:0,x:this.chart.width/2,y:this.chart.height/2}),this.scale=new i.RadialScale({display:this.options.showScale,fontStyle:this.options.scaleFontStyle,fontSize:this.options.scaleFontSize,fontFamily:this.options.scaleFontFamily,fontColor:this.options.scaleFontColor,showLabels:this.options.scaleShowLabels,showLabelBackdrop:this.options.scaleShowLabelBackdrop,backdropColor:this.options.scaleBackdropColor,backdropPaddingY:this.options.scaleBackdropPaddingY,backdropPaddingX:this.options.scaleBackdropPaddingX,lineWidth:this.options.scaleShowLine?this.options.scaleLineWidth:0,lineColor:this.options.scaleLineColor,lineArc:!0,width:this.chart.width,height:this.chart.height,xCenter:this.chart.width/2,yCenter:this.chart.height/2,ctx:this.chart.ctx,templateString:this.options.scaleLabel,valuesCount:t.length}),this.updateScaleRange(t),this.scale.update(),e.each(t,function(t,i){this.addData(t,i,!0)},this),this.options.showTooltips&&e.bindEvents(this,this.options.tooltipEvents,function(t){var i="mouseout"!==t.type?this.getSegmentsAtEvent(t):[];e.each(this.segments,function(t){t.restore(["fillColor"])}),e.each(i,function(t){t.fillColor=t.highlightColor}),this.showTooltip(i)}),this.render()},getSegmentsAtEvent:function(t){var i=[],s=e.getRelativePosition(t);return e.each(this.segments,function(t){t.inRange(s.x,s.y)&&i.push(t)},this),i},addData:function(t,i,e){var s=i||this.segments.length;this.segments.splice(s,0,new this.SegmentArc({fillColor:t.color,highlightColor:t.highlight||t.color,label:t.label,value:t.value,outerRadius:this.options.animateScale?0:this.scale.calculateCenterOffset(t.value),circumference:this.options.animateRotate?0:this.scale.getCircumference(),startAngle:1.5*Math.PI})),e||(this.reflow(),this.update())},removeData:function(t){var i=e.isNumber(t)?t:this.segments.length-1;this.segments.splice(i,1),this.reflow(),this.update()},calculateTotal:function(t){this.total=0,e.each(t,function(t){this.total+=t.value},this),this.scale.valuesCount=this.segments.length},updateScaleRange:function(t){var i=[];e.each(t,function(t){i.push(t.value)});var s=this.options.scaleOverride?{steps:this.options.scaleSteps,stepValue:this.options.scaleStepWidth,min:this.options.scaleStartValue,max:this.options.scaleStartValue+this.options.scaleSteps*this.options.scaleStepWidth}:e.calculateScaleRange(i,e.min([this.chart.width,this.chart.height])/2,this.options.scaleFontSize,this.options.scaleBeginAtZero,this.options.scaleIntegersOnly);e.extend(this.scale,s,{size:e.min([this.chart.width,this.chart.height]),xCenter:this.chart.width/2,yCenter:this.chart.height/2})},update:function(){this.calculateTotal(this.segments),e.each(this.segments,function(t){t.save()}),this.reflow(),this.render()},reflow:function(){e.extend(this.SegmentArc.prototype,{x:this.chart.width/2,y:this.chart.height/2}),this.updateScaleRange(this.segments),this.scale.update(),e.extend(this.scale,{xCenter:this.chart.width/2,yCenter:this.chart.height/2}),e.each(this.segments,function(t){t.update({outerRadius:this.scale.calculateCenterOffset(t.value)})},this)},draw:function(t){var i=t||1;this.clear(),e.each(this.segments,function(t,e){t.transition({circumference:this.scale.getCircumference(),outerRadius:this.scale.calculateCenterOffset(t.value)},i),t.endAngle=t.startAngle+t.circumference,0===e&&(t.startAngle=1.5*Math.PI),e<this.segments.length-1&&(this.segments[e+1].startAngle=t.endAngle),t.draw()},this),this.scale.draw()}})}.call(this),function(){"use strict";var t=this,i=t.Chart,e=i.helpers;i.Type.extend({name:"Radar",defaults:{scaleShowLine:!0,angleShowLineOut:!0,scaleShowLabels:!1,scaleBeginAtZero:!0,angleLineColor:"rgba(0,0,0,.1)",angleLineWidth:1,pointLabelFontFamily:"'Arial'",pointLabelFontStyle:"normal",pointLabelFontSize:10,pointLabelFontColor:"#666",pointDot:!0,pointDotRadius:3,pointDotStrokeWidth:1,pointHitDetectionRadius:20,datasetStroke:!0,datasetStrokeWidth:2,datasetFill:!0,legendTemplate:'<ul class="<%=name.toLowerCase()%>-legend"><% for (var i=0; i<datasets.length; i++){%><li><span style="background-color:<%=datasets[i].strokeColor%>"></span><%if(datasets[i].label){%><%=datasets[i].label%><%}%></li><%}%></ul>'},initialize:function(t){this.PointClass=i.Point.extend({strokeWidth:this.options.pointDotStrokeWidth,radius:this.options.pointDotRadius,display:this.options.pointDot,hitDetectionRadius:this.options.pointHitDetectionRadius,ctx:this.chart.ctx}),this.datasets=[],this.buildScale(t),this.options.showTooltips&&e.bindEvents(this,this.options.tooltipEvents,function(t){var i="mouseout"!==t.type?this.getPointsAtEvent(t):[];this.eachPoints(function(t){t.restore(["fillColor","strokeColor"])}),e.each(i,function(t){t.fillColor=t.highlightFill,t.strokeColor=t.highlightStroke}),this.showTooltip(i)}),e.each(t.datasets,function(i){var s={label:i.label||null,fillColor:i.fillColor,strokeColor:i.strokeColor,pointColor:i.pointColor,pointStrokeColor:i.pointStrokeColor,points:[]};this.datasets.push(s),e.each(i.data,function(e,n){var o;this.scale.animation||(o=this.scale.getPointPosition(n,this.scale.calculateCenterOffset(e))),s.points.push(new this.PointClass({value:e,label:t.labels[n],datasetLabel:i.label,x:this.options.animation?this.scale.xCenter:o.x,y:this.options.animation?this.scale.yCenter:o.y,strokeColor:i.pointStrokeColor,fillColor:i.pointColor,highlightFill:i.pointHighlightFill||i.pointColor,highlightStroke:i.pointHighlightStroke||i.pointStrokeColor}))},this)},this),this.render()},eachPoints:function(t){e.each(this.datasets,function(i){e.each(i.points,t,this)},this)},getPointsAtEvent:function(t){var i=e.getRelativePosition(t),s=e.getAngleFromPoint({x:this.scale.xCenter,y:this.scale.yCenter},i),n=2*Math.PI/this.scale.valuesCount,o=Math.round((s.angle-1.5*Math.PI)/n),a=[];return(o>=this.scale.valuesCount||0>o)&&(o=0),s.distance<=this.scale.drawingArea&&e.each(this.datasets,function(t){a.push(t.points[o])}),a},buildScale:function(t){this.scale=new i.RadialScale({display:this.options.showScale,fontStyle:this.options.scaleFontStyle,fontSize:this.options.scaleFontSize,fontFamily:this.options.scaleFontFamily,fontColor:this.options.scaleFontColor,showLabels:this.options.scaleShowLabels,showLabelBackdrop:this.options.scaleShowLabelBackdrop,backdropColor:this.options.scaleBackdropColor,backdropPaddingY:this.options.scaleBackdropPaddingY,backdropPaddingX:this.options.scaleBackdropPaddingX,lineWidth:this.options.scaleShowLine?this.options.scaleLineWidth:0,lineColor:this.options.scaleLineColor,angleLineColor:this.options.angleLineColor,angleLineWidth:this.options.angleShowLineOut?this.options.angleLineWidth:0,pointLabelFontColor:this.options.pointLabelFontColor,pointLabelFontSize:this.options.pointLabelFontSize,pointLabelFontFamily:this.options.pointLabelFontFamily,pointLabelFontStyle:this.options.pointLabelFontStyle,height:this.chart.height,width:this.chart.width,xCenter:this.chart.width/2,yCenter:this.chart.height/2,ctx:this.chart.ctx,templateString:this.options.scaleLabel,labels:t.labels,valuesCount:t.datasets[0].data.length}),this.scale.setScaleSize(),this.updateScaleRange(t.datasets),this.scale.buildYLabels()},updateScaleRange:function(t){var i=function(){var i=[];return e.each(t,function(t){t.data?i=i.concat(t.data):e.each(t.points,function(t){i.push(t.value)})}),i}(),s=this.options.scaleOverride?{steps:this.options.scaleSteps,stepValue:this.options.scaleStepWidth,min:this.options.scaleStartValue,max:this.options.scaleStartValue+this.options.scaleSteps*this.options.scaleStepWidth}:e.calculateScaleRange(i,e.min([this.chart.width,this.chart.height])/2,this.options.scaleFontSize,this.options.scaleBeginAtZero,this.options.scaleIntegersOnly);e.extend(this.scale,s)},addData:function(t,i){this.scale.valuesCount++,e.each(t,function(t,e){var s=this.scale.getPointPosition(this.scale.valuesCount,this.scale.calculateCenterOffset(t));this.datasets[e].points.push(new this.PointClass({value:t,label:i,x:s.x,y:s.y,strokeColor:this.datasets[e].pointStrokeColor,fillColor:this.datasets[e].pointColor}))},this),this.scale.labels.push(i),this.reflow(),this.update()},removeData:function(){this.scale.valuesCount--,this.scale.labels.shift(),e.each(this.datasets,function(t){t.points.shift()},this),this.reflow(),this.update()},update:function(){this.eachPoints(function(t){t.save()}),this.reflow(),this.render()},reflow:function(){e.extend(this.scale,{width:this.chart.width,height:this.chart.height,size:e.min([this.chart.width,this.chart.height]),xCenter:this.chart.width/2,yCenter:this.chart.height/2}),this.updateScaleRange(this.datasets),this.scale.setScaleSize(),this.scale.buildYLabels()},draw:function(t){var i=t||1,s=this.chart.ctx;this.clear(),this.scale.draw(),e.each(this.datasets,function(t){e.each(t.points,function(t,e){t.hasValue()&&t.transition(this.scale.getPointPosition(e,this.scale.calculateCenterOffset(t.value)),i)},this),s.lineWidth=this.options.datasetStrokeWidth,s.strokeStyle=t.strokeColor,s.beginPath(),e.each(t.points,function(t,i){0===i?s.moveTo(t.x,t.y):s.lineTo(t.x,t.y)},this),s.closePath(),s.stroke(),s.fillStyle=t.fillColor,s.fill(),e.each(t.points,function(t){t.hasValue()&&t.draw()})},this)}})}.call(this);
\ No newline at end of file
diff --git a/deployed/icagenda/media/com_icagenda/js/icagenda.js b/deployed/icagenda/media/com_icagenda/js/icagenda.js
new file mode 100644
index 00000000..2315e9bb
--- /dev/null
+++ b/deployed/icagenda/media/com_icagenda/js/icagenda.js
@@ -0,0 +1,53 @@
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.6.0 2016-05-31
+ * @since       3.4.0
+ *------------------------------------------------------------------------------
+*/
+
+(function($)
+{
+	$(document).ready(function()
+	{
+//		$('*[rel=tooltip]').tooltip()
+
+		// Turn radios into btn-group
+		$('.ic-radio.ic-btn-group label').addClass('ic-btn');
+		$(".ic-btn-group label:not(.active)").click(function()
+		{
+			var label = $(this);
+			var input = $('#' + label.attr('for'));
+
+			if (!input.prop('checked')) {
+				label.closest('.ic-btn-group').find("label").removeClass('active ic-btn-success ic-btn-danger ic-btn-primary');
+				if (input.val() == '') {
+					label.addClass('active ic-btn-primary');
+				} else if (input.val() == 0) {
+					label.addClass('active ic-btn-danger');
+				} else {
+					label.addClass('active ic-btn-success');
+				}
+				input.prop('checked', true);
+			}
+		});
+		$(".ic-btn-group input[checked=checked]").each(function()
+		{
+			if ($(this).val() == '') {
+				$("label[for=" + $(this).attr('id') + "]").addClass('active ic-btn-primary');
+			} else if ($(this).val() == 0) {
+				$("label[for=" + $(this).attr('id') + "]").addClass('active ic-btn-danger');
+			} else {
+				$("label[for=" + $(this).attr('id') + "]").addClass('active ic-btn-success');
+			}
+		});
+	})
+})(jQuery);
diff --git a/deployed/icagenda/media/com_icagenda/js/icdates.js b/deployed/icagenda/media/com_icagenda/js/icdates.js
new file mode 100644
index 00000000..6b9e65c4
--- /dev/null
+++ b/deployed/icagenda/media/com_icagenda/js/icdates.js
@@ -0,0 +1,236 @@
+/* Language initialisation for the jQuery UI date picker plugin. */
+/* Written by Keith Wood (kbwood{at}iinet.com.au) and Stéphane Nahmani (sholby@sholby.net).
+ * Modified by Cyril Rezé (Lyr!C) for iCagenda, joomla! extension
+ */
+
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.6.9 2017-06-08
+ * @since       1.0
+ *------------------------------------------------------------------------------
+*/
+
+jQuery(function($){
+	$.datepicker.regional[''] = {
+		currentText: Joomla.JText._('COM_ICAGENDA_TP_CURRENT', 'Now'),
+		closeText: Joomla.JText._('COM_ICAGENDA_TP_CLOSE', 'Done'),
+		prevText: '&#x3c;Prev',
+		nextText: 'Next&#x3e;',
+		ampm: false,
+		amNames: ['AM', 'A'],
+		pmNames: ['PM', 'P'],
+		timeFormat: 'hh:mm tt',
+		timeSuffix: '',
+		monthNames: [Joomla.JText._('JANUARY', 'January'),
+		Joomla.JText._('FEBRUARY', 'February'),
+		Joomla.JText._('MARCH', 'March'),
+		Joomla.JText._('APRIL', 'April'),
+		Joomla.JText._('MAY', 'May'),
+		Joomla.JText._('JUNE', 'June'),
+		Joomla.JText._('JULY', 'July'),
+		Joomla.JText._('AUGUST', 'August'),
+		Joomla.JText._('SEPTEMBER', 'September'),
+		Joomla.JText._('OCTOBER', 'October'),
+		Joomla.JText._('NOVEMBER', 'November'),
+		Joomla.JText._('DECEMBER', 'December')],
+		monthNamesShort: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
+		'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
+		dayNames: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
+		dayNamesShort: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
+		dayNamesMin: [Joomla.JText._('SU', 'Su'),
+		Joomla.JText._('MO', 'Mo'),
+		Joomla.JText._('TU', 'Tu'),
+		Joomla.JText._('WE', 'We'),
+		Joomla.JText._('TH', 'Th'),
+		Joomla.JText._('FR', 'Fr'),
+		Joomla.JText._('SA', 'Sa')],
+		weekHeader: 'Wk',
+		isRTL: false,
+		showMonthAfterYear: false,
+		timeOnlyTitle: Joomla.JText._('COM_ICAGENDA_TP_TITLE', 'Choose Time'),
+		timeText: [Joomla.JText._('COM_ICAGENDA_TP_TIME')],
+		hourText: Joomla.JText._('COM_ICAGENDA_TP_HOUR', 'Hour'),
+		minuteText: Joomla.JText._('COM_ICAGENDA_TP_MINUTE', 'Minute'),
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['']);
+
+	$.timepicker.regional[''] = {
+		currentText: Joomla.JText._('COM_ICAGENDA_TP_CURRENT', 'Now'),
+		closeText: Joomla.JText._('COM_ICAGENDA_TP_CLOSE', 'Done'),
+		prevText: '&#x3c;Prev',
+		nextText: 'Next&#x3e;',
+		ampm: false,
+		amNames: ['AM', 'A'],
+		pmNames: ['PM', 'P'],
+		timeFormat: 'hh:mm tt',
+		timeSuffix: '',
+		monthNames: [Joomla.JText._('JANUARY', 'January'),
+		Joomla.JText._('FEBRUARY', 'February'),
+		Joomla.JText._('MARCH', 'March'),
+		Joomla.JText._('APRIL', 'April'),
+		Joomla.JText._('MAY', 'May'),
+		Joomla.JText._('JUNE', 'June'),
+		Joomla.JText._('JULY', 'July'),
+		Joomla.JText._('AUGUST', 'August'),
+		Joomla.JText._('SEPTEMBER', 'September'),
+		Joomla.JText._('OCTOBER', 'October'),
+		Joomla.JText._('NOVEMBER', 'November'),
+		Joomla.JText._('DECEMBER', 'December')],
+		monthNamesShort: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
+		'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
+		dayNames: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
+		dayNamesShort: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
+		dayNamesMin: [Joomla.JText._('SU', 'Su'),
+		Joomla.JText._('MO', 'Mo'),
+		Joomla.JText._('TU', 'Tu'),
+		Joomla.JText._('WE', 'We'),
+		Joomla.JText._('TH', 'Th'),
+		Joomla.JText._('FR', 'Fr'),
+		Joomla.JText._('SA', 'Sa')],
+		weekHeader: 'Wk',
+		isRTL: false,
+		showMonthAfterYear: false,
+		timeOnlyTitle: Joomla.JText._('COM_ICAGENDA_TP_TITLE', 'Choose Time'),
+		timeText: [Joomla.JText._('COM_ICAGENDA_TP_TIME')],
+		hourText: Joomla.JText._('COM_ICAGENDA_TP_HOUR', 'Hour'),
+		minuteText: Joomla.JText._('COM_ICAGENDA_TP_MINUTE', 'Minute'),
+		yearSuffix: ''};
+	$.timepicker.setDefaults($.timepicker.regional['']);
+});
+
+jQuery(function($){
+
+	var startDateTextBox = $('#startdate'),
+		endDateTextBox = $('#enddate'),
+		$add_counter = $('#dTable_jalali input').length;
+
+	startDateTextBox.live('focus', function(){
+		$(this).datetimepicker({
+			dateFormat: "yy-mm-dd",
+			timeFormat: 'hh:mm',
+			hourGrid: 4,
+			minuteGrid: 10,
+			onClose: function(dateText, inst) {
+				if (endDateTextBox.val() != '') {
+					var testStartDate = startDateTextBox.datetimepicker('getDate');
+					var testEndDate = endDateTextBox.datetimepicker('getDate');
+					if (testStartDate > testEndDate)
+					{
+						endDateTextBox.datetimepicker('setDate', startDateTextBox.val());
+					}
+				}
+				else {
+					endDateTextBox.val(dateText);
+				}
+			},
+//			onSelect: function (selectedDateTime){
+//				endDateTextBox.datetimepicker('option', 'minDate', startDateTextBox.datetimepicker('getDate') );
+//			}
+		});
+	});
+
+	endDateTextBox.live('focus', function(){
+		$(this).datetimepicker({
+			dateFormat: "yy-mm-dd",
+			timeFormat: 'hh:mm',
+			hourGrid: 4,
+			minuteGrid: 10,
+			onClose: function(dateText, inst) {
+				if (startDateTextBox.val() != '') {
+					var testStartDate = startDateTextBox.datetimepicker('getDate');
+					var testEndDate = endDateTextBox.datetimepicker('getDate');
+					if (testStartDate > testEndDate)
+					{
+						startDateTextBox.datetimepicker('setDate', endDateTextBox.val());
+					}
+				}
+				else {
+					startDateTextBox.val(dateText);
+				}
+			},
+//			onSelect: function (selectedDateTime){
+//				startDateTextBox.datetimepicker('option', 'maxDate', endDateTextBox.datetimepicker('getDate') );
+//			}
+		});
+	});
+
+	$( ".ic-date-input" ).live('focus', function(){
+		$(this).datetimepicker({
+			dateFormat: 'yy-mm-dd',
+			timeFormat: 'hh:mm',
+			hourGrid: 4,
+			minuteGrid: 10,
+			addSliderAccess: true,
+			sliderAccessArgs: { touchonly: true }
+		});
+	});
+
+	$('#add').live('click', function(e){
+		e.preventDefault();
+		$delete = Joomla.JText._('COM_ICAGENDA_DELETE_DATE', 'Delete');
+
+		if ($("#dTable_jalali").length) {
+			$add_counter = $add_counter+1;
+			$('#dTable_jalali').append('<tr><td><div class="input-append"><input id="date_jalali'+$add_counter+'" class="ic-date-input_jalali" type="text" name="d" title=""></input><button id="date_jalali'+$add_counter+'_img" class="btn" type="button"><span class="icon-calendar"></span></button></div></td><td><a class="del btn btn-danger btn-mini" href="#">'+$delete+'</a></td></tr>');
+//			jQuery(document).ready(function($) {
+				Calendar.setup({
+					// Id of the input field
+					inputField: 'date_jalali'+$add_counter,
+					// Format of the input field
+					ifFormat: "%Y-%m-%d %H:%M",
+					// Trigger for the calendar (button ID)
+					button: 'date_jalali'+$add_counter+'_img',
+					// Alignment (defaults to "Bl")
+					align: "Tl",
+					singleClick: true,
+					firstDay: 6
+				});
+//			});
+		} else {
+			$('#dTable').append('<tr><td><input class="ic-date-input" type="text" name="d"/></td><td><a class="del btn btn-danger btn-mini" href="#">'+$delete+'</a></td></tr>');
+		}
+	});
+
+//	$( ".ui-state-default" ).live('click', function(){
+	if ($("#dTable_jalali").length) {
+		$( "#dates" ).on('mouseleave', function() {
+			$array = $('#dTable_jalali input').serialize();
+			$suffix = '_jalali';
+			$('input.date').attr('value', $array);
+			document.getElementById('startdate'+$suffix).removeClass("ic-date-invalid");
+			document.getElementById('enddate'+$suffix).removeClass("ic-date-invalid");
+			document.getElementById('dTable'+$suffix).removeClass("ic-date-invalid");
+		});
+	} else {
+		$( ".ui-state-default" ).live('mouseout', function() {
+			$array = $('#dTable input').serialize();
+			$('input.date').attr('value', $array);
+			document.getElementById('startdate').removeClass("ic-date-invalid");
+			document.getElementById('enddate').removeClass("ic-date-invalid");
+			document.getElementById('dTable').removeClass("ic-date-invalid");
+		});
+	}
+
+	$('.del').live('click', function(e) {
+		e.preventDefault();
+		$(this).parent().parent('tr').remove();
+
+		if ($("#dTable_jalali").length) {
+			$add_counter = $add_counter-1;
+			$array = $('#dTable_jalali input').serialize();
+		} else {
+			$array = $('#dTable input').serialize();
+		}
+		$('input.date').attr('value', $array);
+	});
+
+});
diff --git a/deployed/icagenda/media/com_icagenda/js/icform.js b/deployed/icagenda/media/com_icagenda/js/icform.js
new file mode 100644
index 00000000..5b3ff014
--- /dev/null
+++ b/deployed/icagenda/media/com_icagenda/js/icform.js
@@ -0,0 +1,65 @@
+/**
+ *------------------------------------------------------------------------------
+ *  iCagenda v3 by Jooml!C - Events Management Extension for Joomla! 2.5 / 3.x
+ *------------------------------------------------------------------------------
+ * @package     com_icagenda
+ * @copyright   Copyright (c)2012-2019 Cyril Rezé, Jooml!C - All rights reserved
+ *
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé (Lyr!C)
+ * @link        http://www.joomlic.com
+ *
+ * @version     3.5.0 2015-02-14
+ * @since       3.4.0
+ *------------------------------------------------------------------------------
+*/
+
+/**
+ * Function Text Counter
+ */
+function iCtextCounter( field, countfield, maxlimit  )
+{
+	if ( field.value.length > maxlimit )
+	{
+		field.value = field.value.substring( 0, maxlimit );
+		countfield.value = 0;
+		jQuery(field).addClass("ic-counter-limit");
+		jQuery(countfield).addClass("ic-counter-limit");
+
+		return false;
+	}
+	else
+	{
+		countfield.value = maxlimit - field.value.length;
+		jQuery(field).removeClass("ic-counter-limit");
+		jQuery(countfield).removeClass("ic-counter-limit");
+	}
+}
+
+/**
+ * fieldname, warningname, remainingname, maxchars // DEV.
+ */
+function CheckFieldLength(fn,wn,rn,maxlimit) {
+  var length = fn.value.length;
+  if (length > maxlimit) {
+    fn.value = fn.value.substring(0,maxlimit);
+    length = maxlimit;
+
+	return false;
+  }
+  document.getElementById(wn).innerHTML = length;
+  document.getElementById(rn).innerHTML = maxlimit - length;
+}
+
+/**
+ * Function in array
+ */
+function inArray(needle, haystack)
+{
+	var length = haystack.length;
+	for(var i = 0; i < length; i++)
+	{
+		if(haystack[i] == needle) return true;
+	}
+	return false;
+}
diff --git a/deployed/icagenda/media/com_icagenda/js/icmap-front.js b/deployed/icagenda/media/com_icagenda/js/icmap-front.js
new file mode 100644
index 00000000..d72fcee1
--- /dev/null
+++ b/deployed/icagenda/media/com_icagenda/js/icmap-front.js
@@ -0,0 +1,42 @@
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.0 2018-05-15
+ *
+ * @package     iCagenda.Media
+ * @subpackage  js
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+var lat,
+	lng,
+	id;
+
+function icMapInitialize(lat, lng, id){
+	function initialize(){
+		var latlng = new google.maps.LatLng(lat, lng);
+		var mapOptions = {
+			zoom: 16,
+			center: latlng,
+			mapTypeId: google.maps.MapTypeId.ROADMAP
+		};
+
+		var mapid = new google.maps.Map(document.getElementById('map_canvas'+id), mapOptions);
+
+		var newMarker = new google.maps.Marker({
+			map: mapid,
+			draggable: false,
+			position: latlng
+		});
+	}
+
+	google.maps.event.addDomListener(window, 'load', initialize);	
+}
diff --git a/deployed/icagenda/media/com_icagenda/js/icmap.js b/deployed/icagenda/media/com_icagenda/js/icmap.js
new file mode 100644
index 00000000..8596e8b9
--- /dev/null
+++ b/deployed/icagenda/media/com_icagenda/js/icmap.js
@@ -0,0 +1,241 @@
+/*
+ * jQuery UI addresspicker @VERSION
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Progressbar
+ *
+ * Depends:
+ *   jquery.ui.core.js
+ *   jquery.ui.widget.js
+ *   jquery.ui.autocomplete.js
+ */
+(function( $, undefined ) {
+
+	$.widget( "ui.addresspicker", {
+		options: {
+			appendAddressString: "",
+			draggableMarker: true,
+			regionBias: null,
+			updateCallback: null,
+			reverseGeocode: false,
+			mapOptions: {
+				zoom: 13,
+				center: new google.maps.LatLng(46, 2),
+				scrollwheel: false,
+				mapTypeId: google.maps.MapTypeId.ROADMAP
+			},
+			elements: {
+				map: false,
+				lat: false,
+				lng: false,
+				street_number: false,
+				route: false,
+				locality: false,
+				administrative_area_level_2: false,
+				administrative_area_level_1: false,
+				country: false,
+				postal_code: false,
+				type: false
+
+			}
+		},
+
+		marker: function() {
+			return this.gmarker;
+		},
+
+		map: function() {
+			return this.gmap;
+		},
+
+		updatePosition: function() {
+			this._updatePosition(this.gmarker.getPosition());
+		},
+
+		reloadPosition: function() {
+			this.gmarker.setVisible(true);
+			this.gmarker.setPosition(new google.maps.LatLng(this.lat.val(), this.lng.val()));
+			this.gmap.setCenter(this.gmarker.getPosition());
+		},
+
+		selected: function() {
+			return this.selectedResult;
+		},
+
+		_create: function() {
+			this.geocoder = new google.maps.Geocoder();
+			this.element.autocomplete({
+				source: $.proxy(this._geocode, this),
+				focus:  $.proxy(this._focusAddress, this),
+				select: $.proxy(this._selectAddress, this)
+			});
+
+			this.lat = $(this.options.elements.lat);
+			this.lng = $(this.options.elements.lng);
+			this.street_number = $(this.options.elements.street_number);
+			this.route = $(this.options.elements.route);
+			this.locality = $(this.options.elements.locality);
+			this.administrative_area_level_2 = $(this.options.elements.administrative_area_level_2);
+			this.administrative_area_level_1 = $(this.options.elements.administrative_area_level_1);
+			this.country  = $(this.options.elements.country);
+			this.postal_code = $(this.options.elements.postal_code);
+			this.type = $(this.options.elements.type);
+			if (this.options.elements.map) {
+				this.mapElement = $(this.options.elements.map);
+				this._initMap();
+			}
+		},
+
+		_initMap: function() {
+			if (this.lat && this.lat.val()) {
+				this.options.mapOptions.center = new google.maps.LatLng(this.lat.val(), this.lng.val());
+			}
+
+			this.gmap = new google.maps.Map(this.mapElement[0], this.options.mapOptions);
+			this.gmarker = new google.maps.Marker({
+				position: this.options.mapOptions.center,
+				map:this.gmap,
+				draggable: this.options.draggableMarker});
+			google.maps.event.addListener(this.gmarker, 'dragend', $.proxy(this._markerMoved, this));
+			this.gmarker.setVisible(false);
+		},
+
+		_updatePosition: function(location) {
+			if (this.lat) {
+				this.lat.val(location.lat());
+			}
+			if (this.lng) {
+				this.lng.val(location.lng());
+			}
+		},
+
+		_addressParts: {street_number: null, route: null, locality: null,
+				 administrative_area_level_2: null, administrative_area_level_1: null,
+				 country: null, postal_code:null, type: null},
+
+		_updateAddressParts: function(geocodeResult){
+
+			parsedResult = this._parseGeocodeResult(geocodeResult);
+
+			for (addressPart in this._addressParts){
+				if (this[addressPart]){
+					if (JSON.stringify(parsedResult[addressPart]) == 'false'){
+						this[addressPart].val('');
+					} else {
+						this[addressPart].val(parsedResult[addressPart]);
+					}
+				}
+			}
+		},
+
+		_updateAddressPartsViaReverseGeocode: function(location){
+			var latLng = new google.maps.LatLng(location.lat(), location.lng());
+
+			this.geocoder.geocode({'latLng': latLng}, $.proxy(function(results, status){
+				if (status == google.maps.GeocoderStatus.OK)
+
+				this._updateAddressParts(results[0]);
+				this.element.val(results[0].formatted_address);
+				this.selectedResult = results[0];
+
+				if (this.options.updateCallback) {
+					this.options.updateCallback(this.selectedResult, this._parseGeocodeResult(this.selectedResult));
+				}
+			}, this));
+		},
+
+		_parseGeocodeResult: function(geocodeResult){
+
+			var parsed = {lat: geocodeResult.geometry.location.lat(),
+				lng: geocodeResult.geometry.location.lng()};
+
+			for (var addressPart in this._addressParts){
+				parsed[addressPart] = this._findInfo(geocodeResult, addressPart);
+			}
+
+			parsed.type = geocodeResult.types[0];
+
+			return parsed;
+		},
+
+		_markerMoved: function() {
+			this._updatePosition(this.gmarker.getPosition());
+
+			if (this.options.reverseGeocode){
+				this._updateAddressPartsViaReverseGeocode(this.gmarker.getPosition());
+			}
+		},
+
+		// Autocomplete source method: fill its suggests with google geocoder results
+		_geocode: function(request, response) {
+			var address = request.term, self = this;
+			this.geocoder.geocode({
+				'address': address + this.options.appendAddressString,
+				'region': this.options.regionBias
+			}, function(results, status) {
+				if (status == google.maps.GeocoderStatus.OK) {
+					for (var i = 0; i < results.length; i++) {
+						results[i].label =  results[i].formatted_address;
+					};
+				}
+				response(results);
+			})
+		},
+
+		_findInfo: function(result, type) {
+			for (var i = 0; i < result.address_components.length; i++) {
+				var component = result.address_components[i];
+				if (component.types.indexOf(type) !=-1) {
+					return component.long_name;
+				}
+			}
+			return false;
+		},
+
+		_focusAddress: function(event, ui) {
+			var address = ui.item;
+			if (!address) {
+				return;
+			}
+
+			if (this.gmarker) {
+				this.gmarker.setPosition(address.geometry.location);
+				this.gmarker.setVisible(true);
+
+				this.gmap.fitBounds(address.geometry.viewport);
+			}
+
+			this._updatePosition(address.geometry.location);
+
+			this._updateAddressParts(address);
+
+		},
+
+		_selectAddress: function(event, ui) {
+			this.selectedResult = ui.item;
+			if (this.options.updateCallback) {
+				this.options.updateCallback(this.selectedResult, this._parseGeocodeResult(this.selectedResult));
+			}
+		}
+	});
+
+	$.extend( $.ui.addresspicker, {
+		version: "@VERSION"
+	});
+
+	// make IE think it doesn't suck
+	if(!Array.indexOf){
+		Array.prototype.indexOf = function(obj){
+			for(var i=0; i<this.length; i++){
+				if(this[i]==obj){
+					return i;
+				}
+			}
+			return -1;
+		}
+	}
+
+})( jQuery );
diff --git a/deployed/icagenda/media/com_icagenda/js/index.html b/deployed/icagenda/media/com_icagenda/js/index.html
new file mode 100644
index 00000000..fa6d84e8
--- /dev/null
+++ b/deployed/icagenda/media/com_icagenda/js/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff --git a/deployed/icagenda/media/com_icagenda/js/jquery.noconflict.js b/deployed/icagenda/media/com_icagenda/js/jquery.noconflict.js
new file mode 100644
index 00000000..aa32286f
--- /dev/null
+++ b/deployed/icagenda/media/com_icagenda/js/jquery.noconflict.js
@@ -0,0 +1 @@
+jQuery.noConflict();
\ No newline at end of file
diff --git a/deployed/icagenda/media/com_icagenda/js/jquery.tipTip.js b/deployed/icagenda/media/com_icagenda/js/jquery.tipTip.js
new file mode 100644
index 00000000..ac33d5d9
--- /dev/null
+++ b/deployed/icagenda/media/com_icagenda/js/jquery.tipTip.js
@@ -0,0 +1,202 @@
+ /*
+ * TipTip
+ * Copyright 2010 Drew Wilson
+ * www.drewwilson.com
+ * code.drewwilson.com/entry/tiptip-jquery-plugin
+ *
+ * Version 1.3   -   Updated: Mar. 23, 2010
+ *
+ * This Plug-In will create a custom tooltip to replace the default
+ * browser tooltip. It is extremely lightweight and very smart in
+ * that it detects the edges of the browser window and will make sure
+ * the tooltip stays within the current window size. As a result the
+ * tooltip will adjust itself to be displayed above, below, to the left
+ * or to the right depending on what is necessary to stay within the
+ * browser window. It is completely customizable as well via CSS.
+ *
+ * This TipTip jQuery plug-in is dual licensed under the MIT and GPL licenses:
+ *   http://www.opensource.org/licenses/mit-license.php
+ *   http://www.gnu.org/licenses/gpl.html
+ *
+ * Updated by Cyril Rezé (JoomliC)
+ * @version     3.5.5 2015-04-27
+ */
+
+(function($){
+	$.fn.tipTip = function(options) {
+		var defaults = {
+			activation: "hover",
+			keepAlive: false,
+			maxWidth: "200px",
+			edgeOffset: 3,
+			defaultPosition: "bottom",
+			delay: 400,
+			fadeIn: 200,
+			fadeOut: 200,
+			attribute: "title",
+			content: false, // HTML or String to fill TipTIp with
+		  	enter: function(){},
+		  	exit: function(){}
+	  	};
+	 	var opts = $.extend(defaults, options);
+
+	 	// Setup tip tip elements and render them to the DOM
+	 	if($("#tiptip_holder").length <= 0){
+	 		var tiptip_holder = $('<div id="tiptip_holder" style="max-width:'+ opts.maxWidth +';"></div>');
+			var tiptip_content = $('<div id="tiptip_content"></div>');
+			var tiptip_arrow = $('<div id="tiptip_arrow"></div>');
+			$("body").append(tiptip_holder.html(tiptip_content).prepend(tiptip_arrow.html('<div id="tiptip_arrow_inner"></div>')));
+		} else {
+			var tiptip_holder = $("#tiptip_holder");
+			var tiptip_content = $("#tiptip_content");
+			var tiptip_arrow = $("#tiptip_arrow");
+		}
+
+		return this.each(function(){
+			var org_elem = $(this);
+			if(opts.content){
+				var org_title = opts.content;
+			} else {
+				var org_title = org_elem.attr(opts.attribute);
+			}
+			if(org_title != ""){
+				if(!opts.content){
+					org_elem.removeAttr(opts.attribute); //remove original Attribute
+				}
+				var timeout = false;
+
+				if(opts.activation == "hover"){
+					org_elem.hover(function(){
+						active_tiptip();
+					}, function(){
+						if(!opts.keepAlive){
+							deactive_tiptip();
+						}
+					});
+					if(opts.keepAlive){
+						tiptip_holder.hover(function(){}, function(){
+							deactive_tiptip();
+						});
+					}
+				} else if(opts.activation == "focus"){
+					org_elem.focus(function(){
+						active_tiptip();
+					}).blur(function(){
+						deactive_tiptip();
+					});
+				} else if(opts.activation == "click"){
+					org_elem.click(function(){
+						active_tiptip();
+						return false;
+					}).hover(function(){},function(){
+						if(!opts.keepAlive){
+							deactive_tiptip();
+						}
+					});
+					if(opts.keepAlive){
+						tiptip_holder.hover(function(){}, function(){
+							deactive_tiptip();
+						});
+					}
+				}
+
+				function active_tiptip(){
+					opts.enter.call(this);
+					tiptip_content.html(org_title);
+					tiptip_holder.hide().removeAttr("class").css("margin","0");
+					tiptip_arrow.removeAttr("style");
+
+					// Add body offset control
+					var body_offset = $('body').offset(),
+						offset = org_elem.offset(),
+						tip_top = offset.top,
+						tip_left = offset.left,
+						body_top = body_offset.top,
+						body_left = body_offset.left,
+						top = parseInt(tip_top - body_top),
+						left = parseInt(tip_left - body_left);
+
+					var org_width = parseInt(org_elem.outerWidth()),
+						org_height = parseInt(org_elem.outerHeight()),
+						tip_w = tiptip_holder.outerWidth(),
+						tip_h = tiptip_holder.outerHeight(),
+						w_compare = Math.round((org_width - tip_w) / 2),
+						h_compare = Math.round((org_height - tip_h) / 2),
+						marg_left = Math.round(left + w_compare),
+						marg_top = Math.round(top + org_height + opts.edgeOffset),
+						t_class = "",
+						arrow_top = "",
+						arrow_left = Math.round(tip_w - 12) / 2;
+
+                    if(opts.defaultPosition == "bottom"){
+                    	t_class = "_bottom";
+                   	} else if(opts.defaultPosition == "top"){
+                   		t_class = "_top";
+                   	} else if(opts.defaultPosition == "left"){
+                   		t_class = "_left";
+                   	} else if(opts.defaultPosition == "right"){
+                   		t_class = "_right";
+                   	}
+
+					var right_compare = (w_compare + left) < parseInt($(window).scrollLeft());
+					var left_compare = (tip_w + left) > parseInt($(window).width());
+
+					if((right_compare && w_compare < 0) || (t_class == "_right" && !left_compare) || (t_class == "_left" && left < (tip_w + opts.edgeOffset + 5))){
+						t_class = "_right";
+						arrow_top = Math.round(tip_h - 13) / 2;
+						arrow_left = -12;
+						marg_left = Math.round(left + org_width + opts.edgeOffset);
+						marg_top = Math.round(top + h_compare);
+					} else if((left_compare && w_compare < 0) || (t_class == "_left" && !right_compare)){
+						t_class = "_left";
+						arrow_top = Math.round(tip_h - 13) / 2;
+						arrow_left =  Math.round(tip_w);
+						marg_left = Math.round(left - (tip_w + opts.edgeOffset + 5));
+						marg_top = Math.round(top + h_compare);
+					}
+
+					var top_compare = (top + org_height + opts.edgeOffset + tip_h + 8) > parseInt($(window).height() + $(window).scrollTop());
+					var bottom_compare = ((top + org_height) - (opts.edgeOffset + tip_h + 8)) < 0;
+
+					if(top_compare || (t_class == "_bottom" && top_compare) || (t_class == "_top" && !bottom_compare)){
+						if(t_class == "_top" || t_class == "_bottom"){
+							t_class = "_top";
+						} else {
+							t_class = t_class+"_top";
+						}
+						arrow_top = tip_h;
+						marg_top = Math.round(top - (tip_h + 5 + opts.edgeOffset));
+					} else if(bottom_compare | (t_class == "_top" && bottom_compare) || (t_class == "_bottom" && !top_compare)){
+						if(t_class == "_top" || t_class == "_bottom"){
+							t_class = "_bottom";
+						} else {
+							t_class = t_class+"_bottom";
+						}
+						arrow_top = -12;
+						marg_top = Math.round(top + org_height + opts.edgeOffset);
+					}
+
+					if(t_class == "_right_top" || t_class == "_left_top"){
+						marg_top = marg_top + 5;
+					} else if(t_class == "_right_bottom" || t_class == "_left_bottom"){
+						marg_top = marg_top - 5;
+					}
+					if(t_class == "_left_top" || t_class == "_left_bottom"){
+						marg_left = marg_left + 5;
+					}
+					tiptip_arrow.css({"margin-left": arrow_left+"px", "margin-top": arrow_top+"px"});
+					tiptip_holder.css({"margin-left": marg_left+"px", "margin-top": marg_top+"px"}).attr("class","tip"+t_class);
+
+					if (timeout){ clearTimeout(timeout); }
+					timeout = setTimeout(function(){ tiptip_holder.stop(true,true).fadeIn(opts.fadeIn); }, opts.delay);
+				}
+
+				function deactive_tiptip(){
+					opts.exit.call(this);
+					if (timeout){ clearTimeout(timeout); }
+					tiptip_holder.fadeOut(opts.fadeOut);
+				}
+			}
+		});
+	}
+})(jQuery);
diff --git a/deployed/icagenda/media/com_icagenda/js/template.js b/deployed/icagenda/media/com_icagenda/js/template.js
new file mode 100644
index 00000000..76d83623
--- /dev/null
+++ b/deployed/icagenda/media/com_icagenda/js/template.js
@@ -0,0 +1,45 @@
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Templates.isis
+ * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @since       3.0
+ */
+
+(function($)
+{
+	$(document).ready(function()
+	{
+		$('*[rel=tooltip]').tooltip()
+
+		// Turn radios into btn-group
+		$('.radio.btn-group label').addClass('btn');
+		$(".btn-group label:not(.active)").click(function()
+		{
+			var label = $(this);
+			var input = $('#' + label.attr('for'));
+
+			if (!input.prop('checked')) {
+				label.closest('.btn-group').find("label").removeClass('active btn-success btn-danger btn-primary');
+				if (input.val() == '') {
+					label.addClass('active btn-primary');
+				} else if (input.val() == 0) {
+					label.addClass('active btn-danger');
+				} else {
+					label.addClass('active btn-success');
+				}
+				input.prop('checked', true);
+			}
+		});
+		$(".btn-group input[checked=checked]").each(function()
+		{
+			if ($(this).val() == '') {
+				$("label[for=" + $(this).attr('id') + "]").addClass('active btn-primary');
+			} else if ($(this).val() == 0) {
+				$("label[for=" + $(this).attr('id') + "]").addClass('active btn-danger');
+			} else {
+				$("label[for=" + $(this).attr('id') + "]").addClass('active btn-success');
+			}
+		});
+	})
+})(jQuery);
diff --git a/deployed/icagenda/media/com_icagenda/js/timepicker.js b/deployed/icagenda/media/com_icagenda/js/timepicker.js
new file mode 100644
index 00000000..65f763f2
--- /dev/null
+++ b/deployed/icagenda/media/com_icagenda/js/timepicker.js
@@ -0,0 +1,1764 @@
+/*
+ * jQuery timepicker addon
+ * By: Trent Richardson [http://trentrichardson.com]
+ * Version 1.0.3
+ * Last Modified: 09/15/2012
+ *
+ * Copyright 2012 Trent Richardson
+ * You may use this project under MIT or GPL licenses.
+ * http://trentrichardson.com/Impromptu/GPL-LICENSE.txt
+ * http://trentrichardson.com/Impromptu/MIT-LICENSE.txt
+ *
+ * HERES THE CSS:
+ * .ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
+ * .ui-timepicker-div dl { text-align: left; }
+ * .ui-timepicker-div dl dt { height: 25px; margin-bottom: -25px; }
+ * .ui-timepicker-div dl dd { margin: 0 10px 10px 65px; }
+ * .ui-timepicker-div td { font-size: 90%; }
+ * .ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
+ */
+
+/*jslint evil: true, white: false, undef: false, nomen: false */
+
+(function($) {
+
+	/*
+	* Lets not redefine timepicker, Prevent "Uncaught RangeError: Maximum call stack size exceeded"
+	*/
+	$.ui.timepicker = $.ui.timepicker || {};
+	if ($.ui.timepicker.version) {
+		return;
+	}
+
+	/*
+	* Extend jQueryUI, get it started with our version number
+	*/
+	$.extend($.ui, {
+		timepicker: {
+			version: "1.0.3"
+		}
+	});
+
+	/*
+	* Timepicker manager.
+	* Use the singleton instance of this class, $.timepicker, to interact with the time picker.
+	* Settings for (groups of) time pickers are maintained in an instance object,
+	* allowing multiple different settings on the same page.
+	*/
+	function Timepicker() {
+		this.regional = []; // Available regional settings, indexed by language code
+		this.regional[''] = { // Default regional settings
+			currentText: Joomla.JText._('COM_ICAGENDA_TP_CURRENT', 'Now'),
+			closeText: Joomla.JText._('COM_ICAGENDA_TP_CLOSE', 'Done'),
+			ampm: false,
+			amNames: ['AM', 'A'],
+			pmNames: ['PM', 'P'],
+			timeFormat: 'hh:mm tt',
+			timeSuffix: '',
+			timeOnlyTitle: Joomla.JText._('COM_ICAGENDA_TP_TITLE', 'Choose Time'),
+			timeText: Joomla.JText._('COM_ICAGENDA_TP_TIME', 'Time'),
+			hourText: Joomla.JText._('COM_ICAGENDA_TP_HOUR', 'Hour'),
+			minuteText: Joomla.JText._('COM_ICAGENDA_TP_MINUTE', 'Minute'),
+			secondText: 'Second',
+			millisecText: 'Millisecond',
+			timezoneText: 'Time Zone'
+		};
+		this._defaults = { // Global defaults for all the datetime picker instances
+			showButtonPanel: true,
+			timeOnly: false,
+			showHour: true,
+			showMinute: true,
+			showSecond: false,
+			showMillisec: false,
+			showTimezone: false,
+			showTime: true,
+			stepHour: 1,
+			stepMinute: 1,
+			stepSecond: 1,
+			stepMillisec: 1,
+			hour: 0,
+			minute: 0,
+			second: 0,
+			millisec: 0,
+			timezone: null,
+			useLocalTimezone: false,
+			defaultTimezone: "+0000",
+			hourMin: 0,
+			minuteMin: 0,
+			secondMin: 0,
+			millisecMin: 0,
+			hourMax: 23,
+			minuteMax: 59,
+			secondMax: 59,
+			millisecMax: 999,
+			minDateTime: null,
+			maxDateTime: null,
+			onSelect: null,
+			hourGrid: 0,
+			minuteGrid: 0,
+			secondGrid: 0,
+			millisecGrid: 0,
+			alwaysSetTime: true,
+			separator: ' ',
+			altFieldTimeOnly: true,
+			altSeparator: null,
+			altTimeSuffix: null,
+			showTimepicker: true,
+			timezoneIso8601: false,
+			timezoneList: null,
+			addSliderAccess: false,
+			sliderAccessArgs: null,
+			defaultValue: null
+		};
+		$.extend(this._defaults, this.regional['']);
+	}
+
+	$.extend(Timepicker.prototype, {
+		$input: null,
+		$altInput: null,
+		$timeObj: null,
+		inst: null,
+		hour_slider: null,
+		minute_slider: null,
+		second_slider: null,
+		millisec_slider: null,
+		timezone_select: null,
+		hour: 0,
+		minute: 0,
+		second: 0,
+		millisec: 0,
+		timezone: null,
+		defaultTimezone: "+0000",
+		hourMinOriginal: null,
+		minuteMinOriginal: null,
+		secondMinOriginal: null,
+		millisecMinOriginal: null,
+		hourMaxOriginal: null,
+		minuteMaxOriginal: null,
+		secondMaxOriginal: null,
+		millisecMaxOriginal: null,
+		ampm: '',
+		formattedDate: '',
+		formattedTime: '',
+		formattedDateTime: '',
+		timezoneList: null,
+		units: ['hour','minute','second','millisec'],
+
+		/*
+		* Override the default settings for all instances of the time picker.
+		* @param  settings  object - the new settings to use as defaults (anonymous object)
+		* @return the manager object
+		*/
+		setDefaults: function(settings) {
+			extendRemove(this._defaults, settings || {});
+			return this;
+		},
+
+		/*
+		* Create a new Timepicker instance
+		*/
+		_newInst: function($input, o) {
+			var tp_inst = new Timepicker(),
+				inlineSettings = {};
+
+			for (var attrName in this._defaults) {
+				if(this._defaults.hasOwnProperty(attrName)){
+					var attrValue = $input.attr('time:' + attrName);
+					if (attrValue) {
+						try {
+							inlineSettings[attrName] = eval(attrValue);
+						} catch (err) {
+							inlineSettings[attrName] = attrValue;
+						}
+					}
+				}
+			}
+			tp_inst._defaults = $.extend({}, this._defaults, inlineSettings, o, {
+				beforeShow: function(input, dp_inst) {
+					if ($.isFunction(o.beforeShow)) {
+						return o.beforeShow(input, dp_inst, tp_inst);
+					}
+				},
+				onChangeMonthYear: function(year, month, dp_inst) {
+					// Update the time as well : this prevents the time from disappearing from the $input field.
+					tp_inst._updateDateTime(dp_inst);
+					if ($.isFunction(o.onChangeMonthYear)) {
+						o.onChangeMonthYear.call($input[0], year, month, dp_inst, tp_inst);
+					}
+				},
+				onClose: function(dateText, dp_inst) {
+					if (tp_inst.timeDefined === true && $input.val() !== '') {
+						tp_inst._updateDateTime(dp_inst);
+					}
+					if ($.isFunction(o.onClose)) {
+						o.onClose.call($input[0], dateText, dp_inst, tp_inst);
+					}
+				},
+				timepicker: tp_inst // add timepicker as a property of datepicker: $.datepicker._get(dp_inst, 'timepicker');
+			});
+			tp_inst.amNames = $.map(tp_inst._defaults.amNames, function(val) {
+				return val.toUpperCase();
+			});
+			tp_inst.pmNames = $.map(tp_inst._defaults.pmNames, function(val) {
+				return val.toUpperCase();
+			});
+
+			if (tp_inst._defaults.timezoneList === null) {
+				var timezoneList = ['-1200', '-1100', '-1000', '-0930', '-0900', '-0800', '-0700', '-0600', '-0500', '-0430', '-0400', '-0330', '-0300', '-0200', '-0100', '+0000',
+									'+0100', '+0200', '+0300', '+0330', '+0400', '+0430', '+0500', '+0530', '+0545', '+0600', '+0630', '+0700', '+0800', '+0845', '+0900', '+0930',
+									'+1000', '+1030', '+1100', '+1130', '+1200', '+1245', '+1300', '+1400'];
+
+				if (tp_inst._defaults.timezoneIso8601) {
+					timezoneList = $.map(timezoneList, function(val) {
+						return val == '+0000' ? 'Z' : (val.substring(0, 3) + ':' + val.substring(3));
+					});
+				}
+				tp_inst._defaults.timezoneList = timezoneList;
+			}
+
+			tp_inst.timezone = tp_inst._defaults.timezone;
+			tp_inst.hour = tp_inst._defaults.hour;
+			tp_inst.minute = tp_inst._defaults.minute;
+			tp_inst.second = tp_inst._defaults.second;
+			tp_inst.millisec = tp_inst._defaults.millisec;
+			tp_inst.ampm = '';
+			tp_inst.$input = $input;
+
+			if (o.altField) {
+				tp_inst.$altInput = $(o.altField).css({
+					cursor: 'pointer'
+				}).focus(function() {
+					$input.trigger("focus");
+				});
+			}
+
+			if (tp_inst._defaults.minDate === 0 || tp_inst._defaults.minDateTime === 0) {
+				tp_inst._defaults.minDate = new Date();
+			}
+			if (tp_inst._defaults.maxDate === 0 || tp_inst._defaults.maxDateTime === 0) {
+				tp_inst._defaults.maxDate = new Date();
+			}
+
+			// datepicker needs minDate/maxDate, timepicker needs minDateTime/maxDateTime..
+			if (tp_inst._defaults.minDate !== undefined && tp_inst._defaults.minDate instanceof Date) {
+				tp_inst._defaults.minDateTime = new Date(tp_inst._defaults.minDate.getTime());
+			}
+			if (tp_inst._defaults.minDateTime !== undefined && tp_inst._defaults.minDateTime instanceof Date) {
+				tp_inst._defaults.minDate = new Date(tp_inst._defaults.minDateTime.getTime());
+			}
+			if (tp_inst._defaults.maxDate !== undefined && tp_inst._defaults.maxDate instanceof Date) {
+				tp_inst._defaults.maxDateTime = new Date(tp_inst._defaults.maxDate.getTime());
+			}
+			if (tp_inst._defaults.maxDateTime !== undefined && tp_inst._defaults.maxDateTime instanceof Date) {
+				tp_inst._defaults.maxDate = new Date(tp_inst._defaults.maxDateTime.getTime());
+			}
+			tp_inst.$input.bind('focus', function() {
+				tp_inst._onFocus();
+			});
+
+			return tp_inst;
+		},
+
+		/*
+		* add our sliders to the calendar
+		*/
+		_addTimePicker: function(dp_inst) {
+			var currDT = (this.$altInput && this._defaults.altFieldTimeOnly) ? this.$input.val() + ' ' + this.$altInput.val() : this.$input.val();
+
+			this.timeDefined = this._parseTime(currDT);
+			this._limitMinMaxDateTime(dp_inst, false);
+			this._injectTimePicker();
+		},
+
+		/*
+		* parse the time string from input value or _setTime
+		*/
+		_parseTime: function(timeString, withDate) {
+			if (!this.inst) {
+				this.inst = $.datepicker._getInst(this.$input[0]);
+			}
+
+			if (withDate || !this._defaults.timeOnly) {
+				var dp_dateFormat = $.datepicker._get(this.inst, 'dateFormat');
+				try {
+					var parseRes = parseDateTimeInternal(dp_dateFormat, this._defaults.timeFormat, timeString, $.datepicker._getFormatConfig(this.inst), this._defaults);
+					if (!parseRes.timeObj) {
+						return false;
+					}
+					$.extend(this, parseRes.timeObj);
+				} catch (err) {
+					return false;
+				}
+				return true;
+			} else {
+				var timeObj = $.datepicker.parseTime(this._defaults.timeFormat, timeString, this._defaults);
+				if (!timeObj) {
+					return false;
+				}
+				$.extend(this, timeObj);
+				return true;
+			}
+		},
+
+		/*
+		* generate and inject html for timepicker into ui datepicker
+		*/
+		_injectTimePicker: function() {
+			var $dp = this.inst.dpDiv,
+				o = this.inst.settings,
+				tp_inst = this,
+				litem = '',
+				uitem = '',
+				max = {},
+				gridSize = {},
+				size = null;
+
+			// Prevent displaying twice
+			if ($dp.find("div.ui-timepicker-div").length === 0 && o.showTimepicker) {
+				var noDisplay = ' style="display:none;"',
+					html = '<div class="ui-timepicker-div"><dl>' + '<dt class="ui_tpicker_time_label"' + ((o.showTime) ? '' : noDisplay) + '>' + o.timeText + '</dt>' +
+								'<dd class="ui_tpicker_time"' + ((o.showTime) ? '' : noDisplay) + '></dd>';
+
+				// Create the markup
+				for(var i=0,l=this.units.length; i<l; i++){
+					litem = this.units[i];
+					uitem = litem.substr(0,1).toUpperCase() + litem.substr(1);
+					// Added by Peter Medeiros:
+					// - Figure out what the hour/minute/second max should be based on the step values.
+					// - Example: if stepMinute is 15, then minMax is 45.
+					max[litem] = parseInt((o[litem+'Max'] - ((o[litem+'Max'] - o[litem+'Min']) % o['step'+uitem])), 10);
+					gridSize[litem] = 0;
+
+					html += '<dt class="ui_tpicker_'+ litem +'_label"' + ((o['show'+uitem]) ? '' : noDisplay) + '>' + o[litem +'Text'] + '</dt>' +
+								'<dd class="ui_tpicker_'+ litem +'"><div class="ui_tpicker_'+ litem +'_slider"' + ((o['show'+uitem]) ? '' : noDisplay) + '></div>';
+
+					if (o['show'+uitem] && o[litem+'Grid'] > 0) {
+						html += '<div style="padding-left: 1px"><table class="ui-tpicker-grid-label"><tr>';
+
+						if(litem == 'hour'){
+							for (var h = o[litem+'Min']; h <= max[litem]; h += parseInt(o[litem+'Grid'], 10)) {
+								gridSize[litem]++;
+								var tmph = (o.ampm && h > 12) ? h - 12 : h;
+								if (tmph < 10) {
+									tmph = '0' + tmph;
+								}
+								if (o.ampm) {
+									if (h === 0) {
+										tmph = 12 + 'a';
+									} else {
+										if (h < 12) {
+											tmph += 'a';
+										} else {
+											tmph += 'p';
+										}
+									}
+								}
+								html += '<td data-for="'+litem+'">' + tmph + '</td>';
+							}
+						}
+						else{
+							for (var m = o[litem+'Min']; m <= max[litem]; m += parseInt(o[litem+'Grid'], 10)) {
+								gridSize[litem]++;
+								html += '<td data-for="'+litem+'">' + ((m < 10) ? '0' : '') + m + '</td>';
+							}
+						}
+
+						html += '</tr></table></div>';
+					}
+					html += '</dd>';
+				}
+
+				// Timezone
+				html += '<dt class="ui_tpicker_timezone_label"' + ((o.showTimezone) ? '' : noDisplay) + '>' + o.timezoneText + '</dt>';
+				html += '<dd class="ui_tpicker_timezone" ' + ((o.showTimezone) ? '' : noDisplay) + '></dd>';
+
+				// Create the elements from string
+				html += '</dl></div>';
+				var $tp = $(html);
+
+				// if we only want time picker...
+				if (o.timeOnly === true) {
+					$tp.prepend('<div class="ui-widget-header ui-helper-clearfix ui-corner-all">' + '<div class="ui-datepicker-title">' + o.timeOnlyTitle + '</div>' + '</div>');
+					$dp.find('.ui-datepicker-header, .ui-datepicker-calendar').hide();
+				}
+
+				// Updated by Peter Medeiros:
+				// - Pass in Event and UI instance into slide function
+				this.hour_slider = $tp.find('.ui_tpicker_hour_slider').prop('slide', null).slider({
+					orientation: "horizontal",
+					value: this.hour,
+					min: o.hourMin,
+					max: max.hour,
+					step: o.stepHour,
+					slide: function(event, ui) {
+						tp_inst.hour_slider.slider("option", "value", ui.value);
+						tp_inst._onTimeChange();
+					},
+					stop: function(event, ui) {
+						tp_inst._onSelectHandler();
+					}
+				});
+
+				this.minute_slider = $tp.find('.ui_tpicker_minute_slider').prop('slide', null).slider({
+					orientation: "horizontal",
+					value: this.minute,
+					min: o.minuteMin,
+					max: max.minute,
+					step: o.stepMinute,
+					slide: function(event, ui) {
+						tp_inst.minute_slider.slider("option", "value", ui.value);
+						tp_inst._onTimeChange();
+					},
+					stop: function(event, ui) {
+						tp_inst._onSelectHandler();
+					}
+				});
+
+				this.second_slider = $tp.find('.ui_tpicker_second_slider').prop('slide', null).slider({
+					orientation: "horizontal",
+					value: this.second,
+					min: o.secondMin,
+					max: max.second,
+					step: o.stepSecond,
+					slide: function(event, ui) {
+						tp_inst.second_slider.slider("option", "value", ui.value);
+						tp_inst._onTimeChange();
+					},
+					stop: function(event, ui) {
+						tp_inst._onSelectHandler();
+					}
+				});
+
+				this.millisec_slider = $tp.find('.ui_tpicker_millisec_slider').prop('slide', null).slider({
+					orientation: "horizontal",
+					value: this.millisec,
+					min: o.millisecMin,
+					max: max.millisec,
+					step: o.stepMillisec,
+					slide: function(event, ui) {
+						tp_inst.millisec_slider.slider("option", "value", ui.value);
+						tp_inst._onTimeChange();
+					},
+					stop: function(event, ui) {
+						tp_inst._onSelectHandler();
+					}
+				});
+
+				// add sliders, adjust grids, add events
+				for(var i=0,l=tp_inst.units.length; i<l; i++){
+					litem = tp_inst.units[i];
+					uitem = litem.substr(0,1).toUpperCase() + litem.substr(1);
+
+					/*
+						Something fishy happens when assigning to tp_inst['hour_slider'] instead of tp_inst.hour_slider, I think
+						it is because it is assigned as a prototype. Clicking the slider will always change to the previous value
+						not the new one clicked. Ideally this works and reduces the 80+ lines of code above
+					// add the slider
+					tp_inst[litem+'_slider'] = $tp.find('.ui_tpicker_'+litem+'_slider').prop('slide', null).slider({
+						orientation: "horizontal",
+						value: tp_inst[litem],
+						min: o[litem+'Min'],
+						max: max[litem],
+						step: o['step'+uitem],
+						slide: function(event, ui) {
+							tp_inst[litem+'_slider'].slider("option", "value", ui.value);
+							tp_inst._onTimeChange();
+						},
+						stop: function(event, ui) {
+							//Emulate datepicker onSelect behavior. Call on slidestop.
+							tp_inst._onSelectHandler();
+						}
+					});
+					*/
+
+					// adjust the grid and add click event
+					if (o['show'+uitem] && o[litem+'Grid'] > 0) {
+						size = 100 * gridSize[litem] * o[litem+'Grid'] / (max[litem] - o[litem+'Min']);
+						$tp.find('.ui_tpicker_'+litem+' table').css({
+							width: size + "%",
+							marginLeft: (size / (-2 * gridSize[litem])) + "%",
+							borderCollapse: 'collapse'
+						}).find("td").click(function(e){
+								var $t = $(this),
+									h = $t.html()
+									f = $t.data('for'); // loses scope, so we use data-for
+
+								if (f == 'hour' && o.ampm) {
+									var ap = h.substring(2).toLowerCase(),
+										aph = parseInt(h.substring(0, 2), 10);
+									if (ap == 'a') {
+										if (aph == 12) {
+											h = 0;
+										} else {
+											h = aph;
+										}
+									} else if (aph == 12) {
+										h = 12;
+									} else {
+										h = aph + 12;
+									}
+								}
+								tp_inst[f+'_slider'].slider("option", "value", parseInt(h,10));
+								tp_inst._onTimeChange();
+								tp_inst._onSelectHandler();
+							})
+						.css({
+								cursor: 'pointer',
+								width: (100 / gridSize[litem]) + '%',
+								textAlign: 'center',
+								overflow: 'hidden'
+							});
+					} // end if grid > 0
+				} // end for loop
+
+				// Add timezone options
+				this.timezone_select = $tp.find('.ui_tpicker_timezone').append('<select></select>').find("select");
+				$.fn.append.apply(this.timezone_select,
+				$.map(o.timezoneList, function(val, idx) {
+					return $("<option />").val(typeof val == "object" ? val.value : val).text(typeof val == "object" ? val.label : val);
+				}));
+				if (typeof(this.timezone) != "undefined" && this.timezone !== null && this.timezone !== "") {
+					var local_date = new Date(this.inst.selectedYear, this.inst.selectedMonth, this.inst.selectedDay, 12);
+					var local_timezone = $.timepicker.timeZoneOffsetString(local_date);
+					if (local_timezone == this.timezone) {
+						selectLocalTimeZone(tp_inst);
+					} else {
+						this.timezone_select.val(this.timezone);
+					}
+				} else {
+					if (typeof(this.hour) != "undefined" && this.hour !== null && this.hour !== "") {
+						this.timezone_select.val(o.defaultTimezone);
+					} else {
+						selectLocalTimeZone(tp_inst);
+					}
+				}
+				this.timezone_select.change(function() {
+					tp_inst._defaults.useLocalTimezone = false;
+					tp_inst._onTimeChange();
+				});
+				// End timezone options
+
+				// inject timepicker into datepicker
+				var $buttonPanel = $dp.find('.ui-datepicker-buttonpane');
+				if ($buttonPanel.length) {
+					$buttonPanel.before($tp);
+				} else {
+					$dp.append($tp);
+				}
+
+				this.$timeObj = $tp.find('.ui_tpicker_time');
+
+				if (this.inst !== null) {
+					var timeDefined = this.timeDefined;
+					this._onTimeChange();
+					this.timeDefined = timeDefined;
+				}
+
+				// slideAccess integration: http://trentrichardson.com/2011/11/11/jquery-ui-sliders-and-touch-accessibility/
+				if (this._defaults.addSliderAccess) {
+					var sliderAccessArgs = this._defaults.sliderAccessArgs;
+					setTimeout(function() { // fix for inline mode
+						if ($tp.find('.ui-slider-access').length === 0) {
+							$tp.find('.ui-slider:visible').sliderAccess(sliderAccessArgs);
+
+							// fix any grids since sliders are shorter
+							var sliderAccessWidth = $tp.find('.ui-slider-access:eq(0)').outerWidth(true);
+							if (sliderAccessWidth) {
+								$tp.find('table:visible').each(function() {
+									var $g = $(this),
+										oldWidth = $g.outerWidth(),
+										oldMarginLeft = $g.css('marginLeft').toString().replace('%', ''),
+										newWidth = oldWidth - sliderAccessWidth,
+										newMarginLeft = ((oldMarginLeft * newWidth) / oldWidth) + '%';
+
+									$g.css({
+										width: newWidth,
+										marginLeft: newMarginLeft
+									});
+								});
+							}
+						}
+					}, 10);
+				}
+				// end slideAccess integration
+
+			}
+		},
+
+		/*
+		* This function tries to limit the ability to go outside the
+		* min/max date range
+		*/
+		_limitMinMaxDateTime: function(dp_inst, adjustSliders) {
+			var o = this._defaults,
+				dp_date = new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay);
+
+			if (!this._defaults.showTimepicker) {
+				return;
+			} // No time so nothing to check here
+
+			if ($.datepicker._get(dp_inst, 'minDateTime') !== null && $.datepicker._get(dp_inst, 'minDateTime') !== undefined && dp_date) {
+				var minDateTime = $.datepicker._get(dp_inst, 'minDateTime'),
+					minDateTimeDate = new Date(minDateTime.getFullYear(), minDateTime.getMonth(), minDateTime.getDate(), 0, 0, 0, 0);
+
+				if (this.hourMinOriginal === null || this.minuteMinOriginal === null || this.secondMinOriginal === null || this.millisecMinOriginal === null) {
+					this.hourMinOriginal = o.hourMin;
+					this.minuteMinOriginal = o.minuteMin;
+					this.secondMinOriginal = o.secondMin;
+					this.millisecMinOriginal = o.millisecMin;
+				}
+
+				if (dp_inst.settings.timeOnly || minDateTimeDate.getTime() == dp_date.getTime()) {
+					this._defaults.hourMin = minDateTime.getHours();
+					if (this.hour <= this._defaults.hourMin) {
+						this.hour = this._defaults.hourMin;
+						this._defaults.minuteMin = minDateTime.getMinutes();
+						if (this.minute <= this._defaults.minuteMin) {
+							this.minute = this._defaults.minuteMin;
+							this._defaults.secondMin = minDateTime.getSeconds();
+							if (this.second <= this._defaults.secondMin) {
+								this.second = this._defaults.secondMin;
+								this._defaults.millisecMin = minDateTime.getMilliseconds();
+							} else {
+								if (this.millisec < this._defaults.millisecMin) {
+									this.millisec = this._defaults.millisecMin;
+								}
+								this._defaults.millisecMin = this.millisecMinOriginal;
+							}
+						} else {
+							this._defaults.secondMin = this.secondMinOriginal;
+							this._defaults.millisecMin = this.millisecMinOriginal;
+						}
+					} else {
+						this._defaults.minuteMin = this.minuteMinOriginal;
+						this._defaults.secondMin = this.secondMinOriginal;
+						this._defaults.millisecMin = this.millisecMinOriginal;
+					}
+				} else {
+					this._defaults.hourMin = this.hourMinOriginal;
+					this._defaults.minuteMin = this.minuteMinOriginal;
+					this._defaults.secondMin = this.secondMinOriginal;
+					this._defaults.millisecMin = this.millisecMinOriginal;
+				}
+			}
+
+			if ($.datepicker._get(dp_inst, 'maxDateTime') !== null && $.datepicker._get(dp_inst, 'maxDateTime') !== undefined && dp_date) {
+				var maxDateTime = $.datepicker._get(dp_inst, 'maxDateTime'),
+					maxDateTimeDate = new Date(maxDateTime.getFullYear(), maxDateTime.getMonth(), maxDateTime.getDate(), 0, 0, 0, 0);
+
+				if (this.hourMaxOriginal === null || this.minuteMaxOriginal === null || this.secondMaxOriginal === null) {
+					this.hourMaxOriginal = o.hourMax;
+					this.minuteMaxOriginal = o.minuteMax;
+					this.secondMaxOriginal = o.secondMax;
+					this.millisecMaxOriginal = o.millisecMax;
+				}
+
+				if (dp_inst.settings.timeOnly || maxDateTimeDate.getTime() == dp_date.getTime()) {
+					this._defaults.hourMax = maxDateTime.getHours();
+					if (this.hour >= this._defaults.hourMax) {
+						this.hour = this._defaults.hourMax;
+						this._defaults.minuteMax = maxDateTime.getMinutes();
+						if (this.minute >= this._defaults.minuteMax) {
+							this.minute = this._defaults.minuteMax;
+							this._defaults.secondMax = maxDateTime.getSeconds();
+						} else if (this.second >= this._defaults.secondMax) {
+							this.second = this._defaults.secondMax;
+							this._defaults.millisecMax = maxDateTime.getMilliseconds();
+						} else {
+							if (this.millisec > this._defaults.millisecMax) {
+								this.millisec = this._defaults.millisecMax;
+							}
+							this._defaults.millisecMax = this.millisecMaxOriginal;
+						}
+					} else {
+						this._defaults.minuteMax = this.minuteMaxOriginal;
+						this._defaults.secondMax = this.secondMaxOriginal;
+						this._defaults.millisecMax = this.millisecMaxOriginal;
+					}
+				} else {
+					this._defaults.hourMax = this.hourMaxOriginal;
+					this._defaults.minuteMax = this.minuteMaxOriginal;
+					this._defaults.secondMax = this.secondMaxOriginal;
+					this._defaults.millisecMax = this.millisecMaxOriginal;
+				}
+			}
+
+			if (adjustSliders !== undefined && adjustSliders === true) {
+				var hourMax = parseInt((this._defaults.hourMax - ((this._defaults.hourMax - this._defaults.hourMin) % this._defaults.stepHour)), 10),
+					minMax = parseInt((this._defaults.minuteMax - ((this._defaults.minuteMax - this._defaults.minuteMin) % this._defaults.stepMinute)), 10),
+					secMax = parseInt((this._defaults.secondMax - ((this._defaults.secondMax - this._defaults.secondMin) % this._defaults.stepSecond)), 10),
+					millisecMax = parseInt((this._defaults.millisecMax - ((this._defaults.millisecMax - this._defaults.millisecMin) % this._defaults.stepMillisec)), 10);
+
+				if (this.hour_slider) {
+					this.hour_slider.slider("option", {
+						min: this._defaults.hourMin,
+						max: hourMax
+					}).slider('value', this.hour);
+				}
+				if (this.minute_slider) {
+					this.minute_slider.slider("option", {
+						min: this._defaults.minuteMin,
+						max: minMax
+					}).slider('value', this.minute);
+				}
+				if (this.second_slider) {
+					this.second_slider.slider("option", {
+						min: this._defaults.secondMin,
+						max: secMax
+					}).slider('value', this.second);
+				}
+				if (this.millisec_slider) {
+					this.millisec_slider.slider("option", {
+						min: this._defaults.millisecMin,
+						max: millisecMax
+					}).slider('value', this.millisec);
+				}
+			}
+
+		},
+
+		/*
+		* when a slider moves, set the internal time...
+		* on time change is also called when the time is updated in the text field
+		*/
+		_onTimeChange: function() {
+			var hour = (this.hour_slider) ? this.hour_slider.slider('value') : false,
+				minute = (this.minute_slider) ? this.minute_slider.slider('value') : false,
+				second = (this.second_slider) ? this.second_slider.slider('value') : false,
+				millisec = (this.millisec_slider) ? this.millisec_slider.slider('value') : false,
+				timezone = (this.timezone_select) ? this.timezone_select.val() : false,
+				o = this._defaults;
+
+			if (typeof(hour) == 'object') {
+				hour = false;
+			}
+			if (typeof(minute) == 'object') {
+				minute = false;
+			}
+			if (typeof(second) == 'object') {
+				second = false;
+			}
+			if (typeof(millisec) == 'object') {
+				millisec = false;
+			}
+			if (typeof(timezone) == 'object') {
+				timezone = false;
+			}
+
+			if (hour !== false) {
+				hour = parseInt(hour, 10);
+			}
+			if (minute !== false) {
+				minute = parseInt(minute, 10);
+			}
+			if (second !== false) {
+				second = parseInt(second, 10);
+			}
+			if (millisec !== false) {
+				millisec = parseInt(millisec, 10);
+			}
+
+			var ampm = o[hour < 12 ? 'amNames' : 'pmNames'][0];
+
+			// If the update was done in the input field, the input field should not be updated.
+			// If the update was done using the sliders, update the input field.
+			var hasChanged = (hour != this.hour || minute != this.minute || second != this.second || millisec != this.millisec
+								|| (this.ampm.length > 0 && (hour < 12) != ($.inArray(this.ampm.toUpperCase(), this.amNames) !== -1))
+								|| ((this.timezone === null && timezone != this.defaultTimezone) || (this.timezone !== null && timezone != this.timezone)));
+
+			if (hasChanged) {
+
+				if (hour !== false) {
+					this.hour = hour;
+				}
+				if (minute !== false) {
+					this.minute = minute;
+				}
+				if (second !== false) {
+					this.second = second;
+				}
+				if (millisec !== false) {
+					this.millisec = millisec;
+				}
+				if (timezone !== false) {
+					this.timezone = timezone;
+				}
+
+				if (!this.inst) {
+					this.inst = $.datepicker._getInst(this.$input[0]);
+				}
+
+				this._limitMinMaxDateTime(this.inst, true);
+			}
+			if (o.ampm) {
+				this.ampm = ampm;
+			}
+
+			//this._formatTime();
+			this.formattedTime = $.datepicker.formatTime(this._defaults.timeFormat, this, this._defaults);
+			if (this.$timeObj) {
+				this.$timeObj.text(this.formattedTime + o.timeSuffix);
+			}
+			this.timeDefined = true;
+			if (hasChanged) {
+				this._updateDateTime();
+			}
+		},
+
+		/*
+		* call custom onSelect.
+		* bind to sliders slidestop, and grid click.
+		*/
+		_onSelectHandler: function() {
+			var onSelect = this._defaults.onSelect || this.inst.settings.onSelect;
+			var inputEl = this.$input ? this.$input[0] : null;
+			if (onSelect && inputEl) {
+				onSelect.apply(inputEl, [this.formattedDateTime, this]);
+			}
+		},
+
+		/*
+		* left for any backwards compatibility
+		*/
+		_formatTime: function(time, format) {
+			time = time || {
+				hour: this.hour,
+				minute: this.minute,
+				second: this.second,
+				millisec: this.millisec,
+				ampm: this.ampm,
+				timezone: this.timezone
+			};
+			var tmptime = (format || this._defaults.timeFormat).toString();
+
+			tmptime = $.datepicker.formatTime(tmptime, time, this._defaults);
+
+			if (arguments.length) {
+				return tmptime;
+			} else {
+				this.formattedTime = tmptime;
+			}
+		},
+
+		/*
+		* update our input with the new date time..
+		*/
+		_updateDateTime: function(dp_inst) {
+			dp_inst = this.inst || dp_inst;
+			var dt = $.datepicker._daylightSavingAdjust(new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay)),
+				dateFmt = $.datepicker._get(dp_inst, 'dateFormat'),
+				formatCfg = $.datepicker._getFormatConfig(dp_inst),
+				timeAvailable = dt !== null && this.timeDefined;
+			this.formattedDate = $.datepicker.formatDate(dateFmt, (dt === null ? new Date() : dt), formatCfg);
+			var formattedDateTime = this.formattedDate;
+
+			/*
+			* remove following lines to force every changes in date picker to change the input value
+			* Bug descriptions: when an input field has a default value, and click on the field to pop up the date picker.
+			* If the user manually empty the value in the input field, the date picker will never change selected value.
+			*/
+			//if (dp_inst.lastVal !== undefined && (dp_inst.lastVal.length > 0 && this.$input.val().length === 0)) {
+			//	return;
+			//}
+
+			if (this._defaults.timeOnly === true) {
+				formattedDateTime = this.formattedTime;
+			} else if (this._defaults.timeOnly !== true && (this._defaults.alwaysSetTime || timeAvailable)) {
+				formattedDateTime += this._defaults.separator + this.formattedTime + this._defaults.timeSuffix;
+			}
+
+			this.formattedDateTime = formattedDateTime;
+
+			if (!this._defaults.showTimepicker) {
+				this.$input.val(this.formattedDate);
+			} else if (this.$altInput && this._defaults.altFieldTimeOnly === true) {
+				this.$altInput.val(this.formattedTime);
+				this.$input.val(this.formattedDate);
+			} else if (this.$altInput) {
+				this.$input.val(formattedDateTime);
+				var altFormattedDateTime = '',
+					altSeparator = this._defaults.altSeparator ? this._defaults.altSeparator : this._defaults.separator,
+					altTimeSuffix = this._defaults.altTimeSuffix ? this._defaults.altTimeSuffix : this._defaults.timeSuffix;
+				if (this._defaults.altFormat) altFormattedDateTime = $.datepicker.formatDate(this._defaults.altFormat, (dt === null ? new Date() : dt), formatCfg);
+				else altFormattedDateTime = this.formattedDate;
+				if (altFormattedDateTime) altFormattedDateTime += altSeparator;
+				if (this._defaults.altTimeFormat) altFormattedDateTime += $.datepicker.formatTime(this._defaults.altTimeFormat, this, this._defaults) + altTimeSuffix;
+				else altFormattedDateTime += this.formattedTime + altTimeSuffix;
+				this.$altInput.val(altFormattedDateTime);
+			} else {
+				this.$input.val(formattedDateTime);
+			}
+
+			this.$input.trigger("change");
+		},
+
+		_onFocus: function() {
+			if (!this.$input.val() && this._defaults.defaultValue) {
+				this.$input.val(this._defaults.defaultValue);
+				var inst = $.datepicker._getInst(this.$input.get(0)),
+					tp_inst = $.datepicker._get(inst, 'timepicker');
+				if (tp_inst) {
+					if (tp_inst._defaults.timeOnly && (inst.input.val() != inst.lastVal)) {
+						try {
+							$.datepicker._updateDatepicker(inst);
+						} catch (err) {
+							$.datepicker.log(err);
+						}
+					}
+				}
+			}
+		}
+
+	});
+
+	$.fn.extend({
+		/*
+		* shorthand just to use timepicker..
+		*/
+		timepicker: function(o) {
+			o = o || {};
+			var tmp_args = Array.prototype.slice.call(arguments);
+
+			if (typeof o == 'object') {
+				tmp_args[0] = $.extend(o, {
+					timeOnly: true
+				});
+			}
+
+			return $(this).each(function() {
+				$.fn.datetimepicker.apply($(this), tmp_args);
+			});
+		},
+
+		/*
+		* extend timepicker to datepicker
+		*/
+		datetimepicker: function(o) {
+			o = o || {};
+			var tmp_args = arguments;
+
+			if (typeof(o) == 'string') {
+				if (o == 'getDate') {
+					return $.fn.datepicker.apply($(this[0]), tmp_args);
+				} else {
+					return this.each(function() {
+						var $t = $(this);
+						$t.datepicker.apply($t, tmp_args);
+					});
+				}
+			} else {
+				return this.each(function() {
+					var $t = $(this);
+					$t.datepicker($.timepicker._newInst($t, o)._defaults);
+				});
+			}
+		}
+	});
+
+	/*
+	* Public Utility to parse date and time
+	*/
+	$.datepicker.parseDateTime = function(dateFormat, timeFormat, dateTimeString, dateSettings, timeSettings) {
+		var parseRes = parseDateTimeInternal(dateFormat, timeFormat, dateTimeString, dateSettings, timeSettings);
+		if (parseRes.timeObj) {
+			var t = parseRes.timeObj;
+			parseRes.date.setHours(t.hour, t.minute, t.second, t.millisec);
+		}
+
+		return parseRes.date;
+	};
+
+	/*
+	* Public utility to parse time
+	*/
+	$.datepicker.parseTime = function(timeFormat, timeString, options) {
+
+		// pattern for standard and localized AM/PM markers
+		var getPatternAmpm = function(amNames, pmNames) {
+			var markers = [];
+			if (amNames) {
+				$.merge(markers, amNames);
+			}
+			if (pmNames) {
+				$.merge(markers, pmNames);
+			}
+			markers = $.map(markers, function(val) {
+				return val.replace(/[.*+?|()\[\]{}\\]/g, '\\$&');
+			});
+			return '(' + markers.join('|') + ')?';
+		};
+
+		// figure out position of time elements.. cause js cant do named captures
+		var getFormatPositions = function(timeFormat) {
+			var finds = timeFormat.toLowerCase().match(/(h{1,2}|m{1,2}|s{1,2}|l{1}|t{1,2}|z)/g),
+				orders = {
+					h: -1,
+					m: -1,
+					s: -1,
+					l: -1,
+					t: -1,
+					z: -1
+				};
+
+			if (finds) {
+				for (var i = 0; i < finds.length; i++) {
+					if (orders[finds[i].toString().charAt(0)] == -1) {
+						orders[finds[i].toString().charAt(0)] = i + 1;
+					}
+				}
+			}
+			return orders;
+		};
+
+		var o = extendRemove(extendRemove({}, $.timepicker._defaults), options || {});
+
+		var regstr = '^' + timeFormat.toString()
+									.replace(/h{1,2}/ig, '(\\d?\\d)')
+									.replace(/m{1,2}/ig, '(\\d?\\d)')
+									.replace(/s{1,2}/ig, '(\\d?\\d)')
+									.replace(/l{1}/ig, '(\\d?\\d?\\d)')
+									.replace(/t{1,2}/ig, getPatternAmpm(o.amNames, o.pmNames))
+									.replace(/z{1}/ig, '(z|[-+]\\d\\d:?\\d\\d|\\S+)?')
+									.replace(/\s/g, '\\s?') +
+									o.timeSuffix + '$',
+			order = getFormatPositions(timeFormat),
+			ampm = '',
+			treg;
+
+		treg = timeString.match(new RegExp(regstr, 'i'));
+
+		var resTime = {
+			hour: 0,
+			minute: 0,
+			second: 0,
+			millisec: 0
+		};
+
+		if (treg) {
+			if (order.t !== -1) {
+				if (treg[order.t] === undefined || treg[order.t].length === 0) {
+					ampm = '';
+					resTime.ampm = '';
+				} else {
+					ampm = $.inArray(treg[order.t].toUpperCase(), o.amNames) !== -1 ? 'AM' : 'PM';
+					resTime.ampm = o[ampm == 'AM' ? 'amNames' : 'pmNames'][0];
+				}
+			}
+
+			if (order.h !== -1) {
+				if (ampm == 'AM' && treg[order.h] == '12') {
+					resTime.hour = 0; // 12am = 0 hour
+				} else {
+					if (ampm == 'PM' && treg[order.h] != '12') {
+						resTime.hour = parseInt(treg[order.h], 10) + 12; // 12pm = 12 hour, any other pm = hour + 12
+					} else {
+						resTime.hour = Number(treg[order.h]);
+					}
+				}
+			}
+
+			if (order.m !== -1) {
+				resTime.minute = Number(treg[order.m]);
+			}
+			if (order.s !== -1) {
+				resTime.second = Number(treg[order.s]);
+			}
+			if (order.l !== -1) {
+				resTime.millisec = Number(treg[order.l]);
+			}
+			if (order.z !== -1 && treg[order.z] !== undefined) {
+				var tz = treg[order.z].toUpperCase();
+				switch (tz.length) {
+				case 1:
+					// Z
+					tz = o.timezoneIso8601 ? 'Z' : '+0000';
+					break;
+				case 5:
+					// +hhmm
+					if (o.timezoneIso8601) {
+						tz = tz.substring(1) == '0000' ? 'Z' : tz.substring(0, 3) + ':' + tz.substring(3);
+					}
+					break;
+				case 6:
+					// +hh:mm
+					if (!o.timezoneIso8601) {
+						tz = tz == 'Z' || tz.substring(1) == '00:00' ? '+0000' : tz.replace(/:/, '');
+					} else {
+						if (tz.substring(1) == '00:00') {
+							tz = 'Z';
+						}
+					}
+					break;
+				}
+				resTime.timezone = tz;
+			}
+
+
+			return resTime;
+		}
+
+		return false;
+	};
+
+	/*
+	* Public utility to format the time
+	* format = string format of the time
+	* time = a {}, not a Date() for timezones
+	* options = essentially the regional[].. amNames, pmNames, ampm
+	*/
+	$.datepicker.formatTime = function(format, time, options) {
+		options = options || {};
+		options = $.extend({}, $.timepicker._defaults, options);
+		time = $.extend({
+			hour: 0,
+			minute: 0,
+			second: 0,
+			millisec: 0,
+			timezone: '+0000'
+		}, time);
+
+		var tmptime = format;
+		var ampmName = options.amNames[0];
+
+		var hour = parseInt(time.hour, 10);
+		if (options.ampm) {
+			if (hour > 11) {
+				ampmName = options.pmNames[0];
+				if (hour > 12) {
+					hour = hour % 12;
+				}
+			}
+			if (hour === 0) {
+				hour = 12;
+			}
+		}
+		tmptime = tmptime.replace(/(?:hh?|mm?|ss?|[tT]{1,2}|[lz]|('.*?'|".*?"))/g, function(match) {
+			switch (match.toLowerCase()) {
+			case 'hh':
+				return ('0' + hour).slice(-2);
+			case 'h':
+				return hour;
+			case 'mm':
+				return ('0' + time.minute).slice(-2);
+			case 'm':
+				return time.minute;
+			case 'ss':
+				return ('0' + time.second).slice(-2);
+			case 's':
+				return time.second;
+			case 'l':
+				return ('00' + time.millisec).slice(-3);
+			case 'z':
+				return time.timezone;
+			case 't':
+			case 'tt':
+				if (options.ampm) {
+					if (match.length == 1) {
+						ampmName = ampmName.charAt(0);
+					}
+					return match.charAt(0) === 'T' ? ampmName.toUpperCase() : ampmName.toLowerCase();
+				}
+				return '';
+			default:
+				return match.replace(/\'/g, "") || "'";
+			}
+		});
+
+		tmptime = $.trim(tmptime);
+		return tmptime;
+	};
+
+	/*
+	* the bad hack :/ override datepicker so it doesnt close on select
+	// inspired: http://stackoverflow.com/questions/1252512/jquery-datepicker-prevent-closing-picker-when-clicking-a-date/1762378#1762378
+	*/
+	$.datepicker._base_selectDate = $.datepicker._selectDate;
+	$.datepicker._selectDate = function(id, dateStr) {
+		var inst = this._getInst($(id)[0]),
+			tp_inst = this._get(inst, 'timepicker');
+
+		if (tp_inst) {
+			tp_inst._limitMinMaxDateTime(inst, true);
+			inst.inline = inst.stay_open = true;
+			//This way the onSelect handler called from calendarpicker get the full dateTime
+			this._base_selectDate(id, dateStr);
+			inst.inline = inst.stay_open = false;
+			this._notifyChange(inst);
+			this._updateDatepicker(inst);
+		} else {
+			this._base_selectDate(id, dateStr);
+		}
+	};
+
+	/*
+	* second bad hack :/ override datepicker so it triggers an event when changing the input field
+	* and does not redraw the datepicker on every selectDate event
+	*/
+	$.datepicker._base_updateDatepicker = $.datepicker._updateDatepicker;
+	$.datepicker._updateDatepicker = function(inst) {
+
+		// don't popup the datepicker if there is another instance already opened
+		var input = inst.input[0];
+		if ($.datepicker._curInst && $.datepicker._curInst != inst && $.datepicker._datepickerShowing && $.datepicker._lastInput != input) {
+			return;
+		}
+
+		if (typeof(inst.stay_open) !== 'boolean' || inst.stay_open === false) {
+
+			this._base_updateDatepicker(inst);
+
+			// Reload the time control when changing something in the input text field.
+			var tp_inst = this._get(inst, 'timepicker');
+			if (tp_inst) {
+				tp_inst._addTimePicker(inst);
+
+				if (tp_inst._defaults.useLocalTimezone) { //checks daylight saving with the new date.
+					var date = new Date(inst.selectedYear, inst.selectedMonth, inst.selectedDay, 12);
+					selectLocalTimeZone(tp_inst, date);
+					tp_inst._onTimeChange();
+				}
+			}
+		}
+	};
+
+	/*
+	* third bad hack :/ override datepicker so it allows spaces and colon in the input field
+	*/
+	$.datepicker._base_doKeyPress = $.datepicker._doKeyPress;
+	$.datepicker._doKeyPress = function(event) {
+		var inst = $.datepicker._getInst(event.target),
+			tp_inst = $.datepicker._get(inst, 'timepicker');
+
+		if (tp_inst) {
+			if ($.datepicker._get(inst, 'constrainInput')) {
+				var ampm = tp_inst._defaults.ampm,
+					dateChars = $.datepicker._possibleChars($.datepicker._get(inst, 'dateFormat')),
+					datetimeChars = tp_inst._defaults.timeFormat.toString()
+											.replace(/[hms]/g, '')
+											.replace(/TT/g, ampm ? 'APM' : '')
+											.replace(/Tt/g, ampm ? 'AaPpMm' : '')
+											.replace(/tT/g, ampm ? 'AaPpMm' : '')
+											.replace(/T/g, ampm ? 'AP' : '')
+											.replace(/tt/g, ampm ? 'apm' : '')
+											.replace(/t/g, ampm ? 'ap' : '') +
+											" " + tp_inst._defaults.separator +
+											tp_inst._defaults.timeSuffix +
+											(tp_inst._defaults.showTimezone ? tp_inst._defaults.timezoneList.join('') : '') +
+											(tp_inst._defaults.amNames.join('')) + (tp_inst._defaults.pmNames.join('')) +
+											dateChars,
+					chr = String.fromCharCode(event.charCode === undefined ? event.keyCode : event.charCode);
+				return event.ctrlKey || (chr < ' ' || !dateChars || datetimeChars.indexOf(chr) > -1);
+			}
+		}
+
+		return $.datepicker._base_doKeyPress(event);
+	};
+
+	/*
+	* Override key up event to sync manual input changes.
+	*/
+	$.datepicker._base_doKeyUp = $.datepicker._doKeyUp;
+	$.datepicker._doKeyUp = function(event) {
+		var inst = $.datepicker._getInst(event.target),
+			tp_inst = $.datepicker._get(inst, 'timepicker');
+
+		if (tp_inst) {
+			if (tp_inst._defaults.timeOnly && (inst.input.val() != inst.lastVal)) {
+				try {
+					$.datepicker._updateDatepicker(inst);
+				} catch (err) {
+					$.datepicker.log(err);
+				}
+			}
+		}
+
+		return $.datepicker._base_doKeyUp(event);
+	};
+
+	/*
+	* override "Today" button to also grab the time.
+	*/
+	$.datepicker._base_gotoToday = $.datepicker._gotoToday;
+	$.datepicker._gotoToday = function(id) {
+		var inst = this._getInst($(id)[0]),
+			$dp = inst.dpDiv;
+		this._base_gotoToday(id);
+		var tp_inst = this._get(inst, 'timepicker');
+		selectLocalTimeZone(tp_inst);
+		var now = new Date();
+		this._setTime(inst, now);
+		$('.ui-datepicker-today', $dp).click();
+	};
+
+	/*
+	* Disable & enable the Time in the datetimepicker
+	*/
+	$.datepicker._disableTimepickerDatepicker = function(target) {
+		var inst = this._getInst(target);
+		if (!inst) {
+			return;
+		}
+
+		var tp_inst = this._get(inst, 'timepicker');
+		$(target).datepicker('getDate'); // Init selected[Year|Month|Day]
+		if (tp_inst) {
+			tp_inst._defaults.showTimepicker = false;
+			tp_inst._updateDateTime(inst);
+		}
+	};
+
+	$.datepicker._enableTimepickerDatepicker = function(target) {
+		var inst = this._getInst(target);
+		if (!inst) {
+			return;
+		}
+
+		var tp_inst = this._get(inst, 'timepicker');
+		$(target).datepicker('getDate'); // Init selected[Year|Month|Day]
+		if (tp_inst) {
+			tp_inst._defaults.showTimepicker = true;
+			tp_inst._addTimePicker(inst); // Could be disabled on page load
+			tp_inst._updateDateTime(inst);
+		}
+	};
+
+	/*
+	* Create our own set time function
+	*/
+	$.datepicker._setTime = function(inst, date) {
+		var tp_inst = this._get(inst, 'timepicker');
+		if (tp_inst) {
+			var defaults = tp_inst._defaults,
+				// calling _setTime with no date sets time to defaults
+				hour = date ? date.getHours() : defaults.hour,
+				minute = date ? date.getMinutes() : defaults.minute,
+				second = date ? date.getSeconds() : defaults.second,
+				millisec = date ? date.getMilliseconds() : defaults.millisec;
+			//check if within min/max times..
+			// correct check if within min/max times.
+			// Rewritten by Scott A. Woodward
+			var hourEq = hour === defaults.hourMin,
+				minuteEq = minute === defaults.minuteMin,
+				secondEq = second === defaults.secondMin;
+			var reset = false;
+			if (hour < defaults.hourMin || hour > defaults.hourMax) reset = true;
+			else if ((minute < defaults.minuteMin || minute > defaults.minuteMax) && hourEq) reset = true;
+			else if ((second < defaults.secondMin || second > defaults.secondMax) && hourEq && minuteEq) reset = true;
+			else if ((millisec < defaults.millisecMin || millisec > defaults.millisecMax) && hourEq && minuteEq && secondEq) reset = true;
+			if (reset) {
+				hour = defaults.hourMin;
+				minute = defaults.minuteMin;
+				second = defaults.secondMin;
+				millisec = defaults.millisecMin;
+			}
+			tp_inst.hour = hour;
+			tp_inst.minute = minute;
+			tp_inst.second = second;
+			tp_inst.millisec = millisec;
+			if (tp_inst.hour_slider) tp_inst.hour_slider.slider('value', hour);
+			if (tp_inst.minute_slider) tp_inst.minute_slider.slider('value', minute);
+			if (tp_inst.second_slider) tp_inst.second_slider.slider('value', second);
+			if (tp_inst.millisec_slider) tp_inst.millisec_slider.slider('value', millisec);
+
+			tp_inst._onTimeChange();
+			tp_inst._updateDateTime(inst);
+		}
+	};
+
+	/*
+	* Create new public method to set only time, callable as $().datepicker('setTime', date)
+	*/
+	$.datepicker._setTimeDatepicker = function(target, date, withDate) {
+		var inst = this._getInst(target);
+		if (!inst) {
+			return;
+		}
+
+		var tp_inst = this._get(inst, 'timepicker');
+
+		if (tp_inst) {
+			this._setDateFromField(inst);
+			var tp_date;
+			if (date) {
+				if (typeof date == "string") {
+					tp_inst._parseTime(date, withDate);
+					tp_date = new Date();
+					tp_date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second, tp_inst.millisec);
+				} else {
+					tp_date = new Date(date.getTime());
+				}
+				if (tp_date.toString() == 'Invalid Date') {
+					tp_date = undefined;
+				}
+				this._setTime(inst, tp_date);
+			}
+		}
+
+	};
+
+	/*
+	* override setDate() to allow setting time too within Date object
+	*/
+	$.datepicker._base_setDateDatepicker = $.datepicker._setDateDatepicker;
+	$.datepicker._setDateDatepicker = function(target, date) {
+		var inst = this._getInst(target);
+		if (!inst) {
+			return;
+		}
+
+		var tp_date = (date instanceof Date) ? new Date(date.getTime()) : date;
+
+		this._updateDatepicker(inst);
+		this._base_setDateDatepicker.apply(this, arguments);
+		this._setTimeDatepicker(target, tp_date, true);
+	};
+
+	/*
+	* override getDate() to allow getting time too within Date object
+	*/
+	$.datepicker._base_getDateDatepicker = $.datepicker._getDateDatepicker;
+	$.datepicker._getDateDatepicker = function(target, noDefault) {
+		var inst = this._getInst(target);
+		if (!inst) {
+			return;
+		}
+
+		var tp_inst = this._get(inst, 'timepicker');
+
+		if (tp_inst) {
+			//this._setDateFromField(inst, noDefault); // This keeps setting to today when it shouldn't
+			var date = this._getDate(inst);
+			if (date && tp_inst._parseTime($(target).val(), tp_inst.timeOnly)) {
+				date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second, tp_inst.millisec);
+			}
+			return date;
+		}
+		return this._base_getDateDatepicker(target, noDefault);
+	};
+
+	/*
+	* override parseDate() because UI 1.8.14 throws an error about "Extra characters"
+	* An option in datapicker to ignore extra format characters would be nicer.
+	*/
+	$.datepicker._base_parseDate = $.datepicker.parseDate;
+	$.datepicker.parseDate = function(format, value, settings) {
+		var splitRes = splitDateTime(format, value, settings);
+		return $.datepicker._base_parseDate(format, splitRes[0], settings);
+	};
+
+	/*
+	* override formatDate to set date with time to the input
+	*/
+	$.datepicker._base_formatDate = $.datepicker._formatDate;
+	$.datepicker._formatDate = function(inst, day, month, year) {
+		var tp_inst = this._get(inst, 'timepicker');
+		if (tp_inst) {
+			tp_inst._updateDateTime(inst);
+			return tp_inst.$input.val();
+		}
+		return this._base_formatDate(inst);
+	};
+
+	/*
+	* override options setter to add time to maxDate(Time) and minDate(Time). MaxDate
+	*/
+	$.datepicker._base_optionDatepicker = $.datepicker._optionDatepicker;
+	$.datepicker._optionDatepicker = function(target, name, value) {
+		var inst = this._getInst(target);
+		if (!inst) {
+			return null;
+		}
+
+		var tp_inst = this._get(inst, 'timepicker');
+		if (tp_inst) {
+			var min = null,
+				max = null,
+				onselect = null;
+			if (typeof name == 'string') { // if min/max was set with the string
+				if (name === 'minDate' || name === 'minDateTime') {
+					min = value;
+				} else {
+					if (name === 'maxDate' || name === 'maxDateTime') {
+						max = value;
+					} else {
+						if (name === 'onSelect') {
+							onselect = value;
+						}
+					}
+				}
+			} else {
+				if (typeof name == 'object') { //if min/max was set with the JSON
+					if (name.minDate) {
+						min = name.minDate;
+					} else {
+						if (name.minDateTime) {
+							min = name.minDateTime;
+						} else {
+							if (name.maxDate) {
+								max = name.maxDate;
+							} else {
+								if (name.maxDateTime) {
+									max = name.maxDateTime;
+								}
+							}
+						}
+					}
+				}
+			}
+			if (min) { //if min was set
+				if (min === 0) {
+					min = new Date();
+				} else {
+					min = new Date(min);
+				}
+
+				tp_inst._defaults.minDate = min;
+				tp_inst._defaults.minDateTime = min;
+			} else if (max) { //if max was set
+				if (max === 0) {
+					max = new Date();
+				} else {
+					max = new Date(max);
+				}
+				tp_inst._defaults.maxDate = max;
+				tp_inst._defaults.maxDateTime = max;
+			} else if (onselect) {
+				tp_inst._defaults.onSelect = onselect;
+			}
+		}
+		if (value === undefined) {
+			return this._base_optionDatepicker(target, name);
+		}
+		return this._base_optionDatepicker(target, name, value);
+	};
+
+	/*
+	* jQuery extend now ignores nulls!
+	*/
+	function extendRemove(target, props) {
+		$.extend(target, props);
+		for (var name in props) {
+			if (props[name] === null || props[name] === undefined) {
+				target[name] = props[name];
+			}
+		}
+		return target;
+	}
+
+	/*
+	* Splits datetime string into date ans time substrings.
+	* Throws exception when date can't be parsed
+	* Returns [dateString, timeString]
+	*/
+	var splitDateTime = function(dateFormat, dateTimeString, dateSettings, timeSettings) {
+		try {
+			// The idea is to get the number separator occurances in datetime and the time format requested (since time has
+			// fewer unknowns, mostly numbers and am/pm). We will use the time pattern to split.
+			var separator = timeSettings && timeSettings.separator ? timeSettings.separator : $.timepicker._defaults.separator,
+				format = timeSettings && timeSettings.timeFormat ? timeSettings.timeFormat : $.timepicker._defaults.timeFormat,
+				ampm = timeSettings && timeSettings.ampm ? timeSettings.ampm : $.timepicker._defaults.ampm,
+				timeParts = format.split(separator), // how many occurances of separator may be in our format?
+				timePartsLen = timeParts.length,
+				allParts = dateTimeString.split(separator),
+				allPartsLen = allParts.length;
+
+			// because our default ampm=false, but our default format has tt, we need to filter this out
+			if(!ampm){
+				timeParts = $.trim(format.replace(/t/gi,'')).split(separator);
+				timePartsLen = timeParts.length;
+			}
+
+			if (allPartsLen > 0) {
+				return [
+						allParts.splice(0,allPartsLen-timePartsLen).join(separator),
+						allParts.splice(timePartsLen*-1).join(separator)
+					];
+			}
+
+		} catch (err) {
+			if (err.indexOf(":") >= 0) {
+				// Hack!  The error message ends with a colon, a space, and
+				// the "extra" characters.  We rely on that instead of
+				// attempting to perfectly reproduce the parsing algorithm.
+				var dateStringLength = dateTimeString.length - (err.length - err.indexOf(':') - 2),
+					timeString = dateTimeString.substring(dateStringLength);
+
+				return [$.trim(dateTimeString.substring(0, dateStringLength)), $.trim(dateTimeString.substring(dateStringLength))];
+
+			} else {
+				throw err;
+			}
+		}
+		return [dateTimeString, ''];
+	};
+
+	/*
+	* Internal function to parse datetime interval
+	* Returns: {date: Date, timeObj: Object}, where
+	*   date - parsed date without time (type Date)
+	*   timeObj = {hour: , minute: , second: , millisec: } - parsed time. Optional
+	*/
+	var parseDateTimeInternal = function(dateFormat, timeFormat, dateTimeString, dateSettings, timeSettings) {
+		var date;
+		var splitRes = splitDateTime(dateFormat, dateTimeString, dateSettings, timeSettings);
+		date = $.datepicker._base_parseDate(dateFormat, splitRes[0], dateSettings);
+		if (splitRes[1] !== '') {
+			var timeString = splitRes[1],
+				parsedTime = $.datepicker.parseTime(timeFormat, timeString, timeSettings);
+
+			if (parsedTime === null) {
+				throw 'Wrong time format';
+			}
+			return {
+				date: date,
+				timeObj: parsedTime
+			};
+		} else {
+			return {
+				date: date
+			};
+		}
+	};
+
+	/*
+	* Internal function to set timezone_select to the local timezone
+	*/
+	var selectLocalTimeZone = function(tp_inst, date) {
+		if (tp_inst && tp_inst.timezone_select) {
+			tp_inst._defaults.useLocalTimezone = true;
+			var now = typeof date !== 'undefined' ? date : new Date();
+			var tzoffset = $.timepicker.timeZoneOffsetString(now);
+			if (tp_inst._defaults.timezoneIso8601) {
+				tzoffset = tzoffset.substring(0, 3) + ':' + tzoffset.substring(3);
+			}
+			tp_inst.timezone_select.val(tzoffset);
+		}
+	};
+
+	/*
+	* Create a Singleton Insance
+	*/
+	$.timepicker = new Timepicker();
+
+	/**
+	 * Get the timezone offset as string from a date object (eg '+0530' for UTC+5.5)
+	 * @param  date
+	 * @return string
+	 */
+	$.timepicker.timeZoneOffsetString = function(date) {
+		var off = date.getTimezoneOffset() * -1,
+			minutes = off % 60,
+			hours = (off - minutes) / 60;
+		return (off >= 0 ? '+' : '-') + ('0' + (hours * 101).toString()).substr(-2) + ('0' + (minutes * 101).toString()).substr(-2);
+	};
+
+	/**
+	 * Calls `timepicker()` on the `startTime` and `endTime` elements, and configures them to
+	 * enforce date range limits.
+	 * n.b. The input value must be correctly formatted (reformatting is not supported)
+	 * @param  Element startTime
+	 * @param  Element endTime
+	 * @param  obj options Options for the timepicker() call
+	 * @return jQuery
+	 */
+	$.timepicker.timeRange = function(startTime, endTime, options) {
+		return $.timepicker.handleRange('timepicker', startTime, endTime, options);
+	};
+
+	/**
+	 * Calls `datetimepicker` on the `startTime` and `endTime` elements, and configures them to
+	 * enforce date range limits.
+	 * @param  Element startTime
+	 * @param  Element endTime
+	 * @param  obj options Options for the `timepicker()` call. Also supports `reformat`,
+	 *   a boolean value that can be used to reformat the input values to the `dateFormat`.
+	 * @param  string method Can be used to specify the type of picker to be added
+	 * @return jQuery
+	 */
+	$.timepicker.dateTimeRange = function(startTime, endTime, options) {
+		$.timepicker.dateRange(startTime, endTime, options, 'datetimepicker');
+	};
+
+	/**
+	 * Calls `method` on the `startTime` and `endTime` elements, and configures them to
+	 * enforce date range limits.
+	 * @param  Element startTime
+	 * @param  Element endTime
+	 * @param  obj options Options for the `timepicker()` call. Also supports `reformat`,
+	 *   a boolean value that can be used to reformat the input values to the `dateFormat`.
+	 * @param  string method Can be used to specify the type of picker to be added
+	 * @return jQuery
+	 */
+	$.timepicker.dateRange = function(startTime, endTime, options, method) {
+		method = method || 'datepicker';
+		$.timepicker.handleRange(method, startTime, endTime, options);
+	};
+
+	/**
+	 * Calls `method` on the `startTime` and `endTime` elements, and configures them to
+	 * enforce date range limits.
+	 * @param  string method Can be used to specify the type of picker to be added
+	 * @param  Element startTime
+	 * @param  Element endTime
+	 * @param  obj options Options for the `timepicker()` call. Also supports `reformat`,
+	 *   a boolean value that can be used to reformat the input values to the `dateFormat`.
+	 * @return jQuery
+	 */
+	$.timepicker.handleRange = function(method, startTime, endTime, options) {
+		$.fn[method].call(startTime, $.extend({
+			onClose: function(dateText, inst) {
+				checkDates(this, endTime, dateText);
+			},
+			onSelect: function(selectedDateTime) {
+				selected(this, endTime, 'minDate');
+			}
+		}, options, options.start));
+		$.fn[method].call(endTime, $.extend({
+			onClose: function(dateText, inst) {
+				checkDates(this, startTime, dateText);
+			},
+			onSelect: function(selectedDateTime) {
+				selected(this, startTime, 'maxDate');
+			}
+		}, options, options.end));
+		// timepicker doesn't provide access to its 'timeFormat' option,
+		// nor could I get datepicker.formatTime() to behave with times, so I
+		// have disabled reformatting for timepicker
+		if (method != 'timepicker' && options.reformat) {
+			$([startTime, endTime]).each(function() {
+				var format = $(this)[method].call($(this), 'option', 'dateFormat'),
+					date = new Date($(this).val());
+				if ($(this).val() && date) {
+					$(this).val($.datepicker.formatDate(format, date));
+				}
+			});
+		}
+		checkDates(startTime, endTime, startTime.val());
+
+		function checkDates(changed, other, dateText) {
+			if (other.val() && (new Date(startTime.val()) > new Date(endTime.val()))) {
+				other.val(dateText);
+			}
+		}
+		selected(startTime, endTime, 'minDate');
+		selected(endTime, startTime, 'maxDate');
+
+		function selected(changed, other, option) {
+			if (!$(changed).val()) {
+				return;
+			}
+			var date = $(changed)[method].call($(changed), 'getDate');
+			// timepicker doesn't implement 'getDate' and returns a jQuery
+			if (date.getTime) {
+				$(other)[method].call($(other), 'option', option, date);
+			}
+		}
+		return $([startTime.get(0), endTime.get(0)]);
+	};
+
+	/*
+	* Keep up with the version
+	*/
+	$.timepicker.version = "1.0.3";
+
+})(jQuery);
diff --git a/deployed/icagenda/modules/mod_iccalendar/helper.php b/deployed/icagenda/modules/mod_iccalendar/helper.php
new file mode 100644
index 00000000..45ad2e08
--- /dev/null
+++ b/deployed/icagenda/modules/mod_iccalendar/helper.php
@@ -0,0 +1,1641 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.12 2020-03-25
+ *
+ * @package     iCagenda.Site
+ * @subpackage  mod_iccalendar
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       3.1.9 (1.0)
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+jimport('joomla.methods');
+jimport('joomla.environment.request');
+jimport('joomla.application.component.helper');
+
+/**
+ *	iCagenda - iC calendar
+ */
+class modiCcalendarHelper
+{
+	private function construct($params)
+	{
+		$app    = JFactory::getApplication();
+		$jinput = $app->input;
+
+		$this->modid				= $params->get('id');
+		$this->template				= $params->get('template');
+		$this->format				= $params->get('format');
+		$this->date_separator		= $params->get('date_separator');
+		$this->setTodayTimezone		= $params->get('setTodayTimezone');
+		$this->displayDatesTimezone	= $params->get('displayDatesTimezone');
+		$this->filtering_shortDesc	= $params->get('filtering_shortDesc', '');
+		$this->limit				= $params->get('paramlimit', '')
+									? $params->get('paramlimit_Content')
+									: false;
+		$this->mcatid				= $params->get('mcatid', '');
+		$this->number				= $params->get('number');
+		$this->onlyStDate			= $params->get('onlyStDate');
+		$this->firstMonth           = iCDate::isDate($params->get('firstMonth'))
+									? $params->get('firstMonth')
+									: '';
+		$this->month_nav			= $params->get('month_nav', '1');
+		$this->year_nav				= $params->get('year_nav', '1');
+
+		$this->itemid				= $jinput->getInt('Itemid');
+		$this->mod_iccalendar		= '#mod_iccalendar_' . $this->modid;
+
+		// Get media path
+		$params_media				= JComponentHelper::getParams('com_media');
+		$image_path					= $params_media->get('image_path', 'images');
+
+		// Features Options
+		$this->features_icon_size	= $params->get('features_icon_size');
+		$this->show_icon_title		= $params->get('show_icon_title');
+		$this->features_icon_root	= JURI::base() . "{$image_path}/icagenda/feature_icons/{$this->features_icon_size}/";
+
+		// First day of the current month
+		$this_month	= $this->firstMonth
+//					? date("Y-m-d", strtotime("+1 month", strtotime($this->firstMonth)))
+					? date("Y-m-d", strtotime($this->firstMonth))
+					: JHtml::date('now', 'Y-m-01', null);
+
+		$iccaldate	= $jinput->get('iccaldate', ''); // Get date set in month/year navigation
+
+		// This should be the first day of a month
+		$date_start = $iccaldate ? date('Y-m-01', strtotime($iccaldate)) : $this_month;
+
+		// Add filter to restrict the number of events using the 'next' date
+		if ($date_start > $this_month)
+		{
+			// Month to be displayed is in the future
+			// Events required start from the current month
+			$filter_start = $this_month;
+		}
+		else
+		{
+			// Month to be displayed is current or past
+			// Events required start from the display month
+			$filter_start = $date_start;
+		}
+
+		$this->date_start = $date_start;
+
+		// Set Next date filtering
+		$this->filter_start = $filter_start;
+
+//		$this->addFilter('e.next', $filter_start, '>=');
+
+		// An end date for selection is not possible because it may prevent display of past events where the next
+		// scheduled instance of an event is after the end of the display month
+//		$filter_end = date('Y-m-d', strtotime('+1 month', strtotime($this->date_start)));
+//		$this->addFilter('e.next', "'$filter_end'",'<');
+	}
+
+
+	function start($params)
+	{
+		$this->construct($params);
+	}
+
+
+	// Class Method
+	function getStamp($params)
+	{
+		$db = JFactory::getDbo();
+		$query	= $db->getQuery(true);
+		$query->select('id AS nbevt')->from('`#__icagenda_events` AS e')->where('e.state = 1');
+		$db->setQuery($query);
+		$nbevt = $db->loadResult();
+
+		$no_event_message = '<div class="ic-msg-no-event">' . JText::_('MOD_ICCALENDAR_NO_EVENT') . '</div>';
+
+		if ( ! $nbevt)
+		{
+			echo $no_event_message;
+		}
+
+		$iCparams		= JComponentHelper::getParams('com_icagenda');
+
+		// Global Joomla API objects
+		$app    = JFactory::getApplication();
+		$lang   = JFactory::getLanguage();
+
+		$menu           = $app->getMenu();
+
+		// Module Params
+		$iCmenuitem     = $params->get('iCmenuitem', '');
+		$iCmenu_filters = $params->get('iCmenu_filters', 0);
+
+		$firstMonth     = iCDate::isDate($params->get('firstMonth'))
+						? trim($params->get('firstMonth', ''))
+						: '';
+
+		$dp_city            = $params->get('dp_city', 1);
+		$dp_country         = $params->get('dp_country', 1);
+		$param_dp_regInfos  = $params->get('dp_regInfos', 1);
+		$dp_shortDesc       = $params->get('dp_shortDesc', '');
+		$dp_time            = $params->get('dp_time', 1);
+		$dp_venuename       = $params->get('dp_venuename', 1);
+
+		$eventTimeZone	= null;
+
+		// Itemid Request (automatic detection of the first iCagenda menu-link, by menuID)
+		$iC_list_menus	= icagendaMenus::iClistMenuItemsInfo();
+
+
+
+		// Check if GD is enabled on the server
+		if (extension_loaded('gd') && function_exists('gd_info'))
+		{
+			$thumb_generator = $iCparams->get('thumb_generator', 1);
+		}
+		else
+		{
+			$thumb_generator = 0;
+		}
+
+		$datetime_today	= JHtml::date('now', 'Y-m-d H:i');
+		$timeformat		= $iCparams->get('timeformat', 1);
+		$lang_time		= ($timeformat == 1) ? 'H:i' : 'h:i A';
+
+		// Check if fopen is allowed
+		$result	= ini_get('allow_url_fopen');
+		$fopen	= empty($result) ? false : true;
+
+
+		$this->start($params);
+
+		// Set start/end dates of the current month
+		$days				= self::getNbOfDaysInMonth($this->date_start);
+		$current_date_start	= $this->date_start;
+		$month_start		= date('m', strtotime($current_date_start));
+		$month_end			= date('m', strtotime('+1 month', strtotime($current_date_start)));
+		$day_end			= date('m', strtotime('+'.$days.' days', strtotime($current_date_start)));
+
+		$year_end			= ($month_start == '12')
+							? date('Y', strtotime("+1 year", strtotime($this->date_start)))
+							: date('Y', strtotime($this->date_start));
+
+		$current_date_end	= $year_end . '-' . $month_end . '-' . $day_end;
+
+		// Get the database
+		$query	= $db->getQuery(true);
+
+		// Build the query
+		$query->select('e.*,
+				e.place as place_name,
+				c.title as cat_title,
+				c.alias as cat_alias,
+				c.color as cat_color,
+				c.ordering as cat_order
+			')
+			->from($db->qn('#__icagenda_events').' AS e')
+			->leftJoin($db->qn('#__icagenda_category').' AS c ON ' . $db->qn('c.id') . ' = ' . $db->qn('e.catid'));
+
+		// Where Category is Published
+		$query->where('c.state = 1');
+
+		// Where State is Published
+		$query->where('e.state = 1');
+
+		// Where event is Approved
+		$query->where('e.approval = 0');
+
+		// Filter next date
+		if ( ! $firstMonth)
+		{
+			$query->where('e.next >= ' . $db->q($this->filter_start));
+		}
+
+
+		// Filter by categories to be displayed
+		$catFilter = ! is_array($this->mcatid) ? array($this->mcatid) : $this->mcatid;
+
+		// Note: zero value kept for Joomla 2.5 B/C (option All categories not used on J3 sites)
+		if ( $catFilter && ! in_array('0', $catFilter) && ! in_array('', $catFilter))
+		{
+			$cats_option = implode(', ', $catFilter);
+
+			$query->where('e.catid IN (' . $cats_option . ')');
+		}
+
+		// Check Access Levels
+		$user		= JFactory::getUser();
+		$userID		= $user->id;
+		$userLevels	= $user->getAuthorisedViewLevels();
+		$userGroups = $user->getAuthorisedGroups();
+
+		$userAccess = implode(', ', $userLevels);
+
+		if ( ! in_array('8', $userGroups))
+		{
+			$query->where('e.access IN (' . $userAccess . ')');
+		}
+
+		// Filter by language
+		$query->where('e.language IN (' . $db->q(JFactory::getLanguage()->getTag()) . ',' . $db->q('*') . ')');
+
+		// Features - extract the number of displayable icons per event
+		$query->select('feat.count AS features');
+		$sub_query = $db->getQuery(true);
+		$sub_query->select('fx.event_id, COUNT(*) AS count');
+		$sub_query->from('`#__icagenda_feature_xref` AS fx');
+		$sub_query->innerJoin("`#__icagenda_feature` AS f ON fx.feature_id=f.id AND f.state=1 AND f.icon<>'-1'");
+		$sub_query->group('fx.event_id');
+		$query->leftJoin('(' . (string) $sub_query . ') AS feat ON e.id=feat.event_id');
+
+		// Registrations total
+//		$query->select('r.count AS registered, r.date AS reg_date');
+		$query->select('r.count AS reg_people, r.date AS reg_date');
+		$sub_query = $db->getQuery(true);
+		$sub_query->select('r.eventid, sum(r.people) AS count, r.date AS date');
+		$sub_query->from('`#__icagenda_registration` AS r');
+		$sub_query->where('r.state > 0');
+		$sub_query->group('r.eventid');
+		$query->leftJoin('(' . (string) $sub_query . ') AS r ON e.id=r.eventid');
+
+		// Run the query
+		$db->setQuery($query);
+
+		// Invoke the query
+		$result = $db->loadObjectList();
+
+		$registrations = icagendaEventsData::registeredList();
+
+		foreach ($result AS &$record)
+		{
+			$record_registered = array();
+
+			foreach ($registrations AS &$reg_by_event)
+			{
+				$ex_reg_by_event = explode('@@', $reg_by_event);
+
+				if ($ex_reg_by_event[0] == $record->id)
+				{
+					$record_registered[] = $ex_reg_by_event[0] . '@@' . $ex_reg_by_event[1] . '@@' . $ex_reg_by_event[2] . '@@' . $ex_reg_by_event[3];
+				}
+			}
+
+			$record->registered = $record_registered;
+		}
+
+		// Get days of the current month
+		$days = $this->getDays($this->date_start, 'Y-m-d H:i');
+
+//		$total_items		= 0;
+//		$displayed_items	= 0;
+
+		foreach ($result as $item)
+		{
+			// Extract the feature details, if needed
+			$features = array();
+
+			if (is_null($item->features) || empty($this->features_icon_size))
+			{
+				$item->features = array();
+			}
+			else
+			{
+				$item->features = icagendaEvents::featureIcons($item->id);
+			}
+
+			if (isset($item->features) && is_array($item->features))
+			{
+				foreach ($item->features as &$feature)
+				{
+					$features[] = array('icon' => $feature->icon, 'icon_alt' => $feature->icon_alt);
+				}
+			}
+
+			// list calendar dates
+			$AllDates = array();
+
+//			$next = isset($next) ? $next : '';
+
+			// Get list of valid single dates for this event
+			$allSingleDates_array = $this->getDatelist($item->dates);
+
+			sort($allSingleDates_array);
+
+			// If Single Dates, added to all dates for this event
+//			if (isset($datemultiplelist)
+//				&& $datemultiplelist != NULL
+//				&& is_array($datemultiplelist))
+//			{
+//				$allSingleDates_array = array_merge($AllDates, $datemultiplelist);
+//			}
+
+			foreach ($allSingleDates_array as &$sd)
+			{
+				$this_date = JHtml::date($sd, 'Y-m-d', null);
+
+				if (strtotime($this_date) >= strtotime($current_date_start)
+					&& strtotime($this_date) < strtotime($current_date_end))
+				{
+//					array_push($AllDates, $sd);
+					$AllDates[] = $sd;
+				}
+			}
+
+			// Get WeekDays Array
+			$WeeksDays			= iCDatePeriod::weekdaysToArray($item->weekdays);
+
+			// Get Period Dates
+			$startDate_TZ		= iCDate::isDate($item->startdate)
+								? JHtml::date($item->startdate, 'Y-m-d H:i', $eventTimeZone)
+								: false;
+			$endDate_TZ			= iCDate::isDate($item->enddate)
+								? JHtml::date($item->enddate, 'Y-m-d H:i', $eventTimeZone)
+								: false;
+			$perioddates		= iCDatePeriod::listDates($item->startdate, $item->enddate); // UTC
+
+			$onlyStDate			= isset($this->onlyStDate) ? $this->onlyStDate : '';
+
+			// Check the period if individual dates
+			$only_startdate		= ($item->weekdays || $item->weekdays == '0') ? false : true;
+
+			if ( ! empty($perioddates))
+			{
+				if ($onlyStDate == 1)
+				{
+					if (strtotime($startDate_TZ) >= strtotime($current_date_start)
+						&& strtotime($startDate_TZ) < strtotime($current_date_end))
+					{
+//						array_push($AllDates, date('Y-m-d H:i', strtotime($item->startdate)));
+						$AllDates[] = date('Y-m-d H:i', strtotime($item->startdate));
+					}
+				}
+				else
+				{
+					foreach ($perioddates as &$Dat)
+					{
+						$this_date = JHtml::date($Dat, 'Y-m-d', null);
+
+						if (in_array(date('w', strtotime($Dat)), $WeeksDays))
+						{
+							$SingleDate = date('Y-m-d H:i', strtotime($Dat));
+
+							if (strtotime($this_date) >= strtotime($current_date_start)
+								&& strtotime($this_date) < strtotime($current_date_end))
+							{
+//								array_push($AllDates, $SingleDate);
+								$AllDates[] = $SingleDate;
+							}
+						}
+					}
+				}
+			}
+
+			rsort($AllDates);
+
+//			$total_items = $total_items + 1;
+
+			$descShort = icagendaEvents::shortDescription($item->desc, true, $this->filtering_shortDesc, $this->limit);
+
+
+			/**
+			 * Get Thumbnail
+			 */
+
+			// START iCthumb
+
+			// Set if run iCthumb
+			if ($item->image
+				&& $thumb_generator == 1)
+			{
+				// Generate small thumb if not exist
+				$thumb_img = icagendaThumb::sizeSmall($item->image);
+			}
+			elseif ($item->image
+				&& $thumb_generator == 0)
+			{
+				$thumb_img = $item->image;
+			}
+			else
+			{
+				$thumb_img = $item->image ? 'media/com_icagenda/images/nophoto.jpg' : '';
+			}
+
+			// END iCthumb
+
+
+
+//			$evtParams = '';
+			$evtParams = new JRegistry($item->params);
+
+			// Display Time
+			$r_time			= $dp_time ? true : false;
+
+			// Display City
+			$r_city			= $dp_city ? $item->city : false;
+
+			// Display Country
+			$r_country		= $dp_country ? $item->country : false;
+
+			// Display Venue Name
+			$r_place		= $dp_venuename ? $item->place_name : false;
+
+			// Display Intro Text
+			// Short Description
+			if ($dp_shortDesc == '1')
+			{
+				$descShort		= $item->shortdesc ? $item->shortdesc : false;
+			}
+			// Auto-Introtext
+			elseif ($dp_shortDesc == '2')
+			{
+				$descShort		= $descShort ? $descShort : false;
+			}
+			// Hide
+			elseif ($dp_shortDesc == '0')
+			{
+				$descShort		= false;
+			}
+			// Auto (First Short Description, if does not exist, Auto-generated short description from the full description. And if does not exist, will use meta description if not empty)
+			else
+			{
+				$e_shortdesc	= $item->shortdesc ? $item->shortdesc : $descShort;
+				$descShort		= $e_shortdesc ? $e_shortdesc : $item->metadesc;
+			}
+
+			// Display Registration Infos
+			$eventRegStatus = $evtParams->get('statutReg', $iCparams->get('statutReg', '0'));
+			$dp_regInfos	= ($eventRegStatus == 1) ? $param_dp_regInfos : '';
+
+			$maxReg			= ($dp_regInfos == 1) ? $evtParams->get('maxReg', '1000000') : false;
+			$typeReg		= ($dp_regInfos == 1) ? $evtParams->get('typeReg', '1') : false;
+
+			$reg_deadline	= $evtParams->get('reg_deadline', $iCparams->get('reg_deadline', ''));
+
+			$eventIsCancelled = icagendaEvent::cancelledButton($item->id);
+
+			$eventTitle = $eventIsCancelled ? $item->title . '<div class="ic-float-right">' . $eventIsCancelled . '</div>' : $item->title;
+
+			$event = array(
+				'id'					=> (int)$item->id,
+//				'Itemid'				=> (int)$linkid,
+				'title'					=> $eventTitle,
+				'next'					=> $this->formatDate($item->next),
+				'image'					=> $thumb_img,
+				'file'					=> $item->file,
+				'address'				=> $item->address,
+				'city'					=> $r_city,
+				'country'				=> $r_country,
+				'place'					=> $r_place,
+				'description'			=> $item->desc,
+				'descShort'				=> $descShort,
+				'cat_title'				=> $item->cat_title,
+				'cat_order'				=> $item->cat_order,
+				'cat_color'				=> $item->cat_color,
+//				'nb_events'				=> count($item->id),
+				'no_image'				=> JTEXT::_('MOD_ICCALENDAR_NO_IMAGE'),
+				'params'				=> $item->params,
+				'features_icon_size'	=> $this->features_icon_size,
+				'features_icon_root'	=> $this->features_icon_root,
+				'show_icon_title'		=> $this->show_icon_title,
+				'features'				=> $features,
+				'item'					=> $item,
+			);
+
+			// Get Option Dislay Time
+			$displaytime	= isset($item->displaytime) ? $item->displaytime : '';
+
+			$events_per_day	= array();
+
+			$countEventDates = count($AllDates);
+
+			// Get List of Dates
+			if (is_array($event))
+			{
+				$past_dates = 0;
+
+				foreach ($AllDates as &$d)
+				{
+					// Control if date is past
+					if (strtotime($d) < strtotime($datetime_today))
+					{
+						$past_dates = $past_dates + 1;
+					}
+				}
+
+				unset($d);
+
+				$iCmenuitem = is_numeric($iCmenuitem) ? $iCmenuitem : '';
+
+				foreach ($AllDates as &$d)
+				{
+					$urlevent       = '';
+					$event_filters  = array(
+										'date'      => $d,
+										'catid'     => $item->catid,
+										'language'  => $item->language,
+										'access'    => $item->access,
+									);
+
+					// If use menu item filters
+					if ($iCmenu_filters === '1')
+					{
+						$linkid = $iCmenuitem
+								? icagendaMenus::displayEventItemid($iCmenuitem, $event_filters)
+								: icagendaMenus::thisEventItemid($d, $item->catid, $iC_list_menus);
+					}
+					else
+					{
+						$linkid = $iCmenuitem ? $iCmenuitem : icagendaMenus::thisEventItemid($d, $item->catid, $iC_list_menus);
+						$linkid = $linkid ? $linkid : $menu->getDefault($lang->getTag())->id;
+					}
+
+					$eventnumber	= $item->id ? $item->id : null;
+					$event_slug		= $item->alias ? $item->id . ':' . $item->alias : $item->id;
+
+					if ( $linkid >= 0
+						&& JComponentHelper::getComponent('com_icagenda', true)->enabled
+						)
+					{
+						$urlevent   = 'index.php?option=com_icagenda&amp;view=event&amp;id='
+									. $event_slug . '&amp;Itemid=' . (int) $linkid;
+					}
+
+
+					$this_date_utc  = date('Y-m-d H:i', strtotime($d));
+
+					// Set variable date-alias in url & registration deadline datetime
+					if ($only_startdate && in_array($this_date_utc, $perioddates))
+					{
+						$set_date_in_url = '';
+
+						$regDeadlineDatetime	= ($reg_deadline == '2')
+												? JHtml::date($item->enddate, 'Y-m-d H:i:s', false)
+												: JHtml::date($item->startdate, 'Y-m-d H:i:s', false);
+					}
+					else
+					{
+//						$set_date_in_url = $date_var . iCDate::dateToAlias($d, 'Y-m-d H:i');
+						$set_date_in_url = '&amp;date=' . iCDate::dateToAlias($d, 'Y-m-d H:i');
+
+						if ($reg_deadline == '2')
+						{
+							$regDeadlineDatetime	= (in_array($this_date_utc, $perioddates))
+													? JHtml::date($d, 'Y-m-d', false) . ' ' . JHtml::date($item->enddate, 'H:i:s', false)
+													: JHtml::date($d, 'Y-m-d', false) . ' 23:59:59';
+						}
+						else
+						{
+							$regDeadlineDatetime	= JHtml::date($d, 'Y-m-d H:i:s', false);
+						}
+					}
+
+					if ($r_time)
+					{
+						$time = array(
+							'time'			=> date($lang_time, strtotime($d)),
+							'displaytime'	=> $displaytime,
+							'url'			=> JRoute::_($urlevent . $set_date_in_url),
+						);
+					}
+					else
+					{
+						$time = array(
+							'time'			=> '',
+							'displaytime'	=> '',
+							'url'			=> JRoute::_($urlevent . $set_date_in_url),
+						);
+					}
+
+					$event = array_merge($event, $time);
+
+					$this_date = $item->reg_date ? date('Y-m-d H:i:s', strtotime($d)) : 'period';
+
+					$registrations	= ($dp_regInfos == 1) ? true : false;
+					$registered		= ($dp_regInfos == 1)
+									? self::getNbTicketsBooked($this_date, $item->registered, $eventnumber, $set_date_in_url, $typeReg)
+									: false;
+					$maxTickets		= ($maxReg != '1000000') ? $maxReg : false;
+					$TicketsLeft	= ($dp_regInfos == 1 && $maxReg)
+									? ($maxReg - $registered)
+									: false;
+
+					$canRegister	= (JHtml::date('Now', 'Y-m-d H:i:s', false) <= $regDeadlineDatetime)
+									? true
+									: false;
+
+
+					// Registration for all dates, and no ticket left
+					if ($typeReg == '2'
+						&& $TicketsLeft <= 0)
+					{
+						$date_sold_out	= JText::_('MOD_ICCALENDAR_REGISTRATION_CLOSED');
+					}
+
+					// Registration by date, and no ticket left
+					elseif ($TicketsLeft <= 0)
+					{
+						$date_sold_out	= JText::_('MOD_ICCALENDAR_REGISTRATION_DATE_NO_TICKETS_LEFT');
+					}
+
+					// Registration for all dates + Registration until START date + first date past.
+					elseif ($typeReg == '2'
+						&& ($reg_deadline != '2'
+							&& ((iCDate::isDate($startDate_TZ) && $startDate_TZ < $datetime_today)
+							|| (isset($allSingleDates_array[0]) && $allSingleDates_array[0] < $datetime_today))
+							)
+						)
+					{
+						$date_sold_out	= JText::_('MOD_ICCALENDAR_REGISTRATION_CLOSED');
+					}
+
+					// Registration for all dates + Registration until END date + first date past.
+					elseif ($typeReg == '2'
+						&& ($reg_deadline == '2'
+							&& ((iCDate::isDate($endDate_TZ) && $endDate_TZ < $datetime_today)
+							|| (end($allSingleDates_array) < $datetime_today))
+							)
+						)
+					{
+						$date_sold_out	= JText::_('MOD_ICCALENDAR_REGISTRATION_CLOSED');
+					}
+
+					// Registration by date, and registration deadline is over
+					elseif ( ! $canRegister && $typeReg != '2')
+					{
+						$date_sold_out	= ($TicketsLeft <= 0 && $countEventDates > 1 && $past_dates < $countEventDates)
+										? JText::_('MOD_ICCALENDAR_REGISTRATION_DATE_NO_TICKETS_LEFT')
+										: JText::_('MOD_ICCALENDAR_REGISTRATION_CLOSED');
+					}
+
+					// @todo : test last change > can or cannot register ? (check if needed)
+					elseif ($maxTickets
+						&& $canRegister
+						&& $typeReg != '2'
+						)
+					{
+						$date_sold_out	= ($TicketsLeft <= 0)
+										? JText::_('MOD_ICCALENDAR_REGISTRATION_DATE_NO_TICKETS_LEFT')
+										: false;
+					}
+
+					else
+					{
+						$date_sold_out	= false;
+					}
+
+					$reg_infos = array(
+						'registrations'	=> $registrations,
+						'registered'	=> $registered,
+						'maxTickets'	=> $maxTickets,
+						'TicketsLeft'	=> $TicketsLeft,
+						'date_sold_out'	=> $date_sold_out,
+					);
+
+					$event = array_merge($event, $reg_infos);
+
+					foreach ($days as $k => $dy)
+					{
+						$d_date		= date('Y-m-d', strtotime($d));
+						$dy_date	= date('Y-m-d', strtotime($dy['date']));
+
+						if ($d_date == $dy_date && $linkid)
+						{
+							array_push ($days[$k]['events'], $event);
+//							$days[$k]['events'][]= $event;
+						}
+					}
+				}
+
+				unset($d);
+			}
+		}
+
+		return $days;
+
+	}
+
+	public static function getNbTicketsBooked($date, $event_registered, $event_id, $set_date_in_url, $typeReg)
+	{
+		$event_registered	= is_array($event_registered) ? $event_registered : array();
+		$nb_registrations	= 0;
+
+		foreach ($event_registered as &$reg)
+		{
+			$ex_reg = explode('@@', $reg); // eventid@@date@@period@@people
+
+			if ((date('Y-m-d H:i', strtotime($date)) == date('Y-m-d H:i', strtotime($ex_reg[1]))
+					|| (! iCDate::isDate($ex_reg[1]) && $ex_reg[2] == 1))
+				&& $typeReg == 1
+				&& $event_id == $ex_reg[0]
+				)
+			{
+				$nb_registrations = $nb_registrations + $ex_reg[3];
+			}
+
+			elseif ( ! iCDate::isDate($date)
+				&& $typeReg == 1
+				&& $event_id == $ex_reg[0]
+				)
+			{
+				$nb_registrations = $nb_registrations + $ex_reg[3];
+			}
+
+			elseif ($typeReg == 2)
+			{
+				$nb_registrations = $nb_registrations + $ex_reg[3];
+			}
+
+//			elseif ( ! $date || $date == 'period')
+//			{
+//				$nb_registrations = $nb_registrations + $ex_reg[3];
+//			}
+//			elseif (date('Y-m-d H:i', strtotime($date)) == date('Y-m-d H:i', strtotime($ex_reg[1])))
+//			{
+//				$nb_registrations = $nb_registrations + $ex_reg[3];
+//			}
+//			elseif ( ! $set_date_in_url && $ex_reg[1] == 'period' && $event_id == $ex_reg[0])
+//			{
+//				$nb_registrations = $nb_registrations + $ex_reg[3];
+//			}
+		}
+
+		return $nb_registrations;
+	}
+
+
+	// Function to get Format Date (using option format, and translation)
+	protected function formatDate($date, $tz = false)
+	{
+		// Date Format Option (Global Component Option)
+		$date_format_global	= JComponentHelper::getParams('com_icagenda')->get('date_format_global', 'Y - m - d');
+		$date_format_global	= ($date_format_global !== '0') ? $date_format_global : 'Y - m - d'; // Previous 3.5.6 setting
+
+		// Date Format Option (Module Option)
+		$date_format_module	= isset($this->format) ? $this->format : '';
+		$date_format_module	= ($date_format_module !== '0') ? $date_format_module : ''; // Previous 3.5.6 setting
+
+		// Set Date Format option to be used
+		$format				= $date_format_module ? $date_format_module : $date_format_global;
+
+		// Separator Option
+		$separator			= isset($this->date_separator) ? $this->date_separator : ' ';
+
+		if ( ! is_numeric($format))
+		{
+			// Update old Date Format options of versions before 2.1.7
+			$format = str_replace(array('nosep', 'nosep', 'sepb', 'sepa'), '', $format);
+			$format = str_replace('.', ' .', $format);
+			$format = str_replace(',', ' ,', $format);
+		}
+
+		$dateFormatted = iCGlobalize::dateFormat($date, $format, $separator, $tz);
+
+		return $dateFormatted;
+	}
+
+
+	// Function to get TimeZone offset
+	function get_timezone_offset($remote_tz, $origin_tz = null)
+	{
+		if ($origin_tz === null)
+		{
+			if (!is_string($origin_tz = date_default_timezone_get()))
+			{
+				return false; // A UTC timestamp was returned -- bail out!
+			}
+		}
+
+		$origin_dtz	= new DateTimeZone($origin_tz);
+		$remote_dtz	= new DateTimeZone($remote_tz);
+		$origin_dt	= new DateTime("now", $origin_dtz);
+		$remote_dt	= new DateTime("now", $remote_dtz);
+		$offset		= $origin_dtz->getOffset($origin_dt) - $remote_dtz->getOffset($remote_dt);
+
+		return $offset;
+	}
+
+	function getNbOfDaysInMonth($date)
+	{
+		$lang = JFactory::getLanguage();
+
+		// Get Nb of days in the month in Jalali/Persian calendar
+		if ($lang->getTag() == 'fa-IR')
+		{
+			$date_to_persian	= $date;
+			$persian_month		= date('m', strtotime($date_to_persian));
+			$persian_year		= date('Y', strtotime($date_to_persian));
+			$leap_year			= fa_IRDate::leap_persian($persian_year);
+
+			if ($persian_month < 7)
+			{
+				$days = 31;
+			}
+			elseif ($persian_month == 12)
+			{
+				$days = $leap_year ? 30 : 29;
+			}
+			else
+			{
+				$days = 30;
+			}
+		}
+
+		// Get Nb of days in the month in Gregorian calendar
+		else
+		{
+			$days = date("t", strtotime($date));
+		}
+
+		return $days;
+	}
+
+	// Generate the days of the month
+	function getDays($d, $f)
+	{
+		$lang = JFactory::getLanguage();
+		$eventTimeZone = null;
+
+		$days = self::getNbOfDaysInMonth($d);
+
+		// Set Month and Year
+		$ex_data	= explode('-', $d);
+		$month		= $ex_data[1];
+		$year		= $ex_data[0];
+		$jour		= $ex_data[2];
+
+		$list = array();
+
+		//
+		// Setting function of the visitor Time Zone
+		//
+		$today = time();
+
+		$config			= JFactory::getConfig();
+		$joomla_offset	= $config->get('offset');
+
+		$displayDatesTimezone = '0'; // Option not active
+
+		$opt_TimeZone = isset($this->setTodayTimezone) ? $this->setTodayTimezone : '';
+
+		$gmt_today			= gmdate('Y-m-d H:i:s', $today);
+		$today_timestamp	= strtotime($gmt_today);
+		$GMT_timezone		= 'Etc/UTC';
+
+		if ($opt_TimeZone == 'SITE')
+		{
+			// Joomla Server Time Zone
+			$visitor_timezone	= $joomla_offset;
+			$offset				= $this->get_timezone_offset($GMT_timezone, $visitor_timezone);
+			$visitor_today		= JHtml::date(($today_timestamp+$offset), 'Y-m-d H:i:s', null);
+			$UTCsite			= $offset / 3600;
+
+			if ($UTCsite > 0) $UTCsite = '+'.$UTCsite;
+
+			if ($displayDatesTimezone == '1')
+			{
+				echo '<small>' . JHtml::date('now', 'Y-m-d H:i:s', true) . ' UTC' . $UTCsite . '</small><br />';
+			}
+		}
+		elseif ($opt_TimeZone == 'UTC')
+		{
+			// UTC Time Zone
+			$offset			= 0;
+			$visitor_today = JHtml::date(($today_timestamp+$offset), 'Y-m-d H:i:s', null);
+			$UTC			= $offset / 3600;
+
+			if ($UTC > 0) $UTC = '+'.$UTC;
+
+			if ($displayDatesTimezone == '1')
+			{
+				echo '<small>' . gmdate('Y-m-d H:i:s', $today) . ' UTC' . $UTC . '</small><br />';
+			}
+		}
+		else
+		{
+			$visitor_today = JHtml::date(($today_timestamp), 'Y-m-d H:i:s', null);
+		}
+
+		$date_today	= str_replace(' ', '-', $visitor_today);
+		$date_today	= str_replace(':', '-', $date_today);
+		$ex_data	= explode('-', $date_today);
+		$v_month	= $ex_data[1];
+		$v_year		= $ex_data[0];
+		$v_day		= $ex_data[2];
+		$v_hours	= $ex_data[3];
+		$v_minutes	= $ex_data[4];
+
+		for ($a = 1; $a <= $days; $a++)
+		{
+			$calday = $a;
+
+			$this_date_a = $year . '-' . $month . '-' . $a;
+
+			if ($lang->getTag() == 'fa-IR')
+			{
+				$this_date_cal = iCGlobalizeConvert::jalaliToGregorian($year, $month, $a, true);
+			}
+			else
+			{
+				$this_date_cal = $year . '-' . $month . '-' . $a;
+			}
+
+			if (($a == $v_day) && ($month == $v_month) && ($year == $v_year))
+			{
+				$classDay = 'style_Today';
+			}
+			else
+			{
+				$classDay = 'style_Day';
+			}
+
+			$datejour			= JHtml::date($this_date_cal, 'Y-m-d', $eventTimeZone);
+			$this_year_month	= $year . '-' . $month . '-00';
+			$list_a_date		= date('Y-m-d H:i', strtotime($this_date_a));
+
+			// Set Date in tooltip header
+			$date_to_format					= $this->formatDate($this_date_cal, false);
+			$list[$calday]['dateTitle']		= $date_to_format;
+
+//			$list[$calday]['datecal']		= JHtml::date($this_date_a, 'j', null);
+//			$list[$calday]['monthcal']		= JHtml::date($this_date_a, 'm', null);
+//			$list[$calday]['yearcal']		= JHtml::date($this_date_a, 'Y', null);
+
+			$list[$calday]['date']			= date('Y-m-d H:i', strtotime($this_date_cal));
+
+//			$list[$calday]['dateFormat']	= strftime($f, strtotime($this_date_a));
+			$list[$calday]['week']			= date('N', strtotime($this_date_a));
+			$list[$calday]['day']			= '<div class="' . $classDay . '">' . $a . '</div>';
+
+			// Set cal_date
+			$list[$calday]['this_day']		= date('Y-m-d', strtotime($this_date_a));
+
+			// Added in 2.1.2 (change in NAME_day.php)
+			$list[$calday]['ifToday']		= $classDay;
+			$list[$calday]['Days']			= $a;
+
+			// Set event array
+			$list[$calday]['events']		= array();
+		}
+
+		return $list;
+	}
+	/***/
+
+
+	/**
+	 * Single Dates list for one event
+	 */
+	private function getDatelist($dates)
+	{
+		$dates  = iCString::isSerialized($dates) ? unserialize($dates) : array();
+		$list   = array();
+
+		foreach ($dates as &$d)
+		{
+			if (iCDate::isDate($d))
+			{
+//				array_push($list, date('Y-m-d H:i', strtotime($d)));
+				$list[]= date('Y-m-d H:i', strtotime($d));
+			}
+		}
+
+		return $list;
+	}
+
+
+	/** Systeme de navigation **/
+	function getNav($date_start, $modid)
+	{
+		$app	= JFactory::getApplication();
+		$isSef	= $app->getCfg( 'sef' );
+
+		// Return Current URL
+		$url	= JUri::getInstance()->toString() . '#tag';
+		$url	= preg_replace('/&iccaldate=[^&]*/', '', $url);
+		$url	= preg_replace('/\?iccaldate=[^\?]*/', '', $url);
+
+		// Set Separator for Navigation Var
+		$separator = strpos($url, '?') !== false ? '&amp;' : '?';
+
+		// Remove fragment (hashtag could be added by a third party extension, eg. nonumber framework)
+		$parsed_url	= parse_url($url);
+		$fragment	= isset($parsed_url['fragment']) ? '#' . $parsed_url['fragment'] : '';
+
+		$url	= str_replace($fragment, '', $url);
+
+		// Return Current URL Filtered
+		$url	= htmlspecialchars($url);
+
+		// Start Date
+		$ex_date	= explode('-', $date_start);
+		$year		= $ex_date[0];
+		$month		= $ex_date[1];
+		$day		= 1;
+
+		if ($month != 1)
+		{
+			$backMonth = $month-1;
+			$backYear = $year;
+		}
+		elseif ($month == 1)
+		{
+			$backMonth = 12;
+			$backYear = $year-1;
+		}
+
+		if ($month != 12)
+		{
+			$nextMonth = $month+1;
+			$nextYear = $year;
+		}
+		elseif ($month == 12)
+		{
+			$nextMonth = 1;
+			$nextYear = $year+1;
+		}
+
+		$backYYear = $year-1;
+		$nextYYear = $year+1;
+
+		// A11Y (experimental, since 3.5.14) : see https://www.w3.org/TR/2012/NOTE-WCAG20-TECHS-20120103/C7
+		$icTitleAccess = 'height: 1px; width: 1px; position: absolute; overflow: hidden; top: -10px;';
+
+		// Create Navigation Arrows
+		$classBackYear	= 'backicY icagendabtn_' . $modid;
+		$urlBackYear	= $url . $separator . 'iccaldate=' . $backYYear . '-' . $month . '-' . $day;
+		$iconBackYear	= '<span class="iCicon iCicon-backicY"></span>';
+
+		$backY	= '<a id="ic-prev-year" class="' . $classBackYear . '"'
+				. ' href="' . $urlBackYear . '"'
+//				. ' title="' . JText::_('MOD_ICCALENDAR_PREVIOUS_YEAR') . '"'
+				. ' rel="nofollow">'
+				. '<span style="' . $icTitleAccess . '" title="">' . JText::_('MOD_ICCALENDAR_PREVIOUS_YEAR') . '</span>'
+				. $iconBackYear
+				. '</a>';
+
+		$classBackMonth	= 'backic icagendabtn_' . $modid;
+		$urlBackMonth	= $url . $separator . 'iccaldate=' . $backYear . '-' . $backMonth . '-' . $day;
+		$iconBackMonth	= '<span class="iCicon iCicon-backic"></span>';
+
+		$back	= '<a id="ic-prev-month" class="' . $classBackMonth . '"'
+				. ' href="' . $urlBackMonth . '"'
+//				. ' title="' . JText::_('MOD_ICCALENDAR_PREVIOUS_MONTH') . '"'
+				. ' rel="nofollow">'
+				. '<span style="' . $icTitleAccess . '" title="">' . JText::_('MOD_ICCALENDAR_PREVIOUS_MONTH') . '</span>'
+				. $iconBackMonth
+				. '</a>';
+
+		$classNextMonth	= 'nextic icagendabtn_' . $modid;
+		$urlNextMonth	= $url . $separator . 'iccaldate=' . $nextYear . '-' . $nextMonth . '-' . $day;
+		$iconNextMonth	= '<span class="iCicon iCicon-nextic"></span>';
+
+		$next	= '<a id="ic-next-month" class="' . $classNextMonth . '"'
+				. ' href="' . $urlNextMonth . '"'
+//				. ' title="' . JText::_('MOD_ICCALENDAR_NEXT_MONTH') . '"'
+				. ' rel="nofollow">'
+				. '<span style="' . $icTitleAccess . '" title="">' . JText::_('MOD_ICCALENDAR_NEXT_MONTH') . '</span>'
+				. $iconNextMonth
+				. '</a>';
+
+		$classNextYear	= 'nexticY icagendabtn_' . $modid;
+		$urlNextYear	= $url . $separator . 'iccaldate=' . $nextYYear . '-' . $month . '-' . $day;
+		$iconNextYear	= '<span class="iCicon iCicon-nexticY"></span>';
+
+		$nextY	= '<a id="ic-next-year" class="' . $classNextYear . '"'
+				. ' href="' . $urlNextYear . '"'
+//				. ' title="' . JText::_('MOD_ICCALENDAR_NEXT_YEAR') . '"'
+				. ' rel="nofollow">'
+				. '<span style="' . $icTitleAccess . '" title="">' . JText::_('MOD_ICCALENDAR_NEXT_YEAR') . '</span>'
+				. $iconNextYear
+				. '</a>';
+
+		if ( ! $this->month_nav) $back = $next = '';
+		if ( ! $this->year_nav) $backY = $nextY = '';
+
+		/** translate the month in the calendar module -- Leland Vandervort **/
+		$dateFormat = date('Y-m-d', strtotime($date_start));
+
+		// split out the month and year to obtain translation key for JText using joomla core translation
+		$t_day		= strftime("%d", strtotime("$dateFormat"));
+		$t_month	= date('F', strtotime($dateFormat));
+		$t_year		= strftime("%Y", strtotime("$dateFormat"));
+
+		$lang		= JFactory::getLanguage();
+		$langTag	= $lang->getTag();
+
+		$yearBeforeMonth = array('ar-AA', 'ja-JP', 'hu-HU', 'zh-CN', 'zh-TW');
+
+		$monthBeforeYear = in_array($langTag, $yearBeforeMonth) ? 0 : 1;
+
+		/**
+		 * Get prefix, suffix and separator for month and year in calendar title
+		 */
+
+		// Separator Month/Year
+		$separator_month_year = JText::_('SEPARATOR_MONTH_YEAR');
+		if ($separator_month_year == 'CALENDAR_SEPARATOR_MONTH_YEAR_FACULTATIVE')
+		{
+			$separator_month_year = ' ';
+		}
+		elseif ($separator_month_year == 'NO_SEPARATOR')
+		{
+			$separator_month_year = '';
+		}
+
+		// Prefix Month (Facultative)
+		$prefix_month = JText::_('PREFIX_MONTH');
+		if ($prefix_month == 'CALENDAR_PREFIX_MONTH_FACULTATIVE')
+		{
+			$prefix_month = '';
+		}
+
+		// Suffix Month (Facultative)
+		$suffix_month = JText::_('SUFFIX_MONTH');
+		if ($suffix_month == 'CALENDAR_SUFFIX_MONTH_FACULTATIVE')
+		{
+			$suffix_month = '';
+		}
+
+		// Prefix Year (Facultative)
+		$prefix_year = JText::_('PREFIX_YEAR');
+		if ($prefix_year == 'CALENDAR_PREFIX_YEAR_FACULTATIVE')
+		{
+			$prefix_year = '';
+		}
+
+		// Suffix Year (Facultative)
+		$suffix_year = JText::_('SUFFIX_YEAR');
+		if ($suffix_year == 'CALENDAR_SUFFIX_YEAR_FACULTATIVE')
+		{
+			$suffix_year = '';
+		}
+
+		$SEP	= $separator_month_year;
+		$PM		= $prefix_month;
+		$SM		= $suffix_month;
+		$PY		= $prefix_year;
+		$SY		= $suffix_year;
+
+		// Get MONTH_CAL string or if not translated, use MONTHS
+		$array_months = array(
+			'JANUARY', 'FEBRUARY', 'MARCH', 'APRIL', 'MAY', 'JUNE',
+			'JULY', 'AUGUST', 'SEPTEMBER', 'OCTOBER', 'NOVEMBER', 'DECEMBER'
+		);
+
+		$cal_string			= $t_month . '_CAL';
+		$missing_cal_string	= iCFilterOutput::stringToJText($cal_string);
+
+		if ( in_array($missing_cal_string, $array_months) )
+		{
+			// if MONTHS_CAL strings not translated in current language, use MONTHS strings
+			$month_J = JText::_( $t_month );
+		}
+		else
+		{
+			// Use MONTHS_CAL strings when translated in current language
+			$month_J = JText::_( $t_month . '_CAL' );
+		}
+
+		// Set Calendar Title
+		if ($monthBeforeYear == 0)
+		{
+			$title = $PY . $t_year . $SY . $SEP . $PM . $month_J . $SM;
+		}
+		else
+		{
+			$title = $PM . $month_J . $SM . $SEP . $PY . $t_year . $SY;
+		}
+
+		// Set Nav Bar for calendar
+		$html = '<div class="icnav">' . $backY . $back . $nextY . $next;
+		$html.= '<div class="titleic">' . $title . '</div>';
+		$html.= '</div><div style="clear:both"></div>';
+
+		return $html;
+	}
+}
+
+
+class cal
+{
+	public $data;
+	public $template;
+	public $t_calendar;
+	public $t_day;
+	public $nav;
+	public $fontcolor;
+	private $header_text;
+
+	function __construct ($data, $t_calendar, $t_day, $nav,
+		$firstday, $columns_bg_color,
+		$calfontcolor, $OneEventbgcolor, $Eventsbgcolor, $bgcolor, $bgimage, $bgimagerepeat,
+		$moduleclass_sfx, $modid, $template, $ictip_ordering, $header_text)
+	{
+		$this->data				= $data;
+		$this->t_calendar		= $t_calendar;
+		$this->t_day			= $t_day;
+		$this->nav				= $nav;
+		$this->firstday			= $firstday;
+		$this->calfontcolor		= $calfontcolor;
+		$this->OneEventbgcolor	= $OneEventbgcolor;
+		$this->Eventsbgcolor	= $Eventsbgcolor;
+		$this->bgcolor			= $bgcolor;
+		$this->bgimage			= $bgimage;
+		$this->bgimagerepeat	= $bgimagerepeat;
+		$this->moduleclass_sfx	= $moduleclass_sfx;
+		$this->modid			= $modid;
+		$this->template			= $template;
+		$this->ictip_ordering	= $ictip_ordering;
+		$this->header_text		= $header_text;
+
+		// Columns Background colors
+		$cbc					= $columns_bg_color;
+
+		$this->weekdays = array('MON', 'TUE', 'WED', 'THU', 'FRI', 'SAT', 'SUN');
+
+		switch ($this->firstday)
+		{
+			case 0:
+				$this->colbg	= array($cbc[0], $cbc[1], $cbc[2], $cbc[3], $cbc[4], $cbc[5], $cbc[6]);
+				$this->day		= array(7, 1, 2, 3, 4, 5, 6);
+				break;
+
+			case 1:
+				$this->colbg	= array($cbc[1], $cbc[2], $cbc[3], $cbc[4], $cbc[5], $cbc[6], $cbc[0]);
+				$this->day		= array(1, 2, 3, 4, 5, 6, 7);
+				break;
+
+			case 2:
+				$this->colbg	= array($cbc[2], $cbc[3], $cbc[4], $cbc[5], $cbc[6], $cbc[0], $cbc[1]);
+				$this->day		= array(2, 3, 4, 5, 6, 7, 1);
+				break;
+
+			case 3:
+				$this->colbg	= array($cbc[3], $cbc[4], $cbc[5], $cbc[6], $cbc[0], $cbc[1], $cbc[2]);
+				$this->day		= array(3, 4, 5, 6, 7, 1, 2);
+				break;
+
+			case 4:
+				$this->colbg	= array($cbc[4], $cbc[5], $cbc[6], $cbc[0], $cbc[1], $cbc[2], $cbc[3]);
+				$this->day		= array(4, 5, 6, 7, 1, 2, 3);
+				break;
+
+			case 5:
+				$this->colbg	= array($cbc[5], $cbc[6], $cbc[0], $cbc[1], $cbc[2], $cbc[3], $cbc[4]);
+				$this->day		= array(5, 6, 7, 1, 2, 3, 4);
+				break;
+
+			case 6:
+				$this->colbg	= array($cbc[6], $cbc[0], $cbc[1], $cbc[2], $cbc[3], $cbc[4], $cbc[5]);
+				$this->day		= array(6, 7, 1, 2, 3, 4, 5);
+				break;
+
+			default:
+				$this->colbg	= array($cbc[0], $cbc[1], $cbc[2], $cbc[3], $cbc[4], $cbc[5], $cbc[6]);
+				$this->day		= array(7, 1, 2, 3, 4, 5, 6);
+				break;
+		}
+	}
+
+
+	function days()
+	{
+		$this_calfontcolor	= str_replace(' ', '', $this->calfontcolor);
+		$calfontcolor		= ! empty($this_calfontcolor) ? ' color:' . $this->calfontcolor . ';' : '';
+		$this_bgcolor		= str_replace(' ', '', $this->bgcolor);
+		$bgcolor			= ! empty($this_bgcolor) ? ' background-color:' . $this->bgcolor . ';' : '';
+		$this_bgimage		= str_replace(' ', '', $this->bgimage);
+		$bgimage			= ! empty($this_bgimage) ? ' background-image:url(\'' . $this->bgimage . '\');' : '';
+		$this_bgimagerepeat	= str_replace(' ', '', $this->bgimagerepeat);
+		$bgimagerepeat		= ! empty($this_bgimagerepeat) ? ' background-repeat:' . $this->bgimagerepeat . ';' : '';
+		$iCcal_style		= '';
+
+		if ( ! empty($this_calfontcolor)
+			|| ! empty($this_bgcolor)
+			|| ! empty($this_bgimage)
+			|| ! empty($this_bgimagerepeat) )
+		{
+			$iCcal_style.= 'style="';
+		}
+
+		$iCcal_style.= $calfontcolor . $bgcolor . $bgimage;
+		$iCcal_style.= ($this_bgimagerepeat && $this_bgimage) ? $bgimagerepeat : '';
+		$iCcal_style.= (empty($this_bgcolor) && empty($this_bgimage)) ? ' background-color: transparent; background-image: none;' : '';
+		$iCcal_style.= '"';
+
+		// Verify Hex color strings
+		$OneEventbgcolor	= preg_match('/^#[a-f0-9]{6}$/i', $this->OneEventbgcolor) ? $this->OneEventbgcolor : '';
+		$Eventsbgcolor		= preg_match('/^#[a-f0-9]{6}$/i', $this->Eventsbgcolor) ? $this->Eventsbgcolor : '';
+
+		// Start HTML rendering of calendar
+		$calendar = '';
+
+		$calendar.= '<div class="' . $this->template . ' iccalendar ' . $this->moduleclass_sfx . '" ' . $iCcal_style . ' id="' . $this->modid . '">';
+
+
+		$calendar.= '<div id="mod_iccalendar_' . $this->modid . '">
+			<div class="icagenda_header">' . $this->header_text . '
+			</div>' . $this->nav . '
+			<table id="icagenda_calendar" class="ic-table" style="width:100%;">
+				<thead>
+					<tr>
+						<th style="width:14.2857143%;background:' . $this->colbg[0] . ';">' . JText::_($this->weekdays[($this->day[0]-1)]) . '</th>
+						<th style="width:14.2857143%;background:' . $this->colbg[1] . ';">' . JText::_($this->weekdays[($this->day[1]-1)]) . '</th>
+						<th style="width:14.2857143%;background:' . $this->colbg[2] . ';">' . JText::_($this->weekdays[($this->day[2]-1)]) . '</th>
+						<th style="width:14.2857143%;background:' . $this->colbg[3] . ';">' . JText::_($this->weekdays[($this->day[3]-1)]) . '</th>
+						<th style="width:14.2857143%;background:' . $this->colbg[4] . ';">' . JText::_($this->weekdays[($this->day[4]-1)]) . '</th>
+						<th style="width:14.2857143%;background:' . $this->colbg[5] . ';">' . JText::_($this->weekdays[($this->day[5]-1)]) . '</th>
+						<th style="width:14.2857143%;background:' . $this->colbg[6] . ';">' . JText::_($this->weekdays[($this->day[6]-1)]) . '</th>
+					</tr>
+				</thead>
+		';
+
+		switch ($this->data[1]['week'])
+		{
+			case $this->day[0]:
+				break;
+
+			case $this->day[1]:
+				$calendar.= '<tr><td colspan="1"></td>';
+				break;
+
+			case $this->day[2]:
+				$calendar.= '<tr><td colspan="2"></td>';
+				break;
+
+			case $this->day[3]:
+				$calendar.= '<tr><td colspan="3"></td>';
+				break;
+
+			case $this->day[4]:
+				$calendar.= '<tr><td colspan="4"></td>';
+				break;
+
+			case $this->day[5]:
+				$calendar.= '<tr><td colspan="5"></td>';
+				break;
+
+			case $this->day[6]:
+				$calendar.= '<tr><td colspan="6"></td>';
+				break;
+
+			default:
+				$calendar.= '<tr><td colspan="' . ($this->data[1]['week']-$this->firstday) . '"></td>';
+				break;
+		}
+
+		foreach ($this->data as &$d)
+		{
+			$stamp = new day($d);
+
+			switch($stamp->week)
+			{
+				case $this->day[0]:
+					$calendar.= '<tr><td style="background:' . $this->colbg[0] . ';">';
+					break;
+
+				case $this->day[1]:
+					$calendar.= '<td style="background:' . $this->colbg[1] . ';">';
+					break;
+
+				case $this->day[2]:
+					$calendar.= '<td style="background:' . $this->colbg[2] . ';">';
+					break;
+
+				case $this->day[3]:
+					$calendar.= '<td style="background:' . $this->colbg[3] . ';">';
+					break;
+
+				case $this->day[4]:
+					$calendar.= '<td style="background:' . $this->colbg[4] . ';">';
+					break;
+
+				case $this->day[5]:
+					$calendar.= '<td style="background:' . $this->colbg[5] . ';">';
+					break;
+
+				case $this->day[6]:
+					$calendar.= '<td style="background:' . $this->colbg[6] . ';">';
+					break;
+
+				default:
+					$calendar.= '<td>';
+					break;
+			}
+
+			$count_events = count($stamp->events);
+
+			if ($OneEventbgcolor
+				&& $OneEventbgcolor != ' '
+				&& $count_events == '1')
+			{
+				$bg_day = $OneEventbgcolor;
+			}
+			elseif ($Eventsbgcolor
+				&& $Eventsbgcolor != ' '
+				&& $count_events > '1')
+			{
+				$bg_day = $Eventsbgcolor;
+			}
+			else
+			{
+				$bg_day = isset($stamp->events[0]['cat_color']) ? $stamp->events[0]['cat_color'] : '#d4d4d4';
+			}
+
+			$bgcolor		= iCColor::getBrightness($bg_day);
+			$bgcolor		= ($bgcolor == 'bright') ? 'ic-bright' : 'ic-dark';
+			$order			= 'first';
+
+			$multi_events	= isset($stamp->events[1]['cat_color']) ? 'icmulti' : '';
+
+			// Ordering by time New Theme Packs (since 3.2.9)
+			$events			= $stamp->events;
+
+			// Option for Ordering is not yet finished. This developpement is in brainstorming...
+//			$ictip_ordering = '1';
+//			$ictip_ordering = $this->ictip_ordering;
+
+//			if ($ictip_ordering == '1_ASC-1_ASC' || $ictip_ordering == '1_ASC-1_DESC') $ictip_ordering = '1_ASC';
+//			if ($ictip_ordering == '2_ASC-2_ASC' || $ictip_ordering == '2_ASC-2_DESC') $ictip_ordering = '2_ASC';
+//			if ($ictip_ordering == '1_DESC-1_ASC' || $ictip_ordering == '1_DESC-1_DESC') $ictip_ordering = '1_DESC';
+//			if ($ictip_ordering == '2_DESC-2_ASC' || $ictip_ordering == '2_DESC-2_DESC') $ictip_ordering = '2_DESC';
+
+			// Create Functions for Ordering
+			// Default $newfunc_1_ASC_2_ASC - edited 2015-07-01 to fix ordering by Time when am/pm
+			
+			// @deprecated 3.6.14 (php 7.2 deprecated)
+// 			$newfunc_1_ASC_2_ASC = create_function('$a, $b', 'if ($a["time"] == $b["time"]){ return strcasecmp($a["cat_title"], $b["cat_title"]); } else { return strcasecmp(date("H:i", strtotime($a["time"])), date("H:i", strtotime($b["time"]))); }');
+
+//			$newfunc_1_ASC_2_DESC = create_function('$a, $b', 'if ($a["time"] == $b["time"]){ return strcasecmp($b["cat_title"], $a["cat_title"]); } else { return strcasecmp($a["time"], $b["time"]); }');
+//			$newfunc_1_DESC_2_ASC = create_function('$a, $b', 'if ($a["time"] == $b["time"]){ return strcasecmp($a["cat_title"], $b["cat_title"]); } else { return strcasecmp($b["time"], $a["time"]); }');
+//			$newfunc_1_DESC_2_DESC = create_function('$a, $b', 'if ($a["time"] == $b["time"]){ return strcasecmp($b["cat_title"], $a["cat_title"]); } else { return strcasecmp($b["time"], $a["time"]); }');
+
+//			$newfunc_2_ASC_1_ASC = create_function('$a, $b', 'if ($a["cat_title"] == $b["cat_title"]){ return strcasecmp($a["time"], $b["time"]); } else { return strcasecmp($a["cat_title"], $b["cat_title"]); }');
+//			$newfunc_2_ASC_1_DESC = create_function('$a, $b', 'if ($a["cat_title"] == $b["cat_title"]){ return strcasecmp($b["time"], $a["time"]); } else { return strcasecmp($a["cat_title"], $b["cat_title"]); }');
+//			$newfunc_2_DESC_1_ASC = create_function('$a, $b', 'if ($a["cat_title"] == $b["cat_title"]){ return strcasecmp($a["time"], $b["time"]); } else { return strcasecmp($b["cat_title"], $a["cat_title"]); }');
+//			$newfunc_2_DESC_1_DESC = create_function('$a, $b', 'if ($a["cat_title"] == $b["cat_title"]){ return strcasecmp($b["time"], $a["time"]); } else { return strcasecmp($b["cat_title"], $a["cat_title"]); }');
+
+//			$newfunc_1_ASC = create_function('$a, $b', 'return strcasecmp($a["time"], $b["time"]);');
+//			$newfunc_2_ASC = create_function('$a, $b', 'return strcasecmp($a["cat_title"], $b["cat_title"]);');
+
+//			$newfunc_1_DESC = create_function('$a, $b', 'return strcasecmp($b["time"], $a["time"]);');
+//			$newfunc_2_DESC = create_function('$a, $b', 'return strcasecmp($b["cat_title"], $a["cat_title"]);');
+
+			// Order by time - Old Theme Packs (before 3.2.9) : Update Theme Pack to get all options
+//			usort($stamp->events, $newfunc_1_ASC_2_ASC);
+			usort($stamp->events,
+				function($a, $b)
+				{
+					if ($a["time"] == $b["time"])
+					{
+						return strcasecmp($a["cat_title"], $b["cat_title"]);
+					}
+					else
+					{
+						return strcasecmp(date("H:i", strtotime($a["time"])), date("H:i", strtotime($b["time"])));
+					}
+				}
+			);
+
+			// Time ASC and if same time : Category Title ASC (default)
+//			if ($ictip_ordering == '1_ASC-2_ASC')
+//			{
+//				usort($events, $newfunc_1_ASC_2_ASC);
+				usort($events,
+					function($a, $b)
+					{
+						if ($a["time"] == $b["time"])
+						{
+							return strcasecmp($a["cat_title"], $b["cat_title"]);
+						}
+						else
+						{
+							return strcasecmp(date("H:i", strtotime($a["time"])), date("H:i", strtotime($b["time"])));
+						}
+					}
+				);
+//			}
+			// Time ASC and if same time : Category Title DESC
+//			elseif ($ictip_ordering == '1_ASC-2_DESC')
+//			{
+//				usort($events, $newfunc_1_ASC_2_DESC);
+//			}
+			// Time DESC and if same time : Category Title ASC
+//			elseif ($ictip_ordering == '1_DESC-2_ASC')
+//			{
+//				usort($events, $newfunc_1_DESC_2_ASC);
+//			}
+			// Time DESC and if same time : Category Title DESC
+//			elseif ($ictip_ordering == '1_DESC-2_DESC')
+//			{
+//				usort($events, $newfunc_1_DESC_2_DESC);
+//			}
+
+			// Category Title ASC and if same category : Time ASC
+//			elseif ($ictip_ordering == '2_ASC-1_ASC')
+//			{
+//				usort($events, $newfunc_2_ASC_1_ASC);
+//			}
+			// Category Title ASC and if same category : Time DESC
+//			elseif ($ictip_ordering == '2_ASC-1_DESC')
+//			{
+//				usort($events, $newfunc_2_ASC_1_DESC);
+//			}
+			// Category Title DESC and if same category : Time ASC
+//			elseif ($ictip_ordering == '2_DESC-1_ASC')
+//			{
+//				usort($events, $newfunc_2_DESC_1_ASC);
+//			}
+			// Category Title DESC and if same category : Time DESC
+//			elseif ($ictip_ordering == '2_DESC-1_DESC')
+//			{
+//				usort($events, $newfunc_2_DESC_1_DESC);
+//			}
+
+			// If main ordering and sub-ordering on Time : set TIME ASC (with no sub-ordering)
+//			elseif ($ictip_ordering == '1_ASC')
+//			{
+//				usort($events, $newfunc_1_ASC);
+//			}
+			// If main ordering and sub-ordering on Category Title : set CATEGORY TITLE ASC (with no sub-ordering)
+//			elseif ($ictip_ordering == '2_ASC')
+//			{
+//				usort($events, $newfunc_2_ASC);
+//			}
+
+
+			// Load template for day infotip
+//			require $this->t_day;
+			// Check to see if we have a valid template file
+			if (file_exists($this->t_day))
+			{
+				// Store the file path
+				$this->_file = $this->t_day;
+
+				// Get the file content
+				ob_start();
+				require $this->t_day;
+				$cal_day_layout = ob_get_contents();
+				ob_end_clean();
+			}
+
+			$calendar.= $cal_day_layout;
+
+			switch('week')
+			{
+				case $this->day[6]:
+					$calendar.= '</td></tr>';
+					break;
+
+				default:
+					$calendar.= '</td>';
+					break;
+			}
+		}
+
+		unset($d);
+
+		switch ($stamp->week)
+		{
+			case $this->day[6]:
+				break;
+
+			default:
+				$calendar.= '<td colspan="' . (7-$stamp->week) . '"></td></tr>';
+				break;
+		}
+
+		$calendar.= '</table></div>';
+
+		$calendar.= '</div>';
+
+		echo $calendar;
+	}
+}
+
+
+class day
+{
+	public $date;
+	public $week;
+	public $day;
+	public $month;
+	public $year;
+	public $events;
+	public $fontcolor;
+
+	function __construct($day)
+	{
+		foreach ($day as $k => $v)
+		{
+			$this->$k = $v;
+		}
+	}
+}
diff --git a/deployed/icagenda/modules/mod_iccalendar/index.html b/deployed/icagenda/modules/mod_iccalendar/index.html
new file mode 100644
index 00000000..e69de29b
diff --git a/deployed/icagenda/modules/mod_iccalendar/js/index.html b/deployed/icagenda/modules/mod_iccalendar/js/index.html
new file mode 100644
index 00000000..e69de29b
diff --git a/deployed/icagenda/modules/mod_iccalendar/js/jQuery.highlightToday.js b/deployed/icagenda/modules/mod_iccalendar/js/jQuery.highlightToday.js
new file mode 100644
index 00000000..5f84a31f
--- /dev/null
+++ b/deployed/icagenda/modules/mod_iccalendar/js/jQuery.highlightToday.js
@@ -0,0 +1,33 @@
+(function ($) {
+
+	$.fn.highlightToday = function(option) {
+		var d = new Date(),
+			day = '0' + d.getDate(),
+			month = '0' + (d.getMonth() + 1),
+			year = d.getFullYear(),
+			client_date = year + '-' + month.slice(-2) + '-' + day.slice(-2),
+			$today = $('.style_Today', this),
+			cal_date = $today.attr('data-cal-date');//cal_date='2014-01-07'; // Test data
+		if (typeof cal_date === 'undefined' || client_date !== cal_date) {
+			// Calendar date not in the displayed month - or client date is different
+			$today.removeClass('style_Today').addClass('style_Day');
+			$('.style_Day[data-cal-date="' + client_date + '"]', this).addClass('style_Today').removeClass('style_Day');
+			// Check whether the correct month is loaded if today is required to be shown
+			if (option === 'show_today') {
+				if ($('.style_Today', this).length === 0) {
+					// The current date is not shown (because of offset between server and client date)
+					if (client_date > cal_date) {
+						// Load next month
+						$('.nextic', this).click();
+					} else {
+						// Load previous month
+						$('.backic', this).click();
+					}
+				}
+			}
+		}
+		// Support chaining
+		return this;
+	};
+
+}(jQuery));
diff --git a/deployed/icagenda/modules/mod_iccalendar/js/jQuery.highlightToday.min.js b/deployed/icagenda/modules/mod_iccalendar/js/jQuery.highlightToday.min.js
new file mode 100644
index 00000000..f50e6dac
--- /dev/null
+++ b/deployed/icagenda/modules/mod_iccalendar/js/jQuery.highlightToday.min.js
@@ -0,0 +1 @@
+(function(e){e.fn.highlightToday=function(t){var n=new Date,r="0"+n.getDate(),i="0"+(n.getMonth()+1),s=n.getFullYear(),o=s+"-"+i.slice(-2)+"-"+r.slice(-2),u=e(".style_Today",this),a=u.attr("data-cal-date");if(typeof a==="undefined"||o!==a){u.removeClass("style_Today").addClass("style_Day");e('.style_Day[data-cal-date="'+o+'"]',this).addClass("style_Today").removeClass("style_Day");if(t==="show_today"){if(e(".style_Today",this).length===0){if(o>a){e(".nextic",this).click()}else{e(".backic",this).click()}}}}return this}})(jQuery)
diff --git a/deployed/icagenda/modules/mod_iccalendar/js/jquery.noconflict.js b/deployed/icagenda/modules/mod_iccalendar/js/jquery.noconflict.js
new file mode 100644
index 00000000..aa32286f
--- /dev/null
+++ b/deployed/icagenda/modules/mod_iccalendar/js/jquery.noconflict.js
@@ -0,0 +1 @@
+jQuery.noConflict();
\ No newline at end of file
diff --git a/deployed/icagenda/modules/mod_iccalendar/mod_iccalendar.php b/deployed/icagenda/modules/mod_iccalendar/mod_iccalendar.php
new file mode 100644
index 00000000..4a3fe09b
--- /dev/null
+++ b/deployed/icagenda/modules/mod_iccalendar/mod_iccalendar.php
@@ -0,0 +1,553 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Events Management Extension for Joomla!
+ *----------------------------------------------------------------------------
+ * @version     3.7.0 2018-05-17
+ *
+ * @package     iCagenda.Site
+ * @subpackage  mod_iccalendar
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ * @since       1.0
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * iCagenda - iC calendar
+ */
+
+// Get iCagenda component parameters
+$com_params = JComponentHelper::getParams('com_icagenda');
+
+// For Dev.
+$time_loading = $com_params->get('time_loading', '');
+
+if ($time_loading && class_exists('iCLibrary'))
+{
+	$starttime_cal = iCLibrary::getMicrotime();
+}
+
+jimport('joomla.application.component.helper');
+
+// Get Application
+$app    = JFactory::getApplication();
+$jinput = $app->input;
+
+// Check Errors: iC Library & iCagenda Utilities
+$UTILITIES_DIR = is_dir(JPATH_ADMINISTRATOR . '/components/com_icagenda/utilities');
+
+if ( (!$UTILITIES_DIR)
+	|| (!class_exists('iCLibrary')) )
+{
+	$alert_message = JText::_('ICAGENDA_CAN_NOT_LOAD').'<br />';
+	$alert_message.= '<ul>';
+	if (!class_exists('iCLibrary')) $alert_message.= '<li>' . JText::_('IC_LIBRARY_NOT_LOADED') . '</li>';
+	if (!$UTILITIES_DIR) $alert_message.= '<li>' . JText::_('ICAGENDA_A_FOLDER_IS_MISSING') . '</li>';
+	$alert_message.= '</ul>';
+	if (!$UTILITIES_DIR) $alert_message.= JText::_('ICAGENDA_IS_NOT_CORRECTLY_INSTALLED') . ' ';
+	if (!$UTILITIES_DIR) $alert_message.= JText::_('ICAGENDA_INSTALL_AGAIN') . '<br />';
+	if (!$UTILITIES_DIR) $alert_message.= JText::_('IC_ALTERNATIVELY') . ':<br /><ul>';
+	if ($UTILITIES_DIR) $alert_message.= JText::_('IC_PLEASE') . ', ';
+	if (!class_exists('iCLibrary'))
+	{
+		if (!$UTILITIES_DIR) $alert_message.= '<li>';
+		$alert_message.= JText::_('IC_LIBRARY_CHECK_PLUGIN_AND_LIBRARY');
+		if (!$UTILITIES_DIR) $alert_message.= '</li>';
+	}
+	if (!$UTILITIES_DIR)
+	{
+		$alert_message.= '<li>' . JText::Sprintf('ICAGENDA_UTILITIES_FIX_MANUAL'
+						, '<strong>admin/utilities</strong>'
+						, '<strong>administrator/components/com_icagenda/</strong>');
+		$alert_message.= '</li></ul>';
+	}
+
+	// Get the message queue
+	$messages = $app->getMessageQueue();
+
+	$display_alert_message = false;
+
+	// If we have messages
+	if (is_array($messages) && count($messages))
+	{
+		// Check each message for the one we want
+		foreach ($messages as $key => $value)
+		{
+			if ($value['message'] == $alert_message)
+			{
+				$display_alert_message = true;
+			}
+		}
+	}
+
+	if (!$display_alert_message)
+	{
+		$app->enqueueMessage($alert_message, 'error');
+	}
+
+	echo JText::_('IC_MODULE_CAN_NOT_BE_LOADED') . '<br />';
+	echo JText::_('IC_MODULE_CHECK_ALERT_MESSAGE');
+
+	return false;
+}
+
+// Load iCagenda Utilities
+JLoader::registerPrefix('icagenda', JPATH_ADMINISTRATOR . '/components/com_icagenda/utilities');
+
+jimport( 'joomla.environment.request' );
+
+// Get Document
+$document	= JFactory::getDocument();
+
+// Test if translation is missing, set to en-GB by default
+$language = JFactory::getLanguage();
+$language->load( 'mod_iccalendar', JPATH_SITE, 'en-GB', true );
+$language->load( 'mod_iccalendar', JPATH_SITE, null, true );
+
+// Include the class of the syndicate functions only once
+if ( ! class_exists('modiCcalendarHelper')) require_once(dirname(__FILE__) . '/helper.php');
+
+// Check valid NEXT DATE (removed 3.6.3)
+icagendaEventsData::getNext();
+
+// Module ID
+$modid		= $module->id;
+
+// Params of the Module iC Calendar
+$moduleclass_sfx	= htmlspecialchars($params->get('moduleclass_sfx'));
+$mouseover			= $params->get('mouseover', 'click');
+$mouseout			= $params->get('mouseout', 1);
+$columns_bg_color	= array(
+						$params->get('sun', ' '),
+						$params->get('mon', ' '),
+						$params->get('tue', ' '),
+						$params->get('wed', ' '),
+						$params->get('thu', ' '),
+						$params->get('fri', ' '),
+						$params->get('sat', ' '),
+					);
+$firstday			= $params->get('firstday', '1');
+$calfontcolor		= $params->get('calfontcolor', ' ');
+$OneEventbgcolor	= $params->get('OneEventbgcolor', ' ');
+$Eventsbgcolor		= $params->get('Eventsbgcolor', ' ');
+$bgcolor			= $params->get('bgcolor', ' ');
+$bgimage			= $params->get('bgimage');
+$bgimagerepeat		= $params->get('bgimagerepeat');
+$closebutton		= $params->get('calendarclosebtn', 1);
+$closebutton_custom	= $params->get('calendarclosebtn_Content', 'X');
+$theme_calendar		= $params->get('template', 'default');
+$firstMonth			= iCDate::isDate($params->get('firstMonth'))
+					? $params->get('firstMonth')
+					: '';
+
+$setTodayTimezone	= $params->get('setTodayTimezone', '');
+
+// Ordering set by default (time/category) - Option in developpement (Not used)
+$events_ordering_first	= $params->get('events_ordering_first', '1_ASC');
+$events_ordering_second	= $params->get('events_ordering_second', '2_ASC');
+$ictip_ordering			= $events_ordering_first.'-'.$events_ordering_second;
+
+$header_text			= $params->get('header_text', '');
+$padding				= $params->get('padding', '0');
+
+// Module
+$cal		= new modiCcalendarHelper;
+$data		= $cal->getStamp($params);
+$url_date	= $jinput->get('date');
+$iccaldate	= $jinput->get('iccaldate');
+
+// First day of the current month
+$this_month	= $firstMonth
+//			? date("Y-m-d", strtotime("+1 month", strtotime($firstMonth)))
+			? date("Y-m-01", strtotime($firstMonth))
+			: JHtml::date('now', 'Y-m-01', null);
+
+if ( isset($iccaldate)
+	&& !empty($iccaldate) )
+{
+	// This should be the first day of a month
+	$date_start = date('Y-m-01', strtotime($iccaldate));
+}
+else
+{
+	$date_start	= $this_month;
+}
+
+$nav = $cal->getNav($date_start, $modid);
+
+
+// Search template of iC Calendar from the selected Theme Pack
+$themes_path = '/components/com_icagenda/themes/packs/';
+
+if ( ! file_exists(JPATH_BASE . $themes_path . $theme_calendar . '/' . $theme_calendar . '_calendar.php'))
+{
+	$theme_calendar = 'default';
+}
+
+$theme_tmpl	= JPATH_BASE . $themes_path . $theme_calendar . '/' . $theme_calendar;
+$theme_css	= $themes_path . $theme_calendar . '/css/' . $theme_calendar;
+
+$t_calendar		= $theme_tmpl . '_calendar.php';
+$css_module		= $theme_css . '_module.css';
+$css_mod_rtl	= $theme_css . '_module-rtl.css';
+
+// ToolTip 2 in developpement (Not used)
+$tip_type = '1';
+
+if ($tip_type == 1)
+{
+	$t_day = $theme_tmpl . '_day.php';
+}
+elseif ($tip_type == 2)
+{
+	$t_day = $theme_tmpl . '_calendar_tip.php';
+}
+
+// Add the media specific CSS to the document
+icagendaThemeStyle::addMediaCss($theme_calendar, 'module');
+
+// Load Vector iCicons Font (navigation arrows)
+JHtml::stylesheet( 'media/com_icagenda/icicons/style.css' );
+
+// Theme pack component css
+$document->addStyleSheet( JURI::base( true ) . $css_module );
+
+// RTL css if site language is RTL
+$lang = JFactory::getLanguage();
+
+if ( $lang->isRTL()
+	&& file_exists( JPATH_SITE . $css_mod_rtl) )
+{
+	$document->addStyleSheet( JURI::base( true ) . $css_mod_rtl );
+}
+
+if (version_compare(JVERSION, '3.0', 'ge'))
+{
+	// Request Joomla to load jQuery in no conflict mode
+	JHtml::_('bootstrap.framework');
+	JHtml::_('jquery.framework');
+}
+else
+{
+	//Load JS
+	JHtml::_('behavior.mootools');
+
+	$header = $document->getHeadData();
+	$loadJquery = true;
+
+	switch($params->get('loadJquery',"auto"))
+	{
+		case "0":
+			$loadJquery = false;
+			break;
+		case "1":
+			$loadJquery = true;
+			break;
+		case "auto":
+			foreach ($header['scripts'] as $scriptName => $scriptData)
+			{
+				if (substr_count($scriptName,'jquery'))
+				{
+					$loadJquery = false;
+					break;
+				}
+			}
+			break;
+	}
+
+	//Add js
+	$app = JFactory::getApplication();
+
+	if ($loadJquery && !$app->get('jquery'))
+	{
+		$document->addScript( 'https://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js' );
+		$app->set('jquery', true);
+	}
+
+	$document->addScript( 'modules/mod_iccalendar/js/jquery.noconflict.js' );
+}
+
+if (ini_get('allow_url_fopen'))
+{
+	$file = file_get_contents($t_day);
+
+	if ( ! strpos($file, "data-cal-date"))
+	{
+		$server_date = false;
+		echo "<div class='alert alert-error'>'data-cal-date' not found in your Custom Theme Pack!</div>";
+	}
+	else
+	{
+		$server_date = true;
+	}
+}
+else
+{
+	$server_date = true;
+}
+
+if ( ! $setTodayTimezone && $server_date)
+{
+	$document->addScript( 'modules/mod_iccalendar/js/jQuery.highlightToday.min.js' );
+}
+
+
+$icclasstip		= '.icevent a';
+$icclass		= '.iccalendar';
+$icagendabtn	= '.icagendabtn_' . $modid;
+$mod_iccalendar	= '#mod_iccalendar_' . $modid;
+
+$close_btn		= ($closebutton == 1) ? $closebutton_custom : JText::_('MOD_ICCALENDAR_CLOSE');
+
+// Minimum popup width for mobile phone mode
+$mobile_min_width = 320;
+
+$stamp = new cal($data, $t_calendar, $t_day, $nav, $firstday, $columns_bg_color, $calfontcolor,
+		$OneEventbgcolor, $Eventsbgcolor, $bgcolor, $bgimage, $bgimagerepeat,
+		$moduleclass_sfx, $modid, $theme_calendar, $ictip_ordering, $header_text);
+
+// Load Calendar Template
+echo '<!-- iCagenda - Calendar -->';
+echo '<div tabindex="0" id="ic-calendar-' . $modid . '" class="">';
+require $t_calendar;
+echo '</div>';
+?>
+
+<script type="text/javascript">
+(function($){
+	var icmouse = '<?php echo $mouseover; ?>';
+	var mouseout = '<?php echo $mouseout; ?>';
+	var icclasstip = '<?php echo $icclasstip; ?>';
+	var icclass = '<?php echo $icclass; ?>';
+	var position = '<?php echo $params->get('position', 'center'); ?>';
+	var posmiddle = '<?php echo $params->get('posmiddle', 'top'); ?>';
+	var modid = '<?php echo $modid; ?>';
+	var modidid = '<?php echo '#'.$modid; ?>';
+	var icagendabtn = '<?php echo $icagendabtn; ?>';
+	var mod_iccalendar = '<?php echo $mod_iccalendar; ?>';
+	var template = '<?php echo '.'.$theme_calendar; ?>';
+	var loading = '<?php echo JText::_('MOD_ICCALENDAR_LOADING'); ?>';
+	var closetxt = '<?php echo $close_btn; ?>';
+	var tip_type = '<?php echo $tip_type; ?>';
+	var tipwidth = <?php echo (int)$params->get('tipwidth', 390) ?>;
+	var smallwidththreshold = <?php echo (int) $com_params->get('smallwidththreshold', 0) ?>;
+	var verticaloffset = <?php echo (int)$params->get('verticaloffset', 0) ?>;
+	var css_position = '';
+	var mobile_min_width = <?php echo $mobile_min_width; ?>;
+	var extra_css = '';
+
+	$(document).on('click touchend', icagendabtn, function(e){<?php // Refresh the current month ?>
+		e.preventDefault();
+
+		url=$(this).attr('href');
+
+		$(modidid).html('<\div class="icloading_box"><\div style="text-align:center;">' + loading + '<\/div><\div class="icloading_img"><\/div><\/div>').load(url + ' ' + mod_iccalendar, function(){$('<?php echo $mod_iccalendar ?>').highlightToday();});
+
+	});
+
+	// Calendar Keyboard Accessibility (experimental, since 3.5.14)
+	if (typeof first_mod === 'undefined') {
+		$i = '1';
+		first_mod = modid;
+		first_nb = $i;
+		nb_mod = $i;
+	} else {
+		$i = (typeof $i === 'undefined') ? '2' : ++$i;
+		nb_mod = $i;
+	}
+
+	$('#ic-calendar-'+modid).addClass('ic-'+nb_mod);
+
+	$(document).keydown(function(e){
+
+		// ctrl+alt+C : focus on first Calendar module
+		// REMOVE: Polish language conflict, alt+C Ć
+//		if (e.ctrlKey && e.altKey && e.keyCode == 67) {
+//			$('#ic-calendar-'+first_mod).focus();
+//		}
+
+		// ctrl+alt+N : focus on Next calendar module
+		if (e.ctrlKey && e.altKey && e.keyCode == 78) {
+			if ($('#ic-calendar-'+modid).is(':focus')) {
+				activ = $('#ic-calendar-'+modid).attr('class');
+				act = activ.split('-');
+				act = act[1];
+				next = ++act;
+			}
+			mod_class = $('#ic-calendar-'+modid).attr('class');
+			if ($('.ic-'+next).length == 0) next = 1;
+			if (mod_class == 'ic-'+next) $('.ic-'+next).focus();
+		}
+
+		// On focused calendar module
+		if ($('#ic-calendar-'+modid).is(':focus')){
+			switch (e.keyCode) {
+				case 37:
+					// Left arrow pressed
+					url = $('#ic-calendar-'+modid+' #ic-prev-month').attr('href');
+					break;
+				case 38:
+					// Top arrow pressed
+					url = $('#ic-calendar-'+modid+' #ic-next-year').attr('href');
+					break;
+				case 39:
+					// Right arrow pressed
+					url = $('#ic-calendar-'+modid+' #ic-next-month').attr('href');
+					break;
+				case 40:
+					// Top arrow pressed
+					url = $('#ic-calendar-'+modid+' #ic-prev-year').attr('href');
+					break;
+			}
+
+			if ((!e.shiftKey && (e.keyCode == 37 || e.keyCode == 39)) ||
+				(e.shiftKey && (e.keyCode == 38 || e.keyCode == 40))) {
+				$(modidid).html('<\div class="icloading_box"><\div style="text-align:center;">' + loading + '<\/div><\div class="icloading_img"><\/div><\/div>').load(url + ' ' + mod_iccalendar, function(){$('<?php echo $mod_iccalendar ?>').highlightToday();});
+			}
+
+//			if ($(modidid+' '+icclasstip).is(':focus') && e.keyCode == 13){
+//				var icmouse = "click";
+//			}
+		}
+	});
+
+	if (tip_type=='2') {<?php // Not used ?>
+	$(document).on(icmouse, this, function(e){
+		e.preventDefault();
+
+		$(".iCaTip").tipTip({maxWidth: "400", defaultPosition: "top", edgeOffset: 1, activation:"hover", keepAlive: true});
+	});
+	}
+
+	if (tip_type=='1') {<?php // Display the events popup ?>
+		$view_width=$(window).width();<?php // Get the viewport width ?>
+		if($view_width<smallwidththreshold){<?php // Mobile phones do not support 'hover' or 'click' in the conventional way ?>
+			icmouse='click touchend';
+		}
+
+		$(document).on(icmouse, modidid+' '+icclasstip, function(e){
+			$view_height=$(window).height();<?php // Get the viewport height ?>
+			$view_width=$(window).width();<?php // Get the viewport width ?>
+			e.preventDefault();
+			$('#ictip').remove();
+			$parent=$(this).parent();
+			$tip=$($parent).children(modidid+' .spanEv').html();
+
+			if ($view_width < smallwidththreshold)
+			{
+				<?php // Mobile phone style - fill the viewport ?>
+				css_position = 'fixed';
+				$width_px = Math.max(mobile_min_width,$view_width); <?php // Popup width is screen width (minimum 320px) ?>
+				$width = '100%';
+				$pos = '0px';
+				$top = '0px';
+				extra_css='border:0;border-radius:0;height:100%;box-shadow:none;margin:0px;padding:10px;min-width:'+mobile_min_width+'px;overflow-y:scroll;padding:<?php echo $padding ?>;';<?php // iPhone friendly size and allow scrolling if the page overflows ?>
+			}
+			else
+			{
+				css_position = 'absolute';
+				$width_px = Math.min($view_width, tipwidth);
+				$width = $width_px+'px';
+
+				<?php // Horizontal positioning ?>
+				switch(position) {
+					case 'left':
+						$pos=Math.max(0,$(modidid).offset().left-$width_px-10)+'px';
+						break;
+					case 'right':
+						$pos=Math.max(0,Math.min($view_width-$width_px,$(modidid).offset().left+$(modidid).width()+10))+'px';
+						break;
+					default:<?php //Centre ?>
+						$pos=Math.ceil(($view_width-$width_px)/2)+'px';
+						break;
+				}
+
+				<?php // Vertical positioning ?>
+				if (posmiddle === 'top')
+				{
+					$top = Math.max(0,$(modidid).offset().top-verticaloffset)+'px';<?php // Top ?>
+				}
+				else
+				{
+					$top = Math.max(0,$(modidid).offset().top+$(modidid).height()-verticaloffset)+'px';<?php // Bottom ?>
+				}
+			}
+
+
+			$('body').append('<\div style="display:block; position:'+css_position+'; width:'+$width+'; left:'+$pos+'; top:'+$top+';'+extra_css+'" id="ictip"> '+$(this).parent().children('.date').html()+'<a class="close" style="cursor: pointer;"><\div style="display:block; width:auto; height:50px; text-align:right;">' + closetxt + '<\/div></a><span class="clr"></span>'+$tip+'<\/div>');
+
+			// Tooltip Keyboard Accessibility (experimental, since 3.5.14)
+			$(document).keydown(function(e){
+				//	Shift : focus on tooltip events
+				if ($('.icevent a').is(':focus') && e.keyCode == 16){
+					$('.ictip-event a').focus();
+				}
+				//	esc : close tooltip
+				if (($('.ictip-event a').is(':focus') || $('.icevent a').is(':focus')) && e.keyCode == 27){
+					e.preventDefault();
+					$('#ictip').remove();
+				}
+			});
+
+			// Close Tooltip
+			$(document).on('click touchend', '.close', function(e){
+				e.preventDefault();
+				$('#ictip').remove();
+			});
+
+			if (mouseout == '1')
+			{
+				$('#ictip')
+					.mouseout(function() {
+//						$( "div:first", this ).text( "mouse out" );
+						$('#ictip').stop(true).fadeOut(300);
+					})
+					.mouseover(function() {
+//						$( "div:first", this ).text( "mouse over" );
+						$('#ictip').stop(true).fadeIn(300);
+					});
+			}
+		});
+	}
+
+}) (jQuery);
+</script>
+<?php
+if ( ! $setTodayTimezone && $server_date
+	&& ! $firstMonth
+	&& $lang->getTag() != 'fa-IR')
+{
+	$document->addScriptDeclaration('
+		jQuery(document).ready(function(){
+			jQuery("' . $mod_iccalendar . '").highlightToday("show_today");
+		});
+	');
+}
+
+// For Dev.
+if ($time_loading)
+{
+	$endtime_cal = iCLibrary::getMicrotime();
+
+	echo '<center style="font-size:8px;">Time to create calendar: ' . round($endtime_cal - $starttime_cal, 3) . ' seconds</center>';
+}
diff --git a/deployed/icagenda/modules/mod_iccalendar/mod_iccalendar.xml b/deployed/icagenda/modules/mod_iccalendar/mod_iccalendar.xml
new file mode 100644
index 00000000..e01483d3
--- /dev/null
+++ b/deployed/icagenda/modules/mod_iccalendar/mod_iccalendar.xml
@@ -0,0 +1,748 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extension type="module" version="2.5.14" method="upgrade" client="site">
+	<name>iCagenda - Calendar</name>
+	<author>Cyril Rezé / Jooml!C</author>
+	<creationDate>2020-03-28</creationDate>
+	<copyright>Copyright (c) 2012-2020 Jooml!C / Cyril Rezé. All rights reserved.</copyright>
+	<license>GNU General Public License version 3 or later; see LICENSE.txt</license>
+	<authorEmail>info@joomlic.com</authorEmail>
+	<authorUrl>www.joomlic.com</authorUrl>
+	<version>3.7.12</version>
+	<description>Calendar module for iCagenda component</description>
+
+	<files>
+		<filename>mod_iccalendar.xml</filename>
+		<filename module="mod_iccalendar">mod_iccalendar.php</filename>
+		<filename>index.html</filename>
+		<filename>helper.php</filename>
+		<folder>js</folder>
+	</files>
+
+	<languages folder="site">
+		<language tag="en-GB">language/en-GB/en-GB.mod_iccalendar.ini</language>
+		<language tag="fr-FR">language/fr-FR/fr-FR.mod_iccalendar.ini</language>
+		<language tag="it-IT">language/it-IT/it-IT.mod_iccalendar.ini</language>
+	</languages>
+
+	<config>
+
+		<fields id="params" name="params" type="fields" label="params" addfieldpath="/administrator/components/com_icagenda/models/fields">
+
+			<fieldset name="basic" addfieldpath="/administrator/components/com_icagenda/assets/elements">
+
+				<field
+					name="template"
+					type="modal_template"
+					label="MOD_ICCALENDAR_THEME_PACK_LBL"
+					description="MOD_ICCALENDAR_THEME_PACK_DESC"
+					default="default"
+					class="inputbox"
+					size="40"
+				/>
+
+				<field
+					name="iCmenuitem"
+					type="modal_menulink"
+					label="ICAGENDA_MODULE_MENU_ITEM_LABEL"
+					description="ICAGENDA_MODULE_MENU_ITEM_DESC"
+					default=""
+				/>
+
+				<field
+					name="iCmenu_filters"
+					type="radio"
+					label="ICAGENDA_MODULE_MENU_FILTERS_LABEL"
+					description="ICAGENDA_MODULE_MENU_FILTERS_DESC"
+					default="0"
+					class="btn-group btn-group-yesno"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="firstMonth"
+					type="calendar"
+					label="MOD_ICCALENDAR_LOADING_ON_DATE_LBL"
+					description="MOD_ICCALENDAR_LOADING_ON_DATE_DESC"
+					default=""
+				/>
+
+				<field type="Title" label="MOD_ICCALENDAR_FILTERS_LABEL" class="stylebox lead input-xxlarge" />
+
+				<field
+					name="mcatid"
+					type="modal_multicat"
+					label="MOD_ICCALENDAR_LBL_CATEGORY"
+					description="MOD_ICCALENDAR_DESC_CATEGORY"
+					default="0"
+					class="inputbox"
+					multiple="multiple"
+				/>
+
+				<field
+					name="onlyStDate"
+					type="list"
+					label="MOD_ICCALENDAR_LBL_PERIOD"
+					description="MOD_ICCALENDAR_PERIOD_ONLY_START_DATE_DESC"
+					default=""
+					class="btn-group"
+					>
+					<option value="">PERIOD_ALL_DATES</option>
+					<option value="1">PERIOD_ONLY_START_DATE</option>
+				</field>
+
+				<field type="Title" label="MOD_ICCALENDAR_HEADER_TEXT_LBL" class="stylebox lead input-xxlarge" />
+
+				<field
+					name="header_text"
+					type="editor"
+					label="MOD_ICCALENDAR_HEADER_TEXT_LBL"
+					description="MOD_ICCALENDAR_HEADER_TEXT_DESC"
+					default=""
+					filter="JComponentHelper::filterText"
+				/>
+
+				<field type="Title" label=" " class="stylenote" />
+
+				<field type="Title" label="MOD_ICCALENDAR_LBL_TOOLTIP" class="stylebox lead input-xxlarge" />
+
+				<field
+					name="tipwidth"
+					type="text"
+					label="MOD_ICCALENDAR_LBL_TIP_WIDTH"
+					description="MOD_ICCALENDAR_DESC_TIP_WIDTH"
+					default="390"
+					class="inputbox"
+					size="30"
+				/>
+
+				<field
+					type="TitleImg"
+					label="MOD_ICCALENDAR_DESC_HORIZ_POSITION"
+					class="stylenote alert alert-info input-xxlarge"
+					icicon="info-circle"
+				/>
+
+				<field
+					name="position"
+					type="radio"
+					label="MOD_ICCALENDAR_LBL_HORIZ_POSITION"
+					description="MOD_ICCALENDAR_DESC_HORIZ_POSITION"
+					default="center"
+					class="btn-group"
+					labelclass="control-label"
+					>
+					<option value="left">MOD_ICCALENDAR_HORIZ_POSITION_LEFT</option>
+					<option value="center">MOD_ICCALENDAR_HORIZ_POSITION_MIDDLE</option>
+					<option value="right">MOD_ICCALENDAR_HORIZ_POSITION_RIGHT</option>
+				</field>
+
+				<field
+					name="posmiddle"
+					type="radio"
+					label="MOD_ICCALENDAR_LBL_VERT_POSITION"
+					description="MOD_ICCALENDAR_DESC_VERT_POSITION"
+					default="top"
+					class="btn-group"
+					labelclass="control-label"
+					>
+					<option value="top">MOD_ICCALENDAR_VERT_POSITION_TOP</option>
+					<option value="bottom">MOD_ICCALENDAR_VERT_POSITION_BOTTOM</option>
+				</field>
+
+				<field
+					type="TitleImg"
+					label="MOD_ICCALENDAR_DESC_VERT_POSITION_OFFSET"
+					class="stylenote alert alert-info input-xxlarge"
+					icicon="info-circle"
+				/>
+
+				<field
+					name="verticaloffset"
+					type="text"
+					label="MOD_ICCALENDAR_LBL_VERT_POSITION_OFFSET"
+					description="MOD_ICCALENDAR_DESC_VERT_POSITION_OFFSET"
+					default="50"
+					class="inputbox"
+					size="30"
+				/>
+
+				<field
+					type="TitleImg"
+					label="MOD_ICCALENDAR_TIP_PADDING"
+					class="stylenote alert alert-info input-xxlarge"
+					icicon="info-circle"
+				/>
+
+				<field
+					name="padding"
+					type="text"
+					label="MOD_ICCALENDAR_LBL_TIP_PADDING"
+					description="MOD_ICCALENDAR_DESC_TIP_PADDING"
+					default="0"
+					class="inputbox"
+					size="30"
+				/>
+
+				<field
+					type="TitleImg"
+					label="MOD_ICCALENDAR_DESC_MOUSEOVER"
+					class="stylenote alert alert-info input-xxlarge"
+					icicon="info-circle"
+				/>
+
+				<field
+					name="mouseover"
+					type="radio"
+					label="MOD_ICCALENDAR_LBL_MOUSEOVER"
+					description="MOD_ICCALENDAR_DESC_MOUSEOVER"
+					default="click"
+					class="btn-group"
+					labelclass="control-label"
+					>
+					<option value="click">MOD_ICCALANDAR_OPEN_CLICK</option>
+					<option value="mouseover">MOD_ICCALANDAR_OPEN_MOUSEOVER</option>
+				</field>
+
+				<field
+					name="mouseout"
+					type="radio"
+					label="MOD_ICCALENDAR_CLOSE_ON_MOUSEOUT_LBL"
+					description="MOD_ICCALENDAR_CLOSE_ON_MOUSEOUT_DESC"
+					default="1"
+					class="btn-group"
+					labelclass="control-label"
+					>
+					<option value="0">JNO</option>
+					<option value="1">JYES</option>
+				</field>
+
+				<field
+					type="Title"
+					label="MOD_ICCALENDAR_FORMAT_NOTE"
+					class="stylenote"
+				/>
+
+				<field
+					name="format"
+					type="iclist_globalization"
+					label="COM_ICAGENDA_LBL_FORMAT"
+					description="COM_ICAGENDA_LBL_FORMAT"
+					default="0"
+					class="inputbox"
+				/>
+
+				<field
+					name="date_separator"
+					type="text"
+					label="COM_ICAGENDA_LBL_DATE_SEPARATOR"
+					description="COM_ICAGENDA_DESC_DATE_SEPARATOR"
+					default=""
+					class="inputbox"
+					size="5"
+				/>
+
+				<field
+					type="TitleImg"
+					label="COM_ICAGENDA_DATE_FORMAT_NOTE1"
+					class="stylenote alert alert-info input-xxlarge"
+					icicon="info-circle"
+				/>
+
+				<field
+					type="TitleImg"
+					label="COM_ICAGENDA_DATE_FORMAT_NOTE2"
+					class="stylenoteP alert alert-block input-xxlarge"
+					icicon="earth"
+				/>
+
+				<!--field type="Title" label="MOD_ICCALENDAR_LBL_ORDERING" class="stylenote" />
+
+				<field
+					name="events_ordering_first"
+					type="list"
+					label="MOD_ICCALENDAR_EVENTS_ORDERING_FIRST_LABEL"
+					description="MOD_ICCALENDAR_EVENTS_ORDERING_FIRST_DESC"
+					default="1_ASC"
+					>
+					<option value="1_ASC">MOD_ICCALENDAR_TIME_ASC</option>
+					<option value="1_DESC">MOD_ICCALENDAR_TIME_DESC</option>
+					<option value="2_ASC">MOD_ICCALENDAR_CAT_TITLE_ASC</option>
+					<option value="2_DESC">MOD_ICCALENDAR_CAT_TITLE_DESC</option>
+				</field>
+
+				<field
+					name="events_ordering_second"
+					type="list"
+					label="MOD_ICCALENDAR_EVENTS_ORDERING_SECOND_LABEL"
+					description="MOD_ICCALENDAR_EVENTS_ORDERING_SECOND_DESC"
+					default="3"
+					>
+					<option value="1_ASC">MOD_ICCALENDAR_TIME_ASC</option>
+					<option value="1_DESC">MOD_ICCALENDAR_TIME_DESC</option>
+					<option value="2_ASC">MOD_ICCALENDAR_CAT_TITLE_ASC</option>
+					<option value="2_DESC">MOD_ICCALENDAR_CAT_TITLE_DESC</option>
+				</field-->
+
+				<field type="Title" label="MOD_ICCALENDAR_LBL_TOOLTIP_INFOS" class="stylenote" />
+
+				<field
+					name="dp_time"
+					type="radio"
+					label="MOD_ICCALENDAR_DISPLAY_TIME_LABEL"
+					description="MOD_ICCALENDAR_DISPLAY_TIME_DESC"
+					default="1"
+					class="btn-group"
+					labelclass="control-label"
+					>
+					<option value="0">JHIDE</option>
+					<option value="1">JSHOW</option>
+				</field>
+
+				<field
+					name="dp_venuename"
+					type="radio"
+					label="MOD_ICCALENDAR_DISPLAY_VENUE_NAME_LABEL"
+					description="MOD_ICCALENDAR_DISPLAY_VENUE_NAME_DESC"
+					default="1"
+					class="btn-group"
+					labelclass="control-label"
+					>
+					<option value="0">JHIDE</option>
+					<option value="1">JSHOW</option>
+				</field>
+
+				<field
+					name="dp_city"
+					type="radio"
+					label="MOD_ICCALENDAR_DISPLAY_CITY_LABEL"
+					description="MOD_ICCALENDAR_DISPLAY_CITY_DESC"
+					default="1"
+					class="btn-group"
+					labelclass="control-label"
+					>
+					<option value="0">JHIDE</option>
+					<option value="1">JSHOW</option>
+				</field>
+
+				<field
+					name="dp_country"
+					type="radio"
+					label="MOD_ICCALENDAR_DISPLAY_COUNTRY_LABEL"
+					description="MOD_ICCALENDAR_DISPLAY_COUNTRY_DESC"
+					default="1"
+					class="btn-group"
+					labelclass="control-label"
+					>
+					<option value="0">JHIDE</option>
+					<option value="1">JSHOW</option>
+				</field>
+
+				<field
+					name="dp_regInfos"
+					type="radio"
+					label="MOD_ICCALENDAR_DISPLAY_REGISTRATION_INFOS_LABEL"
+					description="MOD_ICCALENDAR_DISPLAY_REGISTRATION_INFOS_DESC"
+					default="1"
+					class="btn-group"
+					labelclass="control-label"
+					>
+					<option value="0">JHIDE</option>
+					<option value="1">JSHOW</option>
+				</field>
+
+				<field
+					name="features_icon_size"
+					type="list"
+					label="MOD_ICCALENDAR_FEATURES_ICONSIZE_LABEL"
+					description="MOD_ICCALENDAR_FEATURES_ICONSIZE_DESC"
+					default=""
+					class="inputbox"
+					filter="options"
+					>
+					<option value="">COM_ICAGENDA_FEATURES_ICONSIZE_NONE</option>
+					<option value="16_bit">COM_ICAGENDA_FEATURES_ICONSIZE_16</option>
+					<option value="24_bit">COM_ICAGENDA_FEATURES_ICONSIZE_24</option>
+					<option value="32_bit">COM_ICAGENDA_FEATURES_ICONSIZE_32</option>
+					<option value="48_bit">COM_ICAGENDA_FEATURES_ICONSIZE_48</option>
+					<option value="64_bit">COM_ICAGENDA_FEATURES_ICONSIZE_64</option>
+				</field>
+
+				<field
+					name="show_icon_title"
+					type="radio"
+					label="MOD_ICCALENDAR_SHOW_FEATURE_ICON_TITLE_LABEL"
+					description="MOD_ICCALENDAR_SHOW_FEATURE_ICON_TITLE_DESC"
+					default="1"
+					class="btn-group"
+					filter="options"
+					>
+					<option value="0">JHIDE</option>
+					<option value="1">JSHOW</option>
+				</field>
+
+				<field
+					name="dp_shortDesc"
+					type="radio"
+					label="COM_ICAGENDA_LIST_INTROTEXT_DISPLAY_LABEL"
+					description="COM_ICAGENDA_LIST_INTROTEXT_DISPLAY_DESC"
+					default=""
+					class="btn-group"
+					labelclass="control-label"
+					>
+					<option value="">IC_AUTO</option>
+					<option value="0">JHIDE</option>
+					<option value="1">IC_SHORTDESC</option>
+					<option value="2">IC_AUTO_INTROTEXT</option>
+				</field>
+
+				<field
+					name="filtering_shortDesc"
+					type="list"
+					label="ICAGENDA_FILTERING_SHORTDESC_LABEL"
+					description="ICAGENDA_FILTERING_SHORTDESC_DESC"
+					default=""
+					class="btn-group"
+					>
+					<option value="">ICAGENDA_GLOBAL_OPTION</option>
+					<option value="1">ICAGENDA_FILTERING_NO_HTML</option>
+					<option value="2">ICAGENDA_FILTERING_ALL_ITALIC</option>
+				</field>
+
+				<field
+					name="paramlimit"
+					type="modal_icvalue_opt"
+					label="ICAGENDA_AUTO_INTROTEXT_LIMIT_LABEL"
+					description="ICAGENDA_AUTO_INTROTEXT_LIMIT_DESC"
+					default=""
+					labelclass="control-label"
+				/>
+
+				<field
+					name="paramlimit_Content"
+					type="modal_icvalue_field"
+					label=" "
+					class="inputbox"
+					labelclass="control-label"
+				/>
+
+				<field type="Title" label="MOD_ICCALENDAR_LBL_DISPLAY" class="stylenote" />
+
+				<field
+					name="calendarclosebtn"
+					type="modal_icvalue_opt"
+					label="COM_ICAGENDA_LBL_CLOSE_TEXT"
+					description="COM_ICAGENDA_DESC_CLOSE_TEXT"
+					default="0"
+					labelclass="control-label"
+				/>
+
+				<field
+					name="calendarclosebtn_Content"
+					type="modal_icvalue_field"
+					label=" "
+					default="X"
+					class="inputbox"
+					labelclass="control-label"
+				/>
+
+
+				<field type="Title" label=" " class="stylenote" />
+
+				<field type="Title" label="MOD_ICCALENDAR_LBL_DISPLAY" class="stylebox lead input-xxlarge" />
+
+				<field type="Title" label="MOD_ICCALENDAR_NAVIGATION" class="stylenote" />
+
+				<field
+					name="month_nav"
+					type="radio"
+					label="MOD_ICCALENDAR_NAVIGATION_MONTH_DISPLAY_LBL"
+					description="MOD_ICCALENDAR_NAVIGATION_MONTH_DISPLAY_DESC"
+					default="1"
+					class="btn-group"
+					labelclass="control-label"
+					>
+					<option value="0">JHIDE</option>
+					<option value="1">JSHOW</option>
+				</field>
+
+				<field
+					name="year_nav"
+					type="radio"
+					label="MOD_ICCALENDAR_NAVIGATION_YEAR_DISPLAY_LBL"
+					description="MOD_ICCALENDAR_NAVIGATION_YEAR_DISPLAY_DESC"
+					default="1"
+					class="btn-group"
+					labelclass="control-label"
+					>
+					<option value="0">JHIDE</option>
+					<option value="1">JSHOW</option>
+				</field>
+
+				<field type="Title" label="MOD_ICCALENDAR_LBL_FIRSTDAY_WEEK" class="stylenote" />
+
+				<field
+					name="firstday"
+					type="list"
+					label="MOD_ICCALENDAR_LBL_FIRSTDAY"
+					default="1"
+					>
+					<option value="0">SUNDAY</option>
+					<option value="1">MONDAY</option>
+					<option value="2">TUESDAY</option>
+					<option value="3">WEDNESDAY</option>
+					<option value="4">THURSDAY</option>
+					<option value="5">FRIDAY</option>
+					<option value="6">SATURDAY</option>
+				</field>
+
+				<field type="Title" label="MOD_ICCALENDAR_LBL_FONTCOLORS" class="stylenote" />
+
+				<field
+					name="calfontcolor"
+					type="color"
+					label="MOD_ICCALENDAR_CALENDAR_FONTCOLOR_LBL"
+					description="MOD_ICCALENDAR_CALENDAR_FONTCOLOR_DESC"
+					default=" "
+					class="inputbox"
+					size="7"
+					filter="safehtml"
+				/>
+
+				<field type="Title" label="MOD_ICCALENDAR_LBL_BGCOLORS" class="stylenote" />
+
+				<field
+					name="OneEventbgcolor"
+					type="color"
+					label="MOD_ICCALENDAR_DAY_WITH_ONE_EVENT_BACKGROUND_COLOR_LBL"
+					description="MOD_ICCALENDAR_DAY_WITH_ONE_EVENT_BACKGROUND_COLOR_DESC"
+					default=" "
+					class="inputbox"
+					size="7"
+					filter="safehtml"
+				/>
+
+				<field
+					name="Eventsbgcolor"
+					type="color"
+					label="MOD_ICCALENDAR_DAY_WITH_EVENTS_BACKGROUND_COLOR_LBL"
+					description="MOD_ICCALENDAR_DAY_WITH_EVENTS_BACKGROUND_COLOR_DESC"
+					default=" "
+					class="inputbox"
+					size="7"
+					filter="safehtml"
+				/>
+
+				<field
+					name="bgcolor"
+					type="color"
+					label="ICCALENDAR_BACKGROUND_COLOR"
+					description="ICCALENDAR_BACKGROUND_COLOR_DESC"
+					default=" "
+					class="inputbox"
+					size="7"
+					filter="safehtml"
+				/>
+
+				<field
+					name="bgimage"
+					type="media"
+					label="ICCALENDAR_BACKGROUND_IMAGE"
+					description="ICCALENDAR_BACKGROUND_IMAGE_DESC"
+					default=""
+					class="inputbox"
+					size="7"
+					filter="safehtml"
+				/>
+
+				<field
+					name="bgimagerepeat"
+					type="list"
+					label="ICCALENDAR_BACKGROUND_IMAGE_REPEAT"
+					description="ICCALENDAR_BACKGROUND_IMAGE_REPEAT_DESC"
+					default="repeat"
+					>
+					<option value="repeat">repeat</option>
+					<option value="repeat-x">repeat-x</option>
+					<option value="repeat-y">repeat-y</option>
+					<option value="no-repeat">no-repeat</option>
+				</field>
+
+				<field
+					name="mon"
+					type="color"
+					label="MONDAY"
+					default=" "
+					class="inputbox"
+					size="7"
+					filter="safehtml"
+				/>
+
+				<field
+					name="tue"
+					type="color"
+					label="TUESDAY"
+					default=" "
+					class="inputbox"
+					size="7"
+					filter="safehtml"
+				/>
+
+				<field
+					name="wed"
+					type="color"
+					label="WEDNESDAY"
+					default=" "
+					class="inputbox"
+					size="7"
+					filter="safehtml"
+				/>
+
+				<field
+					name="thu"
+					type="color"
+					label="THURSDAY"
+					default=" "
+					class="inputbox"
+					size="7"
+					filter="safehtml"
+				/>
+
+				<field
+					name="fri"
+					type="color"
+					label="FRIDAY"
+					default=" "
+					class="inputbox"
+					size="7"
+					filter="safehtml"
+				/>
+
+				<field
+					name="sat"
+					type="color"
+					label="SATURDAY"
+					default=" "
+					class="inputbox"
+					size="7"
+					filter="safehtml"
+				/>
+
+				<field
+					name="sun"
+					type="color"
+					label="SUNDAY"
+					default=" "
+					class="inputbox"
+					size="7"
+					filter="safehtml"
+				/>
+
+				<field type="Title" label=" " class="stylenote" />
+
+				<field type="Title" label="MOD_ICCALENDAR_LBL_ADVANCED" class="stylebox lead input-xxlarge" />
+
+				<field type="Title" label="MOD_ICCALENDAR_LBL_JQUERY" class="stylenote" />
+
+				<field
+					name="loadJquery"
+					type="radio"
+					label="MOD_ICCALENDAR_LBL_LOADJQUERY"
+					description="MOD_ICCALENDAR_DESC_LOADJQUERY"
+					default="auto"
+					class="btn-group"
+					>
+					<option value="auto">MOD_ICCALENDAR_LOADJQUERY_AUTO</option>
+					<option value="0">MOD_ICCALENDAR_LOADJQUERY_NO</option>
+					<option value="1">MOD_ICCALENDAR_LOADJQUERY_YES</option>
+				</field>
+
+				<field type="Title" label="ICAGENDA_LBL_TIMEZONE" class="stylenote" />
+
+				<field
+					name="setTodayTimezone"
+					type="list"
+					label="ICAGENDA_LBL_TODAY_TIMEZONE"
+					description="ICAGENDA_DESC_TODAY_TIMEZONE"
+					default=""
+					onchange="icalert()"
+					>
+					<option value="">ICAGENDA_VISITOR_TIMEZONE</option>
+					<option value="SITE">ICAGENDA_JOOMLA_SERVER_TIMEZONE</option>
+					<option value="UTC">ICAGENDA_UTC_TIMEZONE</option>
+					<!--option value="2">ICAGENDA_HOSTING_SERVER_TIMEZONE</option-->
+				</field>
+
+				<field
+					name="caldate_error"
+					type="modal_icalert_msg"
+					label="COM_ICAGENDA_THEME_PACKS_COMPATIBILITY"
+					description="MOD_ICCALENDAR_ALERT_CAL_DATE_MISSING_DESC"
+				/>
+
+				<!--field
+					name="displayDatesTimezone"
+					type="list"
+					label="ICAGENDA_LBL_DATES_TIMEZONE_BETA"
+					description="ICAGENDA_DESC_DATES_TIMEZONE_BETA"
+					default="0"
+					class="btn-group"
+					>
+					<option value="0">JHIDE</option>
+					<option value="1">JSHOW</option>
+				</field-->
+
+				<!--field type="title" label="ICAGENDA_DESC_TODAY_TIMEZONE_TEMPORARY" class="alert alert-info input-xxlarge" /-->
+			</fieldset>
+
+			<fieldset name="ADVANCED" label="MOD_ICCALENDAR_LBL_ADVANCED">
+
+				<field
+					name="moduleclass_sfx"
+					type="text"
+					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					icon="text_signature.png"
+				/>
+
+				<field type="Title" label=" " class="stylenote" />
+
+				<field
+					name="cache"
+					type="list"
+					label="COM_MODULES_FIELD_CACHING_LABEL"
+					description="COM_MODULES_FIELD_CACHING_DESC"
+					default="0"
+					>
+					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
+				</field>
+
+				<field type="title" label="MOD_ICCALENDAR_CACHE_NOTE" class="stylered alert alert-error input-xxlarge" />
+
+
+				<!--field
+					name="cache_time"
+					type="text"
+					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
+					description="COM_MODULES_FIELD_CACHE_TIME_DESC"
+					default="900"
+					icon="hourglass.png"
+					suffix="min"
+				/-->
+
+				<field
+					name="cachemode"
+					type="hidden"
+					default="itemid"
+					>
+					<option	value="itemid"></option>
+				</field>
+
+			</fieldset>
+
+		</fields>
+
+	</config>
+
+</extension>
diff --git a/deployed/icagenda/plugins/actionlog/icagenda/icagenda.php b/deployed/icagenda/plugins/actionlog/icagenda/icagenda.php
new file mode 100644
index 00000000..af0b913a
--- /dev/null
+++ b/deployed/icagenda/plugins/actionlog/icagenda/icagenda.php
@@ -0,0 +1,229 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Plugin Action Log
+ *----------------------------------------------------------------------------
+ * @version     1.0 2018-10-30
+ *
+ * @package     iCagenda.Plugin
+ * @subpackage  Actionlog.icagenda
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @since       iCagenda 3.7.5
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\Utilities\ArrayHelper;
+
+JLoader::register('ActionlogsHelper', JPATH_ADMINISTRATOR . '/components/com_actionlogs/helpers/actionlogs.php');
+
+/**
+ * iCagenda Actions Logging Plugin.
+ */
+class PlgActionlogIcagenda extends JPlugin
+{
+	/**
+	 * Array of loggable extensions.
+	 *
+	 * @var    array
+	 * @since  1.0
+	 */
+	protected $loggableExtensions = array();
+
+	/**
+	 * Application object.
+	 *
+	 * @var    JApplicationCms
+	 * @since  1.0
+	 */
+	protected $app;
+
+	/**
+	 * Database object.
+	 *
+	 * @var    JDatabaseDriver
+	 * @since  1.0
+	 */
+	protected $db;
+
+	/**
+	 * Load plugin language file automatically so that it can be used inside component
+	 *
+	 * @var    boolean
+	 * @since  1.0
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   object  &$subject  The object to observe.
+	 * @param   array   $config    An optional associative array of configuration settings.
+	 *
+	 * @since   1.0
+	 */
+	public function __construct(&$subject, $config)
+	{
+		parent::__construct($subject, $config);
+
+		$params = ComponentHelper::getComponent('com_actionlogs')->getParams();
+
+		$db = JFactory::getDbo();
+
+		$query = $db->getQuery(true);
+
+		$query->select($db->quoteName('extension'));
+		$query->from($db->quoteName('#__action_logs_extensions'));
+		$query->where($db->quoteName('extension') . ' = '. $db->quote('com_icagenda'));
+
+		$db->setQuery($query);
+
+		$result = $db->loadResult();
+
+		if ( ! $result)
+		{
+			$extension = new stdClass();
+			$extension->extension = 'com_icagenda';
+
+			// Insert iCagenda (com_icagenda) into the action logs extensions table.
+			$return = $db->insertObject('#__action_logs_extensions', $extension);
+		}
+
+		$this->loggableExtensions = $params->get('loggable_extensions', array());
+	}
+
+	/**
+	 * After save content logging method
+	 * This method adds a record to #__action_logs contains (message, date, context, user)
+	 * Method is called right after the content is saved
+	 *
+	 * @param   string   $context  The context of the content passed to the plugin
+	 * @param   object   $article  A JTableContent object
+	 * @param   boolean  $isNew    If the content is just about to be created
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	public function onContentAfterSave($context, $item, $isNew)
+	{
+		$option = $this->app->input->getCmd('option');
+
+		if (!$this->checkLoggable($option))
+		{
+			return;
+		}
+
+		$params = ActionlogsHelper::getLogContentTypeParams($context);
+
+		// If found a valid content type, don't process further
+		if ($params !== null)
+		{
+			return;
+		}
+
+		$user = JFactory::getUser();
+
+		list(, $contentType) = explode('.', $context);
+
+		if ($isNew)
+		{
+			$messageLanguageKey = strtoupper('PLG_ACTIONLOG_ICAGENDA_' . $contentType . '_ADDED');
+			$defaultLanguageKey = strtoupper('PLG_SYSTEM_ACTIONLOGS_CONTENT_ADDED');
+
+			$action = 'add';
+		}
+		else
+		{
+			$messageLanguageKey = strtoupper('PLG_ACTIONLOG_ICAGENDA_' . $contentType . '_UPDATED');
+			$defaultLanguageKey = strtoupper('PLG_SYSTEM_ACTIONLOGS_CONTENT_UPDATED');
+
+			$action = 'update';
+		}
+
+		// If the content type doesn't has it own language key, use default language key
+		if (!JFactory::getLanguage()->hasKey($messageLanguageKey))
+		{
+			$messageLanguageKey = $defaultLanguageKey;
+		}
+
+		$title = array(
+			'event'        => 'title',
+			'category'     => 'title',
+			'registration' => 'name',
+			'feature'      => 'title',
+			'customfield'  => 'title',
+		);
+
+		$message = array(
+			'action'      => $action,
+			'type'        => strtoupper('PLG_ACTIONLOG_ICAGENDA_TYPE_' . $contentType),
+			'id'          => $item->get('id'),
+			'title'       => $item->get('title', $item->get($title[$contentType])),
+			'itemlink'    => ActionlogsHelper::getContentTypeLink($option, $contentType, $item->get('id')),
+			'userid'      => $user->id,
+			'username'    => $user->username,
+			'accountlink' => 'index.php?option=com_users&task=user.edit&id=' . $user->id,
+			'app'         => strtoupper('PLG_ACTIONLOG_ICAGENDA_APPLICATION_' . $this->app->getName()),
+		);
+
+		$this->addLog(array($message), $messageLanguageKey, $context);
+	}
+
+	/**
+	 * Proxy for ActionlogsModelUserlog addLog method
+	 *
+	 * This method adds a record to #__action_logs contains (message_language_key, message, date, context, user)
+	 *
+	 * @param   array   $messages            The contents of the messages to be logged
+	 * @param   string  $messageLanguageKey  The language key of the message
+	 * @param   string  $context             The context of the content passed to the plugin
+	 * @param   int     $userId              ID of user perform the action, usually ID of current logged in user
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	protected function addLog($messages, $messageLanguageKey, $context, $userId = null)
+	{
+		JLoader::register('ActionlogsModelActionlog', JPATH_ADMINISTRATOR . '/components/com_actionlogs/models/actionlog.php');
+
+		/* @var ActionlogsModelActionlog $model */
+		$model = JModelLegacy::getInstance('Actionlog', 'ActionlogsModel');
+		$model->addLog($messages, $messageLanguageKey, $context, $userId);
+	}
+
+	/**
+	 * Function to check if a component is loggable or not
+	 *
+	 * @param   string  $extension  The extension that triggered the event
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.0
+	 */
+	protected function checkLoggable($extension)
+	{
+		return in_array($extension, $this->loggableExtensions);
+	}
+}
diff --git a/deployed/icagenda/plugins/actionlog/icagenda/icagenda.xml b/deployed/icagenda/plugins/actionlog/icagenda/icagenda.xml
new file mode 100644
index 00000000..119267fb
--- /dev/null
+++ b/deployed/icagenda/plugins/actionlog/icagenda/icagenda.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extension type="plugin" group="actionlog" version="3.2.4" method="upgrade">
+	<name>PLG_ACTIONLOG_ICAGENDA</name>
+	<creationDate>2018-10-30</creationDate>
+	<author>Cyril Rezé / Jooml!C</author>
+	<copyright>Copyright (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved</copyright>
+	<license>GNU General Public License version 3 or later; see LICENSE.txt</license>
+	<authorEmail>info@joomlic.com</authorEmail>
+	<authorUrl>www.joomlic.com</authorUrl>
+	<version>1.0</version>
+	<description>PLG_ACTIONLOG_ICAGENDA_XML_DESCRIPTION</description>
+
+	<files>
+		<filename plugin="icagenda">icagenda.php</filename>
+	</files>
+
+	<languages>
+		<language tag="en-GB">language/en-GB/en-GB.plg_actionlog_icagenda.ini</language>
+		<language tag="en-GB">language/en-GB/en-GB.plg_actionlog_icagenda.sys.ini</language>
+		<language tag="fr-FR">language/fr-FR/fr-FR.plg_actionlog_icagenda.ini</language>
+		<language tag="fr-FR">language/fr-FR/fr-FR.plg_actionlog_icagenda.sys.ini</language>
+		<language tag="it-IT">language/it-IT/it-IT.plg_actionlog_icagenda.ini</language>
+		<language tag="it-IT">language/it-IT/it-IT.plg_actionlog_icagenda.sys.ini</language>
+    </languages>
+
+	<config />
+</extension>
diff --git a/deployed/icagenda/plugins/installer/icagenda/icagenda.php b/deployed/icagenda/plugins/installer/icagenda/icagenda.php
new file mode 100644
index 00000000..63b9cc1b
--- /dev/null
+++ b/deployed/icagenda/plugins/installer/icagenda/icagenda.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Plugin Installer
+ *----------------------------------------------------------------------------
+ * @version     1.0 2018-04-11
+ *
+ * @package     iCagenda.Plugin
+ * @subpackage  Installer.icagenda
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @since       iCagenda 3.6.13
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * Handle iCagenda extension update authorization
+ */
+class plgInstallerIcagenda extends JPlugin
+{
+	/**
+	 * Handle adding credentials to package download request
+	 *
+	 * @param   string  $url      url from which package is going to be downloaded
+	 * @param   array   $headers  headers to be sent along the download request (key => value format)
+	 *
+	 * @return  boolean           true if credentials have been added to request or not our business,
+	 *                            false otherwise (credentials not set by user)
+	 *
+	 * @since   1.0
+	 */
+	public function onInstallerBeforePackageDownload(&$url, &$headers)
+	{
+		if (strpos($url, 'joomlic.com') === false)
+		{
+			return true;
+		}
+
+		// Get the component information from the #__extensions table
+		JLoader::import('joomla.application.component.helper');
+		$component  = JComponentHelper::getComponent('com_icagenda');
+		$downloadId = $component->params->get('downloadid', '');
+
+		if (empty($downloadId) && strpos($url, 'pro.joomlic.com') !== false)
+		{
+			// Test if translation is missing, set to en-GB by default
+			$language = JFactory::getLanguage();
+			$language->load('plg_installer_icagenda', JPATH_ADMINISTRATOR, 'en-GB', true);
+			$language->load('plg_installer_icagenda', JPATH_ADMINISTRATOR, null, true);
+
+			$app = JFactory::getApplication();
+			$app->enqueueMessage(JText::_('PLG_INSTALLER_ICAGENDA_DLID_NOTICE'), 'notice');
+			$app->enqueueMessage(JText::sprintf('PLG_INSTALLER_ICAGENDA_AUTHORIZATION_WARNING', JText::_('PLG_INSTALLER_ICAGENDA_PRO_ID_NOT_FOUND')), 'warning');
+
+			return true;
+		}
+
+		// Bind credentials to request by appending it to the download url
+		if ( ! empty($downloadId) && strpos($url, 'pro.joomlic.com') !== false)
+		{
+			$separator = strpos($url, '?') !== false ? '&' : '?';
+			$url .= $separator . 'dlid=' . $downloadId;
+		}
+
+		return true;
+	}
+}
diff --git a/deployed/icagenda/plugins/installer/icagenda/icagenda.xml b/deployed/icagenda/plugins/installer/icagenda/icagenda.xml
new file mode 100644
index 00000000..67a4bd52
--- /dev/null
+++ b/deployed/icagenda/plugins/installer/icagenda/icagenda.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="plugin" version="2.5.19" method="upgrade" group="installer">
+	<name>plg_installer_icagenda</name>
+	<author>Cyril Rezé / Jooml!C</author>
+	<creationDate>2018-04-17</creationDate>
+	<copyright>Copyright (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved</copyright>
+	<license>GNU General Public License version 3 or later; see LICENSE.txt</license>
+	<authorEmail>info@joomlic.com</authorEmail>
+	<authorUrl>www.joomlic.com</authorUrl>
+	<version>1.0</version>
+	<description>PLG_INSTALLER_ICAGENDA_XML_DESCRIPTION</description>
+
+	<files>
+		<filename plugin="icagenda">icagenda.php</filename>
+	</files>
+
+	<languages>
+		<language tag="en-GB">language/en-GB/en-GB.plg_installer_icagenda.ini</language>
+		<language tag="en-GB">language/en-GB/en-GB.plg_installer_icagenda.sys.ini</language>
+		<language tag="fr-FR">language/fr-FR/fr-FR.plg_installer_icagenda.ini</language>
+		<language tag="fr-FR">language/fr-FR/fr-FR.plg_installer_icagenda.sys.ini</language>
+		<language tag="it-IT">language/it-IT/it-IT.plg_installer_icagenda.ini</language>
+		<language tag="it-IT">language/it-IT/it-IT.plg_installer_icagenda.sys.ini</language>
+	</languages>
+
+</extension>
diff --git a/deployed/icagenda/plugins/privacy/icagenda/icagenda.php b/deployed/icagenda/plugins/privacy/icagenda/icagenda.php
new file mode 100644
index 00000000..1bd40ed8
--- /dev/null
+++ b/deployed/icagenda/plugins/privacy/icagenda/icagenda.php
@@ -0,0 +1,332 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Plugin Privacy
+ *----------------------------------------------------------------------------
+ * @version     1.0 2018-10-30
+ *
+ * @package     iCagenda.Plugin
+ * @subpackage  Privacy.icagenda
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @since       iCagenda 3.7.5
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+JLoader::register('PrivacyPlugin', JPATH_ADMINISTRATOR . '/components/com_privacy/helpers/plugin.php');
+
+// Loads Utilities
+JLoader::registerPrefix('icagenda', JPATH_ADMINISTRATOR . '/components/com_icagenda/utilities');
+
+/**
+ * Handle iCagenda integration in com_privacy capabilities (starting Joomla 3.9)
+ */
+class plgPrivacyIcagenda extends PrivacyPlugin
+{
+	/**
+	 * Database object
+	 *
+	 * @var    JDatabaseDriver
+	 * @since  1.0
+	 */
+	protected $db;
+
+	/**
+	 * Affects constructor behaviour. If true, language files will be loaded automatically.
+	 *
+	 * @var    boolean
+	 * @since  1.0
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Events array
+	 *
+	 * @var    Array
+	 * @since  1.0
+	 */
+	protected $events = array();
+
+	/**
+	 * Participants array
+	 *
+	 * @var    Array
+	 * @since  1.0
+	 */
+	protected $participants = array();
+
+	/**
+	 * Processes an export request for Joomla core user registration data
+	 *
+	 * This event will collect data for the contact core tables:
+	 *
+	 * - Contact custom fields
+	 *
+	 * @param   PrivacyTableRequest  $request  The request record being processed
+	 * @param   JUser                $user     The user account associated with this request if available
+	 *
+	 * @return  PrivacyExportDomain[]
+	 *
+	 * @since   1.0
+	 */
+	public function onPrivacyExportRequest(PrivacyTableRequest $request, JUser $user = null)
+	{
+		if ( ! $user && ! $request->email)
+		{
+			return array();
+		}
+
+		$domains   = array();
+
+		// Create User Events Domain
+		$domains[] = $this->createEventsDomain($request, $user);
+		$domains[] = $this->createEventsCustomfieldsDomain($this->events);
+
+		// Create User Registrations Domain
+		$domains[] = $this->createRegistrationDomain($request, $user);
+		$domains[] = $this->createRegistrationCustomfieldsDomain($this->participants);
+
+		return $domains;
+	}
+
+	/**
+	 * Create the domain for the user events data
+	 *
+	 * @param   PrivacyTableRequest  $request  The request record being processed
+	 * @param   JUser                $user     The user account associated with this request if available
+	 *
+	 * @return  PrivacyExportDomain
+	 *
+	 * @since   1.0
+	 */
+	private function createEventsDomain(PrivacyTableRequest $request, JUser $user = null)
+	{
+		$domain = $this->createDomain(
+			'icagenda_events',
+			'user_icagenda_events_data'
+		);
+
+		if ($user)
+		{
+			$query = $this->db->getQuery(true)
+				->select('*')
+				->from($this->db->quoteName('#__icagenda_events'))
+				->where($this->db->quoteName('created_by') . ' = ' . (int) $user->id
+					. ' OR ' . $this->db->quoteName('created_by_email') . ' = ' . $this->db->quote($request->email))
+				->order($this->db->quoteName('ordering') . ' ASC');
+		}
+		else
+		{
+			$query = $this->db->getQuery(true)
+				->select('*')
+				->from($this->db->quoteName('#__icagenda_events'))
+				->where($this->db->quoteName('created_by_email') . ' = ' . $this->db->quote($request->email))
+				->order($this->db->quoteName('ordering') . ' ASC');
+		}
+
+		$items = $this->db->setQuery($query)->loadAssocList();
+
+		foreach ($items as $item)
+		{
+			$domain->addItem($this->createItemFromArray($item));
+			$this->events[] = (object) $item;
+		}
+
+		return $domain;
+	}
+
+	/**
+	 * Create the domain for the events custom fields
+	 *
+	 * @param   Object  $events  The events to process
+	 *
+	 * @return  PrivacyExportDomain
+	 *
+	 * @since   1.0
+	 */
+	private function createEventsCustomfieldsDomain($events)
+	{
+		$domain = $this->createDomain(
+			'icagenda_events_customfields',
+			'user_icagenda_events_customfields_data'
+		);
+
+		foreach ($events as $event)
+		{
+			// Get item's fields, also preparing their value property for manual display
+			$fields = icagendaCustomfields::getList($event->id, '2', '1');
+
+			if ($fields)
+			{
+				foreach ($fields as $field)
+				{
+					$data = array(
+						'event_id'    => $event->id,
+						'field_slug'  => $field->cf_slug,
+						'field_title' => $field->cf_title,
+						'field_value' => $field->cf_value,
+					);
+
+					$domain->addItem($this->createItemFromArray($data));
+				}
+			}
+		}
+
+		return $domain;
+	}
+
+	/**
+	 * Create the domain for the user registration data
+	 *
+	 * @param   PrivacyTableRequest  $request  The request record being processed
+	 * @param   JUser                $user     The user account associated with this request if available
+	 *
+	 * @return  PrivacyExportDomain
+	 *
+	 * @since   1.0
+	 */
+	private function createRegistrationDomain(PrivacyTableRequest $request, JUser $user = null)
+	{
+		$domain = $this->createDomain(
+			'icagenda_registration',
+			'user_icagenda_registration_data'
+		);
+
+		if ($user)
+		{
+			$query = $this->db->getQuery(true)
+				->select('*')
+				->from($this->db->quoteName('#__icagenda_registration'))
+				->where($this->db->quoteName('userid') . ' = ' . (int) $user->id
+					. ' OR ' . $this->db->quoteName('email') . ' = ' . $this->db->quote($request->email))
+				->order($this->db->quoteName('ordering') . ' ASC');
+		}
+		else
+		{
+			$query = $this->db->getQuery(true)
+				->select('*')
+				->from($this->db->quoteName('#__icagenda_registration'))
+				->where($this->db->quoteName('email') . ' = ' . $this->db->quote($request->email))
+				->order($this->db->quoteName('ordering') . ' ASC');
+		}
+
+		$items = $this->db->setQuery($query)->loadAssocList();
+
+		foreach ($items as $item)
+		{
+			$domain->addItem($this->createItemFromArray($item));
+			$this->participants[] = (object) $item;
+		}
+
+		return $domain;
+	}
+
+	/**
+	 * Create the domain for the registrations custom fields
+	 *
+	 * @param   Object  $registrations  The registrations to process
+	 *
+	 * @return  PrivacyExportDomain
+	 *
+	 * @since   1.0
+	 */
+	private function createRegistrationCustomfieldsDomain($registrations)
+	{
+		$domain = $this->createDomain(
+			'icagenda_registration_customfields',
+			'user_icagenda_registration_customfields_data'
+		);
+
+		foreach ($registrations as $registration)
+		{
+			// Get item's fields, also preparing their value property for manual display
+			$fields = icagendaCustomfields::getList($registration->id, '1', '1');
+
+			if ($fields)
+			{
+				foreach ($fields as $field)
+				{
+					$data = array(
+						'registration_id' => $registration->id,
+						'field_slug'      => $field->cf_slug,
+						'field_title'     => $field->cf_title,
+						'field_value'     => $field->cf_value,
+					);
+
+					$domain->addItem($this->createItemFromArray($data));
+				}
+			}
+		}
+
+		return $domain;
+	}
+
+	/**
+	 * Reports the privacy related capabilities for iCagenda to site administrators.
+	 *
+	 * @return  array
+	 *
+	 * @since   1.0
+	 */
+	public function onPrivacyCollectAdminCapabilities()
+	{
+		$this->loadLanguage();
+
+		$joomlaIntegration  = JText::_('PLG_PRIVACY_ICAGENDA_JOOMLA_INTEGRATION')
+							. '<ul>'
+							. '<li>' . JText::sprintf('PLG_PRIVACY_ICAGENDA_JOOMLA_ACTION_LOGS',
+								JRoute::_('index.php?option=com_plugins&view=plugins&filter_folder=actionlog&filter_element=icagenda') . '" target="_blank') . '</li>'
+							. '<li>' . JText::sprintf('PLG_PRIVACY_ICAGENDA_JOOMLA_PRIVACY_INFORMATION_REQUESTS',
+								JRoute::_('index.php?option=com_plugins&view=plugins&filter_folder=privacy&filter_element=icagenda')) . '</li>'
+							. '</ul>'
+							. '<em>' . JText::_('PLG_PRIVACY_ICAGENDA_NOTE') . ' ' . JText::_('PLG_PRIVACY_ICAGENDA_JOOMLA_PRIVACY_CONSENTS_BY_ICAGENDA') . '</em><br /><br />';
+
+		$componentNetwork   = JText::_('PLG_PRIVACY_ICAGENDA_COMPONENT_NETWORK')
+							. '<ul>'
+							. '<li>' . JText::_('PLG_PRIVACY_ICAGENDA_COMPONENT_NETWORK_UPDATES') . '</li>'
+							. '<li>' . JText::_('PLG_PRIVACY_ICAGENDA_COMPONENT_NETWORK_HELP') . '</li>'
+							. '</ul><br />';
+
+		$thirdpartyServices = JText::_('PLG_PRIVACY_ICAGENDA_COMPONENT_THIRDPARTY') . '*'
+							. '<br /><small>*&#160;' . JText::_('PLG_PRIVACY_ICAGENDA_COMPONENT_THIRDPARTY_SUBLABEL') . '</small>'
+							. '<ul>'
+							. '<li><strong>' . JText::_('PLG_PRIVACY_ICAGENDA_COMPONENT_ADDTHIS_LABEL') . '</strong><br />'
+							. JText::sprintf('PLG_PRIVACY_ICAGENDA_COMPONENT_ADDTHIS_DESC', 'https://www.addthis.com/blog/2018/09/30/how-publishers-can-comply-with-gdpr/" target="_blank" rel="noopener noreferrer') . '</li>'
+							. '<li><strong>' . JText::_('PLG_PRIVACY_ICAGENDA_COMPONENT_CAPTCHA_LABEL') . '</strong><br />'
+							. JText::_('PLG_PRIVACY_ICAGENDA_COMPONENT_CAPTCHA_DESC') . '</li>'
+							. '<li><strong>' . JText::_('PLG_PRIVACY_ICAGENDA_COMPONENT_GOOGLEMAPS_LABEL') . '</strong><br />'
+							. JText::sprintf('PLG_PRIVACY_ICAGENDA_COMPONENT_GOOGLEMAPS_DESC', 'https://cloud.google.com/maps-platform/terms/" target="_blank" rel="noopener noreferrer') . '</li>'
+							. '<li><strong>' . JText::_('PLG_PRIVACY_ICAGENDA_COMPONENT_GRAVATAR_LABEL') . '</strong><br />'
+							. JText::sprintf('PLG_PRIVACY_ICAGENDA_COMPONENT_GRAVATAR_DESC', 'https://gravatar.com" target="_blank" rel="noopener noreferrer') . '</li>'
+							. '</ul>';
+		
+		return array(
+			JText::_('iCagenda') => array(
+				$joomlaIntegration,
+				$componentNetwork,
+				$thirdpartyServices,
+			),
+		);
+	}
+}
diff --git a/deployed/icagenda/plugins/privacy/icagenda/icagenda.xml b/deployed/icagenda/plugins/privacy/icagenda/icagenda.xml
new file mode 100644
index 00000000..a80a2549
--- /dev/null
+++ b/deployed/icagenda/plugins/privacy/icagenda/icagenda.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="plugin" group="privacy" version="3.2.4" method="upgrade">
+	<name>PLG_PRIVACY_ICAGENDA</name>
+	<creationDate>2018-10-30</creationDate>
+	<author>Cyril Rezé / Jooml!C</author>
+	<copyright>Copyright (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved</copyright>
+	<license>GNU General Public License version 3 or later; see LICENSE.txt</license>
+	<authorEmail>info@joomlic.com</authorEmail>
+	<authorUrl>www.joomlic.com</authorUrl>
+	<version>1.0</version>
+	<description>PLG_PRIVACY_ICAGENDA_XML_DESCRIPTION</description>
+
+	<files>
+		<filename plugin="icagenda">icagenda.php</filename>
+	</files>
+
+	<languages>
+		<language tag="en-GB">language/en-GB/en-GB.plg_privacy_icagenda.ini</language>
+		<language tag="en-GB">language/en-GB/en-GB.plg_privacy_icagenda.sys.ini</language>
+		<language tag="fr-FR">language/fr-FR/fr-FR.plg_privacy_icagenda.ini</language>
+		<language tag="fr-FR">language/fr-FR/fr-FR.plg_privacy_icagenda.sys.ini</language>
+		<language tag="it-IT">language/it-IT/it-IT.plg_privacy_icagenda.ini</language>
+		<language tag="it-IT">language/it-IT/it-IT.plg_privacy_icagenda.sys.ini</language>
+	</languages>
+
+	<config />
+</extension>
diff --git a/deployed/icagenda/plugins/quickicon/icagendaupdate/icagendaupdate.php b/deployed/icagenda/plugins/quickicon/icagendaupdate/icagendaupdate.php
new file mode 100644
index 00000000..7847ad1f
--- /dev/null
+++ b/deployed/icagenda/plugins/quickicon/icagendaupdate/icagendaupdate.php
@@ -0,0 +1,172 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Plugin Quick Icon - iCagenda Update Notification
+ *----------------------------------------------------------------------------
+ * @version     1.2 2018-04-11
+ *
+ * @package     iCagenda.Plugin
+ * @subpackage  Quickicon.icagendaupdate
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @since       iCagenda 3.5.16
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+/**
+ * iCagenda Quick Icon update notification plugin
+ */
+class PlgQuickiconiCagendaupdate extends JPlugin
+{
+	/**
+	 * Constructor (ONLY NEEDED FOR JOOMLA 2.5)
+	 *
+	 * @param  object  $subject The object to observe
+	 * @param  array   $config  An array that holds the plugin configuration
+	 *
+	 * @since  1.0
+	 */
+	public function __construct(& $subject, $config)
+	{
+		parent::__construct($subject, $config);
+
+		$this->loadLanguage();
+	}
+
+	/**
+	 * Load the language file on instantiation.
+	 *
+	 * @var    boolean
+	 * @since  1.0
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * This method is called when the Quick Icons module is constructing its set
+	 * of icons. You can return an array which defines a single icon and it will
+	 * be rendered right after the stock Quick Icons.
+	 *
+	 * @param  string  $context  The calling context
+	 *
+	 * @return array  A list of icon definition associative arrays, consisting of the
+	 *                 keys link, image, text and access.
+	 *
+	 * @since  1.0
+	 */
+	public function onGetIcons($context)
+	{
+		$UTILITIES_DIR = is_dir(JPATH_ADMINISTRATOR . '/components/com_icagenda/utilities');
+
+		if ($context != $this->params->get('context', 'mod_quickicon')
+			|| ! JFactory::getUser()->authorise('core.manage', 'com_installer')
+			|| ! $UTILITIES_DIR
+			)
+		{
+			return;
+		}
+
+		// Load Vector iCicons Font
+		JHtml::stylesheet( 'media/com_icagenda/icicons/style.css' );
+
+		// Load iCagenda Live Update
+		require_once JPATH_ADMINISTRATOR . '/components/com_icagenda/liveupdate/liveupdate.php';
+
+		$updateInfo = LiveUpdate::getUpdateInformation();
+
+		// Initialize the array of button options
+		$button = array();
+
+		// Not supported
+		if ( ! $updateInfo->supported)
+		{
+			$button['text'] = JText::_('PLG_QUICKICON_ICAGENDAUPDATE_LIVEUPDATE')
+							. ' <span class="label label-warning">' . JText::_('PLG_QUICKICON_ICAGENDAUPDATE_NOT_SUPPORTED') . '</span>';
+			$button['icon'] = version_compare(JVERSION, '3.0', 'ge') ? 'iclogo' : JUri::root() . 'media/com_icagenda/images/logo_joomlic.png';
+		}
+
+		// Crash
+		elseif ($updateInfo->stuck)
+		{
+			$button['text'] = JText::_('PLG_QUICKICON_ICAGENDAUPDATE_LIVEUPDATE')
+							. ' <span class="label label-important">' . JText::_('PLG_QUICKICON_ICAGENDAUPDATE_CRASHED') . '</span>';
+			$button['icon'] = version_compare(JVERSION, '3.0', 'ge') ? 'iclogo' : JUri::root() . 'media/com_icagenda/images/logo_joomlic.png';
+		}
+
+		// Has updates
+		elseif ($updateInfo->hasUpdates)
+		{
+			$button['text'] = '<strong>' . JText::sprintf('PLG_QUICKICON_ICAGENDAUPDATE_UPDATEFOUND', $updateInfo->version) . '</strong>';
+			$button['icon'] = version_compare(JVERSION, '3.0', 'ge') ? 'iclogo' : JUri::root() . 'media/com_icagenda/images/logo_joomlic.png';
+		}
+
+		// Already in the latest release
+		else
+		{
+			$button['text'] = JText::_('PLG_QUICKICON_ICAGENDAUPDATE_UPTODATE');
+			$button['icon'] = version_compare(JVERSION, '3.0', 'ge') ? 'iclogo' : JUri::root() . 'media/com_icagenda/images/logo_joomlic.png';
+		}
+
+		$token = JSession::getFormToken() . '=' . 1;
+
+		// Joomla 3 only
+		if (version_compare(JVERSION, '3.0', 'ge'))
+		{
+			$script = array();
+			$script[]= 'jQuery(document).ready(function(){';
+			$script[]= '	jQuery(".icon-iclogo").addClass("iCicon-iclogo").removeClass("icon-iclogo");';
+			$script[]= '	jQuery(".iCicon-iclogo").css("margin-right", "9px");';
+
+			if ($updateInfo->hasUpdates)
+			{
+				$script[]= '	jQuery("#system-message-container").prepend("'
+						. '<div class=\"alert alert-warning\"><center><strong>'
+						. JText::sprintf('PLG_QUICKICON_ICAGENDAUPDATE_UPDATEFOUND_MESSAGE', $updateInfo->version)
+						. ' <button class=\"btn btn-primary\" onclick=\"document.location=\''
+						. JUri::base() . 'index.php?option=com_installer&view=update&task=update.find&' . $token . '\';\">'
+						. JText::_('PLG_QUICKICON_ICAGENDAUPDATE_UPDATEFOUND_BUTTON') . '</button>'
+						. '</strong></center></div>");';
+			}
+
+			$script[]= '});';
+
+			JFactory::getDocument()->addScriptDeclaration(implode("\n", $script));
+
+			$link = 'index.php?option=com_installer&view=update&task=update.find&' . $token;
+		}
+		// Joomla 2.5
+		else
+		{
+			$link = 'index.php?option=com_icagenda&view=liveupdate';
+		}
+
+		return array(
+			array(
+				'link'  => $link,
+				'image'	=> $button['icon'],
+				'icon'	=> 'header/icon-48-download.png',
+				'text'	=> $button['text'],
+				'id'	=> 'plg_quickicon_icagendaupdate',
+				'group'	=> 'MOD_QUICKICON_MAINTENANCE'
+			)
+		);
+	}
+}
diff --git a/deployed/icagenda/plugins/quickicon/icagendaupdate/icagendaupdate.xml b/deployed/icagenda/plugins/quickicon/icagendaupdate/icagendaupdate.xml
new file mode 100644
index 00000000..025dfa28
--- /dev/null
+++ b/deployed/icagenda/plugins/quickicon/icagendaupdate/icagendaupdate.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="plugin" version="2.5.14" method="upgrade" group="quickicon">
+	<name>plg_quickicon_icagendaupdate</name>
+	<author>Cyril Rezé / Jooml!C</author>
+	<creationDate>2018-04-17</creationDate>
+	<copyright>Copyright (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.</copyright>
+	<license>GNU General Public License version 3 or later; see LICENSE.txt</license>
+	<authorEmail>info@joomlic.com</authorEmail>
+	<authorUrl>www.joomlic.com</authorUrl>
+	<version>1.2</version>
+	<description>PLG_QUICKICON_ICAGENDAUPDATE_XML_DESCRIPTION</description>
+
+	<files>
+		<filename plugin="icagendaupdate">icagendaupdate.php</filename>
+	</files>
+
+	<languages>
+		<language tag="en-GB">language/en-GB/en-GB.plg_quickicon_icagendaupdate.ini</language>
+		<language tag="en-GB">language/en-GB/en-GB.plg_quickicon_icagendaupdate.sys.ini</language>
+		<language tag="fr-FR">language/fr-FR/fr-FR.plg_quickicon_icagendaupdate.ini</language>
+		<language tag="fr-FR">language/fr-FR/fr-FR.plg_quickicon_icagendaupdate.sys.ini</language>
+		<language tag="it-IT">language/it-IT/it-IT.plg_quickicon_icagendaupdate.ini</language>
+		<language tag="it-IT">language/it-IT/it-IT.plg_quickicon_icagendaupdate.sys.ini</language>
+	</languages>
+
+	<config>
+
+		<fields name="params">
+
+			<fieldset name="basic">
+
+				<field
+					name="context"
+					type="text"
+					label="PLG_QUICKICON_ICAGENDAUPDATE_GROUP_LABEL"
+					description="PLG_QUICKICON_ICAGENDAUPDATE_GROUP_DESC"
+					default="mod_quickicon"
+				/>
+
+			</fieldset>
+
+		</fields>
+
+	</config>
+
+</extension>
diff --git a/deployed/icagenda/plugins/search/icagenda/icagenda.php b/deployed/icagenda/plugins/search/icagenda/icagenda.php
new file mode 100644
index 00000000..fc0ff25e
--- /dev/null
+++ b/deployed/icagenda/plugins/search/icagenda/icagenda.php
@@ -0,0 +1,348 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Plugin Search
+ *----------------------------------------------------------------------------
+ * @version     2.4 2020-03-30
+ *
+ * @package     iCagenda.Plugin
+ * @subpackage  Search.icagenda
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2020 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+// Require the component's router file
+require_once JPATH_SITE . '/components/com_icagenda/router.php';
+
+/**
+ * iCagenda Search Plugin
+ */
+class PlgSearchiCagenda extends JPlugin
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   object  $subject  The object to observe
+	 * @param   array   $config   An array that holds the plugin configuration
+	 *
+	 * @since   1.0
+	 */
+	public function __construct(& $subject, $config)
+	{
+		parent::__construct($subject, $config);
+
+		$this->loadLanguage();
+	}
+
+	/**
+	 * Determine areas searchable by this plugin.
+	 *
+	 * @return  array  An array of search areas.
+	 *
+	 * @since   1.0
+	 */
+	public function onContentSearchAreas()
+	{
+		$search_name = $this->params->get('search_name', JText::_('ICAGENDA_PLG_SEARCH_SECTION_EVENTS'));
+
+		if ($search_name == 'ICAGENDA_PLG_SEARCH_SECTION_EVENTS') $search_name = 'Events';
+
+		return array('icagenda' => $search_name);
+	}
+
+	/**
+	 * Search iCagenda (events).
+	 * The SQL must return the following fields that are used in a common display
+	 * routine: href, title, section, created, text, browsernav.
+	 *
+	 * @param   string  $text      Target search string.
+	 * @param   string  $phrase    Matching option (possible values: exact|any|all).  Default is "any".
+	 * @param   string  $ordering  Ordering option (possible values: newest|oldest|popular|alpha|category). Default is "newest".
+	 * @param   mixed   $areas     An array if the search it to be restricted to areas or null to search all areas.
+	 *
+	 * @return  array   Search results.
+	 *
+	 * @since   1.0
+	 */
+	public function onContentSearch($text, $phrase = '', $ordering = '', $areas = null)
+	{
+		$db     = JFactory::getDbo();
+		$app    = JFactory::getApplication();
+		$tag    = JFactory::getLanguage()->getTag();
+		$user   = JFactory::getUser();
+		$groups = implode(',', $user->getAuthorisedViewLevels());
+
+		$menu   = $app->getMenu();
+
+		// Load iCagenda Utilities
+		JLoader::registerPrefix('icagenda', JPATH_ADMINISTRATOR . '/components/com_icagenda/utilities');
+
+		// Itemid Request (automatic detection of the first iCagenda menu-link, by menuID)
+		$iC_list_menus	= icagendaMenus::iClistMenuItemsInfo();
+
+		// If the array is not correct, return it:
+		if (is_array($areas) && ! array_intersect($areas, array_keys($this->onContentSearchAreas())))
+		{
+			return array();
+		}
+
+		// Now retrieve the plugin parameters
+		$search_name    = $this->params->get('search_name', JText::_('ICAGENDA_PLG_SEARCH_SECTION_EVENTS'));
+		$search_limit   = $this->params->get('search_limit', '50' );
+		$search_target  = $this->params->get('search_target', '0' );
+
+		if ($search_name == 'ICAGENDA_PLG_SEARCH_SECTION_EVENTS') $search_name = 'Events';
+
+		// Use the PHP function trim to delete spaces in front of or at the back of the searching terms
+		$text = trim($text);
+
+		// Return Array when nothing was filled in.
+		if ($text == '')
+		{
+			return array();
+		}
+
+		// Database part.
+		$wheres = array();
+
+		// Check if Falang installed
+		$defaultSiteLang = JComponentHelper::getParams('com_languages')->get('site', 'en-GB');
+
+		//$falang = defined('FALANG_PATH');
+		$falang = is_a($db, 'JFalangDatabase');
+
+		$falangSearch = ($falang && ($tag != $defaultSiteLang));
+
+		switch ($phrase)
+		{
+			// Search exact
+			case 'exact':
+				$text    = $db->Quote('%' . $db->escape($text, true) . '%', false);
+				$wheres2 = array();
+
+				if ($falang && $falangSearch)
+				{
+					$wheres2[] = 'LOWER(f.value) LIKE ' . $text;
+				}
+				else
+				{
+					$wheres2[] = 'LOWER(e.title) LIKE ' . $text;
+					$wheres2[] = 'LOWER(e.shortdesc) LIKE ' . $text;
+					$wheres2[] = 'LOWER(e.desc) LIKE ' . $text;
+					$wheres2[] = 'LOWER(e.metadesc) LIKE ' . $text;
+					$wheres2[] = 'LOWER(e.place) LIKE ' . $text;
+					$wheres2[] = 'LOWER(e.city) LIKE ' . $text;
+					$wheres2[] = 'LOWER(e.country) LIKE ' . $text;
+					$wheres2[] = 'LOWER(e.address) LIKE ' . $text;
+					$wheres2[] = 'LOWER(c.title) LIKE ' . $text;
+				}
+
+				$where = '(' . implode( ') OR (', $wheres2 ) . ')';
+				break;
+
+			// Search all or any
+			case 'all':
+			case 'any':
+
+			// Set default
+			default:
+				$words  = explode(' ', $text);
+				$wheres = array();
+
+				foreach ($words as $word)
+				{
+					$word    = $db->Quote('%' . $db->escape($word, true) . '%', false);
+					$wheres2 = array();
+
+					if ($falang && $falangSearch)
+					{
+						$wheres2[] = 'LOWER(f.value) LIKE ' . $word;
+					}
+					else
+					{
+						$wheres2[] = 'LOWER(e.title) LIKE ' . $word;
+						$wheres2[] = 'LOWER(e.shortdesc) LIKE ' . $word;
+						$wheres2[] = 'LOWER(e.desc) LIKE ' . $word;
+						$wheres2[] = 'LOWER(e.metadesc) LIKE ' . $word;
+						$wheres2[] = 'LOWER(e.place) LIKE ' . $word;
+						$wheres2[] = 'LOWER(e.city) LIKE ' . $word;
+						$wheres2[] = 'LOWER(e.country) LIKE ' . $word;
+						$wheres2[] = 'LOWER(e.address) LIKE ' . $word;
+						$wheres2[] = 'LOWER(c.title) LIKE ' . $word;
+					}
+
+					$wheres[] = implode( ' OR ', $wheres2 );
+				}
+
+				$where = '(' . implode(($phrase == 'all' ? ') AND (' : ') OR ('), $wheres) . ')';
+				break;
+		}
+
+		// Ordering of the results
+		switch ($ordering)
+		{
+			//Alphabetic, ascending
+			case 'alpha':
+				$order = 'e.title ASC';
+				break;
+
+			// Oldest first
+			case 'oldest':
+				$order = 'e.next ASC';
+				break;
+
+			// Popular first
+			case 'popular':
+
+			// Newest first
+			case 'newest':
+				$order = 'e.next DESC';
+				break;
+
+			// Category
+			case 'category':
+				$order = 'c.title ASC';
+				break;
+
+			// Default setting: alphabetic, ascending
+			default:
+				$order = 'e.title ASC';
+		}
+
+		// Section
+		$section = $search_name;
+
+		// List of Events menu Itemid Request
+		$nb_menu        = count($iC_list_menus);
+		$nolink         = ($nb_menu < 1);
+
+		// Get User groups allowed to approve event submitted
+		$userID         = $user->id;
+		$userLevels     = $user->getAuthorisedViewLevels();
+		$userGroups     = $user->getAuthorisedGroups();
+
+		$groupid        = JComponentHelper::getParams('com_icagenda')->get('approvalGroups', array("8"));
+
+		jimport('joomla.access.access');
+
+		$adminUsersArray = array();
+
+		foreach ($groupid as $gp)
+		{
+			$adminUsers      = JAccess::getUsersByGroup($gp, false);
+			$adminUsersArray = array_merge($adminUsersArray, $adminUsers);
+		}
+
+		// The database query;
+		$query  = $db->getQuery(true);
+		$query->select(
+			'e.title AS title, e.created AS created, e.next AS next, e.displaytime AS displaytime, e.alias AS alias, '
+				. 'e.desc AS text, e.id AS eventID, '
+				. 'c.id AS catid, c.title AS cattitle, e.language AS language, '
+				. '"' . $search_target . '" AS browsernav'
+		);
+
+//		$query->select($query->concatenate(array($db->Quote($section), 'c.title'), " / ").' AS section');
+
+		$query->from('#__icagenda_events AS e');
+		$query->join('INNER', $db->quoteName('#__icagenda_category', 'c') . ' ON (' . $db->quoteName('c.id') . ' = ' . $db->quoteName('e.catid') . ')');
+
+		$query->where('e.state = 1');
+		$query->where('c.state = 1');
+		$query->where('e.access IN (' . $groups . ')');
+
+		if ($falang && $falangSearch)
+		{
+			$query->join('LEFT', $db->quoteName('#__falang_content', 'f') . ' ON (' . $db->quoteName('f.reference_id') . ' = ' . $db->quoteName('e.id') . ')');
+			$query->join('LEFT', $db->quoteName('#__languages', 'l') . ' ON (' . $db->quoteName('f.language_id') . ' = ' . $db->quoteName('l.lang_id') . ')');
+			$query->where('f.reference_table IN (' . $db->quote('icagenda_events') . ', ' . $db->quote('icagenda_category') . ')');
+			$query->where('l.lang_code in (' . $db->quote($tag) . ',' . $db->quote('*') . ')');
+		}
+
+		// START Hack for Upcoming Filtering
+//		$datetime_today	= JHtml::date('now', 'Y-m-d H:i'); // Joomla Time Zone
+
+//		$query->where('e.next >= ' . $db->q($datetime_today));
+		// END Hack for Upcoming Filtering
+
+		$query->where('(' . $where . ')');
+
+
+		// if user logged-in has no Approval Rights, not approved events won't be displayed.
+		if ( ! in_array($userID, $adminUsersArray)
+			&& ! in_array('8', $userGroups))
+		{
+			$query->where('e.approval <> 1');
+		}
+
+		// Filter by language.
+		if ($app->isSite() && JLanguageMultilang::isEnabled())
+		{
+			$query->where('e.language in (' . $db->quote($tag) . ',' . $db->quote('*') . ')');
+		}
+
+		// Prevents duplicated results when search in Falang category translations
+		$query->group('e.id');
+
+		$query->order($order);
+
+		// Set query
+		$db->setQuery($query, 0, $search_limit);
+
+		$iCevents = $db->loadObjectList();
+
+		// The 'output' of the displayed link.
+		if (isset($iCevents))
+		{
+			foreach($iCevents as $key => $iCevent)
+			{
+				$event_slug   = empty($iCevent->alias) ? $iCevent->eventID : $iCevent->eventID . ':' . $iCevent->alias;
+
+				$date_next    = JHtml::date($iCevent->next, JText::_( 'DATE_FORMAT_LC3' ), null);
+				$time_next    = JHtml::date($iCevent->next, 'H:i', null);
+
+				$display_time = $iCevent->displaytime ? ' ' . $time_next : '';
+
+				$linkid = icagendaMenus::thisEventItemid($iCevent->next, $iCevent->catid, $iC_list_menus);
+				$linkid = $linkid ? $linkid : $menu->getDefault($tag)->id;
+
+				$iCevents[$key]->title   = $iCevent->title . ' (' . $date_next . $display_time . ')';
+				$iCevents[$key]->section = $section . ' / ' . $iCevent->cattitle;
+				$iCevents[$key]->href    = 'index.php?option=com_icagenda&view=event&id=' . $event_slug . '&Itemid=' . $linkid;
+			}
+		}
+
+		// If menu item iCagenda list of events exists, returns events found.
+		if ($nolink)
+		{
+			// Displays a warning that no menu item to the list of events is published.
+			$app->enqueueMessage(JText::_('ICAGENDA_PLG_SEARCH_ALERT_NO_ICAGENDA_MENUITEM'), 'warning');
+		}
+		else
+		{
+			//Return the search results in an array
+			return $iCevents;
+		}
+	}
+}
diff --git a/deployed/icagenda/plugins/search/icagenda/icagenda.xml b/deployed/icagenda/plugins/search/icagenda/icagenda.xml
new file mode 100644
index 00000000..c22c242e
--- /dev/null
+++ b/deployed/icagenda/plugins/search/icagenda/icagenda.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="plugin" version="3.2.4" method="upgrade" group="search">
+	<name>PLG_SEARCH_ICAGENDA</name>
+	<author>Cyril Rezé / Jooml!C</author>
+	<creationDate>2020-04-02</creationDate>
+	<copyright>Copyright (c) 2012-2020 Jooml!C / Cyril Rezé. All rights reserved.</copyright>
+	<license>GNU General Public License version 3 or later; see LICENSE.txt</license>
+	<authorEmail>info@joomlic.com</authorEmail>
+	<authorUrl>www.joomlic.com</authorUrl>
+	<version>2.4</version>
+	<description>PLG_SEARCH_ICAGENDA_XML_DESCRIPTION</description>
+
+	<files>
+		<filename plugin="icagenda">icagenda.php</filename>
+		<filename>index.html</filename>
+	</files>
+
+	<languages>
+		<language tag="en-GB">language/en-GB/en-GB.plg_search_icagenda.ini</language>
+		<language tag="en-GB">language/en-GB/en-GB.plg_search_icagenda.sys.ini</language>
+		<language tag="fr-FR">language/fr-FR/fr-FR.plg_search_icagenda.ini</language>
+		<language tag="fr-FR">language/fr-FR/fr-FR.plg_search_icagenda.sys.ini</language>
+		<language tag="it-IT">language/it-IT/it-IT.plg_search_icagenda.ini</language>
+		<language tag="it-IT">language/it-IT/it-IT.plg_search_icagenda.sys.ini</language>
+	</languages>
+
+	<config>
+
+		<fields name="params">
+
+			<fieldset name="basic">
+
+				<field
+					name="search_name"
+					type="text"
+					label="ICAGENDA_PLG_SEARCH_NAME_LABEL"
+					description="ICAGENDA_PLG_SEARCH_NAME_DESC"
+					default=""
+				/>
+
+				<field
+					name="search_limit"
+					type="text"
+					label="JFIELD_PLG_SEARCH_SEARCHLIMIT_LABEL"
+					description="JFIELD_PLG_SEARCH_SEARCHLIMIT_DESC"
+					default="50"
+					size="5"
+					filter="integer"
+				/>
+
+				<field
+					name="search_target"
+					type="list"
+					label="ICAGENDA_PLG_SEARCH_TARGET_LABEL"
+					description="ICAGENDA_PLG_SEARCH_TARGET_DESC"
+					default="0"
+					>
+					<option value="0">JBROWSERTARGET_PARENT</option>
+					<option value="1">JBROWSERTARGET_NEW</option>
+				</field>
+
+			</fieldset>
+
+		</fields>
+
+	</config>
+
+</extension>
diff --git a/deployed/icagenda/plugins/search/icagenda/index.html b/deployed/icagenda/plugins/search/icagenda/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/plugins/search/icagenda/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/plugins/system/ic_autologin/ic_autologin.php b/deployed/icagenda/plugins/system/ic_autologin/ic_autologin.php
new file mode 100644
index 00000000..3b1b90bf
--- /dev/null
+++ b/deployed/icagenda/plugins/system/ic_autologin/ic_autologin.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ *----------------------------------------------------------------------------
+ * iCagenda     Plugin System - Autologin
+ *----------------------------------------------------------------------------
+ * @version     1.4 2018-05-01
+ *
+ * @package     iCagenda.Plugin
+ * @subpackage  System.ic_autologin
+ * @link        https://icagenda.joomlic.com
+ *
+ * @author      Cyril Rezé
+ * @copyright   (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @since       1.0
+ *----------------------------------------------------------------------------
+*/
+
+defined('_JEXEC') or die;
+
+JPluginHelper::importPlugin('icagenda'); // @todo: move to a new iCagenda system plugin
+
+jimport('joomla.plugin.plugin');
+
+class PlgSystemic_autologin extends JPlugin
+{
+	protected $ic_un;
+	protected $ic_pw;
+
+	function __construct(& $subject, $config)
+	{
+		parent::__construct($subject, $config);
+
+		$this->loadLanguage();
+	}
+
+	function onAfterInitialise()
+	{
+		$app    = JFactory::getApplication();
+		$jinput = $app->input;
+
+		$this->ic_un = $jinput->get('icu', null, 'raw');
+		$this->ic_pw = $jinput->get('icp', null, 'raw');
+
+		if ( ! empty($this->ic_un) && ! empty($this->ic_pw))
+		{
+			$result = $this->icLogin();
+
+			$urllink  = JUri::getInstance()->toString();
+			$cleanurl = preg_replace('/&icu=[^&]*/', '', $urllink);
+			$cleanurl = preg_replace('/&icp=[^&]*/', '', $cleanurl);
+
+			// Redirect to target URL after success login
+			if ( ! $result instanceof Exception)
+			{
+				$app->redirect($cleanurl);
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Login with ENCRYPT PASSWORD
+	 */
+	function icLogin()
+	{
+		// Get the application object.
+		$app = JFactory::getApplication();
+
+		$db = JFactory::getDbo();
+		$query = 'SELECT id, username, password'
+				. ' FROM #__users'
+				. ' WHERE username=' . $db->Quote($this->ic_un)
+				. '   AND password=' . $db->Quote($this->ic_pw)
+		;
+
+		$db->setQuery($query);
+
+		$result = $db->loadObject();
+
+		if ($result)
+		{
+			JPluginHelper::importPlugin('user');
+
+			$options = array();
+
+			$options['action'] = 'core.login.site';
+
+			$response['username'] = $result->username;
+
+			$result = $app->triggerEvent('onUserLogin', array((array)$response, $options));
+		}
+	}
+}
diff --git a/deployed/icagenda/plugins/system/ic_autologin/ic_autologin.xml b/deployed/icagenda/plugins/system/ic_autologin/ic_autologin.xml
new file mode 100644
index 00000000..dc837de6
--- /dev/null
+++ b/deployed/icagenda/plugins/system/ic_autologin/ic_autologin.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="plugin" version="2.5" method="upgrade" group="system">
+	<name>System - iCagenda :: Autologin</name>
+	<author>Cyril Rezé / Jooml!C</author>
+	<creationDate>2018-05-01</creationDate>
+	<copyright>Copyright (c) 2012-2019 Jooml!C / Cyril Rezé. All rights reserved.</copyright>
+	<license>GNU General Public License version 3 or later; see LICENSE.txt</license>
+	<authorEmail>info@joomlic.com</authorEmail>
+	<authorUrl>www.joomlic.com</authorUrl>
+	<version>1.4</version>
+	<description>The iCagenda Autologin plugin allows to automatically connect an authorized user when clicking on a not public URL inserted in a notification email.</description>
+
+	<files>
+		<filename plugin="ic_autologin">ic_autologin.php</filename>
+		<filename>index.html</filename>
+	</files>
+
+	<config>
+	</config>
+
+</extension>
diff --git a/deployed/icagenda/plugins/system/ic_autologin/index.html b/deployed/icagenda/plugins/system/ic_autologin/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/plugins/system/ic_autologin/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/deployed/icagenda/plugins/system/ic_library/ic_library.php b/deployed/icagenda/plugins/system/ic_library/ic_library.php
new file mode 100644
index 00000000..a5f4ee0a
--- /dev/null
+++ b/deployed/icagenda/plugins/system/ic_library/ic_library.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ *	Plugin System - iC Library
+ *----------------------------------------------------------------------------
+ * @package     iC Library
+ * @copyright   Copyright (c)2014-2019 Cyril Rezé, Jooml!C - All rights reserved
+
+ * @license     GNU General Public License version 3 or later; see LICENSE.txt
+ * @author      Cyril Rezé / Jooml!C
+ * @link        https://www.joomlic.com
+ *
+ * @version     1.4 2017-06-06
+ * @since		1.0
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *----------------------------------------------------------------------------
+*/
+
+
+// No direct access to this file
+defined('_JEXEC') or die();
+
+/**
+ * iC Library plugin class.
+ *
+ * @package     Joomla.plugin
+ * @subpackage  System.iClib
+ */
+class plgSystemiC_library extends JPlugin
+{
+	/**
+	 * Method to register iC library.
+	 *
+	 * return  void
+	 */
+	public function onAfterInitialise()
+	{
+		if (is_dir(JPATH_LIBRARIES . '/ic_library'))
+		{
+			// Ensure that autoloaders are set
+			JLoader::setup();
+
+			// Set iC Library prefix
+			JLoader::registerPrefix('iC', JPATH_LIBRARIES . '/ic_library');
+
+			// Common fields
+			JFormHelper::addFieldPath(JPATH_LIBRARIES . '/ic_library/form/field');
+			JFormHelper::addRulePath(JPATH_LIBRARIES . '/ic_library/form/rule');
+
+			// Test if translation is missing, set to en-GB by default
+			$language = JFactory::getLanguage();
+			$language->load('lib_ic_library', JPATH_SITE, 'en-GB', true);
+			$language->load('lib_ic_library', JPATH_SITE, null, true);
+		}
+	}
+
+	/**
+	 * Method to load Custom CSS from Component Config.
+	 * NOTE: To be moved to a separate system plugin - iCagenda
+	 */
+	public function onAfterDispatch()
+	{
+		// Check if component is installed
+		if ( file_exists(JPATH_ADMINISTRATOR . '/components/com_icagenda/icagenda.php') )
+		{
+			// Custom CSS loading
+			$customCSS_activation = JComponentHelper::getParams('com_icagenda')->get('customCSS_activation', '0');
+			$customCSS = JComponentHelper::getParams('com_icagenda')->get('customCSS', '');
+
+			if (!empty($customCSS_activation) && $customCSS)
+			{
+				JFactory::getDocument()->addStyleDeclaration( $customCSS );
+			}
+		}
+	}
+}
diff --git a/deployed/icagenda/plugins/system/ic_library/ic_library.xml b/deployed/icagenda/plugins/system/ic_library/ic_library.xml
new file mode 100644
index 00000000..ded089ed
--- /dev/null
+++ b/deployed/icagenda/plugins/system/ic_library/ic_library.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="plugin" version="2.5" method="upgrade" group="system">
+	<name>plg_system_ic_library</name>
+	<author>Cyril Rezé / Jooml!C</author>
+	<creationDate>2017-06-06</creationDate>
+	<copyright>Copyright (c) 2013-2019 Jooml!C / Cyril Rezé. All rights reserved.</copyright>
+	<license>GNU General Public License version 3 or later; see LICENSE.txt</license>
+	<authorEmail>info@joomlic.com</authorEmail>
+	<authorUrl>www.joomlic.com</authorUrl>
+	<version>1.4</version>
+	<description>PLG_SYSTEM_IC_LIBRARY_XML_DESCRIPTION</description>
+
+	<files>
+		<filename plugin="ic_library">ic_library.php</filename>
+		<filename>index.html</filename>
+	</files>
+
+	<languages>
+		<language tag="en-GB">language/en-GB/en-GB.plg_system_ic_library.ini</language>
+		<language tag="en-GB">language/en-GB/en-GB.plg_system_ic_library.sys.ini</language>
+		<language tag="fr-FR">language/fr-FR/fr-FR.plg_system_ic_library.ini</language>
+		<language tag="fr-FR">language/fr-FR/fr-FR.plg_system_ic_library.sys.ini</language>
+		<language tag="it-IT">language/it-IT/it-IT.plg_system_ic_library.ini</language>
+		<language tag="it-IT">language/it-IT/it-IT.plg_system_ic_library.sys.ini</language>
+	</languages>
+
+	<config>
+	</config>
+
+</extension>
diff --git a/deployed/icagenda/plugins/system/ic_library/index.html b/deployed/icagenda/plugins/system/ic_library/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/deployed/icagenda/plugins/system/ic_library/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>