From a135d31b1d6e73fb2ca3880589a69584b85341b1 Mon Sep 17 00:00:00 2001 From: Lodder Date: Wed, 18 Jan 2017 11:23:53 +0000 Subject: [PATCH] Merge from staging #8 (#306) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * tinymce 4.5.2 Version 4.5.2 - January 4, 2017 * Clean up JModelForm * xml update version * Catch "expects parameter 2 to be string" error * Remove multiple parameter from user field * Remove default value from the field params to inherit from plugin * It's 2017. Happy New Year * Some improvements in tests #3: (#13402) * Some improvements in tests #3: - call static methods correctly * Fix T_PAAMAYIM_NEKUDOTAYIM (for all PHP 5.x) * Remove forgotten call * Changed a few things after conversation with @mbabker * Fixes according to @andrepereiradasilva's comments * Unnecessary double quotes in /libraries/joomla (#13372) * Replace unnecessary double quotes in /libraries/joomla * Formatting * CS Fix * Fixes, based on @andrepereiradasilva's comments. * Change remove string concatenations for some occurrences. * Fixes, based on @andrepereiradasilva's comments. * Fixes, based on @andrepereiradasilva's comments. * Fixes, based on @andrepereiradasilva's comments. * Fixing search for MySQL (#13571) * Use $query->castAsChar instead of casting to integer * Codestyle * Clean up old code in cache.php file (#12183) * Clean up in cache - part 1 * Remove old php4 style to catch exception which currently is useless. * Add shorten version of ternary pperators. * Add fix for contains() * Add more email cloaking unit tests and fix email cloaking bug (#13446) * Rsponsive article edit fields (#13586) * Fix BS grid (#13560) * Fixing Showon in plugins/modules/templates (#13549) * Adding field group to JFormHelper::parseShowOnConditions and rearranged argument order. * codestyle * $field->assigned_cat_ids may not exist. (#13570) * Clean up ModulesModelModule class (#13380) * Make the calendar work in the subform field (#13153) * [com_fields] Add Joomla loading overlay when form submit is triggered by category selector change (#13320) * Added overlay box and message box for submit and reload form after category change * Removed commented testing code * Added language strings * CS fix, added missing spaces * Used Joomla logo spinner instead of fixed message * Reverted changes in admin lang file * CS * Revert frontend lang changes * Added Joomla loading overlay to new field form when changing field type * Added Joomla.loadingLayer show to typeHasChanged JS method too * PostgreSQL - return the same string each time of call __toString() on update query (#13284) * TranslateFormat in all other forms (#13158) * TranslateFormat in all other forms * Revert for tracks filter bar * Fix for issue #13531 (#13535) * Fix for issue #13531 - [AND] and [OR] operators were not functioning correctly. Fixed. - some cleanup of whitespaces in XML file and removal of rulers when the encapsulated fields are not showing. * Removed $key, as it was an unused leftover * CS Fix * Whitespace Fix * Whitespace Fix * Whitespace Fix#2 * Conflict resolution (hopefully, Don't have a complete dev-environment right now.) * Added css classes to the mod_login submit buttons (#13379) * Added css classes to the mod_login submit buttons * Added css classes to the mod_login submit buttons * Changed class to login-button in both modules * PHPMailer update (#13575) * Correcting sidebar display LTR and RTL (replaces #13548) (#13593) * Fix for Issue #13588 - mod_articles_categories - Fatal error: Class 'ContentHelperRoute' not found... (#13590) * Update helper.php Remove JLoader::register('ContentHelperRoute', JPATH_SITE . '/components/com_content/helpers/route.php'); * Update mod_articles_categories.php * Make clear Exception messages in JTable (#13603) * Fix issue where fields is false (#13574) * Update jQuery Autocomplete to 1.2.27 (#13282) * Show text "No Information Entered" in users profile when no value is set (#13589) * Delete UCM content entries when Joomla articles are deleted (#13592) * [com_fields] Add base list plugin class which activates the list plugin (#13546) * Add base list plugin class * Update fieldslistplugin.php * Fixes #13177: Added where clause with block status (#13545) * Menu manager for Joomla Backend Menu (#13036) * Added client id column to menu_type table. Allow creating and editing of "menutype" records with client_id = 1 Add client_id filters in menu and menu items list views Sync menu type filter and client_id filter allowing only menu type in the URL query parameter (B/C) Both Lists now also filtered by client id. Client id selection updates the menu type list options to show choices only for that client id TBD: Reserved menu types: main & menu * In modal list view we currently hide client_id filter and show only site menu types, will be updated once we have more clear vision. Menu type assignment to backend mod_menu config from both menu manager and module manager. Though that is not functional within the module itself. * Add/edit menu item redirect with clientId from list filter. Load menu item form based on active client id Menu type dropdown choices limited to active client id value Show menu-item-type choices (modal) trigger with client id parameter in the url Switch edit layout based on client id * Menu item type loading from component metadata xml or mvc not identifies backend and frontend application separately. Not yet able to load menu item type from backend so returns empty list. Front-end is still intact and unaffected. * Edit menu item and create menu item set to follow client id and menu type value consistenty. When creating menu item alias, the referenced menu must also belong to same client id. Client id field removed from form, this should be auto-calculated from the menu type when saving. * Adding layout metadata xml in backend to reference menu item types as it was in front-end. Removed unnecessary admin specific layout added earlier as it is so far same as original edit.php, may be added back when needed. Remove page specific meta data fields from backend component type menu items. For now disable/unsupport association for backend menu items. Disallow change of client id for existing menu items, unexpected conflicts may occur if allowed so better be safe. Ref to #2 * Created each backend menu items using menu manager as a replica of existing Joomla backend menu. These are to be used for testing during upgrading menu module. language keys are not yet translated. Translation will be done as we are ready with most new or modified language keys application wide. Backend menu items does not require all those parameters as that with front-end menu items. Therefore segregated entire menu item xml for backend/frontend. Ref #2 * [a11y] Protostar back to top (#12446) * [a11y] Protostar - back to top link * Oops Andre was right * add anchor for non-js enabled browsers * Restructure mod_menu to load preset menu items as an option (default). Other options will be the menu-type and will cause us to load from database. Ref #2 * Disallow editing and set to home of protected menu type menu items viz. 'main' and 'menu' Allow explicit filtering by protected menu type choices in menu items list view. Not limited to #__menutypes table entries only. Unfiltered list still excludes those menu items. (B/C ok) Menu items created during installation of a component are now saved as published. When unpublished we won't load it in customised menu's component menu container. They will still be loaded irrespective of state as previously when preset is in use. (B/C ok) Home page can now be set one per client instead of one overall. Menu module only loads item from 'main' and 'menu' type menu items when requested for component menu items. This filter is now required because we are now going to have other custom menu types for backend which should not be included. Ref #2 * Load menu items from databases in correct hierarchy. Remove any extra separator type menu items created due to exclusion of certain menu items based on various conditions. Populate menu items loaded from db into the AdminCssMenu object for final rendering. Load new installed components menu items dynamically under the specified menu item with “components container” flag. Any unpublished menu items from the protected menutypes (viz. “main” and “menu”) will be skipped. When loading from system preset menu items, these components menu items are all included regardless of their published state. (B/C ok). Ref #2 * View manifests for menu item type and related language key updates. ref #2 * Minor mistake fix. * Translate menu item titles in list view. Ref #2 * Reset the preset menu structure to be same as the current J37 branch state, dropping implicit inclusion of joomla/joomla-cms#10657 improvement. Ref #2 * Allow the existing components to leverage the menu/submenu entries in their install manifest for admin menu manager menu link types. This provides ability to create links for then without requiring them to add layout manifests. Hence, full B/C solution. Ref #2 * Minor fix * Remove temporary dev phase files * Preparing for PR, database and install script updates. Ref #2 * Minor fix * Codestyle fix * CS fix * Don’t sort menu items * Sort lang keys Allow ‘component’ as first level alias in admin menu items Fix lang key Remove ‘home’ setting from admin menu items * apply in hathor * menu item alias check for site only * Post merge fixes. * Fixes as suggested by @infograf768 1. Group menu types by client id in lists and default admin menu 2. Hide association tab for admin menu items. 3. Hide client id filter for association mapping modal. * Add recovery mode for menu where the selected admin menu does not contain link to module manager and/or menu manager. * minor bug fix * Remove assoc column for admin menu items. Make recovery mode message more straight forward. Change radio to toggle buttons. * Add SMS to External URL menu item type (#13615) Allows data like sms://+15555555555 to be used instead of getting "Save Not Permitted" * Adding the Multilanguage Associations Manager (#13537) * Merge Associations rewrite * updated searchtool with the new way * udpated edit view title * added contact associationshelper class * temp fix * fix for category filter * added newsfeeds associations helper * CAPS for params * lang tag and added a helper function * added land tags * code style fix * better title in associations view * better title * use the usual naming * fix language tag, thanks to brian teeman and twitter :-) * initial review * on simple change * on simple change 2 * simple * some more helper changes * Update associations.php * Update associations.php * app isn’t set a model property * correct return value * simplify code adn use helper method * use typename directly * changed the tooltip position * Correct menu helper * remove unreacable code * correcting checked_out * com_menus * fixed not supportted message * installation * fix menu install * Spaces -> tabs * [com_associations] - mssql updates (#13617) the missed mssql updates for #13537 * [com_fields] Improved description in the "description" tooltip Fixes #13392 (#13557) * Fixes #13195: Added margin bottom to sidebar menu * Fixes #13392: Changed description field tooltip * Fixes #13392: Changed description field tooltip * Fixes #13392: Changed description field tooltip * sync admin menu menutype (#13618) * Routing: Remove IDs from tags URLs, use menu item of tags view as default for tag view (#11166) * Remove id from tags, use tags list menu item as default for tag * Code style, remove useless code, feature: first Itemid for tags view, second Itemid for default tag view * Updating install.xml en-GB administrator (#13623) * run grunt --- README.md | 2 +- README.txt | 2 +- administrator/components/com_admin/admin.php | 2 +- .../components/com_admin/controller.php | 2 +- .../com_admin/controllers/profile.php | 2 +- .../com_admin/helpers/html/directory.php | 2 +- .../com_admin/helpers/html/phpsetting.php | 2 +- .../com_admin/helpers/html/system.php | 2 +- .../com_admin/models/forms/profile.xml | 6 +- .../components/com_admin/models/help.php | 2 +- .../components/com_admin/models/profile.php | 2 +- .../components/com_admin/models/sysinfo.php | 2 +- .../com_admin/postinstall/eaccelerator.php | 2 +- .../com_admin/postinstall/htaccess.php | 2 +- .../com_admin/postinstall/joomla40checks.php | 2 +- .../postinstall/languageaccess340.php | 2 +- .../com_admin/postinstall/phpversion.php | 2 +- .../com_admin/postinstall/statscollection.php | 2 +- administrator/components/com_admin/script.php | 10 +- .../sql/updates/mysql/2.5.0-2011-12-21-1.sql | 2 +- .../sql/updates/mysql/2.5.1-2012-01-26.sql | 2 +- .../com_admin/sql/updates/mysql/3.0.0.sql | 8 +- .../com_admin/sql/updates/mysql/3.1.0.sql | 4 +- .../com_admin/sql/updates/mysql/3.2.0.sql | 2 +- .../sql/updates/mysql/3.7.0-2016-11-19.sql | 3 + .../sql/updates/mysql/3.7.0-2017-01-15.sql | 2 + .../sql/updates/postgresql/3.1.0.sql | 6 +- .../sql/updates/postgresql/3.2.0.sql | 2 +- .../updates/postgresql/3.7.0-2016-11-19.sql | 3 + .../updates/postgresql/3.7.0-2017-01-15.sql | 2 + .../sql/updates/sqlazure/3.7.0-2016-11-19.sql | 3 + .../sql/updates/sqlazure/3.7.0-2017-01-15.sql | 2 + .../com_admin/views/help/tmpl/default.php | 2 +- .../com_admin/views/help/tmpl/default.xml | 8 + .../com_admin/views/help/view.html.php | 2 +- .../com_admin/views/profile/tmpl/edit.php | 2 +- .../com_admin/views/profile/view.html.php | 2 +- .../com_admin/views/sysinfo/tmpl/default.php | 2 +- .../com_admin/views/sysinfo/tmpl/default.xml | 8 + .../views/sysinfo/tmpl/default_config.php | 2 +- .../views/sysinfo/tmpl/default_directory.php | 2 +- .../views/sysinfo/tmpl/default_phpinfo.php | 2 +- .../sysinfo/tmpl/default_phpsettings.php | 2 +- .../views/sysinfo/tmpl/default_system.php | 2 +- .../com_admin/views/sysinfo/view.html.php | 2 +- .../com_admin/views/sysinfo/view.json.php | 2 +- .../com_admin/views/sysinfo/view.text.php | 2 +- administrator/components/com_ajax/ajax.php | 2 +- .../components/com_associations/access.xml | 8 + .../com_associations/associations.php | 41 ++ .../com_associations/associations.xml | 30 + .../components/com_associations/config.xml | 17 + .../com_associations/controller.php | 27 + .../controllers/association.php | 86 +++ .../controllers/associations.php | 71 +++ .../com_associations/helpers/associations.php | 528 +++++++++++++++++ .../joomla/searchtools/default/bar.php | 32 ++ .../com_associations/models/association.php | 36 ++ .../com_associations/models/associations.php | 529 ++++++++++++++++++ .../models/fields/itemlanguage.php | 115 ++++ .../models/fields/itemtype.php | 62 ++ .../models/fields/modalassociation.php | 105 ++++ .../models/forms/association.xml | 21 + .../models/forms/filter_associations.xml | 116 ++++ .../views/association/tmpl/edit.php | 70 +++ .../views/association/view.html.php | 197 +++++++ .../views/associations/tmpl/default.php | 171 ++++++ .../views/associations/tmpl/modal.php | 161 ++++++ .../views/associations/view.html.php | 232 ++++++++ .../components/com_banners/banners.php | 2 +- .../components/com_banners/controller.php | 2 +- .../com_banners/controllers/banner.php | 2 +- .../com_banners/controllers/banners.php | 2 +- .../com_banners/controllers/client.php | 2 +- .../com_banners/controllers/clients.php | 2 +- .../com_banners/controllers/tracks.php | 2 +- .../com_banners/controllers/tracks.raw.php | 2 +- .../com_banners/helpers/banners.php | 2 +- .../com_banners/helpers/html/banner.php | 2 +- .../components/com_banners/models/banner.php | 2 +- .../components/com_banners/models/banners.php | 2 +- .../components/com_banners/models/client.php | 2 +- .../components/com_banners/models/clients.php | 2 +- .../com_banners/models/download.php | 2 +- .../models/fields/bannerclient.php | 2 +- .../com_banners/models/fields/clicks.php | 2 +- .../com_banners/models/fields/impmade.php | 2 +- .../com_banners/models/fields/imptotal.php | 2 +- .../com_banners/models/forms/banner.xml | 12 +- .../components/com_banners/models/tracks.php | 2 +- .../components/com_banners/tables/banner.php | 2 +- .../components/com_banners/tables/client.php | 2 +- .../com_banners/views/banner/tmpl/edit.php | 2 +- .../com_banners/views/banner/view.html.php | 2 +- .../views/banners/tmpl/default.php | 2 +- .../views/banners/tmpl/default_batch_body.php | 2 +- .../banners/tmpl/default_batch_footer.php | 2 +- .../com_banners/views/banners/view.html.php | 2 +- .../com_banners/views/client/tmpl/edit.php | 2 +- .../com_banners/views/client/view.html.php | 2 +- .../views/clients/tmpl/default.php | 2 +- .../com_banners/views/clients/view.html.php | 2 +- .../views/download/tmpl/default.php | 2 +- .../com_banners/views/download/view.html.php | 2 +- .../com_banners/views/tracks/tmpl/default.php | 2 +- .../com_banners/views/tracks/view.html.php | 2 +- .../com_banners/views/tracks/view.raw.php | 2 +- administrator/components/com_cache/cache.php | 2 +- .../components/com_cache/controller.php | 2 +- .../components/com_cache/helpers/cache.php | 2 +- .../components/com_cache/models/cache.php | 2 +- .../com_cache/views/cache/tmpl/default.php | 2 +- .../com_cache/views/cache/tmpl/default.xml | 8 + .../com_cache/views/cache/view.html.php | 2 +- .../com_cache/views/purge/tmpl/default.php | 2 +- .../com_cache/views/purge/tmpl/default.xml | 8 + .../com_cache/views/purge/view.html.php | 2 +- .../components/com_categories/categories.php | 2 +- .../components/com_categories/controller.php | 2 +- .../com_categories/controllers/categories.php | 2 +- .../com_categories/controllers/category.php | 2 +- .../com_categories/helpers/association.php | 2 +- .../com_categories/helpers/categories.php | 2 +- .../helpers/html/categoriesadministrator.php | 2 +- .../com_categories/models/categories.php | 2 +- .../com_categories/models/category.php | 2 +- .../models/fields/categoryedit.php | 2 +- .../models/fields/categoryparent.php | 2 +- .../models/fields/modal/category.php | 2 +- .../com_categories/tables/category.php | 2 +- .../views/categories/tmpl/default.php | 2 +- .../views/categories/tmpl/default.xml | 19 + .../categories/tmpl/default_batch_body.php | 2 +- .../categories/tmpl/default_batch_footer.php | 2 +- .../views/categories/tmpl/modal.php | 2 +- .../views/categories/view.html.php | 2 +- .../views/category/tmpl/edit.php | 2 +- .../views/category/tmpl/edit.xml | 24 + .../views/category/tmpl/edit_associations.php | 2 +- .../views/category/tmpl/edit_metadata.php | 2 +- .../views/category/tmpl/modal.php | 2 +- .../category/tmpl/modal_associations.php | 2 +- .../views/category/tmpl/modal_extrafields.php | 2 +- .../views/category/tmpl/modal_metadata.php | 2 +- .../views/category/tmpl/modal_options.php | 2 +- .../views/category/view.html.php | 2 +- .../components/com_checkin/checkin.php | 2 +- .../components/com_checkin/controller.php | 2 +- .../components/com_checkin/models/checkin.php | 2 +- .../views/checkin/tmpl/default.php | 2 +- .../views/checkin/tmpl/default.xml | 8 + .../com_checkin/views/checkin/view.html.php | 2 +- .../components/com_config/config.php | 2 +- .../components/com_config/controller.php | 2 +- .../controller/application/cancel.php | 2 +- .../controller/application/display.php | 2 +- .../controller/application/removeroot.php | 2 +- .../controller/application/save.php | 2 +- .../controller/application/sendtestmail.php | 2 +- .../controller/application/store.php | 2 +- .../controller/component/cancel.php | 2 +- .../controller/component/display.php | 2 +- .../com_config/controller/component/save.php | 2 +- .../com_config/controllers/application.php | 2 +- .../com_config/controllers/component.php | 2 +- .../components/com_config/helper/config.php | 2 +- .../com_config/model/application.php | 2 +- .../components/com_config/model/component.php | 2 +- .../com_config/model/field/filters.php | 2 +- .../com_config/models/application.php | 2 +- .../com_config/models/component.php | 2 +- .../com_config/view/application/html.php | 2 +- .../com_config/view/application/json.php | 2 +- .../view/application/tmpl/default.php | 2 +- .../view/application/tmpl/default.xml | 8 + .../view/application/tmpl/default_cache.php | 2 +- .../view/application/tmpl/default_cookie.php | 2 +- .../application/tmpl/default_database.php | 2 +- .../view/application/tmpl/default_debug.php | 2 +- .../view/application/tmpl/default_filters.php | 2 +- .../view/application/tmpl/default_ftp.php | 2 +- .../application/tmpl/default_ftplogin.php | 2 +- .../view/application/tmpl/default_locale.php | 2 +- .../view/application/tmpl/default_mail.php | 2 +- .../application/tmpl/default_metadata.php | 2 +- .../application/tmpl/default_navigation.php | 2 +- .../application/tmpl/default_permissions.php | 2 +- .../view/application/tmpl/default_proxy.php | 2 +- .../view/application/tmpl/default_seo.php | 2 +- .../view/application/tmpl/default_server.php | 2 +- .../view/application/tmpl/default_session.php | 2 +- .../view/application/tmpl/default_site.php | 2 +- .../view/application/tmpl/default_system.php | 2 +- .../com_config/view/component/html.php | 2 +- .../view/component/tmpl/default.php | 6 +- .../view/component/tmpl/default.xml | 19 + .../component/tmpl/default_navigation.php | 2 +- .../components/com_contact/contact.php | 2 +- .../components/com_contact/controller.php | 2 +- .../com_contact/controllers/contact.php | 2 +- .../com_contact/controllers/contacts.php | 2 +- .../com_contact/helpers/associations.php | 191 +++++++ .../com_contact/helpers/contact.php | 2 +- .../com_contact/helpers/html/contact.php | 2 +- .../components/com_contact/models/contact.php | 2 +- .../com_contact/models/contacts.php | 2 +- .../models/fields/modal/contact.php | 2 +- .../com_contact/models/forms/contact.xml | 14 +- .../models/forms/filter_contacts.xml | 0 .../components/com_contact/tables/contact.php | 2 +- .../com_contact/views/contact/tmpl/edit.php | 2 +- .../views/contact/tmpl/edit_associations.php | 2 +- .../views/contact/tmpl/edit_metadata.php | 2 +- .../views/contact/tmpl/edit_params.php | 2 +- .../com_contact/views/contact/tmpl/modal.php | 2 +- .../views/contact/tmpl/modal_associations.php | 2 +- .../views/contact/tmpl/modal_metadata.php | 2 +- .../views/contact/tmpl/modal_params.php | 2 +- .../com_contact/views/contact/view.html.php | 2 +- .../views/contacts/tmpl/default.php | 2 +- .../views/contacts/tmpl/default_batch.php | 2 +- .../contacts/tmpl/default_batch_body.php | 2 +- .../contacts/tmpl/default_batch_footer.php | 2 +- .../com_contact/views/contacts/tmpl/modal.php | 2 +- .../com_contact/views/contacts/view.html.php | 2 +- .../components/com_content/config.xml | 395 ++++++------- .../components/com_content/content.php | 2 +- .../components/com_content/controller.php | 2 +- .../com_content/controllers/article.php | 2 +- .../com_content/controllers/articles.php | 2 +- .../com_content/controllers/featured.php | 2 +- .../com_content/helpers/associations.php | 189 +++++++ .../com_content/helpers/content.php | 2 +- .../helpers/html/contentadministrator.php | 2 +- .../components/com_content/models/article.php | 2 +- .../com_content/models/articles.php | 2 +- .../components/com_content/models/feature.php | 2 +- .../com_content/models/featured.php | 2 +- .../models/fields/modal/article.php | 2 +- .../com_content/models/forms/article.xml | 6 +- .../com_content/tables/featured.php | 2 +- .../com_content/views/article/tmpl/edit.php | 2 +- .../com_content/views/article/tmpl/edit.xml | 17 + .../views/article/tmpl/edit_associations.php | 2 +- .../views/article/tmpl/edit_metadata.php | 2 +- .../com_content/views/article/tmpl/modal.php | 2 +- .../views/article/tmpl/modal_associations.php | 2 +- .../views/article/tmpl/modal_metadata.php | 2 +- .../views/article/tmpl/pagebreak.php | 2 +- .../com_content/views/article/view.html.php | 2 +- .../views/articles/tmpl/default.php | 2 +- .../views/articles/tmpl/default.xml | 8 + .../articles/tmpl/default_batch_body.php | 2 +- .../articles/tmpl/default_batch_footer.php | 2 +- .../com_content/views/articles/tmpl/modal.php | 2 +- .../com_content/views/articles/view.html.php | 2 +- .../views/featured/tmpl/default.php | 2 +- .../views/featured/tmpl/default.xml | 8 + .../com_content/views/featured/view.html.php | 2 +- .../com_contenthistory/contenthistory.php | 2 +- .../com_contenthistory/controller.php | 2 +- .../controllers/history.php | 2 +- .../controllers/preview.php | 2 +- .../helpers/contenthistory.php | 2 +- .../helpers/html/textdiff.php | 2 +- .../com_contenthistory/models/compare.php | 2 +- .../com_contenthistory/models/history.php | 2 +- .../com_contenthistory/models/preview.php | 2 +- .../views/compare/tmpl/compare.php | 2 +- .../views/compare/view.html.php | 2 +- .../views/history/tmpl/modal.php | 2 +- .../views/history/view.html.php | 2 +- .../views/preview/tmpl/preview.php | 2 +- .../views/preview/view.html.php | 2 +- .../components/com_cpanel/controller.php | 2 +- .../components/com_cpanel/cpanel.php | 2 +- .../com_cpanel/views/cpanel/tmpl/default.php | 2 +- .../com_cpanel/views/cpanel/tmpl/default.xml | 8 + .../com_cpanel/views/cpanel/view.html.php | 2 +- .../components/com_fields/controller.php | 2 +- .../com_fields/controllers/field.php | 2 +- .../com_fields/controllers/fields.php | 2 +- .../com_fields/controllers/group.php | 2 +- .../com_fields/controllers/groups.php | 2 +- .../components/com_fields/fields.php | 2 +- .../components/com_fields/helpers/fields.php | 17 +- .../com_fields/libraries/fieldslistplugin.php | 82 +++ .../com_fields/libraries/fieldsplugin.php | 4 +- .../components/com_fields/models/field.php | 2 +- .../components/com_fields/models/fields.php | 2 +- .../models/fields/fieldcontexts.php | 2 +- .../com_fields/models/fields/fieldgroups.php | 2 +- .../com_fields/models/fields/section.php | 2 +- .../com_fields/models/fields/type.php | 14 +- .../components/com_fields/models/group.php | 2 +- .../components/com_fields/models/groups.php | 2 +- .../components/com_fields/tables/field.php | 2 +- .../components/com_fields/tables/group.php | 2 +- .../com_fields/views/field/tmpl/edit.php | 2 +- .../com_fields/views/field/view.html.php | 2 +- .../com_fields/views/fields/tmpl/default.php | 2 +- .../views/fields/tmpl/default_batch_body.php | 2 +- .../fields/tmpl/default_batch_footer.php | 2 +- .../com_fields/views/fields/view.html.php | 2 +- .../com_fields/views/group/tmpl/edit.php | 2 +- .../com_fields/views/group/view.html.php | 2 +- .../com_fields/views/groups/tmpl/default.php | 2 +- .../views/groups/tmpl/default_batch_body.php | 2 +- .../groups/tmpl/default_batch_footer.php | 2 +- .../com_fields/views/groups/view.html.php | 2 +- .../components/com_finder/controller.php | 2 +- .../com_finder/controllers/filter.php | 2 +- .../com_finder/controllers/filters.php | 2 +- .../com_finder/controllers/index.php | 2 +- .../com_finder/controllers/indexer.json.php | 2 +- .../com_finder/controllers/maps.php | 2 +- .../components/com_finder/finder.php | 2 +- .../components/com_finder/helpers/finder.php | 2 +- .../com_finder/helpers/html/finder.php | 2 +- .../com_finder/helpers/indexer/adapter.php | 2 +- .../helpers/indexer/driver/mysql.php | 2 +- .../helpers/indexer/driver/postgresql.php | 2 +- .../helpers/indexer/driver/sqlsrv.php | 2 +- .../com_finder/helpers/indexer/helper.php | 2 +- .../com_finder/helpers/indexer/indexer.php | 2 +- .../com_finder/helpers/indexer/parser.php | 2 +- .../helpers/indexer/parser/html.php | 2 +- .../com_finder/helpers/indexer/parser/rtf.php | 2 +- .../com_finder/helpers/indexer/parser/txt.php | 2 +- .../com_finder/helpers/indexer/query.php | 2 +- .../com_finder/helpers/indexer/result.php | 2 +- .../com_finder/helpers/indexer/stemmer.php | 2 +- .../com_finder/helpers/indexer/stemmer/fr.php | 2 +- .../helpers/indexer/stemmer/porter_en.php | 2 +- .../helpers/indexer/stemmer/snowball.php | 2 +- .../com_finder/helpers/indexer/taxonomy.php | 2 +- .../com_finder/helpers/indexer/token.php | 2 +- .../com_finder/helpers/language.php | 2 +- .../com_finder/models/fields/branches.php | 2 +- .../com_finder/models/fields/contentmap.php | 2 +- .../com_finder/models/fields/contenttypes.php | 2 +- .../com_finder/models/fields/directories.php | 2 +- .../com_finder/models/fields/searchfilter.php | 2 +- .../components/com_finder/models/filter.php | 2 +- .../components/com_finder/models/filters.php | 2 +- .../com_finder/models/forms/filter.xml | 51 +- .../components/com_finder/models/index.php | 2 +- .../components/com_finder/models/indexer.php | 2 +- .../components/com_finder/models/maps.php | 2 +- .../com_finder/models/statistics.php | 2 +- .../components/com_finder/tables/filter.php | 2 +- .../components/com_finder/tables/link.php | 2 +- .../components/com_finder/tables/map.php | 2 +- .../com_finder/views/filter/tmpl/edit.php | 2 +- .../com_finder/views/filter/view.html.php | 2 +- .../com_finder/views/filters/tmpl/default.php | 2 +- .../com_finder/views/filters/view.html.php | 2 +- .../com_finder/views/index/tmpl/default.php | 2 +- .../com_finder/views/index/view.html.php | 2 +- .../com_finder/views/indexer/tmpl/default.php | 2 +- .../com_finder/views/indexer/view.html.php | 2 +- .../com_finder/views/maps/tmpl/default.php | 2 +- .../com_finder/views/maps/view.html.php | 2 +- .../views/statistics/tmpl/default.php | 2 +- .../com_finder/views/statistics/view.html.php | 2 +- .../components/com_installer/controller.php | 2 +- .../com_installer/controllers/database.php | 2 +- .../com_installer/controllers/discover.php | 2 +- .../com_installer/controllers/install.php | 2 +- .../com_installer/controllers/manage.php | 2 +- .../com_installer/controllers/update.php | 2 +- .../com_installer/controllers/updatesites.php | 2 +- .../com_installer/helpers/html/manage.php | 2 +- .../helpers/html/updatesites.php | 2 +- .../com_installer/helpers/installer.php | 2 +- .../components/com_installer/installer.php | 2 +- .../com_installer/models/database.php | 2 +- .../com_installer/models/discover.php | 2 +- .../com_installer/models/extension.php | 2 +- .../models/fields/extensionstatus.php | 2 +- .../com_installer/models/fields/folder.php | 2 +- .../com_installer/models/fields/location.php | 2 +- .../com_installer/models/fields/type.php | 2 +- .../com_installer/models/install.php | 2 +- .../com_installer/models/languages.php | 2 +- .../com_installer/models/manage.php | 2 +- .../com_installer/models/update.php | 2 +- .../com_installer/models/updatesites.php | 2 +- .../com_installer/models/warnings.php | 2 +- .../views/database/tmpl/default.php | 2 +- .../views/database/tmpl/default.xml | 8 + .../views/database/view.html.php | 2 +- .../views/default/tmpl/default_ftp.php | 2 +- .../views/default/tmpl/default_message.php | 2 +- .../com_installer/views/default/view.php | 2 +- .../views/discover/tmpl/default.php | 2 +- .../views/discover/tmpl/default.xml | 8 + .../views/discover/tmpl/default_item.php | 2 +- .../views/discover/view.html.php | 2 +- .../views/install/tmpl/default.php | 2 +- .../views/install/tmpl/default.xml | 8 + .../com_installer/views/install/view.html.php | 2 +- .../views/languages/tmpl/default.php | 2 +- .../views/languages/tmpl/default.xml | 8 + .../views/languages/view.html.php | 2 +- .../views/manage/tmpl/default.php | 2 +- .../views/manage/tmpl/default.xml | 8 + .../com_installer/views/manage/view.html.php | 2 +- .../views/update/tmpl/default.php | 2 +- .../views/update/tmpl/default.xml | 8 + .../com_installer/views/update/view.html.php | 2 +- .../views/updatesites/tmpl/default.php | 2 +- .../views/updatesites/tmpl/default.xml | 8 + .../views/updatesites/view.html.php | 2 +- .../views/warnings/tmpl/default.php | 2 +- .../views/warnings/tmpl/default.xml | 8 + .../views/warnings/view.html.php | 2 +- .../com_joomlaupdate/controller.php | 2 +- .../com_joomlaupdate/controllers/update.php | 2 +- .../com_joomlaupdate/helpers/joomlaupdate.php | 2 +- .../com_joomlaupdate/helpers/select.php | 2 +- .../com_joomlaupdate/joomlaupdate.php | 2 +- .../com_joomlaupdate/models/default.php | 2 +- .../com_joomlaupdate/restore_finalisation.php | 2 +- .../views/default/tmpl/complete.php | 2 +- .../views/default/tmpl/default.php | 2 +- .../views/default/tmpl/default.xml | 8 + .../views/default/tmpl/default_nodownload.php | 2 +- .../views/default/tmpl/default_reinstall.php | 2 +- .../views/default/tmpl/default_update.php | 2 +- .../default/tmpl/default_updatemefirst.php | 2 +- .../views/default/tmpl/default_upload.php | 2 +- .../views/default/view.html.php | 2 +- .../views/update/tmpl/default.php | 2 +- .../views/update/tmpl/finaliseconfirm.php | 2 +- .../views/update/view.html.php | 2 +- .../views/upload/tmpl/captive.php | 2 +- .../views/upload/view.html.php | 2 +- .../components/com_languages/controller.php | 2 +- .../com_languages/controllers/installed.php | 2 +- .../com_languages/controllers/language.php | 2 +- .../com_languages/controllers/languages.php | 2 +- .../com_languages/controllers/override.php | 2 +- .../com_languages/controllers/overrides.php | 2 +- .../controllers/strings.json.php | 2 +- .../com_languages/helpers/html/languages.php | 2 +- .../com_languages/helpers/jsonresponse.php | 2 +- .../com_languages/helpers/languages.php | 2 +- .../com_languages/helpers/multilangstatus.php | 2 +- .../components/com_languages/languages.php | 2 +- .../com_languages/models/installed.php | 2 +- .../com_languages/models/language.php | 2 +- .../com_languages/models/languages.php | 2 +- .../com_languages/models/override.php | 2 +- .../com_languages/models/overrides.php | 2 +- .../com_languages/models/strings.php | 2 +- .../views/installed/tmpl/default.php | 2 +- .../views/installed/tmpl/default.xml | 8 + .../views/installed/view.html.php | 2 +- .../views/language/tmpl/edit.php | 2 +- .../views/language/view.html.php | 2 +- .../views/languages/tmpl/default.php | 2 +- .../views/languages/tmpl/default.xml | 8 + .../views/languages/view.html.php | 2 +- .../views/multilangstatus/tmpl/default.php | 2 +- .../views/multilangstatus/view.html.php | 2 +- .../views/override/tmpl/edit.php | 2 +- .../views/override/view.html.php | 2 +- .../views/overrides/tmpl/default.php | 2 +- .../views/overrides/tmpl/default.xml | 8 + .../views/overrides/view.html.php | 2 +- .../components/com_login/controller.php | 2 +- administrator/components/com_login/login.php | 2 +- .../components/com_login/models/login.php | 2 +- .../com_login/views/login/tmpl/default.php | 2 +- .../com_login/views/login/view.html.php | 2 +- .../components/com_media/controller.php | 2 +- .../com_media/controllers/file.json.php | 2 +- .../components/com_media/controllers/file.php | 2 +- .../com_media/controllers/folder.php | 2 +- .../components/com_media/helpers/media.php | 2 +- .../com_media/layouts/toolbar/deletemedia.php | 2 +- .../com_media/layouts/toolbar/newfolder.php | 2 +- .../com_media/layouts/toolbar/uploadmedia.php | 2 +- administrator/components/com_media/media.php | 2 +- .../components/com_media/models/list.php | 2 +- .../components/com_media/models/manager.php | 2 +- .../com_media/views/images/tmpl/default.php | 2 +- .../com_media/views/images/view.html.php | 2 +- .../views/imageslist/tmpl/default.php | 2 +- .../views/imageslist/tmpl/default_folder.php | 2 +- .../views/imageslist/tmpl/default_image.php | 2 +- .../com_media/views/imageslist/view.html.php | 2 +- .../com_media/views/media/tmpl/default.php | 2 +- .../com_media/views/media/tmpl/default.xml | 8 + .../views/media/tmpl/default_folders.php | 2 +- .../views/media/tmpl/default_navigation.php | 2 +- .../com_media/views/media/view.html.php | 2 +- .../views/medialist/tmpl/default.php | 2 +- .../views/medialist/tmpl/details.php | 2 +- .../views/medialist/tmpl/details_docs.php | 2 +- .../views/medialist/tmpl/details_folders.php | 2 +- .../views/medialist/tmpl/details_imgs.php | 2 +- .../views/medialist/tmpl/details_up.php | 2 +- .../views/medialist/tmpl/details_videos.php | 2 +- .../com_media/views/medialist/tmpl/thumbs.php | 2 +- .../views/medialist/tmpl/thumbs_docs.php | 2 +- .../views/medialist/tmpl/thumbs_folders.php | 2 +- .../views/medialist/tmpl/thumbs_imgs.php | 2 +- .../views/medialist/tmpl/thumbs_up.php | 2 +- .../views/medialist/tmpl/thumbs_videos.php | 2 +- .../com_media/views/medialist/view.html.php | 2 +- .../components/com_menus/controller.php | 2 +- .../components/com_menus/controllers/item.php | 76 ++- .../com_menus/controllers/items.php | 2 +- .../components/com_menus/controllers/menu.php | 13 +- .../com_menus/controllers/menus.php | 2 +- .../com_menus/helpers/associations.php | 166 ++++++ .../com_menus/helpers/html/menus.php | 2 +- .../components/com_menus/helpers/menus.php | 2 +- .../layouts/joomla/menu/edit_modules.php | 2 +- .../layouts/joomla/searchtools/default.php | 83 +++ .../joomla/searchtools/default/bar.php | 46 ++ administrator/components/com_menus/menus.php | 2 +- .../com_menus/models/fields/menuordering.php | 2 +- .../com_menus/models/fields/menuparent.php | 5 +- .../com_menus/models/fields/menutype.php | 21 +- .../com_menus/models/fields/modal/menu.php | 8 +- .../com_menus/models/forms/filter_items.xml | 12 + .../com_menus/models/forms/filter_menus.xml | 12 +- .../com_menus/models/forms/item.xml | 6 +- .../com_menus/models/forms/item_alias.xml | 1 + .../com_menus/models/forms/itemadmin.xml | 194 +++++++ .../models/forms/itemadmin_alias.xml | 72 +++ .../models/forms/itemadmin_component.xml | 43 ++ .../models/forms/itemadmin_heading.xml | 81 +++ .../models/forms/itemadmin_separator.xml | 18 + .../com_menus/models/forms/itemadmin_url.xml | 61 ++ .../com_menus/models/forms/menu.xml | 33 +- .../components/com_menus/models/item.php | 191 +++++-- .../components/com_menus/models/items.php | 199 +++++-- .../components/com_menus/models/menu.php | 2 +- .../components/com_menus/models/menus.php | 20 +- .../components/com_menus/models/menutypes.php | 197 +++++-- .../components/com_menus/tables/menu.php | 2 +- .../com_menus/views/item/tmpl/edit.php | 21 +- .../com_menus/views/item/tmpl/edit.xml | 21 + .../views/item/tmpl/edit_associations.php | 2 +- .../views/item/tmpl/edit_modules.php | 2 +- .../views/item/tmpl/edit_options.php | 2 +- .../com_menus/views/item/tmpl/modal.php | 2 +- .../views/item/tmpl/modal_associations.php | 2 +- .../views/item/tmpl/modal_options.php | 2 +- .../com_menus/views/item/view.html.php | 11 +- .../com_menus/views/items/tmpl/default.php | 14 +- .../com_menus/views/items/tmpl/default.xml | 21 + .../views/items/tmpl/default_batch_body.php | 2 +- .../views/items/tmpl/default_batch_footer.php | 2 +- .../com_menus/views/items/tmpl/modal.php | 2 +- .../com_menus/views/items/view.html.php | 10 +- .../com_menus/views/menu/tmpl/edit.php | 15 +- .../com_menus/views/menu/tmpl/edit.xml | 8 + .../com_menus/views/menu/view.html.php | 2 +- .../com_menus/views/menus/tmpl/default.php | 2 +- .../com_menus/views/menus/tmpl/default.xml | 8 + .../com_menus/views/menus/view.html.php | 2 +- .../views/menutypes/tmpl/default.php | 2 +- .../com_menus/views/menutypes/view.html.php | 92 +-- .../components/com_messages/controller.php | 2 +- .../com_messages/controllers/config.php | 2 +- .../com_messages/controllers/message.php | 2 +- .../com_messages/controllers/messages.php | 2 +- .../com_messages/helpers/html/messages.php | 2 +- .../com_messages/helpers/messages.php | 2 +- .../layouts/toolbar/mysettings.php | 2 +- .../components/com_messages/messages.php | 2 +- .../components/com_messages/models/config.php | 2 +- .../models/fields/messagestates.php | 2 +- .../models/fields/usermessages.php | 2 +- .../com_messages/models/message.php | 2 +- .../com_messages/models/messages.php | 2 +- .../com_messages/tables/message.php | 2 +- .../views/config/tmpl/default.php | 2 +- .../com_messages/views/config/view.html.php | 2 +- .../views/message/tmpl/default.php | 2 +- .../com_messages/views/message/tmpl/edit.php | 2 +- .../com_messages/views/message/view.html.php | 2 +- .../views/messages/tmpl/default.php | 2 +- .../com_messages/views/messages/view.html.php | 2 +- .../components/com_modules/controller.php | 2 +- .../com_modules/controllers/module.php | 2 +- .../com_modules/controllers/modules.php | 2 +- .../com_modules/helpers/html/modules.php | 2 +- .../com_modules/helpers/modules.php | 2 +- .../components/com_modules/helpers/xml.php | 2 +- .../layouts/toolbar/cancelselect.php | 2 +- .../com_modules/layouts/toolbar/newmodule.php | 2 +- .../models/fields/modulesmodule.php | 2 +- .../models/fields/modulesposition.php | 2 +- .../com_modules/models/forms/module.xml | 18 +- .../components/com_modules/models/module.php | 27 +- .../components/com_modules/models/modules.php | 2 +- .../com_modules/models/positions.php | 2 +- .../components/com_modules/models/select.php | 2 +- .../components/com_modules/modules.php | 2 +- .../com_modules/views/module/tmpl/edit.php | 2 +- .../views/module/tmpl/edit_assignment.php | 2 +- .../views/module/tmpl/edit_options.php | 2 +- .../views/module/tmpl/edit_positions.php | 2 +- .../com_modules/views/module/tmpl/modal.php | 2 +- .../com_modules/views/module/view.html.php | 2 +- .../com_modules/views/module/view.json.php | 2 +- .../views/modules/tmpl/default.php | 2 +- .../views/modules/tmpl/default.xml | 8 + .../views/modules/tmpl/default_batch_body.php | 2 +- .../modules/tmpl/default_batch_footer.php | 2 +- .../com_modules/views/modules/tmpl/modal.php | 2 +- .../com_modules/views/modules/view.html.php | 2 +- .../views/positions/tmpl/modal.php | 2 +- .../com_modules/views/positions/view.html.php | 2 +- .../views/preview/tmpl/default.php | 2 +- .../com_modules/views/preview/view.html.php | 2 +- .../com_modules/views/select/tmpl/default.php | 2 +- .../com_modules/views/select/view.html.php | 2 +- .../components/com_newsfeeds/controller.php | 2 +- .../com_newsfeeds/controllers/newsfeed.php | 2 +- .../com_newsfeeds/controllers/newsfeeds.php | 2 +- .../com_newsfeeds/helpers/associations.php | 192 +++++++ .../com_newsfeeds/helpers/html/newsfeed.php | 2 +- .../com_newsfeeds/helpers/newsfeeds.php | 2 +- .../models/fields/modal/newsfeed.php | 2 +- .../com_newsfeeds/models/fields/newsfeeds.php | 2 +- .../com_newsfeeds/models/forms/newsfeed.xml | 12 +- .../com_newsfeeds/models/newsfeed.php | 2 +- .../com_newsfeeds/models/newsfeeds.php | 2 +- .../components/com_newsfeeds/newsfeeds.php | 2 +- .../com_newsfeeds/tables/newsfeed.php | 2 +- .../views/newsfeed/tmpl/edit.php | 2 +- .../views/newsfeed/tmpl/edit_associations.php | 2 +- .../views/newsfeed/tmpl/edit_display.php | 2 +- .../views/newsfeed/tmpl/edit_metadata.php | 2 +- .../views/newsfeed/tmpl/edit_params.php | 2 +- .../views/newsfeed/tmpl/modal.php | 2 +- .../newsfeed/tmpl/modal_associations.php | 2 +- .../views/newsfeed/tmpl/modal_display.php | 2 +- .../views/newsfeed/tmpl/modal_metadata.php | 2 +- .../views/newsfeed/tmpl/modal_params.php | 2 +- .../views/newsfeed/view.html.php | 2 +- .../views/newsfeeds/tmpl/default.php | 2 +- .../newsfeeds/tmpl/default_batch_body.php | 2 +- .../newsfeeds/tmpl/default_batch_footer.php | 2 +- .../views/newsfeeds/tmpl/modal.php | 2 +- .../views/newsfeeds/view.html.php | 2 +- .../components/com_plugins/controller.php | 2 +- .../com_plugins/controllers/plugin.php | 2 +- .../com_plugins/controllers/plugins.php | 2 +- .../com_plugins/helpers/plugins.php | 2 +- .../models/fields/pluginordering.php | 2 +- .../com_plugins/models/fields/plugintype.php | 2 +- .../components/com_plugins/models/plugin.php | 2 +- .../components/com_plugins/models/plugins.php | 2 +- .../components/com_plugins/plugins.php | 2 +- .../com_plugins/views/plugin/tmpl/edit.php | 2 +- .../views/plugin/tmpl/edit_options.php | 2 +- .../com_plugins/views/plugin/view.html.php | 2 +- .../views/plugins/tmpl/default.php | 2 +- .../views/plugins/tmpl/default.xml | 8 + .../com_plugins/views/plugins/view.html.php | 2 +- .../com_postinstall/controllers/message.php | 2 +- .../com_postinstall/models/messages.php | 2 +- .../com_postinstall/postinstall.php | 2 +- .../components/com_postinstall/toolbar.php | 2 +- .../views/messages/tmpl/default.php | 2 +- .../views/messages/tmpl/default.xml | 8 + .../views/messages/view.html.php | 2 +- .../components/com_redirect/controller.php | 2 +- .../com_redirect/controllers/link.php | 2 +- .../com_redirect/controllers/links.php | 2 +- .../com_redirect/helpers/html/redirect.php | 2 +- .../com_redirect/helpers/redirect.php | 2 +- .../com_redirect/layouts/toolbar/batch.php | 2 +- .../com_redirect/models/fields/redirect.php | 2 +- .../components/com_redirect/models/link.php | 2 +- .../components/com_redirect/models/links.php | 2 +- .../components/com_redirect/redirect.php | 2 +- .../components/com_redirect/tables/link.php | 2 +- .../com_redirect/views/link/tmpl/edit.php | 2 +- .../com_redirect/views/link/view.html.php | 2 +- .../com_redirect/views/links/tmpl/default.php | 2 +- .../views/links/tmpl/default_addform.php | 2 +- .../views/links/tmpl/default_batch_body.php | 2 +- .../views/links/tmpl/default_batch_footer.php | 2 +- .../com_redirect/views/links/view.html.php | 2 +- .../components/com_search/controller.php | 2 +- .../com_search/controllers/searches.php | 2 +- .../components/com_search/helpers/search.php | 2 +- .../components/com_search/helpers/site.php | 2 +- .../components/com_search/models/searches.php | 2 +- .../components/com_search/search.php | 2 +- .../views/searches/tmpl/default.php | 2 +- .../com_search/views/searches/view.html.php | 2 +- .../components/com_tags/controller.php | 2 +- .../components/com_tags/controllers/tag.php | 2 +- .../components/com_tags/controllers/tags.php | 2 +- .../components/com_tags/helpers/tags.php | 2 +- .../components/com_tags/models/forms/tag.xml | 10 +- .../components/com_tags/models/tag.php | 2 +- .../components/com_tags/models/tags.php | 2 +- .../components/com_tags/tables/tag.php | 2 +- administrator/components/com_tags/tags.php | 2 +- .../com_tags/views/tag/tmpl/edit.php | 2 +- .../com_tags/views/tag/tmpl/edit_metadata.php | 2 +- .../com_tags/views/tag/tmpl/edit_options.php | 2 +- .../com_tags/views/tag/view.html.php | 2 +- .../com_tags/views/tags/tmpl/default.php | 2 +- .../views/tags/tmpl/default_batch_body.php | 2 +- .../views/tags/tmpl/default_batch_footer.php | 2 +- .../com_tags/views/tags/view.html.php | 2 +- .../components/com_templates/controller.php | 2 +- .../com_templates/controllers/style.php | 2 +- .../com_templates/controllers/styles.php | 2 +- .../com_templates/controllers/template.php | 2 +- .../com_templates/helpers/html/templates.php | 2 +- .../com_templates/helpers/template.php | 2 +- .../com_templates/helpers/templates.php | 2 +- .../models/fields/templatelocation.php | 2 +- .../models/fields/templatename.php | 2 +- .../components/com_templates/models/style.php | 2 +- .../com_templates/models/styles.php | 2 +- .../com_templates/models/template.php | 2 +- .../com_templates/models/templates.php | 2 +- .../components/com_templates/tables/style.php | 2 +- .../components/com_templates/templates.php | 2 +- .../com_templates/views/style/tmpl/edit.php | 2 +- .../views/style/tmpl/edit_assignment.php | 2 +- .../views/style/tmpl/edit_options.php | 2 +- .../com_templates/views/style/view.html.php | 2 +- .../com_templates/views/style/view.json.php | 2 +- .../views/styles/tmpl/default.php | 2 +- .../views/styles/tmpl/default.xml | 8 + .../com_templates/views/styles/view.html.php | 2 +- .../views/template/tmpl/default.php | 2 +- .../template/tmpl/default_description.php | 2 +- .../views/template/tmpl/default_folders.php | 2 +- .../template/tmpl/default_modal_copy_body.php | 2 +- .../tmpl/default_modal_copy_footer.php | 2 +- .../tmpl/default_modal_delete_body.php | 2 +- .../tmpl/default_modal_delete_footer.php | 2 +- .../template/tmpl/default_modal_file_body.php | 2 +- .../tmpl/default_modal_file_footer.php | 2 +- .../tmpl/default_modal_folder_body.php | 2 +- .../tmpl/default_modal_folder_footer.php | 2 +- .../tmpl/default_modal_rename_body.php | 2 +- .../tmpl/default_modal_rename_footer.php | 2 +- .../tmpl/default_modal_resize_body.php | 2 +- .../tmpl/default_modal_resize_footer.php | 2 +- .../views/template/tmpl/default_tree.php | 2 +- .../views/template/tmpl/readonly.php | 2 +- .../views/template/view.html.php | 2 +- .../views/templates/tmpl/default.php | 2 +- .../views/templates/tmpl/default.xml | 8 + .../views/templates/view.html.php | 2 +- .../components/com_users/controller.php | 2 +- .../com_users/controllers/group.php | 2 +- .../com_users/controllers/groups.php | 2 +- .../com_users/controllers/level.php | 2 +- .../com_users/controllers/levels.php | 2 +- .../components/com_users/controllers/mail.php | 2 +- .../components/com_users/controllers/note.php | 2 +- .../com_users/controllers/notes.php | 2 +- .../com_users/controllers/profile.json.php | 2 +- .../components/com_users/controllers/user.php | 2 +- .../com_users/controllers/users.php | 2 +- .../components/com_users/helpers/debug.php | 2 +- .../com_users/helpers/html/users.php | 2 +- .../components/com_users/helpers/users.php | 2 +- .../com_users/models/debuggroup.php | 2 +- .../components/com_users/models/debuguser.php | 2 +- .../com_users/models/fields/components.php | 2 +- .../com_users/models/fields/groupparent.php | 2 +- .../com_users/models/fields/levels.php | 2 +- .../com_users/models/forms/note.xml | 39 +- .../com_users/models/forms/user.xml | 9 +- .../components/com_users/models/group.php | 2 +- .../components/com_users/models/groups.php | 2 +- .../components/com_users/models/level.php | 2 +- .../components/com_users/models/levels.php | 2 +- .../components/com_users/models/mail.php | 2 +- .../components/com_users/models/note.php | 2 +- .../components/com_users/models/notes.php | 2 +- .../components/com_users/models/user.php | 2 +- .../components/com_users/models/users.php | 2 +- .../components/com_users/tables/note.php | 2 +- administrator/components/com_users/users.php | 2 +- .../views/debuggroup/tmpl/default.php | 2 +- .../com_users/views/debuggroup/view.html.php | 2 +- .../views/debuguser/tmpl/default.php | 2 +- .../com_users/views/debuguser/view.html.php | 2 +- .../com_users/views/group/tmpl/edit.php | 2 +- .../com_users/views/group/tmpl/edit.xml | 8 + .../com_users/views/group/view.html.php | 2 +- .../com_users/views/groups/tmpl/default.php | 2 +- .../com_users/views/groups/tmpl/default.xml | 8 + .../com_users/views/groups/view.html.php | 2 +- .../com_users/views/level/tmpl/edit.php | 2 +- .../com_users/views/level/tmpl/edit.xml | 8 + .../com_users/views/level/view.html.php | 2 +- .../com_users/views/levels/tmpl/default.php | 2 +- .../com_users/views/levels/tmpl/default.xml | 8 + .../com_users/views/levels/view.html.php | 2 +- .../com_users/views/mail/tmpl/default.php | 2 +- .../com_users/views/mail/tmpl/default.xml | 8 + .../com_users/views/mail/view.html.php | 2 +- .../com_users/views/note/tmpl/edit.php | 2 +- .../com_users/views/note/tmpl/edit.xml | 8 + .../com_users/views/note/view.html.php | 2 +- .../com_users/views/notes/tmpl/default.php | 2 +- .../com_users/views/notes/tmpl/default.xml | 8 + .../com_users/views/notes/tmpl/modal.php | 2 +- .../com_users/views/notes/view.html.php | 2 +- .../com_users/views/user/tmpl/edit.php | 2 +- .../com_users/views/user/tmpl/edit.xml | 8 + .../com_users/views/user/tmpl/edit_groups.php | 2 +- .../com_users/views/user/view.html.php | 2 +- .../com_users/views/users/tmpl/default.php | 2 +- .../com_users/views/users/tmpl/default.xml | 8 + .../views/users/tmpl/default_batch_body.php | 2 +- .../views/users/tmpl/default_batch_footer.php | 2 +- .../com_users/views/users/tmpl/modal.php | 2 +- .../com_users/views/users/view.html.php | 2 +- administrator/includes/defines.php | 2 +- administrator/includes/framework.php | 2 +- administrator/includes/helper.php | 2 +- administrator/includes/subtoolbar.php | 2 +- administrator/includes/toolbar.php | 2 +- administrator/index.php | 2 +- .../language/en-GB/en-GB.com_admin.ini | 2 +- .../language/en-GB/en-GB.com_admin.sys.ini | 7 +- .../language/en-GB/en-GB.com_ajax.ini | 2 +- .../language/en-GB/en-GB.com_ajax.sys.ini | 2 +- .../language/en-GB/en-GB.com_associations.ini | 50 ++ .../en-GB/en-GB.com_associations.sys.ini | 7 + .../language/en-GB/en-GB.com_banners.ini | 2 +- .../language/en-GB/en-GB.com_banners.sys.ini | 2 +- .../language/en-GB/en-GB.com_cache.ini | 2 +- .../language/en-GB/en-GB.com_cache.sys.ini | 7 +- .../language/en-GB/en-GB.com_categories.ini | 2 +- .../en-GB/en-GB.com_categories.sys.ini | 9 +- .../language/en-GB/en-GB.com_checkin.ini | 2 +- .../language/en-GB/en-GB.com_checkin.sys.ini | 5 +- .../language/en-GB/en-GB.com_config.ini | 2 +- .../language/en-GB/en-GB.com_config.sys.ini | 7 +- .../language/en-GB/en-GB.com_contact.ini | 3 +- .../language/en-GB/en-GB.com_contact.sys.ini | 2 +- .../language/en-GB/en-GB.com_content.ini | 2 +- .../language/en-GB/en-GB.com_content.sys.ini | 8 +- .../en-GB/en-GB.com_contenthistory.ini | 2 +- .../en-GB/en-GB.com_contenthistory.sys.ini | 2 +- .../language/en-GB/en-GB.com_cpanel.ini | 2 +- .../language/en-GB/en-GB.com_cpanel.sys.ini | 5 +- .../language/en-GB/en-GB.com_fields.ini | 4 +- .../language/en-GB/en-GB.com_fields.sys.ini | 2 +- .../language/en-GB/en-GB.com_finder.ini | 2 +- .../language/en-GB/en-GB.com_finder.sys.ini | 2 +- .../language/en-GB/en-GB.com_installer.ini | 2 +- .../en-GB/en-GB.com_installer.sys.ini | 19 +- .../language/en-GB/en-GB.com_joomlaupdate.ini | 2 +- .../en-GB/en-GB.com_joomlaupdate.sys.ini | 5 +- .../language/en-GB/en-GB.com_languages.ini | 2 +- .../en-GB/en-GB.com_languages.sys.ini | 9 +- .../language/en-GB/en-GB.com_login.ini | 2 +- .../language/en-GB/en-GB.com_login.sys.ini | 2 +- .../language/en-GB/en-GB.com_mailto.sys.ini | 2 +- .../language/en-GB/en-GB.com_media.ini | 2 +- .../language/en-GB/en-GB.com_media.sys.ini | 5 +- .../language/en-GB/en-GB.com_menus.ini | 20 +- .../language/en-GB/en-GB.com_menus.sys.ini | 12 +- .../language/en-GB/en-GB.com_messages.ini | 2 +- .../language/en-GB/en-GB.com_messages.sys.ini | 2 +- .../language/en-GB/en-GB.com_modules.ini | 2 +- .../language/en-GB/en-GB.com_modules.sys.ini | 4 +- .../language/en-GB/en-GB.com_newsfeeds.ini | 3 +- .../en-GB/en-GB.com_newsfeeds.sys.ini | 2 +- .../language/en-GB/en-GB.com_plugins.ini | 2 +- .../language/en-GB/en-GB.com_plugins.sys.ini | 5 +- .../language/en-GB/en-GB.com_postinstall.ini | 2 +- .../en-GB/en-GB.com_postinstall.sys.ini | 7 +- .../language/en-GB/en-GB.com_redirect.ini | 2 +- .../language/en-GB/en-GB.com_redirect.sys.ini | 2 +- .../language/en-GB/en-GB.com_search.ini | 2 +- .../language/en-GB/en-GB.com_search.sys.ini | 2 +- .../language/en-GB/en-GB.com_tags.ini | 2 +- .../language/en-GB/en-GB.com_tags.sys.ini | 2 +- .../language/en-GB/en-GB.com_templates.ini | 2 +- .../en-GB/en-GB.com_templates.sys.ini | 7 +- .../language/en-GB/en-GB.com_users.ini | 2 +- .../language/en-GB/en-GB.com_users.sys.ini | 31 +- .../language/en-GB/en-GB.com_weblinks.ini | 2 +- .../language/en-GB/en-GB.com_weblinks.sys.ini | 2 +- .../language/en-GB/en-GB.com_wrapper.ini | 2 +- .../language/en-GB/en-GB.com_wrapper.sys.ini | 2 +- administrator/language/en-GB/en-GB.ini | 4 +- .../language/en-GB/en-GB.lib_joomla.ini | 2 +- .../language/en-GB/en-GB.localise.php | 2 +- .../language/en-GB/en-GB.mod_custom.ini | 2 +- .../language/en-GB/en-GB.mod_custom.sys.ini | 2 +- .../language/en-GB/en-GB.mod_feed.ini | 2 +- .../language/en-GB/en-GB.mod_feed.sys.ini | 2 +- .../language/en-GB/en-GB.mod_latest.ini | 2 +- .../language/en-GB/en-GB.mod_latest.sys.ini | 2 +- .../language/en-GB/en-GB.mod_logged.ini | 2 +- .../language/en-GB/en-GB.mod_logged.sys.ini | 2 +- .../language/en-GB/en-GB.mod_login.ini | 2 +- .../language/en-GB/en-GB.mod_login.sys.ini | 2 +- .../language/en-GB/en-GB.mod_menu.ini | 12 +- .../language/en-GB/en-GB.mod_menu.sys.ini | 2 +- .../en-GB/en-GB.mod_multilangstatus.ini | 2 +- .../en-GB/en-GB.mod_multilangstatus.sys.ini | 2 +- .../language/en-GB/en-GB.mod_popular.ini | 2 +- .../language/en-GB/en-GB.mod_popular.sys.ini | 2 +- .../language/en-GB/en-GB.mod_quickicon.ini | 2 +- .../en-GB/en-GB.mod_quickicon.sys.ini | 2 +- .../language/en-GB/en-GB.mod_stats_admin.ini | 2 +- .../en-GB/en-GB.mod_stats_admin.sys.ini | 2 +- .../language/en-GB/en-GB.mod_status.ini | 2 +- .../language/en-GB/en-GB.mod_status.sys.ini | 2 +- .../language/en-GB/en-GB.mod_submenu.ini | 2 +- .../language/en-GB/en-GB.mod_submenu.sys.ini | 2 +- .../language/en-GB/en-GB.mod_title.ini | 2 +- .../language/en-GB/en-GB.mod_title.sys.ini | 2 +- .../language/en-GB/en-GB.mod_toolbar.ini | 2 +- .../language/en-GB/en-GB.mod_toolbar.sys.ini | 2 +- .../language/en-GB/en-GB.mod_version.ini | 2 +- .../language/en-GB/en-GB.mod_version.sys.ini | 2 +- .../en-GB/en-GB.plg_authentication_cookie.ini | 2 +- .../en-GB.plg_authentication_cookie.sys.ini | 2 +- .../en-GB/en-GB.plg_authentication_gmail.ini | 2 +- .../en-GB.plg_authentication_gmail.sys.ini | 2 +- .../en-GB/en-GB.plg_authentication_joomla.ini | 2 +- .../en-GB.plg_authentication_joomla.sys.ini | 2 +- .../en-GB/en-GB.plg_authentication_ldap.ini | 2 +- .../en-GB.plg_authentication_ldap.sys.ini | 2 +- .../en-GB/en-GB.plg_captcha_recaptcha.ini | 2 +- .../en-GB/en-GB.plg_captcha_recaptcha.sys.ini | 2 +- .../en-GB/en-GB.plg_content_contact.ini | 2 +- .../en-GB/en-GB.plg_content_contact.sys.ini | 2 +- .../en-GB/en-GB.plg_content_emailcloak.ini | 2 +- .../en-GB.plg_content_emailcloak.sys.ini | 2 +- .../en-GB/en-GB.plg_content_finder.ini | 2 +- .../en-GB/en-GB.plg_content_finder.sys.ini | 2 +- .../en-GB/en-GB.plg_content_joomla.ini | 2 +- .../en-GB/en-GB.plg_content_joomla.sys.ini | 2 +- .../en-GB/en-GB.plg_content_loadmodule.ini | 2 +- .../en-GB.plg_content_loadmodule.sys.ini | 2 +- .../en-GB/en-GB.plg_content_pagebreak.ini | 2 +- .../en-GB/en-GB.plg_content_pagebreak.sys.ini | 2 +- .../en-GB.plg_content_pagenavigation.ini | 2 +- .../en-GB.plg_content_pagenavigation.sys.ini | 2 +- .../language/en-GB/en-GB.plg_content_vote.ini | 2 +- .../en-GB/en-GB.plg_content_vote.sys.ini | 2 +- .../en-GB/en-GB.plg_editors-xtd_article.ini | 2 +- .../en-GB.plg_editors-xtd_article.sys.ini | 2 +- .../en-GB/en-GB.plg_editors-xtd_contact.ini | 2 +- .../en-GB.plg_editors-xtd_contact.sys.ini | 2 +- .../en-GB/en-GB.plg_editors-xtd_image.ini | 2 +- .../en-GB/en-GB.plg_editors-xtd_image.sys.ini | 2 +- .../en-GB/en-GB.plg_editors-xtd_menu.ini | 2 +- .../en-GB/en-GB.plg_editors-xtd_menu.sys.ini | 2 +- .../en-GB/en-GB.plg_editors-xtd_module.ini | 2 +- .../en-GB.plg_editors-xtd_module.sys.ini | 2 +- .../en-GB/en-GB.plg_editors-xtd_pagebreak.ini | 2 +- .../en-GB.plg_editors-xtd_pagebreak.sys.ini | 2 +- .../en-GB/en-GB.plg_editors-xtd_readmore.ini | 2 +- .../en-GB.plg_editors-xtd_readmore.sys.ini | 2 +- .../en-GB/en-GB.plg_editors_codemirror.ini | 2 +- .../en-GB.plg_editors_codemirror.sys.ini | 2 +- .../language/en-GB/en-GB.plg_editors_none.ini | 2 +- .../en-GB/en-GB.plg_editors_none.sys.ini | 2 +- .../en-GB/en-GB.plg_editors_tinymce.ini | 2 +- .../en-GB/en-GB.plg_editors_tinymce.sys.ini | 2 +- .../en-GB/en-GB.plg_extension_joomla.ini | 2 +- .../en-GB/en-GB.plg_extension_joomla.sys.ini | 2 +- .../en-GB/en-GB.plg_fields_calendar.ini | 2 +- .../en-GB/en-GB.plg_fields_calendar.sys.ini | 2 +- .../en-GB/en-GB.plg_fields_checkboxes.ini | 2 +- .../en-GB/en-GB.plg_fields_checkboxes.sys.ini | 2 +- .../language/en-GB/en-GB.plg_fields_color.ini | 2 +- .../en-GB/en-GB.plg_fields_color.sys.ini | 2 +- .../en-GB/en-GB.plg_fields_editor.ini | 2 +- .../en-GB/en-GB.plg_fields_editor.sys.ini | 2 +- .../en-GB/en-GB.plg_fields_gallery.ini | 2 +- .../en-GB/en-GB.plg_fields_gallery.sys.ini | 2 +- .../language/en-GB/en-GB.plg_fields_image.ini | 2 +- .../en-GB/en-GB.plg_fields_image.sys.ini | 2 +- .../en-GB/en-GB.plg_fields_imagelist.ini | 2 +- .../en-GB/en-GB.plg_fields_imagelist.sys.ini | 2 +- .../en-GB/en-GB.plg_fields_integer.ini | 2 +- .../en-GB/en-GB.plg_fields_integer.sys.ini | 2 +- .../language/en-GB/en-GB.plg_fields_list.ini | 2 +- .../en-GB/en-GB.plg_fields_list.sys.ini | 2 +- .../language/en-GB/en-GB.plg_fields_media.ini | 2 +- .../en-GB/en-GB.plg_fields_media.sys.ini | 2 +- .../language/en-GB/en-GB.plg_fields_radio.ini | 2 +- .../en-GB/en-GB.plg_fields_radio.sys.ini | 2 +- .../language/en-GB/en-GB.plg_fields_sql.ini | 2 +- .../en-GB/en-GB.plg_fields_sql.sys.ini | 2 +- .../language/en-GB/en-GB.plg_fields_text.ini | 2 +- .../en-GB/en-GB.plg_fields_text.sys.ini | 2 +- .../en-GB/en-GB.plg_fields_textarea.ini | 2 +- .../en-GB/en-GB.plg_fields_textarea.sys.ini | 2 +- .../language/en-GB/en-GB.plg_fields_url.ini | 2 +- .../en-GB/en-GB.plg_fields_url.sys.ini | 2 +- .../language/en-GB/en-GB.plg_fields_user.ini | 2 +- .../en-GB/en-GB.plg_fields_user.sys.ini | 2 +- .../en-GB/en-GB.plg_fields_usergrouplist.ini | 2 +- .../en-GB.plg_fields_usergrouplist.sys.ini | 2 +- .../en-GB/en-GB.plg_finder_categories.ini | 2 +- .../en-GB/en-GB.plg_finder_categories.sys.ini | 2 +- .../en-GB/en-GB.plg_finder_contacts.ini | 2 +- .../en-GB/en-GB.plg_finder_contacts.sys.ini | 2 +- .../en-GB/en-GB.plg_finder_content.ini | 2 +- .../en-GB/en-GB.plg_finder_content.sys.ini | 2 +- .../en-GB/en-GB.plg_finder_newsfeeds.ini | 2 +- .../en-GB/en-GB.plg_finder_newsfeeds.sys.ini | 2 +- .../language/en-GB/en-GB.plg_finder_tags.ini | 2 +- .../en-GB/en-GB.plg_finder_tags.sys.ini | 2 +- .../en-GB/en-GB.plg_finder_weblinks.ini | 2 +- .../en-GB/en-GB.plg_finder_weblinks.sys.ini | 2 +- .../en-GB.plg_installer_folderinstaller.ini | 2 +- ...n-GB.plg_installer_folderinstaller.sys.ini | 2 +- .../en-GB.plg_installer_packageinstaller.ini | 2 +- ...-GB.plg_installer_packageinstaller.sys.ini | 2 +- .../en-GB.plg_installer_urlinstaller.ini | 2 +- .../en-GB.plg_installer_urlinstaller.sys.ini | 2 +- .../en-GB.plg_installer_webinstaller.ini | 2 +- .../en-GB.plg_installer_webinstaller.sys.ini | 2 +- .../en-GB.plg_quickicon_extensionupdate.ini | 2 +- ...n-GB.plg_quickicon_extensionupdate.sys.ini | 2 +- .../en-GB.plg_quickicon_joomlaupdate.ini | 2 +- .../en-GB.plg_quickicon_joomlaupdate.sys.ini | 2 +- .../en-GB.plg_quickicon_phpversioncheck.ini | 2 +- ...n-GB.plg_quickicon_phpversioncheck.sys.ini | 2 +- .../en-GB/en-GB.plg_search_categories.ini | 2 +- .../en-GB/en-GB.plg_search_categories.sys.ini | 2 +- .../en-GB/en-GB.plg_search_contacts.ini | 2 +- .../en-GB/en-GB.plg_search_contacts.sys.ini | 2 +- .../en-GB/en-GB.plg_search_content.ini | 2 +- .../en-GB/en-GB.plg_search_content.sys.ini | 2 +- .../en-GB/en-GB.plg_search_newsfeeds.ini | 2 +- .../en-GB/en-GB.plg_search_newsfeeds.sys.ini | 2 +- .../language/en-GB/en-GB.plg_search_tags.ini | 2 +- .../en-GB/en-GB.plg_search_tags.sys.ini | 2 +- .../en-GB/en-GB.plg_search_weblinks.ini | 2 +- .../en-GB/en-GB.plg_search_weblinks.sys.ini | 2 +- .../language/en-GB/en-GB.plg_system_cache.ini | 2 +- .../en-GB/en-GB.plg_system_cache.sys.ini | 2 +- .../language/en-GB/en-GB.plg_system_debug.ini | 2 +- .../en-GB/en-GB.plg_system_debug.sys.ini | 2 +- .../en-GB/en-GB.plg_system_fields.ini | 2 +- .../en-GB/en-GB.plg_system_fields.sys.ini | 2 +- .../en-GB/en-GB.plg_system_highlight.ini | 2 +- .../en-GB/en-GB.plg_system_highlight.sys.ini | 2 +- .../en-GB/en-GB.plg_system_languagecode.ini | 2 +- .../en-GB.plg_system_languagecode.sys.ini | 2 +- .../en-GB/en-GB.plg_system_languagefilter.ini | 2 +- .../en-GB.plg_system_languagefilter.sys.ini | 2 +- .../language/en-GB/en-GB.plg_system_log.ini | 2 +- .../en-GB/en-GB.plg_system_log.sys.ini | 2 +- .../en-GB/en-GB.plg_system_logout.ini | 2 +- .../en-GB/en-GB.plg_system_logout.sys.ini | 2 +- .../language/en-GB/en-GB.plg_system_p3p.ini | 2 +- .../en-GB/en-GB.plg_system_p3p.sys.ini | 2 +- .../en-GB/en-GB.plg_system_redirect.ini | 2 +- .../en-GB/en-GB.plg_system_redirect.sys.ini | 2 +- .../en-GB/en-GB.plg_system_remember.ini | 2 +- .../en-GB/en-GB.plg_system_remember.sys.ini | 2 +- .../language/en-GB/en-GB.plg_system_sef.ini | 2 +- .../en-GB/en-GB.plg_system_sef.sys.ini | 2 +- .../language/en-GB/en-GB.plg_system_stats.ini | 2 +- .../en-GB/en-GB.plg_system_stats.sys.ini | 2 +- .../en-GB.plg_system_updatenotification.ini | 2 +- ...n-GB.plg_system_updatenotification.sys.ini | 2 +- .../en-GB/en-GB.plg_twofactorauth_totp.ini | 2 +- .../en-GB.plg_twofactorauth_totp.sys.ini | 2 +- .../en-GB/en-GB.plg_twofactorauth_yubikey.ini | 2 +- .../en-GB.plg_twofactorauth_yubikey.sys.ini | 2 +- .../en-GB/en-GB.plg_user_contactcreator.ini | 2 +- .../en-GB.plg_user_contactcreator.sys.ini | 2 +- .../language/en-GB/en-GB.plg_user_joomla.ini | 2 +- .../en-GB/en-GB.plg_user_joomla.sys.ini | 2 +- .../language/en-GB/en-GB.plg_user_profile.ini | 2 +- .../en-GB/en-GB.plg_user_profile.sys.ini | 2 +- administrator/language/en-GB/en-GB.xml | 2 +- administrator/language/en-GB/install.xml | 4 +- administrator/manifests/libraries/joomla.xml | 2 +- .../manifests/packages/pkg_en-GB.xml | 2 +- .../modules/mod_custom/mod_custom.php | 2 +- .../modules/mod_custom/mod_custom.xml | 2 +- .../modules/mod_custom/tmpl/default.php | 2 +- administrator/modules/mod_feed/helper.php | 2 +- administrator/modules/mod_feed/mod_feed.php | 2 +- administrator/modules/mod_feed/mod_feed.xml | 2 +- .../modules/mod_feed/tmpl/default.php | 2 +- administrator/modules/mod_latest/helper.php | 2 +- .../modules/mod_latest/mod_latest.php | 2 +- .../modules/mod_latest/mod_latest.xml | 2 +- .../modules/mod_latest/tmpl/default.php | 2 +- administrator/modules/mod_logged/helper.php | 2 +- .../modules/mod_logged/mod_logged.php | 2 +- .../modules/mod_logged/mod_logged.xml | 2 +- .../modules/mod_logged/tmpl/default.php | 2 +- administrator/modules/mod_login/helper.php | 2 +- administrator/modules/mod_login/mod_login.php | 2 +- administrator/modules/mod_login/mod_login.xml | 2 +- .../modules/mod_login/tmpl/default.php | 2 +- administrator/modules/mod_menu/helper.php | 254 ++++++++- administrator/modules/mod_menu/menu.php | 166 +++++- administrator/modules/mod_menu/mod_menu.php | 11 +- administrator/modules/mod_menu/mod_menu.xml | 23 +- .../disabled.php} | 23 +- .../enabled.php} | 187 ++++--- .../modules/mod_menu/tmpl/default.php | 4 +- .../en-GB/en-GB.mod_multilangstatus.ini | 2 +- .../en-GB/en-GB.mod_multilangstatus.sys.ini | 2 +- .../mod_multilangstatus.php | 2 +- .../mod_multilangstatus.xml | 2 +- .../mod_multilangstatus/tmpl/default.php | 2 +- administrator/modules/mod_popular/helper.php | 2 +- .../modules/mod_popular/mod_popular.php | 2 +- .../modules/mod_popular/mod_popular.xml | 2 +- .../modules/mod_popular/tmpl/default.php | 2 +- .../modules/mod_quickicon/helper.php | 2 +- .../modules/mod_quickicon/mod_quickicon.php | 2 +- .../modules/mod_quickicon/mod_quickicon.xml | 2 +- .../modules/mod_quickicon/tmpl/default.php | 2 +- .../modules/mod_stats_admin/helper.php | 2 +- .../language/en-GB.mod_stats_admin.ini | 2 +- .../language/en-GB.mod_stats_admin.sys.ini | 2 +- .../mod_stats_admin/mod_stats_admin.php | 2 +- .../mod_stats_admin/mod_stats_admin.xml | 2 +- .../modules/mod_stats_admin/tmpl/default.php | 2 +- .../modules/mod_status/mod_status.php | 2 +- .../modules/mod_status/tmpl/default.php | 2 +- .../modules/mod_submenu/mod_submenu.php | 2 +- .../modules/mod_submenu/mod_submenu.xml | 2 +- .../modules/mod_submenu/tmpl/default.php | 2 +- administrator/modules/mod_title/mod_title.php | 2 +- administrator/modules/mod_title/mod_title.xml | 2 +- .../modules/mod_title/tmpl/default.php | 2 +- .../modules/mod_toolbar/mod_toolbar.php | 2 +- .../modules/mod_toolbar/mod_toolbar.xml | 2 +- .../modules/mod_toolbar/tmpl/default.php | 2 +- administrator/modules/mod_version/helper.php | 2 +- .../language/en-GB/en-GB.mod_version.ini | 2 +- .../language/en-GB/en-GB.mod_version.sys.ini | 2 +- .../modules/mod_version/mod_version.php | 2 +- .../modules/mod_version/mod_version.xml | 2 +- .../modules/mod_version/tmpl/default.php | 2 +- administrator/templates/atum/component.php | 2 +- administrator/templates/atum/cpanel.php | 2 +- .../atum/html/mod_version/default.php | 2 +- .../templates/atum/html/pagination.php | 2 +- administrator/templates/system/component.php | 2 +- administrator/templates/system/css/error.css | 2 +- administrator/templates/system/css/system.css | 2 +- administrator/templates/system/error.php | 2 +- .../templates/system/html/modules.php | 2 +- administrator/templates/system/index.php | 2 +- bin/keychain.php | 2 +- build/build.php | 2 +- build/bump.php | 2 +- build/helpTOC.php | 2 +- cli/deletefiles.php | 2 +- cli/finder_indexer.php | 2 +- cli/garbagecron.php | 2 +- cli/update_cron.php | 2 +- components/com_ajax/ajax.php | 2 +- components/com_banners/banners.php | 2 +- components/com_banners/controller.php | 2 +- components/com_banners/helpers/banner.php | 2 +- components/com_banners/helpers/category.php | 2 +- components/com_banners/models/banner.php | 2 +- components/com_banners/models/banners.php | 2 +- components/com_banners/router.php | 2 +- components/com_config/config.php | 2 +- components/com_config/controller/cancel.php | 2 +- .../com_config/controller/canceladmin.php | 2 +- components/com_config/controller/cmsbase.php | 2 +- .../com_config/controller/config/display.php | 2 +- .../com_config/controller/config/save.php | 2 +- components/com_config/controller/display.php | 2 +- components/com_config/controller/helper.php | 2 +- .../com_config/controller/modules/cancel.php | 2 +- .../com_config/controller/modules/display.php | 2 +- .../com_config/controller/modules/save.php | 2 +- .../controller/templates/display.php | 2 +- .../com_config/controller/templates/save.php | 2 +- components/com_config/model/cms.php | 2 +- components/com_config/model/config.php | 2 +- components/com_config/model/form.php | 2 +- components/com_config/model/form/modules.xml | 18 +- components/com_config/model/modules.php | 2 +- components/com_config/model/templates.php | 2 +- components/com_config/view/cms/html.php | 2 +- components/com_config/view/cms/json.php | 2 +- components/com_config/view/config/html.php | 2 +- .../com_config/view/config/tmpl/default.php | 2 +- .../view/config/tmpl/default_metadata.php | 2 +- .../view/config/tmpl/default_seo.php | 2 +- .../view/config/tmpl/default_site.php | 2 +- components/com_config/view/modules/html.php | 2 +- .../com_config/view/modules/tmpl/default.php | 2 +- .../view/modules/tmpl/default_options.php | 2 +- .../view/modules/tmpl/default_positions.php | 2 +- components/com_config/view/templates/html.php | 2 +- .../view/templates/tmpl/default.php | 2 +- .../view/templates/tmpl/default_options.php | 2 +- components/com_contact/contact.php | 2 +- components/com_contact/controller.php | 2 +- .../com_contact/controllers/contact.php | 2 +- .../com_contact/helpers/association.php | 2 +- components/com_contact/helpers/category.php | 2 +- .../com_contact/helpers/legacyrouter.php | 2 +- components/com_contact/helpers/route.php | 2 +- .../com_contact/layouts/field/render.php | 2 +- .../com_contact/layouts/fields/render.php | 2 +- .../layouts/joomla/form/renderfield.php | 2 +- components/com_contact/models/categories.php | 2 +- components/com_contact/models/category.php | 2 +- components/com_contact/models/contact.php | 2 +- components/com_contact/models/featured.php | 2 +- .../com_contact/models/rules/contactemail.php | 2 +- .../models/rules/contactemailmessage.php | 2 +- .../models/rules/contactemailsubject.php | 2 +- components/com_contact/router.php | 2 +- .../views/categories/tmpl/default.php | 2 +- .../views/categories/tmpl/default_items.php | 2 +- .../views/categories/view.html.php | 2 +- .../views/category/tmpl/default.php | 2 +- .../views/category/tmpl/default_children.php | 2 +- .../views/category/tmpl/default_items.php | 2 +- .../com_contact/views/category/view.feed.php | 2 +- .../com_contact/views/category/view.html.php | 2 +- .../views/contact/tmpl/default.php | 2 +- .../views/contact/tmpl/default_address.php | 2 +- .../views/contact/tmpl/default_articles.php | 2 +- .../views/contact/tmpl/default_form.php | 2 +- .../views/contact/tmpl/default_links.php | 2 +- .../views/contact/tmpl/default_profile.php | 2 +- .../tmpl/default_user_custom_fields.php | 2 +- .../com_contact/views/contact/view.html.php | 2 +- .../com_contact/views/contact/view.vcf.php | 2 +- .../views/featured/tmpl/default.php | 2 +- .../views/featured/tmpl/default_items.php | 2 +- .../com_contact/views/featured/view.html.php | 2 +- components/com_content/content.php | 2 +- components/com_content/controller.php | 2 +- .../com_content/controllers/article.php | 2 +- .../com_content/helpers/association.php | 2 +- components/com_content/helpers/category.php | 2 +- components/com_content/helpers/icon.php | 2 +- .../com_content/helpers/legacyrouter.php | 2 +- components/com_content/helpers/query.php | 2 +- components/com_content/helpers/route.php | 2 +- .../layouts/field/prepare/modal_article.php | 2 +- components/com_content/models/archive.php | 2 +- components/com_content/models/article.php | 2 +- components/com_content/models/articles.php | 2 +- components/com_content/models/categories.php | 2 +- components/com_content/models/category.php | 2 +- components/com_content/models/featured.php | 2 +- components/com_content/models/form.php | 2 +- .../com_content/models/forms/article.xml | 13 +- components/com_content/router.php | 2 +- .../views/archive/tmpl/default.php | 2 +- .../views/archive/tmpl/default_items.php | 2 +- .../com_content/views/archive/view.html.php | 2 +- .../views/article/tmpl/default.php | 2 +- .../views/article/tmpl/default_links.php | 2 +- .../com_content/views/article/view.html.php | 2 +- .../views/categories/tmpl/default.php | 2 +- .../views/categories/tmpl/default_items.php | 2 +- .../views/categories/view.html.php | 2 +- .../com_content/views/category/tmpl/blog.php | 2 +- .../views/category/tmpl/blog_children.php | 2 +- .../views/category/tmpl/blog_item.php | 2 +- .../views/category/tmpl/blog_links.php | 2 +- .../views/category/tmpl/default.php | 2 +- .../views/category/tmpl/default_articles.php | 2 +- .../views/category/tmpl/default_children.php | 2 +- .../com_content/views/category/view.feed.php | 2 +- .../com_content/views/category/view.html.php | 2 +- .../views/featured/tmpl/default.php | 2 +- .../views/featured/tmpl/default_item.php | 2 +- .../views/featured/tmpl/default_links.php | 2 +- .../com_content/views/featured/view.feed.php | 2 +- .../com_content/views/featured/view.html.php | 2 +- .../com_content/views/form/tmpl/edit.php | 2 +- .../com_content/views/form/view.html.php | 2 +- .../com_contenthistory/contenthistory.php | 2 +- components/com_fields/controller.php | 2 +- components/com_fields/controllers/field.php | 2 +- components/com_fields/fields.php | 2 +- .../com_fields/layouts/field/render.php | 2 +- .../com_fields/layouts/fields/render.php | 2 +- components/com_finder/controller.php | 2 +- .../controllers/suggestions.json.php | 2 +- components/com_finder/finder.php | 2 +- components/com_finder/helpers/html/filter.php | 2 +- components/com_finder/helpers/html/query.php | 2 +- components/com_finder/helpers/route.php | 2 +- components/com_finder/models/search.php | 2 +- components/com_finder/models/suggestions.php | 2 +- components/com_finder/router.php | 2 +- .../com_finder/views/search/tmpl/default.php | 2 +- .../views/search/tmpl/default_form.php | 2 +- .../views/search/tmpl/default_result.php | 2 +- .../views/search/tmpl/default_results.php | 2 +- .../com_finder/views/search/view.feed.php | 2 +- .../com_finder/views/search/view.html.php | 2 +- .../views/search/view.opensearch.php | 2 +- components/com_mailto/controller.php | 2 +- components/com_mailto/helpers/mailto.php | 2 +- components/com_mailto/mailto.php | 2 +- .../com_mailto/views/mailto/tmpl/default.php | 2 +- .../com_mailto/views/mailto/view.html.php | 2 +- .../com_mailto/views/sent/tmpl/default.php | 2 +- .../com_mailto/views/sent/view.html.php | 2 +- components/com_media/media.php | 2 +- components/com_menus/controller.php | 2 +- components/com_menus/menus.php | 2 +- components/com_modules/controller.php | 2 +- components/com_modules/modules.php | 2 +- components/com_newsfeeds/controller.php | 2 +- .../com_newsfeeds/helpers/association.php | 2 +- components/com_newsfeeds/helpers/category.php | 2 +- .../com_newsfeeds/helpers/legacyrouter.php | 2 +- components/com_newsfeeds/helpers/route.php | 2 +- .../com_newsfeeds/models/categories.php | 2 +- components/com_newsfeeds/models/category.php | 2 +- components/com_newsfeeds/models/newsfeed.php | 2 +- components/com_newsfeeds/newsfeeds.php | 2 +- components/com_newsfeeds/router.php | 2 +- .../views/categories/tmpl/default.php | 2 +- .../views/categories/tmpl/default_items.php | 2 +- .../views/categories/view.html.php | 2 +- .../views/category/tmpl/default.php | 2 +- .../views/category/tmpl/default_children.php | 2 +- .../views/category/tmpl/default_items.php | 2 +- .../views/category/view.html.php | 2 +- .../views/newsfeed/tmpl/default.php | 2 +- .../views/newsfeed/view.html.php | 2 +- components/com_search/controller.php | 2 +- components/com_search/models/search.php | 2 +- components/com_search/router.php | 2 +- components/com_search/search.php | 2 +- .../com_search/views/search/tmpl/default.php | 2 +- .../views/search/tmpl/default_error.php | 2 +- .../views/search/tmpl/default_form.php | 2 +- .../views/search/tmpl/default_results.php | 2 +- .../com_search/views/search/view.html.php | 2 +- .../views/search/view.opensearch.php | 2 +- components/com_tags/controller.php | 2 +- components/com_tags/controllers/tags.php | 2 +- components/com_tags/helpers/route.php | 38 +- components/com_tags/models/tag.php | 2 +- components/com_tags/models/tags.php | 2 +- components/com_tags/router.php | 47 +- components/com_tags/tags.php | 2 +- .../com_tags/views/tag/tmpl/default.php | 2 +- .../com_tags/views/tag/tmpl/default_items.php | 2 +- components/com_tags/views/tag/tmpl/list.php | 2 +- .../com_tags/views/tag/tmpl/list_items.php | 2 +- components/com_tags/views/tag/view.feed.php | 2 +- components/com_tags/views/tag/view.html.php | 2 +- .../com_tags/views/tags/tmpl/default.php | 2 +- .../views/tags/tmpl/default_items.php | 2 +- components/com_tags/views/tags/view.feed.php | 2 +- components/com_tags/views/tags/view.html.php | 2 +- components/com_users/controller.php | 2 +- .../com_users/controllers/profile.json.php | 2 +- components/com_users/controllers/profile.php | 2 +- .../controllers/profile_base_json.php | 2 +- .../com_users/controllers/registration.php | 2 +- components/com_users/controllers/remind.php | 2 +- components/com_users/controllers/reset.php | 2 +- components/com_users/controllers/user.php | 2 +- components/com_users/helpers/html/users.php | 2 +- components/com_users/helpers/legacyrouter.php | 2 +- components/com_users/helpers/route.php | 2 +- components/com_users/models/login.php | 2 +- components/com_users/models/profile.php | 2 +- components/com_users/models/registration.php | 8 +- components/com_users/models/remind.php | 2 +- components/com_users/models/reset.php | 2 +- .../models/rules/loginuniquefield.php | 2 +- .../models/rules/logoutuniquefield.php | 2 +- components/com_users/router.php | 2 +- components/com_users/users.php | 2 +- .../com_users/views/login/tmpl/default.php | 2 +- .../views/login/tmpl/default_login.php | 2 +- .../views/login/tmpl/default_logout.php | 2 +- .../com_users/views/login/view.html.php | 2 +- .../com_users/views/profile/tmpl/default.php | 2 +- .../views/profile/tmpl/default_core.php | 2 +- .../views/profile/tmpl/default_custom.php | 4 +- .../views/profile/tmpl/default_params.php | 2 +- .../com_users/views/profile/tmpl/edit.php | 2 +- .../com_users/views/profile/view.html.php | 2 +- .../views/registration/tmpl/complete.php | 2 +- .../views/registration/tmpl/default.php | 2 +- .../views/registration/view.html.php | 2 +- .../com_users/views/remind/tmpl/default.php | 2 +- .../com_users/views/remind/view.html.php | 2 +- .../com_users/views/reset/tmpl/complete.php | 2 +- .../com_users/views/reset/tmpl/confirm.php | 2 +- .../com_users/views/reset/tmpl/default.php | 2 +- .../com_users/views/reset/view.html.php | 2 +- components/com_wrapper/controller.php | 2 +- components/com_wrapper/router.php | 2 +- .../views/wrapper/tmpl/default.php | 2 +- .../com_wrapper/views/wrapper/view.html.php | 2 +- components/com_wrapper/wrapper.php | 2 +- composer.lock | 10 +- htaccess.txt | 2 +- includes/defines.php | 2 +- includes/framework.php | 2 +- index.php | 2 +- installation/COPYRIGHT | 2 +- installation/CREDITS | 2 +- installation/INSTALL | 2 +- installation/LICENSES | 2 +- installation/application/bootstrap.php | 2 +- installation/application/defines.php | 2 +- installation/application/framework.php | 2 +- installation/application/router.php | 2 +- installation/application/web.php | 2 +- installation/configuration.php-dist | 2 +- installation/controller/database.php | 2 +- installation/controller/default.php | 2 +- installation/controller/detectftproot.php | 2 +- installation/controller/ftp.php | 2 +- installation/controller/install/config.php | 2 +- installation/controller/install/database.php | 2 +- .../controller/install/database_backup.php | 2 +- .../controller/install/database_remove.php | 2 +- installation/controller/install/email.php | 2 +- installation/controller/install/languages.php | 2 +- installation/controller/install/sample.php | 2 +- installation/controller/preinstall.php | 2 +- installation/controller/removefolder.php | 2 +- .../controller/setdefaultlanguage.php | 2 +- installation/controller/setlanguage.php | 2 +- installation/controller/site.php | 2 +- installation/controller/summary.php | 2 +- installation/controller/verifyftpsettings.php | 2 +- installation/form/field/language.php | 2 +- installation/form/field/prefix.php | 2 +- installation/form/field/sample.php | 2 +- installation/form/rule/prefix.php | 2 +- installation/helper/database.php | 2 +- installation/html/helper.php | 2 +- installation/index.php | 2 +- installation/language/af-ZA/af-ZA.ini | 2 +- installation/language/af-ZA/af-ZA.xml | 2 +- installation/language/ar-AA/ar-AA.ini | 2 +- installation/language/ar-AA/ar-AA.xml | 2 +- installation/language/be-BY/be-BY.ini | 2 +- installation/language/be-BY/be-BY.xml | 2 +- installation/language/bg-BG/bg-BG.ini | 2 +- installation/language/bg-BG/bg-BG.xml | 2 +- installation/language/bs-BA/bs-BA.ini | 2 +- installation/language/bs-BA/bs-BA.xml | 2 +- installation/language/ca-ES/ca-ES.ini | 2 +- installation/language/ca-ES/ca-ES.xml | 2 +- installation/language/ckb-IQ/ckb-IQ.ini | 2 +- installation/language/ckb-IQ/ckb-IQ.xml | 2 +- installation/language/cs-CZ/cs-CZ.ini | 2 +- installation/language/cs-CZ/cs-CZ.xml | 2 +- installation/language/cy-GB/cy-GB.ini | 2 +- installation/language/cy-GB/cy-GB.xml | 2 +- installation/language/da-DK/da-DK.ini | 2 +- installation/language/da-DK/da-DK.xml | 2 +- installation/language/de-DE/de-DE.ini | 2 +- installation/language/de-DE/de-DE.xml | 2 +- installation/language/dz-BT/dz-BT.ini | 2 +- installation/language/dz-BT/dz-BT.xml | 2 +- installation/language/el-GR/el-GR.ini | 2 +- installation/language/en-AU/en-AU.ini | 2 +- installation/language/en-AU/en-AU.xml | 2 +- installation/language/en-CA/en-CA.ini | 2 +- installation/language/en-CA/en-CA.xml | 2 +- installation/language/en-GB/en-GB.ini | 2 +- installation/language/en-GB/en-GB.xml | 2 +- installation/language/en-NZ/en-NZ.ini | 2 +- installation/language/en-NZ/en-NZ.xml | 2 +- installation/language/en-US/en-US.ini | 2 +- installation/language/en-US/en-US.xml | 2 +- installation/language/eo-XX/eo-XX.ini | 2 +- installation/language/es-CO/es-CO.ini | 2 +- installation/language/es-CO/es-CO.xml | 2 +- installation/language/es-ES/es-ES.ini | 2 +- installation/language/es-ES/es-ES.xml | 2 +- installation/language/et-EE/et-EE.ini | 2 +- installation/language/et-EE/et-EE.xml | 2 +- installation/language/eu-ES/eu-ES.ini | 2 +- installation/language/eu-ES/eu-ES.xml | 2 +- installation/language/fa-IR/fa-IR.ini | 2 +- installation/language/fa-IR/fa-IR.xml | 2 +- installation/language/fi-FI/fi-FI.ini | 2 +- installation/language/fi-FI/fi-FI.xml | 2 +- installation/language/fr-CA/fr-CA.ini | 2 +- installation/language/fr-CA/fr-CA.xml | 2 +- installation/language/fr-FR/fr-FR.ini | 2 +- installation/language/fr-FR/fr-FR.xml | 2 +- installation/language/ga-IE/ga-IE.ini | 2 +- installation/language/ga-IE/ga-IE.xml | 2 +- installation/language/gl-ES/gl-ES.ini | 2 +- installation/language/gl-ES/gl-ES.xml | 2 +- installation/language/he-IL/he-IL.ini | 2 +- installation/language/he-IL/he-IL.xml | 2 +- installation/language/hi-IN/hi-IN.xml | 2 +- installation/language/hr-HR/hr-HR.ini | 2 +- installation/language/hr-HR/hr-HR.xml | 2 +- installation/language/hu-HU/hu-HU.ini | 2 +- installation/language/hu-HU/hu-HU.xml | 2 +- installation/language/hy-AM/hy-AM.ini | 2 +- installation/language/hy-AM/hy-AM.xml | 2 +- installation/language/id-ID/id-ID.ini | 2 +- installation/language/id-ID/id-ID.xml | 2 +- installation/language/it-IT/it-IT.ini | 2 +- installation/language/it-IT/it-IT.xml | 2 +- installation/language/ja-JP/ja-JP.ini | 2 +- installation/language/ja-JP/ja-JP.xml | 2 +- installation/language/ka-GE/ka-GE.ini | 2 +- installation/language/ka-GE/ka-GE.xml | 2 +- installation/language/km-KH/km-KH.ini | 2 +- installation/language/km-KH/km-KH.xml | 2 +- installation/language/ko-KR/ko-KR.ini | 2 +- installation/language/ko-KR/ko-KR.xml | 2 +- installation/language/lv-LV/lv-LV.ini | 2 +- installation/language/lv-LV/lv-LV.xml | 2 +- installation/language/mk-MK/mk-MK.ini | 2 +- installation/language/mk-MK/mk-MK.xml | 2 +- installation/language/ms-MY/ms-MY.ini | 2 +- installation/language/ms-MY/ms-MY.xml | 2 +- installation/language/nb-NO/nb-NO.ini | 2 +- installation/language/nb-NO/nb-NO.xml | 2 +- installation/language/nl-NL/nl-NL.ini | 2 +- installation/language/nl-NL/nl-NL.xml | 2 +- installation/language/nn-NO/nn-NO.ini | 2 +- installation/language/nn-NO/nn-NO.xml | 2 +- installation/language/pl-PL/pl-PL.ini | 2 +- installation/language/pl-PL/pl-PL.xml | 2 +- installation/language/prs-AF/prs-AF.ini | 2 +- installation/language/prs-AF/prs-AF.xml | 2 +- installation/language/pt-BR/pt-BR.ini | 2 +- installation/language/pt-PT/pt-PT.ini | 2 +- installation/language/pt-PT/pt-PT.xml | 2 +- installation/language/ro-RO/ro-RO.ini | 2 +- installation/language/ro-RO/ro-RO.xml | 2 +- installation/language/ru-RU/ru-RU.ini | 2 +- installation/language/ru-RU/ru-RU.xml | 2 +- installation/language/si-LK/si-LK.ini | 2 +- installation/language/si-LK/si-LK.xml | 2 +- installation/language/sk-SK/sk-SK.ini | 2 +- installation/language/sk-SK/sk-SK.xml | 2 +- installation/language/sl-SI/sl-SI.ini | 2 +- installation/language/sl-SI/sl-SI.xml | 2 +- installation/language/sr-RS/sr-RS.ini | 2 +- installation/language/sr-RS/sr-RS.xml | 2 +- installation/language/sr-YU/sr-YU.ini | 3 +- installation/language/sr-YU/sr-YU.xml | 2 +- installation/language/srp-ME/srp-ME.ini | 2 +- installation/language/srp-ME/srp-ME.xml | 2 +- installation/language/sv-SE/sv-SE.ini | 2 +- installation/language/sv-SE/sv-SE.xml | 2 +- installation/language/sw-KE/sw-KE.ini | 2 +- installation/language/sw-KE/sw-KE.xml | 2 +- installation/language/sy-IQ/sy-IQ.ini | 2 +- installation/language/sy-IQ/sy-IQ.xml | 2 +- installation/language/ta-IN/ta-IN.ini | 2 +- installation/language/ta-IN/ta-IN.xml | 2 +- installation/language/th-TH/th-TH.ini | 2 +- installation/language/th-TH/th-TH.xml | 2 +- installation/language/tk-TM/tk-TM.ini | 2 +- installation/language/tk-TM/tk-TM.xml | 2 +- installation/language/tr-TR/tr-TR.ini | 2 +- installation/language/tr-TR/tr-TR.xml | 2 +- installation/language/ug-CN/ug-CN.ini | 2 +- installation/language/ug-CN/ug-CN.xml | 2 +- installation/language/uk-UA/uk-UA.ini | 2 +- installation/language/vi-VN/vi-VN.ini | 2 +- installation/language/vi-VN/vi-VN.xml | 2 +- installation/language/zh-CN/zh-CN.ini | 2 +- installation/language/zh-CN/zh-CN.xml | 2 +- installation/language/zh-TW/zh-TW.ini | 2 +- installation/language/zh-TW/zh-TW.xml | 2 +- installation/model/configuration.php | 2 +- installation/model/database.php | 2 +- installation/model/ftp.php | 2 +- installation/model/languages.php | 2 +- installation/model/setup.php | 2 +- installation/response/json.php | 2 +- installation/sql/mysql/joomla.sql | 49 +- installation/sql/postgresql/joomla.sql | 49 +- installation/sql/sqlazure/joomla.sql | 53 +- installation/template/body.php | 2 +- installation/template/css/template.css | 2 +- installation/template/css/template_rtl.css | 2 +- installation/template/index.php | 2 +- installation/template/js/installation.js | 2 +- installation/view/complete/html.php | 2 +- installation/view/complete/tmpl/default.php | 2 +- installation/view/database/tmpl/default.php | 2 +- installation/view/default.php | 2 +- installation/view/defaultlanguage/html.php | 2 +- .../view/defaultlanguage/tmpl/default.php | 2 +- installation/view/ftp/tmpl/default.php | 2 +- installation/view/install/html.php | 2 +- installation/view/install/tmpl/default.php | 2 +- installation/view/languages/html.php | 2 +- installation/view/languages/tmpl/default.php | 2 +- installation/view/preinstall/html.php | 2 +- installation/view/preinstall/tmpl/default.php | 2 +- installation/view/remove/html.php | 2 +- installation/view/remove/tmpl/default.php | 2 +- installation/view/site/tmpl/default.php | 2 +- installation/view/summary/html.php | 2 +- installation/view/summary/tmpl/default.php | 2 +- language/en-GB/en-GB.com_ajax.ini | 2 +- language/en-GB/en-GB.com_config.ini | 2 +- language/en-GB/en-GB.com_contact.ini | 2 +- language/en-GB/en-GB.com_content.ini | 2 +- language/en-GB/en-GB.com_finder.ini | 2 +- language/en-GB/en-GB.com_mailto.ini | 2 +- language/en-GB/en-GB.com_media.ini | 2 +- language/en-GB/en-GB.com_messages.ini | 2 +- language/en-GB/en-GB.com_newsfeeds.ini | 2 +- language/en-GB/en-GB.com_search.ini | 2 +- language/en-GB/en-GB.com_tags.ini | 2 +- language/en-GB/en-GB.com_users.ini | 2 +- language/en-GB/en-GB.com_weblinks.ini | 2 +- language/en-GB/en-GB.com_wrapper.ini | 2 +- language/en-GB/en-GB.files_joomla.sys.ini | 2 +- language/en-GB/en-GB.finder_cli.ini | 2 +- language/en-GB/en-GB.ini | 2 +- language/en-GB/en-GB.lib_fof.ini | 0 language/en-GB/en-GB.lib_fof.sys.ini | 2 +- language/en-GB/en-GB.lib_idna_convert.sys.ini | 2 +- language/en-GB/en-GB.lib_joomla.ini | 2 +- language/en-GB/en-GB.lib_joomla.sys.ini | 2 +- language/en-GB/en-GB.lib_phpass.sys.ini | 2 +- language/en-GB/en-GB.lib_phputf8.sys.ini | 2 +- language/en-GB/en-GB.lib_simplepie.sys.ini | 2 +- language/en-GB/en-GB.localise.php | 2 +- language/en-GB/en-GB.mod_articles_archive.ini | 2 +- .../en-GB/en-GB.mod_articles_archive.sys.ini | 2 +- .../en-GB/en-GB.mod_articles_categories.ini | 2 +- .../en-GB.mod_articles_categories.sys.ini | 2 +- .../en-GB/en-GB.mod_articles_category.ini | 2 +- .../en-GB/en-GB.mod_articles_category.sys.ini | 2 +- language/en-GB/en-GB.mod_articles_latest.ini | 2 +- .../en-GB/en-GB.mod_articles_latest.sys.ini | 2 +- language/en-GB/en-GB.mod_articles_news.ini | 2 +- .../en-GB/en-GB.mod_articles_news.sys.ini | 2 +- language/en-GB/en-GB.mod_articles_popular.ini | 2 +- .../en-GB/en-GB.mod_articles_popular.sys.ini | 2 +- language/en-GB/en-GB.mod_banners.ini | 2 +- language/en-GB/en-GB.mod_banners.sys.ini | 2 +- language/en-GB/en-GB.mod_breadcrumbs.ini | 2 +- language/en-GB/en-GB.mod_breadcrumbs.sys.ini | 2 +- language/en-GB/en-GB.mod_custom.ini | 2 +- language/en-GB/en-GB.mod_custom.sys.ini | 2 +- language/en-GB/en-GB.mod_feed.ini | 2 +- language/en-GB/en-GB.mod_feed.sys.ini | 2 +- language/en-GB/en-GB.mod_finder.ini | 2 +- language/en-GB/en-GB.mod_finder.sys.ini | 2 +- language/en-GB/en-GB.mod_footer.ini | 2 +- language/en-GB/en-GB.mod_footer.sys.ini | 2 +- language/en-GB/en-GB.mod_languages.ini | 2 +- language/en-GB/en-GB.mod_languages.sys.ini | 2 +- language/en-GB/en-GB.mod_login.ini | 2 +- language/en-GB/en-GB.mod_login.sys.ini | 2 +- language/en-GB/en-GB.mod_menu.ini | 2 +- language/en-GB/en-GB.mod_menu.sys.ini | 2 +- language/en-GB/en-GB.mod_random_image.ini | 2 +- language/en-GB/en-GB.mod_random_image.sys.ini | 2 +- language/en-GB/en-GB.mod_related_items.ini | 2 +- .../en-GB/en-GB.mod_related_items.sys.ini | 2 +- language/en-GB/en-GB.mod_search.ini | 2 +- language/en-GB/en-GB.mod_search.sys.ini | 2 +- language/en-GB/en-GB.mod_stats.ini | 2 +- language/en-GB/en-GB.mod_stats.sys.ini | 2 +- language/en-GB/en-GB.mod_syndicate.ini | 2 +- language/en-GB/en-GB.mod_syndicate.sys.ini | 2 +- language/en-GB/en-GB.mod_tags_popular.ini | 2 +- language/en-GB/en-GB.mod_tags_popular.sys.ini | 2 +- language/en-GB/en-GB.mod_tags_similar.ini | 2 +- language/en-GB/en-GB.mod_tags_similar.sys.ini | 2 +- language/en-GB/en-GB.mod_users_latest.ini | 2 +- language/en-GB/en-GB.mod_users_latest.sys.ini | 2 +- language/en-GB/en-GB.mod_weblinks.ini | 2 +- language/en-GB/en-GB.mod_weblinks.sys.ini | 2 +- language/en-GB/en-GB.mod_whosonline.ini | 2 +- language/en-GB/en-GB.mod_whosonline.sys.ini | 2 +- language/en-GB/en-GB.mod_wrapper.ini | 2 +- language/en-GB/en-GB.mod_wrapper.sys.ini | 2 +- language/en-GB/en-GB.tpl_protostar.ini | 2 +- language/en-GB/en-GB.tpl_protostar.sys.ini | 2 +- language/en-GB/en-GB.xml | 2 +- language/en-GB/install.xml | 2 +- layouts/joomla/content/associations.php | 4 +- .../content/blog_style_default_item_title.php | 2 +- .../content/blog_style_default_links.php | 2 +- layouts/joomla/content/categories_default.php | 2 +- .../content/categories_default_items.php | 2 +- layouts/joomla/content/category_default.php | 2 +- layouts/joomla/content/full_image.php | 2 +- layouts/joomla/content/icons.php | 2 +- layouts/joomla/content/icons/create.php | 2 +- layouts/joomla/content/icons/edit.php | 2 +- layouts/joomla/content/icons/edit_lock.php | 2 +- layouts/joomla/content/icons/email.php | 2 +- layouts/joomla/content/icons/print_popup.php | 2 +- layouts/joomla/content/icons/print_screen.php | 2 +- layouts/joomla/content/info_block.php | 2 +- .../content/info_block/associations.php | 2 +- layouts/joomla/content/info_block/author.php | 2 +- layouts/joomla/content/info_block/block.php | 2 +- .../joomla/content/info_block/category.php | 2 +- .../joomla/content/info_block/create_date.php | 2 +- layouts/joomla/content/info_block/hits.php | 2 +- .../joomla/content/info_block/modify_date.php | 2 +- .../content/info_block/parent_category.php | 2 +- .../content/info_block/publish_date.php | 2 +- layouts/joomla/content/intro_image.php | 2 +- layouts/joomla/content/language.php | 2 +- layouts/joomla/content/options_default.php | 4 +- layouts/joomla/content/readmore.php | 2 +- layouts/joomla/content/tags.php | 2 +- layouts/joomla/edit/associations.php | 2 +- layouts/joomla/edit/details.php | 2 +- layouts/joomla/edit/fieldset.php | 2 +- layouts/joomla/edit/frontediting_modules.php | 2 +- layouts/joomla/edit/global.php | 2 +- layouts/joomla/edit/item_title.php | 2 +- layouts/joomla/edit/metadata.php | 2 +- layouts/joomla/edit/params.php | 2 +- layouts/joomla/edit/publishingdata.php | 2 +- layouts/joomla/edit/title_alias.php | 2 +- layouts/joomla/editors/buttons.php | 2 +- layouts/joomla/editors/buttons/button.php | 2 +- layouts/joomla/form/field/calendar.php | 2 +- layouts/joomla/form/field/checkboxes.php | 2 +- layouts/joomla/form/field/color/advanced.php | 2 +- layouts/joomla/form/field/color/simple.php | 2 +- layouts/joomla/form/field/contenthistory.php | 2 +- layouts/joomla/form/field/email.php | 2 +- layouts/joomla/form/field/file.php | 2 +- layouts/joomla/form/field/hidden.php | 2 +- layouts/joomla/form/field/media.php | 2 +- layouts/joomla/form/field/meter.php | 2 +- layouts/joomla/form/field/moduleorder.php | 2 +- layouts/joomla/form/field/number.php | 2 +- layouts/joomla/form/field/password.php | 2 +- layouts/joomla/form/field/radio.php | 2 +- layouts/joomla/form/field/range.php | 2 +- layouts/joomla/form/field/subform/default.php | 2 +- .../form/field/subform/repeatable-table.php | 2 +- .../repeatable-table/section-byfieldsets.php | 2 +- .../subform/repeatable-table/section.php | 2 +- .../joomla/form/field/subform/repeatable.php | 2 +- .../repeatable/section-byfieldsets.php | 2 +- .../form/field/subform/repeatable/section.php | 2 +- layouts/joomla/form/field/tel.php | 2 +- layouts/joomla/form/field/text.php | 2 +- layouts/joomla/form/field/textarea.php | 2 +- layouts/joomla/form/field/url.php | 2 +- layouts/joomla/form/field/user.php | 2 +- layouts/joomla/form/renderfield.php | 2 +- layouts/joomla/form/renderlabel.php | 2 +- layouts/joomla/html/batch/access.php | 2 +- layouts/joomla/html/batch/item.php | 2 +- layouts/joomla/html/batch/language.php | 2 +- layouts/joomla/html/batch/tag.php | 2 +- layouts/joomla/html/batch/user.php | 2 +- layouts/joomla/html/sortablelist.php | 64 +++ layouts/joomla/html/tag.php | 100 ++++ layouts/joomla/links/groupclose.php | 2 +- layouts/joomla/links/groupopen.php | 2 +- layouts/joomla/links/groupsclose.php | 2 +- layouts/joomla/links/groupseparator.php | 2 +- layouts/joomla/links/groupsopen.php | 2 +- layouts/joomla/links/link.php | 2 +- layouts/joomla/modal/body.php | 2 +- layouts/joomla/modal/footer.php | 2 +- layouts/joomla/modal/header.php | 2 +- layouts/joomla/modal/iframe.php | 2 +- layouts/joomla/modal/main.php | 2 +- layouts/joomla/pagination/link.php | 2 +- layouts/joomla/pagination/links.php | 2 +- layouts/joomla/pagination/list.php | 2 +- layouts/joomla/quickicons/icon.php | 2 +- layouts/joomla/searchtools/default.php | 2 +- layouts/joomla/searchtools/default/bar.php | 2 +- .../joomla/searchtools/default/filters.php | 4 +- layouts/joomla/searchtools/default/list.php | 2 +- .../joomla/searchtools/default/noitems.php | 2 +- .../joomla/searchtools/default/selector.php | 2 +- layouts/joomla/searchtools/grid/sort.php | 2 +- layouts/joomla/sidebars/submenu.php | 2 +- layouts/joomla/sidebars/toggle.php | 2 +- layouts/joomla/system/message.php | 2 +- layouts/joomla/tinymce/buttons.php | 2 +- layouts/joomla/tinymce/buttons/button.php | 2 +- layouts/joomla/tinymce/textarea.php | 2 +- layouts/joomla/tinymce/togglebutton.php | 2 +- layouts/joomla/toolbar/base.php | 2 +- layouts/joomla/toolbar/batch.php | 2 +- layouts/joomla/toolbar/confirm.php | 2 +- layouts/joomla/toolbar/containerclose.php | 2 +- layouts/joomla/toolbar/containeropen.php | 2 +- layouts/joomla/toolbar/group/groupclose.php | 2 +- layouts/joomla/toolbar/group/groupopen.php | 2 +- layouts/joomla/toolbar/help.php | 2 +- layouts/joomla/toolbar/iconclass.php | 2 +- layouts/joomla/toolbar/link.php | 2 +- layouts/joomla/toolbar/modal.php | 2 +- layouts/joomla/toolbar/popup.php | 2 +- layouts/joomla/toolbar/separator.php | 2 +- layouts/joomla/toolbar/slider.php | 2 +- layouts/joomla/toolbar/standard.php | 2 +- layouts/joomla/toolbar/title.php | 2 +- layouts/joomla/toolbar/versions.php | 2 +- .../libraries/cms/html/bootstrap/addtab.php | 2 +- .../cms/html/bootstrap/addtabscript.php | 2 +- .../libraries/cms/html/bootstrap/endtab.php | 2 +- .../cms/html/bootstrap/endtabset.php | 2 +- .../cms/html/bootstrap/starttabset.php | 2 +- .../cms/html/bootstrap/starttabsetscript.php | 2 +- .../editors/tinymce/field/tinymcebuilder.php | 2 +- .../field/tinymcebuilder/setoptions.php | 2 +- layouts/plugins/user/profile/fields/dob.php | 2 +- libraries/classmap.php | 2 +- libraries/cms.php | 2 +- libraries/cms/application/administrator.php | 2 +- libraries/cms/application/cms.php | 2 +- libraries/cms/application/helper.php | 2 +- libraries/cms/application/site.php | 2 +- libraries/cms/authentication/helper.php | 2 +- libraries/cms/captcha/captcha.php | 2 +- libraries/cms/class/loader.php | 2 +- libraries/cms/component/helper.php | 2 +- libraries/cms/component/router/base.php | 2 +- libraries/cms/component/router/interface.php | 2 +- libraries/cms/component/router/legacy.php | 2 +- .../cms/component/router/rules/interface.php | 2 +- libraries/cms/component/router/rules/menu.php | 2 +- .../cms/component/router/rules/nomenu.php | 2 +- .../cms/component/router/rules/standard.php | 2 +- libraries/cms/component/router/view.php | 2 +- .../component/router/viewconfiguration.php | 2 +- libraries/cms/editor/editor.php | 2 +- libraries/cms/error/page.php | 2 +- libraries/cms/form/field/author.php | 2 +- libraries/cms/form/field/captcha.php | 2 +- libraries/cms/form/field/chromestyle.php | 2 +- libraries/cms/form/field/contenthistory.php | 2 +- libraries/cms/form/field/contentlanguage.php | 2 +- libraries/cms/form/field/contenttype.php | 2 +- libraries/cms/form/field/editor.php | 2 +- .../cms/form/field/frontend_language.php | 2 +- libraries/cms/form/field/headertag.php | 2 +- libraries/cms/form/field/helpsite.php | 2 +- .../cms/form/field/lastvisitdaterange.php | 2 +- libraries/cms/form/field/limitbox.php | 2 +- libraries/cms/form/field/media.php | 2 +- libraries/cms/form/field/menu.php | 79 ++- libraries/cms/form/field/menuitem.php | 2 +- libraries/cms/form/field/moduleorder.php | 2 +- libraries/cms/form/field/moduleposition.php | 2 +- libraries/cms/form/field/moduletag.php | 2 +- libraries/cms/form/field/ordering.php | 2 +- libraries/cms/form/field/plugin_status.php | 2 +- .../cms/form/field/registrationdaterange.php | 2 +- libraries/cms/form/field/status.php | 2 +- libraries/cms/form/field/tag.php | 2 +- libraries/cms/form/field/templatestyle.php | 2 +- libraries/cms/form/field/user.php | 2 +- libraries/cms/form/field/useractive.php | 2 +- libraries/cms/form/field/usergrouplist.php | 2 +- libraries/cms/form/field/userstate.php | 2 +- libraries/cms/form/rule/captcha.php | 2 +- libraries/cms/form/rule/notequals.php | 2 +- libraries/cms/form/rule/password.php | 2 +- libraries/cms/help/help.php | 2 +- libraries/cms/helper/content.php | 2 +- libraries/cms/helper/contenthistory.php | 2 +- libraries/cms/helper/helper.php | 2 +- libraries/cms/helper/media.php | 2 +- libraries/cms/helper/route.php | 2 +- libraries/cms/helper/tags.php | 29 +- libraries/cms/helper/usergroups.php | 2 +- libraries/cms/html/access.php | 2 +- libraries/cms/html/actionsdropdown.php | 2 +- libraries/cms/html/batch.php | 2 +- libraries/cms/html/behavior.php | 2 +- libraries/cms/html/bootstrap.php | 2 +- libraries/cms/html/category.php | 2 +- libraries/cms/html/content.php | 2 +- libraries/cms/html/contentlanguage.php | 2 +- libraries/cms/html/date.php | 2 +- libraries/cms/html/dropdown.php | 2 +- libraries/cms/html/email.php | 2 +- libraries/cms/html/form.php | 2 +- libraries/cms/html/formbehavior.php | 2 +- libraries/cms/html/grid.php | 2 +- libraries/cms/html/html.php | 2 +- libraries/cms/html/icons.php | 2 +- libraries/cms/html/jgrid.php | 2 +- libraries/cms/html/jquery.php | 2 +- .../html/language/en-GB/en-GB.jhtmldate.ini | 2 +- libraries/cms/html/links.php | 2 +- libraries/cms/html/list.php | 2 +- libraries/cms/html/menu.php | 2 +- libraries/cms/html/number.php | 2 +- libraries/cms/html/rules.php | 2 +- libraries/cms/html/searchtools.php | 2 +- libraries/cms/html/select.php | 2 +- libraries/cms/html/sidebar.php | 2 +- libraries/cms/html/sliders.php | 2 +- libraries/cms/html/sortablelist.php | 2 +- libraries/cms/html/string.php | 2 +- libraries/cms/html/tabs.php | 2 +- libraries/cms/html/tag.php | 2 +- libraries/cms/html/tel.php | 2 +- libraries/cms/html/user.php | 2 +- libraries/cms/installer/adapter.php | 2 +- libraries/cms/installer/adapter/component.php | 8 +- libraries/cms/installer/adapter/file.php | 2 +- libraries/cms/installer/adapter/language.php | 2 +- libraries/cms/installer/adapter/library.php | 2 +- libraries/cms/installer/adapter/module.php | 2 +- libraries/cms/installer/adapter/package.php | 2 +- libraries/cms/installer/adapter/plugin.php | 2 +- libraries/cms/installer/adapter/template.php | 2 +- libraries/cms/installer/extension.php | 2 +- libraries/cms/installer/helper.php | 2 +- libraries/cms/installer/installer.php | 2 +- libraries/cms/installer/manifest.php | 2 +- libraries/cms/installer/manifest/library.php | 2 +- libraries/cms/installer/manifest/package.php | 2 +- libraries/cms/installer/script.php | 2 +- libraries/cms/language/associations.php | 2 +- libraries/cms/language/multilang.php | 2 +- libraries/cms/layout/base.php | 2 +- libraries/cms/layout/file.php | 2 +- libraries/cms/layout/helper.php | 2 +- libraries/cms/layout/layout.php | 2 +- libraries/cms/less/formatter/joomla.php | 2 +- libraries/cms/less/less.php | 2 +- libraries/cms/library/helper.php | 2 +- libraries/cms/menu/administrator.php | 2 +- libraries/cms/menu/item.php | 2 +- libraries/cms/menu/menu.php | 2 +- libraries/cms/menu/site.php | 2 +- libraries/cms/module/helper.php | 2 +- libraries/cms/pagination/object.php | 2 +- libraries/cms/pagination/pagination.php | 2 +- libraries/cms/pathway/pathway.php | 2 +- libraries/cms/pathway/site.php | 2 +- libraries/cms/plugin/helper.php | 2 +- libraries/cms/plugin/plugin.php | 2 +- libraries/cms/response/json.php | 2 +- libraries/cms/router/administrator.php | 2 +- libraries/cms/router/router.php | 2 +- libraries/cms/router/site.php | 2 +- libraries/cms/schema/changeitem.php | 2 +- libraries/cms/schema/changeitem/mysql.php | 2 +- .../cms/schema/changeitem/postgresql.php | 2 +- libraries/cms/schema/changeitem/sqlsrv.php | 2 +- libraries/cms/schema/changeset.php | 2 +- libraries/cms/search/helper.php | 2 +- libraries/cms/table/contenthistory.php | 2 +- libraries/cms/table/contenttype.php | 2 +- libraries/cms/table/corecontent.php | 2 +- libraries/cms/table/ucm.php | 2 +- libraries/cms/toolbar/button.php | 2 +- libraries/cms/toolbar/button/confirm.php | 2 +- libraries/cms/toolbar/button/custom.php | 2 +- libraries/cms/toolbar/button/help.php | 2 +- libraries/cms/toolbar/button/link.php | 2 +- libraries/cms/toolbar/button/popup.php | 2 +- libraries/cms/toolbar/button/separator.php | 2 +- libraries/cms/toolbar/button/slider.php | 2 +- libraries/cms/toolbar/button/standard.php | 2 +- libraries/cms/toolbar/toolbar.php | 2 +- libraries/cms/ucm/base.php | 2 +- libraries/cms/ucm/content.php | 2 +- libraries/cms/ucm/type.php | 2 +- libraries/cms/ucm/ucm.php | 2 +- libraries/cms/version/version.php | 4 +- libraries/import.legacy.php | 2 +- libraries/import.php | 2 +- libraries/joomla/access/access.php | 2 +- .../joomla/access/exception/notallowed.php | 2 +- libraries/joomla/access/rule.php | 2 +- libraries/joomla/access/rules.php | 2 +- libraries/joomla/access/wrapper/access.php | 2 +- libraries/joomla/application/base.php | 2 +- libraries/joomla/application/cli.php | 2 +- libraries/joomla/application/daemon.php | 2 +- libraries/joomla/application/route.php | 2 +- libraries/joomla/application/web.php | 6 +- libraries/joomla/application/web/router.php | 2 +- .../joomla/application/web/router/base.php | 2 +- .../joomla/application/web/router/rest.php | 2 +- libraries/joomla/archive/archive.php | 2 +- libraries/joomla/archive/bzip2.php | 2 +- libraries/joomla/archive/extractable.php | 2 +- libraries/joomla/archive/gzip.php | 2 +- libraries/joomla/archive/tar.php | 6 +- libraries/joomla/archive/wrapper/archive.php | 2 +- libraries/joomla/archive/zip.php | 8 +- .../joomla/association/extension/helper.php | 292 ++++++++++ .../association/extension/interface.php | 27 + .../joomla/authentication/authentication.php | 2 +- libraries/joomla/authentication/response.php | 2 +- libraries/joomla/base/adapter.php | 2 +- libraries/joomla/base/adapterinstance.php | 2 +- libraries/joomla/cache/cache.php | 113 +--- libraries/joomla/cache/controller.php | 2 +- .../joomla/cache/controller/callback.php | 2 +- libraries/joomla/cache/controller/output.php | 2 +- libraries/joomla/cache/controller/page.php | 2 +- libraries/joomla/cache/controller/view.php | 2 +- .../joomla/cache/exception/connecting.php | 2 +- .../joomla/cache/exception/unsupported.php | 2 +- libraries/joomla/cache/storage.php | 2 +- libraries/joomla/cache/storage/apc.php | 2 +- libraries/joomla/cache/storage/apcu.php | 2 +- libraries/joomla/cache/storage/cachelite.php | 2 +- libraries/joomla/cache/storage/file.php | 8 +- libraries/joomla/cache/storage/helper.php | 2 +- libraries/joomla/cache/storage/memcache.php | 2 +- libraries/joomla/cache/storage/memcached.php | 2 +- libraries/joomla/cache/storage/redis.php | 2 +- libraries/joomla/cache/storage/wincache.php | 2 +- libraries/joomla/cache/storage/xcache.php | 2 +- libraries/joomla/client/ftp.php | 94 ++-- libraries/joomla/client/helper.php | 2 +- libraries/joomla/client/ldap.php | 6 +- libraries/joomla/client/wrapper/helper.php | 2 +- libraries/joomla/controller/base.php | 2 +- libraries/joomla/controller/controller.php | 2 +- libraries/joomla/crypt/cipher.php | 2 +- libraries/joomla/crypt/cipher/3des.php | 2 +- libraries/joomla/crypt/cipher/blowfish.php | 2 +- libraries/joomla/crypt/cipher/crypto.php | 2 +- libraries/joomla/crypt/cipher/mcrypt.php | 4 +- libraries/joomla/crypt/cipher/rijndael256.php | 2 +- libraries/joomla/crypt/cipher/simple.php | 2 +- libraries/joomla/crypt/crypt.php | 2 +- libraries/joomla/crypt/key.php | 2 +- libraries/joomla/crypt/password.php | 2 +- libraries/joomla/crypt/password/simple.php | 2 +- libraries/joomla/database/database.php | 2 +- libraries/joomla/database/driver.php | 4 +- libraries/joomla/database/driver/mysql.php | 4 +- libraries/joomla/database/driver/mysqli.php | 8 +- libraries/joomla/database/driver/oracle.php | 2 +- libraries/joomla/database/driver/pdo.php | 4 +- libraries/joomla/database/driver/pdomysql.php | 4 +- .../joomla/database/driver/postgresql.php | 20 +- libraries/joomla/database/driver/sqlazure.php | 2 +- libraries/joomla/database/driver/sqlite.php | 4 +- libraries/joomla/database/driver/sqlsrv.php | 7 +- .../joomla/database/exception/connecting.php | 2 +- .../joomla/database/exception/executing.php | 2 +- .../joomla/database/exception/unsupported.php | 2 +- libraries/joomla/database/exporter.php | 2 +- libraries/joomla/database/exporter/mysql.php | 2 +- libraries/joomla/database/exporter/mysqli.php | 2 +- .../joomla/database/exporter/pdomysql.php | 2 +- .../joomla/database/exporter/postgresql.php | 2 +- libraries/joomla/database/factory.php | 2 +- libraries/joomla/database/importer.php | 2 +- libraries/joomla/database/importer/mysql.php | 2 +- libraries/joomla/database/importer/mysqli.php | 2 +- .../joomla/database/importer/pdomysql.php | 2 +- .../joomla/database/importer/postgresql.php | 2 +- libraries/joomla/database/interface.php | 2 +- libraries/joomla/database/iterator.php | 2 +- libraries/joomla/database/iterator/mysql.php | 2 +- libraries/joomla/database/iterator/mysqli.php | 2 +- libraries/joomla/database/iterator/oracle.php | 2 +- libraries/joomla/database/iterator/pdo.php | 2 +- .../joomla/database/iterator/pdomysql.php | 2 +- .../joomla/database/iterator/postgresql.php | 2 +- .../joomla/database/iterator/sqlazure.php | 2 +- libraries/joomla/database/iterator/sqlite.php | 2 +- libraries/joomla/database/iterator/sqlsrv.php | 2 +- libraries/joomla/database/query.php | 4 +- libraries/joomla/database/query/element.php | 2 +- libraries/joomla/database/query/limitable.php | 2 +- libraries/joomla/database/query/mysql.php | 2 +- libraries/joomla/database/query/mysqli.php | 4 +- libraries/joomla/database/query/oracle.php | 8 +- libraries/joomla/database/query/pdo.php | 2 +- libraries/joomla/database/query/pdomysql.php | 2 +- .../joomla/database/query/postgresql.php | 25 +- .../joomla/database/query/preparable.php | 2 +- libraries/joomla/database/query/sqlazure.php | 2 +- libraries/joomla/database/query/sqlite.php | 2 +- libraries/joomla/database/query/sqlsrv.php | 24 +- libraries/joomla/date/date.php | 2 +- libraries/joomla/document/document.php | 6 +- libraries/joomla/document/error.php | 2 +- libraries/joomla/document/feed.php | 40 +- .../joomla/document/feed/renderer/atom.php | 2 +- .../joomla/document/feed/renderer/rss.php | 2 +- libraries/joomla/document/html.php | 2 +- .../document/html/renderer/component.php | 2 +- .../joomla/document/html/renderer/head.php | 2 +- .../joomla/document/html/renderer/message.php | 2 +- .../joomla/document/html/renderer/module.php | 2 +- .../joomla/document/html/renderer/modules.php | 2 +- libraries/joomla/document/image.php | 2 +- libraries/joomla/document/json.php | 2 +- libraries/joomla/document/opensearch.php | 12 +- libraries/joomla/document/raw.php | 2 +- libraries/joomla/document/renderer.php | 4 +- .../joomla/document/renderer/feed/atom.php | 14 +- .../joomla/document/renderer/feed/rss.php | 12 +- .../document/renderer/html/component.php | 2 +- .../joomla/document/renderer/html/head.php | 2 +- .../joomla/document/renderer/html/message.php | 2 +- .../joomla/document/renderer/html/module.php | 2 +- .../joomla/document/renderer/html/modules.php | 2 +- libraries/joomla/document/xml.php | 2 +- libraries/joomla/environment/browser.php | 2 +- libraries/joomla/event/dispatcher.php | 2 +- libraries/joomla/event/event.php | 2 +- libraries/joomla/facebook/album.php | 2 +- libraries/joomla/facebook/checkin.php | 2 +- libraries/joomla/facebook/comment.php | 2 +- libraries/joomla/facebook/event.php | 2 +- libraries/joomla/facebook/facebook.php | 2 +- libraries/joomla/facebook/group.php | 2 +- libraries/joomla/facebook/link.php | 2 +- libraries/joomla/facebook/note.php | 2 +- libraries/joomla/facebook/oauth.php | 2 +- libraries/joomla/facebook/object.php | 2 +- libraries/joomla/facebook/photo.php | 2 +- libraries/joomla/facebook/post.php | 2 +- libraries/joomla/facebook/status.php | 2 +- libraries/joomla/facebook/user.php | 2 +- libraries/joomla/facebook/video.php | 2 +- libraries/joomla/factory.php | 2 +- libraries/joomla/feed/entry.php | 2 +- libraries/joomla/feed/factory.php | 2 +- libraries/joomla/feed/feed.php | 2 +- libraries/joomla/feed/link.php | 2 +- libraries/joomla/feed/parser.php | 2 +- libraries/joomla/feed/parser/atom.php | 2 +- libraries/joomla/feed/parser/namespace.php | 2 +- libraries/joomla/feed/parser/rss.php | 2 +- libraries/joomla/feed/parser/rss/itunes.php | 2 +- libraries/joomla/feed/parser/rss/media.php | 2 +- libraries/joomla/feed/person.php | 2 +- libraries/joomla/filesystem/file.php | 2 +- libraries/joomla/filesystem/folder.php | 6 +- libraries/joomla/filesystem/helper.php | 2 +- .../en-GB.lib_joomla_filesystem_patcher.ini | 2 +- libraries/joomla/filesystem/patcher.php | 2 +- libraries/joomla/filesystem/path.php | 8 +- libraries/joomla/filesystem/stream.php | 2 +- .../joomla/filesystem/streams/string.php | 2 +- .../filesystem/support/stringcontroller.php | 2 +- libraries/joomla/filesystem/wrapper/file.php | 2 +- .../joomla/filesystem/wrapper/folder.php | 2 +- libraries/joomla/filesystem/wrapper/path.php | 2 +- libraries/joomla/filter/input.php | 2 +- libraries/joomla/filter/output.php | 2 +- libraries/joomla/filter/wrapper/output.php | 2 +- libraries/joomla/form/field.php | 5 +- libraries/joomla/form/fields/accesslevel.php | 2 +- libraries/joomla/form/fields/aliastag.php | 2 +- libraries/joomla/form/fields/cachehandler.php | 2 +- libraries/joomla/form/fields/calendar.php | 22 +- libraries/joomla/form/fields/checkbox.php | 2 +- libraries/joomla/form/fields/checkboxes.php | 2 +- libraries/joomla/form/fields/color.php | 2 +- libraries/joomla/form/fields/combo.php | 2 +- libraries/joomla/form/fields/components.php | 74 +++ .../joomla/form/fields/databaseconnection.php | 2 +- libraries/joomla/form/fields/email.php | 2 +- libraries/joomla/form/fields/file.php | 2 +- libraries/joomla/form/fields/filelist.php | 2 +- libraries/joomla/form/fields/folderlist.php | 2 +- libraries/joomla/form/fields/groupedlist.php | 2 +- libraries/joomla/form/fields/hidden.php | 2 +- libraries/joomla/form/fields/imagelist.php | 2 +- libraries/joomla/form/fields/integer.php | 2 +- libraries/joomla/form/fields/language.php | 4 +- libraries/joomla/form/fields/list.php | 2 +- libraries/joomla/form/fields/meter.php | 2 +- libraries/joomla/form/fields/note.php | 2 +- libraries/joomla/form/fields/number.php | 2 +- libraries/joomla/form/fields/password.php | 2 +- libraries/joomla/form/fields/plugins.php | 2 +- .../joomla/form/fields/predefinedlist.php | 2 +- libraries/joomla/form/fields/radio.php | 2 +- libraries/joomla/form/fields/range.php | 2 +- libraries/joomla/form/fields/repeatable.php | 150 +++++ libraries/joomla/form/fields/rules.php | 2 +- .../joomla/form/fields/sessionhandler.php | 2 +- libraries/joomla/form/fields/spacer.php | 2 +- libraries/joomla/form/fields/sql.php | 4 +- libraries/joomla/form/fields/subform.php | 2 +- libraries/joomla/form/fields/tel.php | 2 +- libraries/joomla/form/fields/text.php | 6 +- libraries/joomla/form/fields/textarea.php | 2 +- libraries/joomla/form/fields/timezone.php | 2 +- libraries/joomla/form/fields/url.php | 2 +- libraries/joomla/form/fields/usergroup.php | 2 +- libraries/joomla/form/form.php | 2 +- libraries/joomla/form/helper.php | 32 +- libraries/joomla/form/rule.php | 2 +- libraries/joomla/form/rule/boolean.php | 2 +- libraries/joomla/form/rule/color.php | 2 +- libraries/joomla/form/rule/email.php | 2 +- libraries/joomla/form/rule/equals.php | 2 +- libraries/joomla/form/rule/number.php | 2 +- libraries/joomla/form/rule/options.php | 2 +- libraries/joomla/form/rule/rules.php | 2 +- libraries/joomla/form/rule/tel.php | 2 +- libraries/joomla/form/rule/url.php | 2 +- libraries/joomla/form/rule/username.php | 2 +- libraries/joomla/form/wrapper/helper.php | 2 +- libraries/joomla/github/account.php | 2 +- libraries/joomla/github/commits.php | 2 +- libraries/joomla/github/forks.php | 2 +- libraries/joomla/github/github.php | 2 +- libraries/joomla/github/hooks.php | 2 +- libraries/joomla/github/http.php | 2 +- libraries/joomla/github/meta.php | 2 +- libraries/joomla/github/milestones.php | 2 +- libraries/joomla/github/object.php | 2 +- libraries/joomla/github/package.php | 2 +- libraries/joomla/github/package/activity.php | 2 +- .../joomla/github/package/activity/events.php | 2 +- .../github/package/activity/notifications.php | 2 +- .../github/package/activity/starring.php | 2 +- .../github/package/activity/watching.php | 2 +- .../joomla/github/package/authorization.php | 2 +- libraries/joomla/github/package/data.php | 2 +- .../joomla/github/package/data/blobs.php | 2 +- .../joomla/github/package/data/commits.php | 2 +- libraries/joomla/github/package/data/refs.php | 2 +- libraries/joomla/github/package/data/tags.php | 2 +- .../joomla/github/package/data/trees.php | 2 +- libraries/joomla/github/package/gists.php | 2 +- .../joomla/github/package/gists/comments.php | 2 +- libraries/joomla/github/package/gitignore.php | 2 +- libraries/joomla/github/package/issues.php | 2 +- .../github/package/issues/assignees.php | 2 +- .../joomla/github/package/issues/comments.php | 2 +- .../joomla/github/package/issues/events.php | 2 +- .../joomla/github/package/issues/labels.php | 2 +- .../github/package/issues/milestones.php | 2 +- libraries/joomla/github/package/orgs.php | 2 +- .../joomla/github/package/orgs/members.php | 2 +- .../joomla/github/package/orgs/teams.php | 2 +- libraries/joomla/github/package/pulls.php | 2 +- .../joomla/github/package/pulls/comments.php | 2 +- .../joomla/github/package/repositories.php | 2 +- .../package/repositories/collaborators.php | 2 +- .../github/package/repositories/comments.php | 2 +- .../github/package/repositories/commits.php | 2 +- .../github/package/repositories/contents.php | 2 +- .../github/package/repositories/downloads.php | 2 +- .../github/package/repositories/forks.php | 2 +- .../github/package/repositories/hooks.php | 2 +- .../github/package/repositories/keys.php | 2 +- .../github/package/repositories/merging.php | 2 +- .../package/repositories/statistics.php | 2 +- .../github/package/repositories/statuses.php | 2 +- libraries/joomla/github/package/search.php | 2 +- libraries/joomla/github/package/users.php | 2 +- .../joomla/github/package/users/emails.php | 2 +- .../joomla/github/package/users/followers.php | 2 +- .../joomla/github/package/users/keys.php | 2 +- libraries/joomla/github/refs.php | 2 +- libraries/joomla/github/statuses.php | 2 +- libraries/joomla/google/auth.php | 2 +- libraries/joomla/google/auth/oauth2.php | 2 +- libraries/joomla/google/data.php | 2 +- libraries/joomla/google/data/adsense.php | 2 +- libraries/joomla/google/data/calendar.php | 2 +- libraries/joomla/google/data/picasa.php | 2 +- libraries/joomla/google/data/picasa/album.php | 4 +- libraries/joomla/google/data/picasa/photo.php | 2 +- libraries/joomla/google/data/plus.php | 2 +- .../joomla/google/data/plus/activities.php | 2 +- .../joomla/google/data/plus/comments.php | 2 +- libraries/joomla/google/data/plus/people.php | 2 +- libraries/joomla/google/embed.php | 2 +- libraries/joomla/google/embed/analytics.php | 2 +- libraries/joomla/google/embed/maps.php | 12 +- libraries/joomla/google/google.php | 2 +- libraries/joomla/grid/grid.php | 2 +- libraries/joomla/http/factory.php | 2 +- libraries/joomla/http/http.php | 2 +- libraries/joomla/http/response.php | 2 +- libraries/joomla/http/transport.php | 2 +- libraries/joomla/http/transport/curl.php | 2 +- libraries/joomla/http/transport/socket.php | 2 +- libraries/joomla/http/transport/stream.php | 2 +- libraries/joomla/http/wrapper/factory.php | 2 +- libraries/joomla/image/filter.php | 2 +- .../joomla/image/filter/backgroundfill.php | 2 +- libraries/joomla/image/filter/brightness.php | 2 +- libraries/joomla/image/filter/contrast.php | 2 +- libraries/joomla/image/filter/edgedetect.php | 2 +- libraries/joomla/image/filter/emboss.php | 2 +- libraries/joomla/image/filter/grayscale.php | 2 +- libraries/joomla/image/filter/negate.php | 2 +- libraries/joomla/image/filter/sketchy.php | 2 +- libraries/joomla/image/filter/smooth.php | 2 +- libraries/joomla/image/image.php | 2 +- libraries/joomla/input/cli.php | 2 +- libraries/joomla/input/cookie.php | 2 +- libraries/joomla/input/files.php | 2 +- libraries/joomla/input/input.php | 2 +- libraries/joomla/input/json.php | 2 +- libraries/joomla/keychain/keychain.php | 12 +- libraries/joomla/language/helper.php | 2 +- libraries/joomla/language/language.php | 2 +- libraries/joomla/language/stemmer.php | 2 +- .../joomla/language/stemmer/porteren.php | 2 +- libraries/joomla/language/text.php | 2 +- libraries/joomla/language/transliterate.php | 2 +- libraries/joomla/language/wrapper/helper.php | 2 +- libraries/joomla/language/wrapper/text.php | 2 +- .../joomla/language/wrapper/transliterate.php | 2 +- libraries/joomla/linkedin/communications.php | 2 +- libraries/joomla/linkedin/companies.php | 2 +- libraries/joomla/linkedin/groups.php | 2 +- libraries/joomla/linkedin/jobs.php | 2 +- libraries/joomla/linkedin/linkedin.php | 2 +- libraries/joomla/linkedin/oauth.php | 2 +- libraries/joomla/linkedin/object.php | 2 +- libraries/joomla/linkedin/people.php | 2 +- libraries/joomla/linkedin/stream.php | 2 +- libraries/joomla/log/entry.php | 2 +- libraries/joomla/log/log.php | 2 +- libraries/joomla/log/logger.php | 2 +- libraries/joomla/log/logger/callback.php | 2 +- libraries/joomla/log/logger/database.php | 2 +- libraries/joomla/log/logger/echo.php | 2 +- libraries/joomla/log/logger/formattedtext.php | 4 +- libraries/joomla/log/logger/messagequeue.php | 2 +- libraries/joomla/log/logger/syslog.php | 2 +- libraries/joomla/log/logger/w3c.php | 2 +- libraries/joomla/mail/helper.php | 10 +- .../mail/language/phpmailer.lang-joomla.php | 38 +- libraries/joomla/mail/mail.php | 4 +- libraries/joomla/mail/wrapper/helper.php | 2 +- libraries/joomla/mediawiki/categories.php | 2 +- libraries/joomla/mediawiki/http.php | 2 +- libraries/joomla/mediawiki/images.php | 2 +- libraries/joomla/mediawiki/links.php | 2 +- libraries/joomla/mediawiki/mediawiki.php | 2 +- libraries/joomla/mediawiki/object.php | 2 +- libraries/joomla/mediawiki/pages.php | 2 +- libraries/joomla/mediawiki/search.php | 2 +- libraries/joomla/mediawiki/sites.php | 2 +- libraries/joomla/mediawiki/users.php | 2 +- libraries/joomla/microdata/microdata.php | 4 +- libraries/joomla/model/base.php | 2 +- libraries/joomla/model/database.php | 2 +- libraries/joomla/model/model.php | 2 +- libraries/joomla/oauth1/client.php | 2 +- libraries/joomla/oauth2/client.php | 2 +- libraries/joomla/object/object.php | 2 +- libraries/joomla/observable/interface.php | 2 +- libraries/joomla/observer/interface.php | 2 +- libraries/joomla/observer/mapper.php | 2 +- libraries/joomla/observer/updater.php | 2 +- .../joomla/observer/updater/interface.php | 2 +- libraries/joomla/observer/wrapper/mapper.php | 2 +- libraries/joomla/openstreetmap/changesets.php | 2 +- libraries/joomla/openstreetmap/elements.php | 26 +- libraries/joomla/openstreetmap/gps.php | 2 +- libraries/joomla/openstreetmap/info.php | 2 +- libraries/joomla/openstreetmap/oauth.php | 2 +- libraries/joomla/openstreetmap/object.php | 2 +- .../joomla/openstreetmap/openstreetmap.php | 2 +- libraries/joomla/openstreetmap/user.php | 2 +- libraries/joomla/platform.php | 4 +- libraries/joomla/profiler/profiler.php | 2 +- libraries/joomla/route/wrapper/route.php | 2 +- .../joomla/session/exception/unsupported.php | 2 +- .../joomla/session/handler/interface.php | 2 +- libraries/joomla/session/handler/joomla.php | 2 +- libraries/joomla/session/handler/native.php | 2 +- libraries/joomla/session/session.php | 11 +- libraries/joomla/session/storage.php | 2 +- libraries/joomla/session/storage/apc.php | 4 +- libraries/joomla/session/storage/database.php | 2 +- libraries/joomla/session/storage/memcache.php | 2 +- .../joomla/session/storage/memcached.php | 2 +- libraries/joomla/session/storage/none.php | 2 +- libraries/joomla/session/storage/wincache.php | 4 +- libraries/joomla/session/storage/xcache.php | 4 +- libraries/joomla/string/punycode.php | 2 +- libraries/joomla/string/string.php | 2 +- libraries/joomla/string/wrapper/normalise.php | 2 +- libraries/joomla/string/wrapper/punycode.php | 2 +- libraries/joomla/table/asset.php | 2 +- libraries/joomla/table/extension.php | 2 +- libraries/joomla/table/interface.php | 2 +- libraries/joomla/table/language.php | 2 +- libraries/joomla/table/nested.php | 33 +- libraries/joomla/table/observer.php | 2 +- .../joomla/table/observer/contenthistory.php | 2 +- libraries/joomla/table/observer/tags.php | 2 +- libraries/joomla/table/table.php | 10 +- libraries/joomla/table/update.php | 2 +- libraries/joomla/table/updatesite.php | 2 +- libraries/joomla/table/user.php | 4 +- libraries/joomla/table/usergroup.php | 10 +- libraries/joomla/table/viewlevel.php | 2 +- libraries/joomla/twitter/block.php | 2 +- libraries/joomla/twitter/directmessages.php | 2 +- libraries/joomla/twitter/favorites.php | 2 +- libraries/joomla/twitter/friends.php | 2 +- libraries/joomla/twitter/help.php | 2 +- libraries/joomla/twitter/lists.php | 2 +- libraries/joomla/twitter/oauth.php | 2 +- libraries/joomla/twitter/object.php | 2 +- libraries/joomla/twitter/places.php | 2 +- libraries/joomla/twitter/profile.php | 2 +- libraries/joomla/twitter/search.php | 2 +- libraries/joomla/twitter/statuses.php | 4 +- libraries/joomla/twitter/trends.php | 2 +- libraries/joomla/twitter/twitter.php | 2 +- libraries/joomla/twitter/users.php | 2 +- .../joomla/updater/adapters/collection.php | 6 +- .../joomla/updater/adapters/extension.php | 8 +- libraries/joomla/updater/update.php | 6 +- libraries/joomla/updater/updateadapter.php | 4 +- libraries/joomla/updater/updater.php | 2 +- libraries/joomla/uri/uri.php | 6 +- libraries/joomla/user/helper.php | 4 +- libraries/joomla/user/user.php | 2 +- libraries/joomla/user/wrapper/helper.php | 2 +- libraries/joomla/utilities/arrayhelper.php | 2 +- libraries/joomla/utilities/buffer.php | 2 +- libraries/joomla/utilities/utility.php | 2 +- libraries/joomla/view/base.php | 2 +- libraries/joomla/view/html.php | 2 +- libraries/joomla/view/view.php | 2 +- libraries/legacy/access/rule.php | 2 +- libraries/legacy/access/rules.php | 2 +- libraries/legacy/application/application.php | 2 +- libraries/legacy/application/cli.php | 2 +- libraries/legacy/application/daemon.php | 2 +- libraries/legacy/base/node.php | 2 +- libraries/legacy/base/observable.php | 2 +- libraries/legacy/base/observer.php | 2 +- libraries/legacy/base/tree.php | 2 +- libraries/legacy/categories/categories.php | 2 +- libraries/legacy/controller/admin.php | 2 +- libraries/legacy/controller/form.php | 2 +- libraries/legacy/controller/legacy.php | 2 +- libraries/legacy/database/exception.php | 2 +- libraries/legacy/database/mysql.php | 2 +- libraries/legacy/database/mysqli.php | 2 +- libraries/legacy/database/sqlazure.php | 2 +- libraries/legacy/database/sqlsrv.php | 2 +- libraries/legacy/dispatcher/dispatcher.php | 2 +- libraries/legacy/error/error.php | 2 +- libraries/legacy/exception/exception.php | 2 +- libraries/legacy/form/field/category.php | 2 +- .../legacy/form/field/componentlayout.php | 2 +- libraries/legacy/form/field/modulelayout.php | 2 +- libraries/legacy/log/logexception.php | 2 +- libraries/legacy/model/admin.php | 2 +- libraries/legacy/model/form.php | 24 +- libraries/legacy/model/item.php | 2 +- libraries/legacy/model/legacy.php | 2 +- libraries/legacy/model/list.php | 2 +- libraries/legacy/request/request.php | 2 +- libraries/legacy/response/response.php | 2 +- libraries/legacy/simplecrypt/simplecrypt.php | 2 +- libraries/legacy/simplepie/factory.php | 2 +- libraries/legacy/table/category.php | 2 +- libraries/legacy/table/content.php | 2 +- libraries/legacy/table/menu.php | 31 +- libraries/legacy/table/menu/type.php | 2 +- libraries/legacy/table/module.php | 2 +- libraries/legacy/table/session.php | 2 +- libraries/legacy/utilities/xmlelement.php | 2 +- libraries/legacy/view/categories.php | 2 +- libraries/legacy/view/category.php | 2 +- libraries/legacy/view/categoryfeed.php | 2 +- libraries/legacy/view/legacy.php | 2 +- libraries/legacy/web/client.php | 2 +- libraries/legacy/web/web.php | 2 +- libraries/loader.php | 2 +- libraries/vendor/composer/installed.json | 12 +- libraries/vendor/leafo/lessphp/lessify | 0 libraries/vendor/leafo/lessphp/plessc | 0 libraries/vendor/phpmailer/phpmailer/VERSION | 2 +- .../phpmailer/phpmailer/class.phpmailer.php | 32 +- .../vendor/phpmailer/phpmailer/class.pop3.php | 2 +- .../vendor/phpmailer/phpmailer/class.smtp.php | 4 +- .../phpmailer/phpmailer/extras/htmlfilter.php | 6 +- media/com_associations/css/sidebyside.css | 75 +++ .../js/sidebyside-uncompressed.js | 301 ++++++++++ media/com_associations/js/sidebyside.js | 1 + media/editors/none/js/editor-none.js | 2 +- media/editors/tinymce/js/tinymce-builder.js | 316 ----------- media/jui/js/cms-uncompressed.js | 2 +- media/jui/js/treeselectmenu.jquery.js | 2 +- media/jui/js/treeselectmenu.jquery.min.js | 2 +- media/media/css/medialist-details.css | 2 +- media/media/css/medialist-details_rtl.css | 2 +- media/media/css/medialist-thumbs.css | 2 +- media/media/css/medialist-thumbs_rtl.css | 2 +- media/media/css/mediamanager.css | 180 ++++++ media/media/css/mediamanager_rtl.css | 82 +++ media/media/css/popup-imagelist.css | 2 +- media/media/css/popup-imagelist_rtl.css | 2 +- media/media/css/popup-imagemanager.css | 2 +- media/media/css/popup-imagemanager_rtl.css | 2 +- media/media/js/mediamanager.js | 2 +- media/media/js/popup-imagemanager.js | 2 +- media/overrider/css/overrider.css | 2 +- media/overrider/js/overrider.js | 2 +- media/plg_captcha_recaptcha/js/recaptcha.js | 2 +- .../js/extensionupdatecheck.js | 5 +- .../js/jupdatecheck.js | 2 +- media/plg_system_stats/js/stats.js | 2 +- media/system/css/adminlist.css | 2 +- media/system/css/calendar-jos.css | 2 +- media/system/css/debug.css | 2 +- .../css/fields/calendar-vanilla-rtl.css | 2 +- media/system/css/fields/calendar-vanilla.css | 2 +- media/system/css/frontediting.css | 2 +- media/system/css/mootree.css | 2 +- media/system/css/mootree_rtl.css | 2 +- media/system/css/sortablelist.css | 2 +- media/system/css/system.css | 2 +- media/system/css/treeprefix.php | 2 +- media/system/js/fields/calendar-vanilla.js | 17 +- .../system/js/fields/calendar-vanilla.min.js | 2 +- media/system/js/fields/fielduser.js | 2 +- media/system/js/fields/mediafield.js | 2 +- media/system/js/fields/modal-fields.js | 2 +- media/system/js/helpsite.js | 6 +- media/system/js/legacy/html5fallback.js | 2 +- media/system/js/legacy/sortablelist.js | 2 +- media/system/js/tabs-state.js | 2 +- media/system/js/tinymce-init.js | 2 +- modules/mod_articles_archive/helper.php | 2 +- .../mod_articles_archive.php | 2 +- .../mod_articles_archive.xml | 2 +- modules/mod_articles_archive/tmpl/default.php | 2 +- modules/mod_articles_categories/helper.php | 4 +- .../mod_articles_categories.php | 4 +- .../mod_articles_categories.xml | 2 +- .../mod_articles_categories/tmpl/default.php | 2 +- .../tmpl/default_items.php | 2 +- modules/mod_articles_category/helper.php | 2 +- .../mod_articles_category.php | 2 +- .../mod_articles_category.xml | 8 +- .../mod_articles_category/tmpl/default.php | 2 +- modules/mod_articles_latest/helper.php | 2 +- .../mod_articles_latest.php | 2 +- .../mod_articles_latest.xml | 2 +- modules/mod_articles_latest/tmpl/default.php | 2 +- modules/mod_articles_news/helper.php | 2 +- .../mod_articles_news/mod_articles_news.php | 2 +- .../mod_articles_news/mod_articles_news.xml | 2 +- modules/mod_articles_news/tmpl/_item.php | 2 +- modules/mod_articles_news/tmpl/default.php | 2 +- modules/mod_articles_news/tmpl/horizontal.php | 2 +- modules/mod_articles_news/tmpl/vertical.php | 2 +- modules/mod_articles_popular/helper.php | 2 +- .../mod_articles_popular.php | 2 +- .../mod_articles_popular.xml | 8 +- modules/mod_articles_popular/tmpl/default.php | 2 +- modules/mod_banners/helper.php | 2 +- modules/mod_banners/mod_banners.php | 2 +- modules/mod_banners/mod_banners.xml | 2 +- modules/mod_banners/tmpl/default.php | 2 +- modules/mod_breadcrumbs/helper.php | 2 +- modules/mod_breadcrumbs/mod_breadcrumbs.php | 2 +- modules/mod_breadcrumbs/mod_breadcrumbs.xml | 2 +- modules/mod_breadcrumbs/tmpl/default.php | 2 +- modules/mod_custom/mod_custom.php | 2 +- modules/mod_custom/mod_custom.xml | 2 +- modules/mod_custom/tmpl/default.php | 2 +- modules/mod_feed/helper.php | 2 +- modules/mod_feed/mod_feed.php | 2 +- modules/mod_feed/mod_feed.xml | 2 +- modules/mod_feed/tmpl/default.php | 2 +- modules/mod_finder/helper.php | 2 +- modules/mod_finder/mod_finder.php | 2 +- modules/mod_finder/tmpl/default.php | 2 +- modules/mod_footer/mod_footer.php | 2 +- modules/mod_footer/mod_footer.xml | 2 +- modules/mod_footer/tmpl/default.php | 2 +- modules/mod_languages/helper.php | 2 +- modules/mod_languages/mod_languages.php | 2 +- modules/mod_languages/mod_languages.xml | 2 +- modules/mod_languages/tmpl/default.php | 2 +- modules/mod_login/helper.php | 2 +- modules/mod_login/mod_login.php | 2 +- modules/mod_login/mod_login.xml | 2 +- modules/mod_login/tmpl/default.php | 4 +- modules/mod_login/tmpl/default_logout.php | 2 +- modules/mod_menu/helper.php | 2 +- modules/mod_menu/mod_menu.php | 2 +- modules/mod_menu/mod_menu.xml | 3 +- modules/mod_menu/tmpl/default.php | 2 +- modules/mod_menu/tmpl/default_component.php | 2 +- modules/mod_menu/tmpl/default_heading.php | 2 +- modules/mod_menu/tmpl/default_separator.php | 2 +- modules/mod_menu/tmpl/default_url.php | 2 +- modules/mod_random_image/helper.php | 2 +- modules/mod_random_image/mod_random_image.php | 2 +- modules/mod_random_image/mod_random_image.xml | 2 +- modules/mod_random_image/tmpl/default.php | 2 +- modules/mod_related_items/helper.php | 2 +- .../mod_related_items/mod_related_items.php | 2 +- .../mod_related_items/mod_related_items.xml | 2 +- modules/mod_related_items/tmpl/default.php | 2 +- modules/mod_search/helper.php | 2 +- modules/mod_search/mod_search.php | 2 +- modules/mod_search/mod_search.xml | 2 +- modules/mod_search/tmpl/default.php | 2 +- modules/mod_stats/helper.php | 2 +- modules/mod_stats/mod_stats.php | 2 +- modules/mod_stats/mod_stats.xml | 2 +- modules/mod_stats/tmpl/default.php | 2 +- modules/mod_syndicate/helper.php | 2 +- modules/mod_syndicate/mod_syndicate.php | 2 +- modules/mod_syndicate/mod_syndicate.xml | 2 +- modules/mod_syndicate/tmpl/default.php | 2 +- modules/mod_tags_popular/helper.php | 2 +- modules/mod_tags_popular/mod_tags_popular.php | 2 +- modules/mod_tags_popular/mod_tags_popular.xml | 2 +- modules/mod_tags_popular/tmpl/cloud.php | 2 +- modules/mod_tags_popular/tmpl/default.php | 2 +- modules/mod_tags_similar/helper.php | 2 +- modules/mod_tags_similar/mod_tags_similar.php | 2 +- modules/mod_tags_similar/mod_tags_similar.xml | 2 +- modules/mod_tags_similar/tmpl/default.php | 2 +- modules/mod_users_latest/helper.php | 2 +- modules/mod_users_latest/mod_users_latest.php | 2 +- modules/mod_users_latest/mod_users_latest.xml | 2 +- modules/mod_users_latest/tmpl/default.php | 2 +- modules/mod_whosonline/helper.php | 2 +- modules/mod_whosonline/mod_whosonline.php | 2 +- modules/mod_whosonline/mod_whosonline.xml | 2 +- modules/mod_whosonline/tmpl/default.php | 2 +- modules/mod_wrapper/helper.php | 2 +- modules/mod_wrapper/mod_wrapper.php | 2 +- modules/mod_wrapper/mod_wrapper.xml | 2 +- modules/mod_wrapper/tmpl/default.php | 2 +- plugins/authentication/cookie/cookie.php | 2 +- plugins/authentication/cookie/cookie.xml | 2 +- plugins/authentication/gmail/gmail.php | 2 +- plugins/authentication/gmail/gmail.xml | 2 +- plugins/authentication/joomla/joomla.php | 2 +- plugins/authentication/joomla/joomla.xml | 2 +- plugins/authentication/ldap/ldap.php | 2 +- plugins/authentication/ldap/ldap.xml | 2 +- plugins/captcha/recaptcha/recaptcha.php | 2 +- plugins/captcha/recaptcha/recaptcha.xml | 2 +- plugins/content/contact/contact.php | 2 +- plugins/content/contact/contact.xml | 2 +- plugins/content/emailcloak/emailcloak.php | 10 +- plugins/content/emailcloak/emailcloak.xml | 2 +- plugins/content/finder/finder.php | 2 +- plugins/content/finder/finder.xml | 2 +- plugins/content/joomla/joomla.php | 2 +- plugins/content/joomla/joomla.xml | 2 +- plugins/content/loadmodule/loadmodule.php | 2 +- plugins/content/loadmodule/loadmodule.xml | 2 +- plugins/content/pagebreak/pagebreak.php | 2 +- plugins/content/pagebreak/pagebreak.xml | 2 +- .../content/pagenavigation/pagenavigation.php | 2 +- .../content/pagenavigation/pagenavigation.xml | 2 +- .../content/pagenavigation/tmpl/default.php | 2 +- plugins/content/vote/tmpl/rating.php | 2 +- plugins/content/vote/tmpl/vote.php | 2 +- plugins/content/vote/vote.php | 2 +- plugins/content/vote/vote.xml | 2 +- plugins/editors-xtd/article/article.php | 2 +- plugins/editors-xtd/article/article.xml | 2 +- plugins/editors-xtd/contact/contact.php | 2 +- plugins/editors-xtd/contact/contact.xml | 2 +- plugins/editors-xtd/image/image.php | 2 +- plugins/editors-xtd/image/image.xml | 2 +- plugins/editors-xtd/menu/menu.php | 2 +- plugins/editors-xtd/menu/menu.xml | 2 +- plugins/editors-xtd/module/module.php | 2 +- plugins/editors-xtd/module/module.xml | 2 +- plugins/editors-xtd/pagebreak/pagebreak.php | 2 +- plugins/editors-xtd/pagebreak/pagebreak.xml | 2 +- plugins/editors-xtd/readmore/readmore.php | 2 +- plugins/editors-xtd/readmore/readmore.xml | 2 +- plugins/editors/codemirror/codemirror.php | 2 +- plugins/editors/codemirror/codemirror.xml | 2 +- plugins/editors/codemirror/fonts.php | 2 +- .../layouts/editors/codemirror/element.php | 2 +- .../layouts/editors/codemirror/init.php | 2 +- .../layouts/editors/codemirror/styles.php | 2 +- plugins/editors/none/none.php | 2 +- plugins/editors/none/none.xml | 2 +- plugins/editors/tinymce/field/skins.php | 2 +- .../editors/tinymce/field/tinymcebuilder.php | 2 +- plugins/editors/tinymce/tinymce.php | 2 +- plugins/extension/joomla/joomla.php | 2 +- plugins/extension/joomla/joomla.xml | 2 +- plugins/fields/calendar/calendar.php | 2 +- plugins/fields/calendar/calendar.xml | 2 +- plugins/fields/calendar/params/calendar.xml | 1 - plugins/fields/calendar/tmpl/calendar.php | 2 +- plugins/fields/checkboxes/checkboxes.php | 6 +- plugins/fields/checkboxes/checkboxes.xml | 2 +- plugins/fields/checkboxes/tmpl/checkboxes.php | 2 +- plugins/fields/color/color.php | 2 +- plugins/fields/color/color.xml | 2 +- plugins/fields/color/tmpl/color.php | 2 +- plugins/fields/editor/editor.php | 2 +- plugins/fields/editor/editor.xml | 2 +- plugins/fields/editor/tmpl/editor.php | 2 +- plugins/fields/gallery/fields/gallery.php | 2 +- plugins/fields/gallery/gallery.php | 2 +- plugins/fields/gallery/gallery.xml | 2 +- plugins/fields/gallery/tmpl/gallery.php | 2 +- plugins/fields/imagelist/imagelist.php | 6 +- plugins/fields/imagelist/imagelist.xml | 2 +- plugins/fields/imagelist/tmpl/imagelist.php | 2 +- plugins/fields/integer/integer.php | 2 +- plugins/fields/integer/integer.xml | 2 +- plugins/fields/integer/tmpl/integer.php | 2 +- plugins/fields/list/list.php | 68 +-- plugins/fields/list/list.xml | 2 +- plugins/fields/list/tmpl/list.php | 2 +- plugins/fields/media/media.php | 2 +- plugins/fields/media/media.xml | 2 +- plugins/fields/media/tmpl/media.php | 2 +- plugins/fields/radio/radio.php | 6 +- plugins/fields/radio/radio.xml | 2 +- plugins/fields/radio/tmpl/radio.php | 2 +- plugins/fields/sql/sql.php | 6 +- plugins/fields/sql/sql.xml | 2 +- plugins/fields/sql/tmpl/sql.php | 2 +- plugins/fields/text/text.php | 2 +- plugins/fields/text/text.xml | 2 +- plugins/fields/text/tmpl/text.php | 2 +- plugins/fields/textarea/textarea.php | 2 +- plugins/fields/textarea/textarea.xml | 2 +- plugins/fields/textarea/tmpl/textarea.php | 2 +- plugins/fields/url/tmpl/url.php | 2 +- plugins/fields/url/url.php | 2 +- plugins/fields/url/url.xml | 2 +- plugins/fields/user/params/user.xml | 17 - plugins/fields/user/tmpl/user.php | 2 +- plugins/fields/user/user.php | 2 +- plugins/fields/user/user.xml | 20 +- .../usergrouplist/tmpl/usergrouplist.php | 2 +- .../fields/usergrouplist/usergrouplist.php | 2 +- .../fields/usergrouplist/usergrouplist.xml | 2 +- plugins/finder/categories/categories.php | 2 +- plugins/finder/contacts/contacts.php | 2 +- plugins/finder/content/content.php | 2 +- plugins/finder/newsfeeds/newsfeeds.php | 2 +- plugins/finder/tags/tags.php | 2 +- .../folderinstaller/folderinstaller.php | 2 +- .../folderinstaller/folderinstaller.xml | 2 +- .../folderinstaller/tmpl/default.php | 2 +- .../packageinstaller/packageinstaller.php | 2 +- .../packageinstaller/packageinstaller.xml | 2 +- .../packageinstaller/tmpl/default.php | 2 +- .../installer/urlinstaller/tmpl/default.php | 2 +- .../installer/urlinstaller/urlinstaller.php | 2 +- .../installer/urlinstaller/urlinstaller.xml | 2 +- .../extensionupdate/extensionupdate.php | 2 +- .../extensionupdate/extensionupdate.xml | 2 +- .../quickicon/joomlaupdate/joomlaupdate.php | 2 +- .../quickicon/joomlaupdate/joomlaupdate.xml | 2 +- .../phpversioncheck/phpversioncheck.php | 2 +- .../phpversioncheck/phpversioncheck.xml | 2 +- plugins/search/categories/categories.php | 2 +- plugins/search/categories/categories.xml | 2 +- plugins/search/contacts/contacts.php | 2 +- plugins/search/contacts/contacts.xml | 2 +- plugins/search/content/content.php | 6 +- plugins/search/content/content.xml | 2 +- plugins/search/newsfeeds/newsfeeds.php | 2 +- plugins/search/newsfeeds/newsfeeds.xml | 2 +- plugins/search/tags/tags.php | 2 +- plugins/search/tags/tags.xml | 2 +- plugins/system/cache/cache.php | 2 +- plugins/system/cache/cache.xml | 2 +- plugins/system/debug/debug.php | 2 +- plugins/system/debug/debug.xml | 2 +- plugins/system/fields/fields.php | 2 +- plugins/system/fields/fields.xml | 2 +- plugins/system/highlight/highlight.php | 2 +- .../en-GB/en-GB.plg_system_languagecode.ini | 2 +- .../en-GB.plg_system_languagecode.sys.ini | 2 +- plugins/system/languagecode/languagecode.php | 2 +- plugins/system/languagecode/languagecode.xml | 2 +- .../system/languagefilter/languagefilter.php | 2 +- .../system/languagefilter/languagefilter.xml | 2 +- plugins/system/log/log.php | 2 +- plugins/system/log/log.xml | 2 +- plugins/system/logout/logout.php | 2 +- plugins/system/logout/logout.xml | 2 +- plugins/system/p3p/p3p.php | 2 +- plugins/system/p3p/p3p.xml | 2 +- plugins/system/redirect/redirect.php | 2 +- plugins/system/redirect/redirect.xml | 2 +- plugins/system/remember/remember.php | 2 +- plugins/system/remember/remember.xml | 2 +- plugins/system/sef/sef.php | 2 +- plugins/system/sef/sef.xml | 2 +- plugins/system/stats/field/base.php | 2 +- plugins/system/stats/field/data.php | 2 +- plugins/system/stats/field/uniqueid.php | 2 +- plugins/system/stats/layouts/field/data.php | 2 +- .../system/stats/layouts/field/uniqueid.php | 2 +- plugins/system/stats/layouts/message.php | 2 +- plugins/system/stats/layouts/stats.php | 2 +- plugins/system/stats/stats.php | 2 +- plugins/system/stats/stats.xml | 2 +- .../postinstall/updatecachetime.php | 2 +- .../updatenotification/updatenotification.php | 2 +- .../updatenotification/updatenotification.xml | 2 +- .../totp/postinstall/actions.php | 2 +- plugins/twofactorauth/totp/tmpl/form.php | 2 +- plugins/twofactorauth/totp/totp.php | 2 +- plugins/twofactorauth/totp/totp.xml | 2 +- plugins/twofactorauth/yubikey/tmpl/form.php | 2 +- plugins/twofactorauth/yubikey/yubikey.php | 2 +- plugins/twofactorauth/yubikey/yubikey.xml | 2 +- .../user/contactcreator/contactcreator.php | 2 +- plugins/user/joomla/joomla.php | 2 +- plugins/user/profile/field/dob.php | 2 +- plugins/user/profile/field/tos.php | 2 +- plugins/user/profile/profile.php | 2 +- templates/protostar/component.php | 2 +- templates/protostar/css/offline.css | 2 +- templates/protostar/error.php | 2 +- .../joomla/form/field/contenthistory.php | 2 +- .../html/layouts/joomla/form/field/media.php | 2 +- .../html/layouts/joomla/form/field/user.php | 2 +- .../html/layouts/joomla/system/message.php | 2 +- templates/protostar/html/modules.php | 2 +- templates/protostar/html/pagination.php | 2 +- templates/protostar/index.php | 2 +- templates/protostar/js/template.js | 2 +- .../language/en-GB/en-GB.tpl_protostar.ini | 2 +- .../en-GB/en-GB.tpl_protostar.sys.ini | 2 +- templates/protostar/offline.php | 2 +- templates/protostar/templateDetails.xml | 2 +- templates/system/component.php | 2 +- templates/system/css/editor.css | 2 +- templates/system/css/error.css | 2 +- templates/system/css/error_rtl.css | 2 +- templates/system/css/general.css | 2 +- templates/system/css/offline.css | 2 +- templates/system/css/offline_rtl.css | 2 +- templates/system/css/system.css | 2 +- templates/system/css/toolbar.css | 2 +- templates/system/error.php | 2 +- templates/system/html/modules.php | 2 +- templates/system/index.php | 2 +- templates/system/offline.php | 2 +- tests/CHANGELOG | 2 +- tests/javascript/calendar/spec-setup.js | 2 +- tests/javascript/calendar/spec.js | 2 +- tests/javascript/caption/spec-setup.js | 2 +- tests/javascript/caption/spec.js | 2 +- tests/javascript/combobox/spec-setup.js | 2 +- tests/javascript/combobox/spec.js | 2 +- tests/javascript/core/spec-setup.js | 2 +- tests/javascript/core/spec.js | 2 +- tests/javascript/highlighter/spec-setup.js | 2 +- tests/javascript/highlighter/spec.js | 2 +- tests/javascript/permissions/spec-setup.js | 2 +- tests/javascript/permissions/spec.js | 2 +- tests/javascript/repeatable/spec-setup.js | 2 +- tests/javascript/repeatable/spec.js | 2 +- tests/javascript/sendtestmail/spec-setup.js | 2 +- tests/javascript/sendtestmail/spec.js | 2 +- .../subform-repeatable/spec-setup.js | 2 +- tests/javascript/subform-repeatable/spec.js | 2 +- tests/javascript/switcher/spec-setup.js | 27 + tests/javascript/switcher/spec.js | 96 ++++ tests/javascript/validate/spec-setup.js | 2 +- tests/javascript/validate/spec.js | 2 +- tests/unit/bootstrap.php | 2 +- tests/unit/core/case/cache.php | 6 +- tests/unit/core/case/case.php | 2 +- tests/unit/core/case/database.php | 2 +- tests/unit/core/case/database/mysql.php | 2 +- tests/unit/core/case/database/mysqli.php | 2 +- tests/unit/core/case/database/oracle.php | 2 +- tests/unit/core/case/database/pdomysql.php | 2 +- tests/unit/core/case/database/postgresql.php | 2 +- tests/unit/core/case/database/sqlsrv.php | 2 +- tests/unit/core/helper/helper.php | 2 +- tests/unit/core/mock/application.php | 2 +- tests/unit/core/mock/application/base.php | 2 +- tests/unit/core/mock/application/cli.php | 2 +- tests/unit/core/mock/application/cms.php | 2 +- tests/unit/core/mock/application/web.php | 2 +- tests/unit/core/mock/cache.php | 2 +- tests/unit/core/mock/config.php | 2 +- tests/unit/core/mock/controller.php | 2 +- tests/unit/core/mock/database/driver.php | 2 +- tests/unit/core/mock/database/query.php | 2 +- tests/unit/core/mock/dispatcher.php | 2 +- tests/unit/core/mock/document.php | 2 +- tests/unit/core/mock/input.php | 2 +- tests/unit/core/mock/language.php | 2 +- tests/unit/core/mock/menu.php | 2 +- tests/unit/core/mock/rules.php | 2 +- tests/unit/core/mock/session.php | 2 +- tests/unit/core/reflection/reflection.php | 2 +- tests/unit/stubs/FormInspectors.php | 2 +- tests/unit/stubs/bogusload.php | 2 +- tests/unit/stubs/config.wrongclass.php | 2 +- tests/unit/stubs/configuration.php | 2 +- tests/unit/stubs/database/jos_extensions.csv | 156 +++--- tests/unit/stubs/discover2/challenger.php | 2 +- tests/unit/stubs/discover2/endeavour.php | 2 +- tests/unit/stubs/jhttp_stub.php | 2 +- tests/unit/stubs/loader/patch.php | 2 +- tests/unit/stubs/loader/patch/tester.php | 2 +- tests/unit/stubs/loader/tester/tester.php | 2 +- .../includes/JAdministratorHelperTest.php | 2 +- .../driver/mysql/JDatabaseDriverMysqlTest.php | 2 +- .../mysql/JDatabaseExporterMysqlTest.php | 2 +- .../mysql/JDatabaseImporterMysqlTest.php | 2 +- .../mysql/JDatabaseIteratorMysqlTest.php | 2 +- .../mysqli/JDatabaseDriverMysqliTest.php | 2 +- .../mysqli/JDatabaseExporterMysqliTest.php | 2 +- .../mysqli/JDatabaseImporterMysqliTest.php | 2 +- .../mysqli/JDatabaseIteratorMysqliTest.php | 2 +- .../pdomysql/JDatabaseDriverPdomysqlTest.php | 2 +- .../JDatabaseExporterPdomysqlTest.php | 2 +- .../JDatabaseImporterPdomysqlTest.php | 2 +- .../JDatabaseIteratorPdomysqlTest.php | 2 +- .../JDatabaseDriverPostgresqlTest.php | 2 +- .../JDatabaseExporterPostgresqlTest.php | 2 +- .../JDatabaseImporterPostgresqlTest.php | 2 +- .../JDatabaseIteratorPostgresqlTest.php | 2 +- .../JDatabaseQueryPostgresqlTest.php | 32 +- .../sqlite/JDatabaseQuerySqliteTest.php | 2 +- .../sqlsrv/JDatabaseDriverSqlsrvTest.php | 2 +- .../sqlsrv/JDatabaseIteratorSqlsrvTest.php | 2 +- .../sqlsrv/JDatabaseQuerySqlsrvTest.php | 2 +- .../finderIndexer/FinderIndexerHelperTest.php | 2 +- .../finderIndexer/FinderIndexerParserTest.php | 2 +- .../finderIndexer/FinderIndexerResultTest.php | 2 +- .../FinderIndexerStemmerTest.php | 2 +- .../finderIndexer/FinderIndexerTest.php | 2 +- .../finderIndexer/FinderIndexerTokenTest.php | 2 +- .../parser/FinderIndexerParserHtmlTest.php | 2 +- .../parser/FinderIndexerParserRtfTest.php | 2 +- .../stemmer/FinderIndexerStemmerFrTest.php | 2 +- .../FinderIndexerStemmerPorter_EnTest.php | 2 +- .../JApplicationAdministratorTest.php | 4 +- .../cms/application/JApplicationCmsTest.php | 4 +- .../cms/application/JApplicationSiteTest.php | 4 +- .../stubs/JApplicationCmsInspector.php | 2 +- .../stubs/JApplicationHelperInspector.php | 2 +- .../cms/component/JComponentHelperTest.php | 2 +- .../router/JComponentRouterBaseTest.php | 2 +- .../router/JComponentRouterLegacyTest.php | 2 +- .../router/JComponentRouterViewTest.php | 2 +- .../JComponentRouterViewconfigurationTest.php | 2 +- .../rules/JComponentRouterRulesMenuTest.php | 2 +- .../rules/JComponentRouterRulesNomenuTest.php | 2 +- .../JComponentRouterRulesMenuInspector.php | 2 +- .../JComponentRouterRulesNomenuInspector.php | 2 +- ...ockJComponentRouterRulesMenuMenuObject.php | 2 +- .../router/stubs/JCategoriesMock.php | 2 +- .../stubs/JComponentRouterBaseInspector.php | 2 +- .../stubs/JComponentRouterViewInspector.php | 2 +- .../router/stubs/componentrouter.php | 2 +- .../router/stubs/componentrouterrule.php | 2 +- .../libraries/cms/editor/JEditorTest.php | 2 +- .../cms/editor/stubs/EditorObserver.php | 2 +- .../libraries/cms/error/JErrorPageTest.php | 2 +- .../form/field/JFormFieldHeadertagTest.php | 2 +- .../cms/form/field/JFormFieldHelpsiteTest.php | 2 +- .../form/field/JFormFieldModuletagTest.php | 2 +- .../cms/form/rule/JFormRuleNotequalsTest.php | 2 +- .../suites/libraries/cms/help/JHelpTest.php | 2 +- .../cms/helper/JHelperContentTest.php | 2 +- .../libraries/cms/helper/JHelperMediaTest.php | 6 +- .../libraries/cms/helper/JHelperTest.php | 2 +- .../libraries/cms/html/JHtmlBatchTest.php | 2 +- .../libraries/cms/html/JHtmlBehaviorTest.php | 2 +- .../libraries/cms/html/JHtmlBootstrapTest.php | 2 +- .../libraries/cms/html/JHtmlDateTest.php | 2 +- .../libraries/cms/html/JHtmlEmailTest.php | 2 +- .../libraries/cms/html/JHtmlFormTest.php | 2 +- .../cms/html/JHtmlFormbehaviorTest.php | 2 +- .../libraries/cms/html/JHtmlIconsTest.php | 2 +- .../libraries/cms/html/JHtmlJqueryTest.php | 2 +- .../libraries/cms/html/JHtmlListTest.php | 2 +- .../libraries/cms/html/JHtmlMenuTest.php | 2 +- .../libraries/cms/html/JHtmlNumberTest.php | 2 +- .../libraries/cms/html/JHtmlSelectTest.php | 2 +- .../libraries/cms/html/JHtmlStringTest.php | 2 +- .../libraries/cms/html/JHtmlTelTest.php | 2 +- .../suites/libraries/cms/html/JHtmlTest.php | 2 +- .../libraries/cms/html/JHtmlUserTest.php | 2 +- .../JHtmlSelect-helper-dataset.php | 2 +- .../cms/html/stubs/JHtmlBehaviorInspector.php | 2 +- .../html/stubs/JHtmlBootstrapInspector.php | 2 +- .../cms/html/stubs/JHtmlJqueryInspector.php | 2 +- .../libraries/cms/html/testfiles/empty.php | 2 +- .../cms/html/testfiles/inspector.php | 2 +- .../cms/installer/JInstallerAdapterTest.php | 2 +- .../cms/installer/JInstallerExtensionTest.php | 2 +- .../cms/installer/JInstallerHelperTest.php | 2 +- .../cms/installer/JInstallerTest.php | 2 +- .../libraries/cms/installer/data/joomla.xml | 2 +- .../cms/installer/data/pkg_joomla.xml | 2 +- .../JInstallerManifestLibraryTest.php | 2 +- .../JInstallerManifestPackageTest.php | 2 +- .../cms/language/JLanguageMultilangTest.php | 2 +- .../libraries/cms/layout/JLayoutBaseTest.php | 2 +- .../libraries/cms/layout/JLayoutFileTest.php | 2 +- .../cms/module/JModuleHelperTest.php | 2 +- .../cms/pagination/JPaginationObjectTest.php | 2 +- .../cms/pagination/JPaginationTest.php | 2 +- .../libraries/cms/pathway/JPathwayTest.php | 2 +- .../cms/pathway/stubs/includes/pathway.php | 2 +- .../cms/plugin/JPluginHelperTest.php | 2 +- .../libraries/cms/plugin/JPluginTest.php | 2 +- .../cms/plugin/stubs/PlgSystemBase.php | 2 +- .../cms/plugin/stubs/PlgSystemJoomla.php | 2 +- .../cms/plugin/stubs/PlgSystemPrivate.php | 2 +- .../cms/response/JResponseJsonTest.php | 2 +- .../cms/response/stubs/mock.application.php | 2 +- .../cms/router/JRouterAdministratorTest.php | 2 +- .../libraries/cms/router/JRouterSiteTest.php | 2 +- .../libraries/cms/router/JRouterTest.php | 2 +- .../libraries/cms/router/data/TestRouter.php | 2 +- .../cms/router/data/includes/router.php | 2 +- .../cms/schema/JSchemaChangeitemTest.php | 2 +- .../cms/schema/JSchemaChangesetTestMysql.php | 2 +- .../cms/schema/JSchemaChangesetTestMysqli.php | 2 +- .../schema/JSchemaChangesetTestPdomysql.php | 2 +- .../schema/JSchemaChangesetTestPostgresql.php | 2 +- .../cms/schema/JSchemaChangesetTestSqlsrv.php | 2 +- .../cms/schema/stubs/mysql/3.0.0.sql | 8 +- .../cms/schema/stubs/mysql/3.2.0.sql | 2 +- .../cms/schema/stubs/postgresql/3.2.0.sql | 2 +- .../cms/table/JTableContenttypeTest.php | 2 +- .../cms/table/JTableCorecontentTest.php | 2 +- .../cms/toolbar/JToolbarButtonTest.php | 2 +- .../libraries/cms/toolbar/JToolbarTest.php | 2 +- .../button/JToolbarButtonConfirmTest.php | 2 +- .../button/JToolbarButtonCustomTest.php | 2 +- .../toolbar/button/JToolbarButtonHelpTest.php | 2 +- .../toolbar/button/JToolbarButtonLinkTest.php | 2 +- .../button/JToolbarButtonPopupTest.php | 2 +- .../button/JToolbarButtonSliderTest.php | 2 +- .../button/JToolbarButtonStandardTest.php | 2 +- .../suites/libraries/cms/ucm/JUcmBaseTest.php | 2 +- .../libraries/cms/ucm/JUcmContentTest.php | 2 +- .../suites/libraries/cms/ucm/JUcmTypeTest.php | 2 +- .../libraries/cms/version/JVersionTest.php | 2 +- .../suites/libraries/joomla/JFactoryTest.php | 2 +- .../suites/libraries/joomla/JLoaderTest.php | 2 +- .../suites/libraries/joomla/JPlatformTest.php | 4 +- .../joomla/access/JAccessRuleTest.php | 2 +- .../joomla/access/JAccessRulesTest.php | 2 +- .../libraries/joomla/access/JAccessTest.php | 46 +- .../application/JApplicationBaseTest.php | 2 +- .../application/JApplicationCliTest.php | 2 +- .../application/JApplicationDaemonTest.php | 2 +- .../application/JApplicationWebTest.php | 2 +- .../stubs/JApplicationCliInspector.php | 2 +- .../stubs/JApplicationDaemonInspector.php | 2 +- .../stubs/JApplicationWebInspector.php | 2 +- .../web/JApplicationWebRouterTest.php | 2 +- .../router/JApplicationWebRouterBaseTest.php | 2 +- .../router/JApplicationWebRouterRestTest.php | 2 +- .../web/stubs/JWebClientInspector.php | 2 +- .../application/web/stubs/controllers/bar.php | 2 +- .../application/web/stubs/controllers/baz.php | 2 +- .../application/web/stubs/controllers/foo.php | 2 +- .../joomla/archive/JArchiveBzip2Test.php | 2 +- .../joomla/archive/JArchiveGzipTest.php | 2 +- .../joomla/archive/JArchiveTarTest.php | 2 +- .../libraries/joomla/archive/JArchiveTest.php | 2 +- .../joomla/archive/JArchiveTestCase.php | 2 +- .../joomla/archive/JArchiveZipTest.php | 2 +- .../joomla/base/JAdapterInstanceTest.php | 2 +- .../libraries/joomla/base/JAdapterTest.php | 2 +- .../joomla/base/stubs/testadapter.php | 2 +- .../joomla/base/stubs/testadapter2.php | 2 +- .../joomla/base/stubs/testadapter3.php | 2 +- .../joomla/base/stubs/testadapter4.php | 2 +- .../joomla/cache/JCacheConstructTest.php | 2 +- .../joomla/cache/JCacheStorageTest.php | 6 +- .../libraries/joomla/cache/JCacheTest.php | 2 +- .../JCacheControllerCallback.helper.php | 2 +- .../JCacheControllerCallbackCallbackTest.php | 2 +- .../cache/controller/JCacheControllerRaw.php | 2 +- .../cache/storage/JCacheStorageApcTest.php | 2 +- .../cache/storage/JCacheStorageApcuTest.php | 2 +- .../storage/JCacheStorageCacheliteTest.php | 2 +- .../cache/storage/JCacheStorageFileTest.php | 2 +- .../storage/JCacheStorageMemcacheTest.php | 2 +- .../storage/JCacheStorageMemcachedTest.php | 2 +- .../cache/storage/JCacheStorageMock.php | 2 +- .../cache/storage/JCacheStorageRedisTest.php | 2 +- .../storage/JCacheStorageWincacheTest.php | 2 +- .../cache/storage/JCacheStorageXcacheTest.php | 2 +- .../joomla/controller/JControllerBaseTest.php | 2 +- .../joomla/controller/stubs/tbase.php | 2 +- .../libraries/joomla/crypt/JCryptTest.php | 2 +- .../crypt/cipher/JCryptCipher3DesTest.php | 2 +- .../crypt/cipher/JCryptCipherBlowfishTest.php | 2 +- .../crypt/cipher/JCryptCipherCryptoTest.php | 2 +- .../cipher/JCryptCipherRijndael256Test.php | 2 +- .../crypt/cipher/JCryptCipherSimpleTest.php | 2 +- .../password/JCryptPasswordSimpleTest.php | 2 +- .../joomla/database/JDatabaseDriverTest.php | 10 +- .../joomla/database/JDatabaseFactoryTest.php | 2 +- .../JDatabaseQueryElementInspector.php | 2 +- .../database/JDatabaseQueryElementTest.php | 2 +- .../database/JDatabaseQueryInspector.php | 2 +- .../joomla/database/JDatabaseQueryTest.php | 2 +- .../joomla/database/stubs/nosqldriver.php | 2 +- .../libraries/joomla/date/JDateTest.php | 2 +- .../joomla/document/JDocumentRendererTest.php | 2 +- .../joomla/document/JDocumentTest.php | 2 +- .../document/error/JDocumentErrorTest.php | 2 +- .../document/feed/JDocumentFeedTest.php | 2 +- .../renderer/JDocumentRendererAtomTest.php | 2 +- .../renderer/JDocumentRendererRSSTest.php | 2 +- .../document/html/JDocumentHTMLTest.php | 2 +- .../JDocumentRendererComponentTest.php | 2 +- .../renderer/JDocumentRendererMessageTest.php | 2 +- .../document/image/JDocumentImageTest.php | 2 +- .../document/json/JDocumentJSONTest.php | 2 +- .../opensearch/JDocumentOpensearchTest.php | 2 +- .../joomla/document/raw/JDocumentRawTest.php | 2 +- .../JDocumentRendererHtmlModulesTest.php | 2 +- .../joomla/document/xml/JDocumentXmlTest.php | 2 +- .../joomla/environment/JBrowserTest.php | 2 +- .../joomla/event/JEventDispatcherTest.php | 2 +- .../joomla/event/JEventInspector.php | 2 +- .../libraries/joomla/event/JEventStub.php | 2 +- .../libraries/joomla/event/JEventTest.php | 2 +- .../joomla/facebook/JFacebookAlbumTest.php | 2 +- .../joomla/facebook/JFacebookCheckinTest.php | 2 +- .../joomla/facebook/JFacebookCommentTest.php | 2 +- .../joomla/facebook/JFacebookEventTest.php | 2 +- .../joomla/facebook/JFacebookGroupTest.php | 2 +- .../joomla/facebook/JFacebookLinkTest.php | 2 +- .../joomla/facebook/JFacebookNoteTest.php | 2 +- .../joomla/facebook/JFacebookOauthTest.php | 2 +- .../joomla/facebook/JFacebookObjectTest.php | 2 +- .../joomla/facebook/JFacebookPhotoTest.php | 2 +- .../joomla/facebook/JFacebookPostTest.php | 2 +- .../joomla/facebook/JFacebookStatusTest.php | 2 +- .../joomla/facebook/JFacebookTest.php | 2 +- .../joomla/facebook/JFacebookUserTest.php | 2 +- .../joomla/facebook/JFacebookVideoTest.php | 2 +- .../facebook/stubs/JFacebookObjectMock.php | 2 +- .../libraries/joomla/feed/JFeedEntryTest.php | 2 +- .../joomla/feed/JFeedFactoryTest.php | 2 +- .../libraries/joomla/feed/JFeedLinkTest.php | 2 +- .../libraries/joomla/feed/JFeedParserTest.php | 2 +- .../libraries/joomla/feed/JFeedPersonTest.php | 2 +- .../libraries/joomla/feed/JFeedTest.php | 2 +- .../feed/parser/JFeedParserAtomTest.php | 2 +- .../joomla/feed/parser/JFeedParserRssTest.php | 2 +- .../joomla/feed/stubs/JFeedParserMock.php | 2 +- .../feed/stubs/JFeedParserMockNamespace.php | 2 +- .../stubs/JFeedParserProcessElementMock.php | 2 +- .../libraries/joomla/filesystem/JFileTest.php | 2 +- .../filesystem/JFilesystemHelperTest.php | 2 +- .../filesystem/JFilesystemPatcherTest.php | 2 +- .../joomla/filesystem/JFolderTest.php | 2 +- .../libraries/joomla/filesystem/JPathTest.php | 2 +- .../joomla/filter/JFilterInputTest.php | 2 +- .../joomla/filter/JFilterOutputTest.php | 25 +- .../libraries/joomla/form/JFormDataHelper.php | 2 +- .../libraries/joomla/form/JFormFieldTest.php | 2 +- .../libraries/joomla/form/JFormTest.php | 2 +- .../TestHelpers/JHtmlField-helper-dataset.php | 2 +- .../libraries/joomla/form/_testfields/bar.php | 2 +- .../libraries/joomla/form/_testfields/foo.php | 2 +- .../joomla/form/_testfields/modal/bar.php | 2 +- .../joomla/form/_testfields/modal/foo.php | 2 +- .../joomla/form/_testfields/test.php | 2 +- .../joomla/form/_testrules/custom.php | 2 +- .../form/field/JFormFieldCategoryTest.php | 2 +- .../field/JFormFieldComponentLayoutTest.php | 2 +- .../form/field/JFormFieldModuleLayoutTest.php | 2 +- .../form/fields/JFormFieldAccessLevelTest.php | 2 +- .../fields/JFormFieldCacheHandlerTest.php | 2 +- .../form/fields/JFormFieldCheckboxTest.php | 2 +- .../form/fields/JFormFieldCheckboxesTest.php | 2 +- .../form/fields/JFormFieldColorTest.php | 2 +- .../form/fields/JFormFieldComboTest.php | 2 +- .../JFormFieldDatabaseConnectionTest.php | 2 +- .../form/fields/JFormFieldEmailTest.php | 2 +- .../form/fields/JFormFieldFileListTest.php | 2 +- .../joomla/form/fields/JFormFieldFileTest.php | 2 +- .../form/fields/JFormFieldFolderListTest.php | 2 +- .../form/fields/JFormFieldGroupedListTest.php | 2 +- .../form/fields/JFormFieldHiddenTest.php | 2 +- .../form/fields/JFormFieldImageListTest.php | 2 +- .../form/fields/JFormFieldIntegerTest.php | 2 +- .../form/fields/JFormFieldLanguageTest.php | 2 +- .../joomla/form/fields/JFormFieldListTest.php | 2 +- .../form/fields/JFormFieldNumberTest.php | 2 +- .../form/fields/JFormFieldPasswordTest.php | 2 +- .../form/fields/JFormFieldPluginsTest.php | 2 +- .../form/fields/JFormFieldRadioTest.php | 2 +- .../joomla/form/fields/JFormFieldRange.php | 2 +- .../form/fields/JFormFieldRulesTest.php | 2 +- .../joomla/form/fields/JFormFieldSQLTest.php | 2 +- .../fields/JFormFieldSessionHandlerTest.php | 2 +- .../form/fields/JFormFieldSpacerTest.php | 2 +- .../joomla/form/fields/JFormFieldTelTest.php | 2 +- .../joomla/form/fields/JFormFieldTextTest.php | 2 +- .../form/fields/JFormFieldTextareaTest.php | 2 +- .../form/fields/JFormFieldTimezoneTest.php | 2 +- .../joomla/form/fields/JFormFieldUrlTest.php | 2 +- .../form/fields/JFormFieldUsergroupTest.php | 2 +- .../JHtmlFieldCheckbox-helper-dataset.php | 2 +- .../JHtmlFieldEmail-helper-dataset.php | 2 +- .../JHtmlFieldNumber-helper-dataset.php | 2 +- .../JHtmlFieldPassword-helper-dataset.php | 2 +- .../JHtmlFieldRadio-helper-dataset.php | 2 +- .../JHtmlFieldRange-helper-dataset.php | 2 +- .../JHtmlFieldTel-helper-dataset.php | 2 +- .../JHtmlFieldText-helper-dataset.php | 2 +- .../JHtmlFieldTextarea-helper-dataset.php | 2 +- .../JHtmlFieldUrl-helper-dataset.php | 2 +- .../joomla/form/rule/JFormRuleBooleanTest.php | 2 +- .../joomla/form/rule/JFormRuleColorTest.php | 2 +- .../joomla/form/rule/JFormRuleEmailTest.php | 2 +- .../joomla/form/rule/JFormRuleOptionsTest.php | 2 +- .../joomla/form/rule/JFormRuleRulesTest.php | 2 +- .../joomla/form/rule/JFormRuleTelTest.php | 2 +- .../joomla/form/rule/JFormRuleUrlTest.php | 2 +- .../joomla/github/JGithubAccountTest.php | 2 +- .../joomla/github/JGithubCommitsTest.php | 2 +- .../joomla/github/JGithubForksTest.php | 2 +- .../joomla/github/JGithubGistsTest.php | 2 +- .../joomla/github/JGithubHooksTest.php | 2 +- .../joomla/github/JGithubHttpTest.php | 2 +- .../joomla/github/JGithubIssuesTest.php | 2 +- .../joomla/github/JGithubMetaTest.php | 2 +- .../joomla/github/JGithubMilestonesTest.php | 2 +- .../joomla/github/JGithubObjectTest.php | 2 +- .../JGithubPackageAuthorizationsTest.php | 2 +- .../joomla/github/JGithubPackageGistsTest.php | 2 +- .../github/JGithubPackageGitignoreTest.php | 2 +- .../github/JGithubPackageIssuesTest.php | 2 +- .../joomla/github/JGithubPackagePullsTest.php | 2 +- .../joomla/github/JGithubPackageUsersTest.php | 2 +- .../joomla/github/JGithubPullsTest.php | 2 +- .../joomla/github/JGithubRefsTest.php | 2 +- .../joomla/github/JGithubStatusesTest.php | 2 +- .../libraries/joomla/github/JGithubTest.php | 2 +- .../joomla/github/JGithubUsersTest.php | 2 +- .../JGithubPackageActivityEventsTest.php | 2 +- .../data/JGithubPackageDataRefsTest.php | 2 +- .../JGithubPackageIssuesMilestonesTest.php | 2 +- .../JGithubPackageRepositoriesForksTest.php | 2 +- .../JGithubPackageRepositoriesHooksTest.php | 2 +- ...JGithubPackageRepositoriesStatusesTest.php | 2 +- .../joomla/github/stubs/JGithubObjectMock.php | 2 +- .../joomla/google/JGoogleAuthOauth2Test.php | 2 +- .../joomla/google/JGoogleDataAdsenseTest.php | 2 +- .../joomla/google/JGoogleDataCalendarTest.php | 2 +- .../google/JGoogleDataPicasaAlbumTest.php | 2 +- .../google/JGoogleDataPicasaPhotoTest.php | 2 +- .../joomla/google/JGoogleDataPicasaTest.php | 2 +- .../google/JGoogleDataPlusActivitiesTest.php | 2 +- .../google/JGoogleDataPlusCommentsTest.php | 2 +- .../google/JGoogleDataPlusPeopleTest.php | 2 +- .../joomla/google/JGoogleDataPlusTest.php | 2 +- .../google/JGoogleEmbedAnalyticsTest.php | 2 +- .../joomla/google/JGoogleEmbedMapsTest.php | 2 +- .../libraries/joomla/google/JGoogleTest.php | 2 +- .../libraries/joomla/grid/JGridTest.php | 2 +- .../joomla/http/JHttpFactoryTest.php | 2 +- .../libraries/joomla/http/JHttpTest.php | 2 +- .../joomla/http/JHttpTransportTest.php | 2 +- .../joomla/image/JImageFilterTest.php | 2 +- .../libraries/joomla/image/JImageTest.php | 2 +- .../filter/JImageFilterBackgroundfillTest.php | 2 +- .../filter/JImageFilterBrightnessTest.php | 2 +- .../image/filter/JImageFilterContrastTest.php | 2 +- .../filter/JImageFilterEdgedetectTest.php | 2 +- .../image/stubs/JImageFilterInspector.php | 2 +- .../joomla/image/stubs/JImageInspector.php | 2 +- .../libraries/joomla/input/JInputCliTest.php | 2 +- .../libraries/joomla/input/JInputTest.php | 2 +- .../joomla/input/stubs/JFilterInputMock.php | 2 +- .../input/stubs/JFilterInputMockTracker.php | 2 +- .../joomla/input/stubs/JInputInspector.php | 2 +- .../joomla/keychain/JKeychainTest.php | 2 +- .../joomla/language/JLanguageHelperTest.php | 2 +- .../joomla/language/JLanguageInspector.php | 2 +- .../joomla/language/JLanguageStemmerTest.php | 2 +- .../joomla/language/JLanguageTest.php | 8 +- .../language/JLanguageTransliterateTest.php | 2 +- .../data/language/en-GB/en-GB.localise.php | 2 +- .../language/data/language/en-GB/en-GB.xml | 2 +- .../stemmer/JLanguageStemmerPorterenTest.php | 2 +- .../linkedin/JLinkedinCommunicationsTest.php | 2 +- .../linkedin/JLinkedinCompaniesTest.php | 2 +- .../joomla/linkedin/JLinkedinGroupsTest.php | 2 +- .../joomla/linkedin/JLinkedinJobsTest.php | 2 +- .../joomla/linkedin/JLinkedinOAuthTest.php | 2 +- .../joomla/linkedin/JLinkedinObjectTest.php | 2 +- .../joomla/linkedin/JLinkedinPeopleTest.php | 2 +- .../joomla/linkedin/JLinkedinStreamTest.php | 2 +- .../joomla/linkedin/JLinkedinTest.php | 2 +- .../linkedin/stubs/JLinkedinObjectMock.php | 2 +- .../libraries/joomla/log/JLogEntryTest.php | 2 +- .../suites/libraries/joomla/log/JLogTest.php | 2 +- .../log/loggers/JLogLoggerCallbackTest.php | 2 +- .../log/loggers/JLogLoggerDatabaseTest.php | 2 +- .../joomla/log/loggers/JLogLoggerEchoTest.php | 2 +- .../loggers/JLogLoggerFormattedTextTest.php | 2 +- .../loggers/JLogLoggerMessageQueueTest.php | 2 +- .../joomla/log/loggers/JLogLoggerW3CTest.php | 2 +- .../log/loggers/stubs/callback/helper.php | 2 +- .../log/loggers/stubs/callback/inspector.php | 2 +- .../log/loggers/stubs/database/inspector.php | 2 +- .../loggers/stubs/formattedtext/inspector.php | 2 +- .../stubs/messagequeue/mock.application.php | 2 +- .../log/loggers/stubs/w3c/inspector.php | 2 +- .../joomla/log/stubs/log/inspector.php | 2 +- .../libraries/joomla/mail/JMailHelperTest.php | 2 +- .../libraries/joomla/mail/JMailTest.php | 2 +- .../mediawiki/JMediawikiCategoriesTest.php | 2 +- .../joomla/mediawiki/JMediawikiHttpTest.php | 2 +- .../joomla/mediawiki/JMediawikiImagesTest.php | 2 +- .../joomla/mediawiki/JMediawikiLinksTest.php | 2 +- .../joomla/mediawiki/JMediawikiObjectTest.php | 2 +- .../joomla/mediawiki/JMediawikiPagesTest.php | 2 +- .../joomla/mediawiki/JMediawikiSearchTest.php | 2 +- .../joomla/mediawiki/JMediawikiSitesTest.php | 2 +- .../joomla/mediawiki/JMediawikiTest.php | 2 +- .../joomla/mediawiki/JMediawikiUsersTest.php | 2 +- .../mediawiki/stubs/JMediawikiObjectMock.php | 2 +- .../joomla/microdata/JMicrodataTest.php | 2 +- .../libraries/joomla/model/JModelBaseTest.php | 2 +- .../joomla/model/JModelDatabaseTest.php | 2 +- .../libraries/joomla/model/stubs/tbase.php | 2 +- .../joomla/model/stubs/tdatabase.php | 2 +- .../joomla/oauth1/JOAuth1ClientTest.php | 2 +- .../oauth1/stubs/JOAuth1ClientInspector.php | 2 +- .../joomla/oauth2/JOauth2ClientTest.php | 2 +- .../libraries/joomla/object/JObjectTest.php | 2 +- .../JOpenstreetmapChangesetsTest.php | 2 +- .../JOpenstreetmapElementsTest.php | 2 +- .../openstreetmap/JOpenstreetmapGpsTest.php | 2 +- .../openstreetmap/JOpenstreetmapInfoTest.php | 2 +- .../openstreetmap/JOpenstreetmapOauthTest.php | 2 +- .../JOpenstreetmapObjectTest.php | 2 +- .../openstreetmap/JOpenstreetmapTest.php | 2 +- .../openstreetmap/JOpenstreetmapUserTest.php | 2 +- .../stubs/JOpenstreetmapObjectMock.php | 2 +- .../joomla/session/JSessionStorageTest.php | 2 +- .../libraries/joomla/session/JSessionTest.php | 7 +- .../joomla/session/handler/array.php | 2 +- .../storage/JSessionStorageApcTest.php | 2 +- .../storage/JSessionStorageDatabaseTest.php | 2 +- .../storage/JSessionStorageMemcacheTest.php | 2 +- .../storage/JSessionStorageNoneTest.php | 2 +- .../storage/JSessionStorageWincacheTest.php | 2 +- .../storage/JSessionStorageXcacheTest.php | 2 +- .../joomla/table/JTableExtensionTest.php | 2 +- .../joomla/table/JTableLanguageTest.php | 2 +- .../joomla/table/JTableNestedTest.php | 11 +- .../libraries/joomla/table/JTableTest.php | 2 +- .../libraries/joomla/table/JTableUserTest.php | 2 +- .../joomla/table/stubs/dbtestcomposite.php | 2 +- .../libraries/joomla/table/stubs/nested.php | 2 +- .../joomla/twitter/JTwitterBlockTest.php | 2 +- .../twitter/JTwitterDirectmessagesTest.php | 2 +- .../joomla/twitter/JTwitterFavoritesTest.php | 2 +- .../joomla/twitter/JTwitterFriendsTest.php | 2 +- .../joomla/twitter/JTwitterHelpTest.php | 2 +- .../joomla/twitter/JTwitterListsTest.php | 2 +- .../joomla/twitter/JTwitterOauthTest.php | 2 +- .../joomla/twitter/JTwitterObjectTest.php | 2 +- .../joomla/twitter/JTwitterPlacesTest.php | 2 +- .../joomla/twitter/JTwitterProfileTest.php | 2 +- .../joomla/twitter/JTwitterSearchTest.php | 2 +- .../joomla/twitter/JTwitterStatusesTest.php | 2 +- .../libraries/joomla/twitter/JTwitterTest.php | 2 +- .../joomla/twitter/JTwitterTrendsTest.php | 2 +- .../joomla/twitter/JTwitterUsersTest.php | 2 +- .../twitter/stubs/JTwitterObjectMock.php | 2 +- .../suites/libraries/joomla/uri/JURITest.php | 32 +- .../joomla/user/JAuthenticationTest.php | 5 +- .../libraries/joomla/user/JUserHelperTest.php | 2 +- .../libraries/joomla/user/JUserTest.php | 2 +- .../user/stubs/FakeAuthenticationPlugin.php | 2 +- .../joomla/utilities/JArrayHelperTest.php | 2 +- .../joomla/utilities/JBufferTest.php | 2 +- .../joomla/utilities/JUtilityTest.php | 2 +- .../libraries/joomla/view/JViewBaseTest.php | 2 +- .../libraries/joomla/view/JViewHtmlTest.php | 2 +- .../joomla/view/mocks/JModelMock.php | 2 +- .../libraries/joomla/view/stubs/tbase.php | 2 +- .../libraries/joomla/view/stubs/thtml.php | 2 +- .../legacy/application/JApplicationTest.php | 2 +- .../legacy/categories/JCategoriesTest.php | 2 +- .../legacy/controller/JControllerFormTest.php | 2 +- .../controller/JControllerLegacyTest.php | 2 +- .../legacy/controller/stubs/controller.php | 2 +- .../controller/stubs/controllerform.php | 2 +- .../legacy/error/JErrorInspector.php | 2 +- .../libraries/legacy/error/JErrorTest.php | 2 +- .../legacy/model/JModelAdminTest.php | 2 +- .../libraries/legacy/model/JModelFormTest.php | 2 +- .../libraries/legacy/model/JModelItemTest.php | 2 +- .../legacy/model/JModelLegacyTest.php | 2 +- .../libraries/legacy/model/JModelListTest.php | 2 +- .../model/stubs/constructorexceptiontest.php | 2 +- .../libraries/legacy/model/stubs/foobar.php | 2 +- .../libraries/legacy/model/stubs/lead.php | 2 +- .../model/stubs/listmodelexceptiontest.php | 2 +- .../legacy/model/stubs/listmodeltest.php | 2 +- .../libraries/legacy/model/stubs/name.php | 2 +- .../libraries/legacy/model/stubs/room.php | 2 +- .../legacy/response/JResponseTest.php | 2 +- .../legacy/table/JTableContentTest.php | 2 +- .../libraries/legacy/view/JViewLegacyTest.php | 2 +- .../legacy/view/stubs/ContentViewArticle.php | 2 +- .../legacy/view/stubs/ContentViewHtml.php | 2 +- .../legacy/view/stubs/ExampleViewSEOHtml.php | 2 +- .../legacy/view/stubs/MediaViewMediaList.php | 2 +- .../stubs/MediaViewMediaListItemsHtml.php | 2 +- .../emailcloak/PlgContentEmailcloakTest.php | 287 +++++++--- 3468 files changed, 12206 insertions(+), 5161 deletions(-) create mode 100644 administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-11-19.sql create mode 100644 administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-01-15.sql create mode 100644 administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-11-19.sql create mode 100644 administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-01-15.sql create mode 100644 administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-11-19.sql create mode 100644 administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-01-15.sql create mode 100755 administrator/components/com_admin/views/help/tmpl/default.xml create mode 100755 administrator/components/com_admin/views/sysinfo/tmpl/default.xml create mode 100644 administrator/components/com_associations/access.xml create mode 100644 administrator/components/com_associations/associations.php create mode 100644 administrator/components/com_associations/associations.xml create mode 100644 administrator/components/com_associations/config.xml create mode 100644 administrator/components/com_associations/controller.php create mode 100644 administrator/components/com_associations/controllers/association.php create mode 100644 administrator/components/com_associations/controllers/associations.php create mode 100644 administrator/components/com_associations/helpers/associations.php create mode 100644 administrator/components/com_associations/layouts/joomla/searchtools/default/bar.php create mode 100644 administrator/components/com_associations/models/association.php create mode 100644 administrator/components/com_associations/models/associations.php create mode 100644 administrator/components/com_associations/models/fields/itemlanguage.php create mode 100644 administrator/components/com_associations/models/fields/itemtype.php create mode 100644 administrator/components/com_associations/models/fields/modalassociation.php create mode 100644 administrator/components/com_associations/models/forms/association.xml create mode 100644 administrator/components/com_associations/models/forms/filter_associations.xml create mode 100644 administrator/components/com_associations/views/association/tmpl/edit.php create mode 100644 administrator/components/com_associations/views/association/view.html.php create mode 100644 administrator/components/com_associations/views/associations/tmpl/default.php create mode 100644 administrator/components/com_associations/views/associations/tmpl/modal.php create mode 100644 administrator/components/com_associations/views/associations/view.html.php create mode 100755 administrator/components/com_cache/views/cache/tmpl/default.xml create mode 100755 administrator/components/com_cache/views/purge/tmpl/default.xml create mode 100755 administrator/components/com_categories/views/categories/tmpl/default.xml create mode 100755 administrator/components/com_categories/views/category/tmpl/edit.xml create mode 100755 administrator/components/com_checkin/views/checkin/tmpl/default.xml create mode 100755 administrator/components/com_config/view/application/tmpl/default.xml create mode 100755 administrator/components/com_config/view/component/tmpl/default.xml create mode 100644 administrator/components/com_contact/helpers/associations.php mode change 100755 => 100644 administrator/components/com_contact/models/forms/filter_contacts.xml create mode 100644 administrator/components/com_content/helpers/associations.php create mode 100755 administrator/components/com_content/views/article/tmpl/edit.xml create mode 100755 administrator/components/com_content/views/articles/tmpl/default.xml create mode 100755 administrator/components/com_content/views/featured/tmpl/default.xml create mode 100755 administrator/components/com_cpanel/views/cpanel/tmpl/default.xml create mode 100644 administrator/components/com_fields/libraries/fieldslistplugin.php create mode 100755 administrator/components/com_installer/views/database/tmpl/default.xml create mode 100755 administrator/components/com_installer/views/discover/tmpl/default.xml create mode 100755 administrator/components/com_installer/views/install/tmpl/default.xml create mode 100755 administrator/components/com_installer/views/languages/tmpl/default.xml create mode 100755 administrator/components/com_installer/views/manage/tmpl/default.xml create mode 100755 administrator/components/com_installer/views/update/tmpl/default.xml create mode 100755 administrator/components/com_installer/views/updatesites/tmpl/default.xml create mode 100755 administrator/components/com_installer/views/warnings/tmpl/default.xml create mode 100755 administrator/components/com_joomlaupdate/views/default/tmpl/default.xml create mode 100755 administrator/components/com_languages/views/installed/tmpl/default.xml create mode 100755 administrator/components/com_languages/views/languages/tmpl/default.xml create mode 100755 administrator/components/com_languages/views/overrides/tmpl/default.xml create mode 100755 administrator/components/com_media/views/media/tmpl/default.xml create mode 100644 administrator/components/com_menus/helpers/associations.php create mode 100644 administrator/components/com_menus/layouts/joomla/searchtools/default.php create mode 100644 administrator/components/com_menus/layouts/joomla/searchtools/default/bar.php create mode 100644 administrator/components/com_menus/models/forms/itemadmin.xml create mode 100644 administrator/components/com_menus/models/forms/itemadmin_alias.xml create mode 100644 administrator/components/com_menus/models/forms/itemadmin_component.xml create mode 100644 administrator/components/com_menus/models/forms/itemadmin_heading.xml create mode 100644 administrator/components/com_menus/models/forms/itemadmin_separator.xml create mode 100644 administrator/components/com_menus/models/forms/itemadmin_url.xml create mode 100755 administrator/components/com_menus/views/item/tmpl/edit.xml create mode 100755 administrator/components/com_menus/views/items/tmpl/default.xml create mode 100755 administrator/components/com_menus/views/menu/tmpl/edit.xml create mode 100755 administrator/components/com_menus/views/menus/tmpl/default.xml create mode 100755 administrator/components/com_modules/views/modules/tmpl/default.xml create mode 100644 administrator/components/com_newsfeeds/helpers/associations.php create mode 100755 administrator/components/com_plugins/views/plugins/tmpl/default.xml create mode 100755 administrator/components/com_postinstall/views/messages/tmpl/default.xml mode change 100755 => 100644 administrator/components/com_redirect/views/links/tmpl/default.php create mode 100755 administrator/components/com_templates/views/styles/tmpl/default.xml create mode 100755 administrator/components/com_templates/views/templates/tmpl/default.xml create mode 100755 administrator/components/com_users/views/group/tmpl/edit.xml create mode 100755 administrator/components/com_users/views/groups/tmpl/default.xml create mode 100755 administrator/components/com_users/views/level/tmpl/edit.xml create mode 100755 administrator/components/com_users/views/levels/tmpl/default.xml create mode 100755 administrator/components/com_users/views/mail/tmpl/default.xml create mode 100755 administrator/components/com_users/views/note/tmpl/edit.xml create mode 100755 administrator/components/com_users/views/notes/tmpl/default.xml create mode 100755 administrator/components/com_users/views/user/tmpl/edit.xml create mode 100755 administrator/components/com_users/views/users/tmpl/default.xml create mode 100644 administrator/language/en-GB/en-GB.com_associations.ini create mode 100644 administrator/language/en-GB/en-GB.com_associations.sys.ini rename administrator/modules/mod_menu/{tmpl/default_disabled.php => preset/disabled.php} (67%) rename administrator/modules/mod_menu/{tmpl/default_enabled.php => preset/enabled.php} (61%) mode change 100755 => 100644 language/en-GB/en-GB.lib_fof.ini create mode 100644 layouts/joomla/html/sortablelist.php create mode 100644 layouts/joomla/html/tag.php create mode 100644 libraries/joomla/association/extension/helper.php create mode 100644 libraries/joomla/association/extension/interface.php create mode 100644 libraries/joomla/form/fields/components.php create mode 100644 libraries/joomla/form/fields/repeatable.php mode change 100755 => 100644 libraries/vendor/leafo/lessphp/lessify mode change 100755 => 100644 libraries/vendor/leafo/lessphp/plessc create mode 100644 media/com_associations/css/sidebyside.css create mode 100644 media/com_associations/js/sidebyside-uncompressed.js create mode 100644 media/com_associations/js/sidebyside.js delete mode 100644 media/editors/tinymce/js/tinymce-builder.js create mode 100644 media/media/css/mediamanager.css create mode 100644 media/media/css/mediamanager_rtl.css delete mode 100644 plugins/fields/user/params/user.xml create mode 100644 tests/javascript/switcher/spec-setup.js create mode 100644 tests/javascript/switcher/spec.js diff --git a/README.md b/README.md index 1f1ee778ac0c7..25665d8f440ff 100644 --- a/README.md +++ b/README.md @@ -85,7 +85,7 @@ Do you want to improve Joomla? Copyright --------------------- -* Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +* Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. * [Special Thanks](https://docs.joomla.org/Joomla!_Credits_and_Thanks) * Distributed under the GNU General Public License version 2 or later * See [License details](https://docs.joomla.org/Joomla_Licenses) diff --git a/README.txt b/README.txt index 163410ea2498f..aa2192e239691 100644 --- a/README.txt +++ b/README.txt @@ -66,7 +66,7 @@ * Documentation for Web designers: https://docs.joomla.org/Web_designers Copyright: - * Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + * Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. * Special Thanks: https://docs.joomla.org/Joomla!_Credits_and_Thanks * Distributed under the GNU General Public License version 2 or later * See Licenses details at https://docs.joomla.org/Joomla_Licenses diff --git a/administrator/components/com_admin/admin.php b/administrator/components/com_admin/admin.php index 6e6070e94c736..e4f61bfbb0ee5 100644 --- a/administrator/components/com_admin/admin.php +++ b/administrator/components/com_admin/admin.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_admin/controller.php b/administrator/components/com_admin/controller.php index c8f1fa7d86b59..8d95c42abe836 100644 --- a/administrator/components/com_admin/controller.php +++ b/administrator/components/com_admin/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_admin/controllers/profile.php b/administrator/components/com_admin/controllers/profile.php index b34ea7c252f8e..0c7496f417f33 100644 --- a/administrator/components/com_admin/controllers/profile.php +++ b/administrator/components/com_admin/controllers/profile.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_admin/helpers/html/directory.php b/administrator/components/com_admin/helpers/html/directory.php index 153c110f411ef..367988faff920 100644 --- a/administrator/components/com_admin/helpers/html/directory.php +++ b/administrator/components/com_admin/helpers/html/directory.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_admin/helpers/html/phpsetting.php b/administrator/components/com_admin/helpers/html/phpsetting.php index 77dbdbd93b28a..1f676165bb2c4 100644 --- a/administrator/components/com_admin/helpers/html/phpsetting.php +++ b/administrator/components/com_admin/helpers/html/phpsetting.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_admin/helpers/html/system.php b/administrator/components/com_admin/helpers/html/system.php index 448f38609e90c..6d8c3dc7fb804 100644 --- a/administrator/components/com_admin/helpers/html/system.php +++ b/administrator/components/com_admin/helpers/html/system.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_admin/models/forms/profile.xml b/administrator/components/com_admin/models/forms/profile.xml index 0f4ed654ea0a2..ca772b2e257fb 100644 --- a/administrator/components/com_admin/models/forms/profile.xml +++ b/administrator/components/com_admin/models/forms/profile.xml @@ -53,7 +53,8 @@ label="COM_ADMIN_USER_FIELD_REGISTERDATE_LABEL" description="COM_ADMIN_USER_FIELD_REGISTERDATE_DESC" readonly="true" - format="%Y-%m-%d %H:%M:%S" + translateformat="true" + showtime="true" size="22" filter="user_utc" /> @@ -65,7 +66,8 @@ label="COM_ADMIN_USER_FIELD_LASTVISIT_LABEL" description="COM_ADMIN_USER_FIELD_LASTVISIT_DESC" readonly="true" - format="%Y-%m-%d %H:%M:%S" + translateformat="true" + showtime="true" size="22" filter="user_utc" /> diff --git a/administrator/components/com_admin/models/help.php b/administrator/components/com_admin/models/help.php index 1655c1ea03179..9d08624249b92 100644 --- a/administrator/components/com_admin/models/help.php +++ b/administrator/components/com_admin/models/help.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_admin/models/profile.php b/administrator/components/com_admin/models/profile.php index 779c279f616ad..9cc985eb23d01 100644 --- a/administrator/components/com_admin/models/profile.php +++ b/administrator/components/com_admin/models/profile.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_admin/models/sysinfo.php b/administrator/components/com_admin/models/sysinfo.php index 32e92b5b8a6ea..c65d70d3bb26a 100644 --- a/administrator/components/com_admin/models/sysinfo.php +++ b/administrator/components/com_admin/models/sysinfo.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_admin/postinstall/eaccelerator.php b/administrator/components/com_admin/postinstall/eaccelerator.php index f83ae6a280290..9136998a23de4 100644 --- a/administrator/components/com_admin/postinstall/eaccelerator.php +++ b/administrator/components/com_admin/postinstall/eaccelerator.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt * * This file contains post-installation message handling for eAccelerator compatibility. diff --git a/administrator/components/com_admin/postinstall/htaccess.php b/administrator/components/com_admin/postinstall/htaccess.php index 7f6e3c213d7f8..0ce7291f4d7dd 100644 --- a/administrator/components/com_admin/postinstall/htaccess.php +++ b/administrator/components/com_admin/postinstall/htaccess.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt * * This file contains post-installation message handling for notifying users of a change diff --git a/administrator/components/com_admin/postinstall/joomla40checks.php b/administrator/components/com_admin/postinstall/joomla40checks.php index 9ddd31b98c859..293235b18a1bb 100644 --- a/administrator/components/com_admin/postinstall/joomla40checks.php +++ b/administrator/components/com_admin/postinstall/joomla40checks.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt * * This file contains post-installation message handling for Joomla 4.0 pre checks diff --git a/administrator/components/com_admin/postinstall/languageaccess340.php b/administrator/components/com_admin/postinstall/languageaccess340.php index 2bc6f31c54bbb..86186a95d355d 100644 --- a/administrator/components/com_admin/postinstall/languageaccess340.php +++ b/administrator/components/com_admin/postinstall/languageaccess340.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt * * This file contains post-installation message handling for the checks if the installation is diff --git a/administrator/components/com_admin/postinstall/phpversion.php b/administrator/components/com_admin/postinstall/phpversion.php index 5ace364fd8136..7e1a4aec28533 100644 --- a/administrator/components/com_admin/postinstall/phpversion.php +++ b/administrator/components/com_admin/postinstall/phpversion.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt * * This file contains post-installation message handling for the checking minimum PHP version support diff --git a/administrator/components/com_admin/postinstall/statscollection.php b/administrator/components/com_admin/postinstall/statscollection.php index d5aa1a02996e4..c6df9cc32da69 100644 --- a/administrator/components/com_admin/postinstall/statscollection.php +++ b/administrator/components/com_admin/postinstall/statscollection.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt * * This file contains post-installation message handling for the checking minimum PHP version support diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php index 6d62f5752f3e5..43ded264e7dae 100644 --- a/administrator/components/com_admin/script.php +++ b/administrator/components/com_admin/script.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -285,6 +285,7 @@ protected function updateManifestCaches() array('component', 'com_postinstall', '', 1), array('component', 'com_joomlaupdate', '', 1), array('component', 'com_fields', '', 1), + array('component', 'com_associations', '', 1), // Libraries array('library', 'phputf8', '', 0), @@ -1623,6 +1624,10 @@ public function deleteUnexistingFiles() '/administrator/components/com_modules/layouts/joomla/searchtools/default.php', '/administrator/components/com_templates/layouts/joomla/searchtools/default/bar.php', '/administrator/components/com_templates/layouts/joomla/searchtools/default.php', + // Joomla __DEPLOY_VERSION__ + '/administrator/modules/mod_menu/tmpl/default_enabled.php', + '/administrator/modules/mod_menu/tmpl/default_disabled.php', + '/administrator/templates/hathor/html/mod_menu/default_enabled.php', ); // TODO There is an issue while deleting folders using the ftp mode @@ -1755,6 +1760,8 @@ public function deleteUnexistingFiles() '/administrator/components/com_templates/layouts/joomla/searchtools', '/administrator/components/com_templates/layouts/joomla', '/administrator/components/com_templates/layouts', + // Joomla! __DEPLOY_VERSION__ + '/administrator/templates/hathor/html/mod_menu', ); jimport('joomla.filesystem.file'); @@ -1825,6 +1832,7 @@ public function updateAssets() 'com_ajax', 'com_postinstall', 'com_fields', + 'com_associations', ); foreach ($newComponents as $component) diff --git a/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-21-1.sql b/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-21-1.sql index 933e10eea633f..7c1615481965e 100644 --- a/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-21-1.sql +++ b/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-21-1.sql @@ -2,7 +2,7 @@ INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder` (27, 'com_finder', 'component', 'com_finder', '', 1, 1, 0, 0, '', '{"show_description":"1","description_length":255,"allow_empty_query":"0","show_url":"1","show_advanced":"1","expand_advanced":"0","show_date_filters":"0","highlight_terms":"1","opensearch_name":"","opensearch_description":"","batch_size":"50","memory_table_limit":30000,"title_multiplier":"1.7","text_multiplier":"0.7","meta_multiplier":"1.2","path_multiplier":"2.0","misc_multiplier":"0.3","stemmer":"porter_en"}', '', '', 0, '0000-00-00 00:00:00', 0, 0), (439, 'plg_captcha_recaptcha', 'plugin', 'recaptcha', 'captcha', 0, 1, 1, 0, '{}', '{"public_key":"","private_key":"","theme":"clean"}', '', '', 0, '0000-00-00 00:00:00', 0, 0), (440, 'plg_system_highlight', 'plugin', 'highlight', 'system', 0, 1, 1, 0, '', '{}', '', '', 0, '0000-00-00 00:00:00', 7, 0), -(441, 'plg_content_finder', 'plugin', 'finder', 'content', 0, 0, 1, 0, '{"legacy":false,"name":"plg_content_finder","type":"plugin","creationDate":"December 2011","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"1.7.0","description":"PLG_CONTENT_FINDER_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0), +(441, 'plg_content_finder', 'plugin', 'finder', 'content', 0, 0, 1, 0, '{"legacy":false,"name":"plg_content_finder","type":"plugin","creationDate":"December 2011","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"1.7.0","description":"PLG_CONTENT_FINDER_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0), (442, 'plg_finder_categories', 'plugin', 'categories', 'finder', 0, 1, 1, 0, '', '{}', '', '', 0, '0000-00-00 00:00:00', 1, 0), (443, 'plg_finder_contacts', 'plugin', 'contacts', 'finder', 0, 1, 1, 0, '', '{}', '', '', 0, '0000-00-00 00:00:00', 2, 0), (444, 'plg_finder_content', 'plugin', 'content', 'finder', 0, 1, 1, 0, '', '{}', '', '', 0, '0000-00-00 00:00:00', 3, 0), diff --git a/administrator/components/com_admin/sql/updates/mysql/2.5.1-2012-01-26.sql b/administrator/components/com_admin/sql/updates/mysql/2.5.1-2012-01-26.sql index 4a7484a0dc568..012462ebac59e 100644 --- a/administrator/components/com_admin/sql/updates/mysql/2.5.1-2012-01-26.sql +++ b/administrator/components/com_admin/sql/updates/mysql/2.5.1-2012-01-26.sql @@ -1,5 +1,5 @@ INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES -(314, 'mod_version', 'module', 'mod_version', '', 1, 1, 1, 0, '{"legacy":false,"name":"mod_version","type":"module","creationDate":"January 2012","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"2.5.0","description":"MOD_VERSION_XML_DESCRIPTION","group":""}', '{"format":"short","product":"1","cache":"0"}', '', '', 0, '0000-00-00 00:00:00', 0, 0); +(314, 'mod_version', 'module', 'mod_version', '', 1, 1, 1, 0, '{"legacy":false,"name":"mod_version","type":"module","creationDate":"January 2012","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"2.5.0","description":"MOD_VERSION_XML_DESCRIPTION","group":""}', '{"format":"short","product":"1","cache":"0"}', '', '', 0, '0000-00-00 00:00:00', 0, 0); INSERT INTO `#__modules` (`title`, `note`, `content`, `ordering`, `position`, `checked_out`, `checked_out_time`, `publish_up`, `publish_down`, `published`, `module`, `access`, `showtitle`, `params`, `client_id`, `language`) VALUES ('Joomla Version', '', '', 1, 'footer', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_version', 3, 1, '{"format":"short","product":"1","layout":"_:default","moduleclass_sfx":"","cache":"0"}', 1, '*'); diff --git a/administrator/components/com_admin/sql/updates/mysql/3.0.0.sql b/administrator/components/com_admin/sql/updates/mysql/3.0.0.sql index 3c0deb57c80c0..9476cf457d332 100644 --- a/administrator/components/com_admin/sql/updates/mysql/3.0.0.sql +++ b/administrator/components/com_admin/sql/updates/mysql/3.0.0.sql @@ -114,9 +114,9 @@ ALTER TABLE `#__finder_tokens_aggregate` ADD COLUMN `language` char(3) NOT NULL INSERT INTO `#__extensions` (`name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES - ('isis', 'template', 'isis', '', 1, 1, 1, 0, '{"name":"isis","type":"template","creationDate":"3\\/30\\/2012","author":"Kyle Ledbetter","copyright":"Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"","version":"1.0","description":"TPL_ISIS_XML_DESCRIPTION","group":""}', '{"templateColor":"","logoFile":""}', '', '', 0, '0000-00-00 00:00:00', 0, 0), - ('protostar', 'template', 'protostar', '', 0, 1, 1, 0, '{"name":"protostar","type":"template","creationDate":"4\\/30\\/2012","author":"Kyle Ledbetter","copyright":"Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"","version":"1.0","description":"TPL_PROTOSTAR_XML_DESCRIPTION","group":""}', '{"templateColor":"","logoFile":"","googleFont":"1","googleFontName":"Open+Sans","fluidContainer":"0"}', '', '', 0, '0000-00-00 00:00:00', 0, 0), - ('beez3', 'template', 'beez3', '', 0, 1, 1, 0, '{"legacy":false,"name":"beez3","type":"template","creationDate":"25 November 2009","author":"Angie Radtke","copyright":"Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.","authorEmail":"a.radtke@derauftritt.de","authorUrl":"http:\\/\\/www.der-auftritt.de","version":"1.6.0","description":"TPL_BEEZ3_XML_DESCRIPTION","group":""}', '{"wrapperSmall":"53","wrapperLarge":"72","sitetitle":"","sitedescription":"","navposition":"center","templatecolor":"nature"}', '', '', 0, '0000-00-00 00:00:00', 0, 0); + ('isis', 'template', 'isis', '', 1, 1, 1, 0, '{"name":"isis","type":"template","creationDate":"3\\/30\\/2012","author":"Kyle Ledbetter","copyright":"Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"","version":"1.0","description":"TPL_ISIS_XML_DESCRIPTION","group":""}', '{"templateColor":"","logoFile":""}', '', '', 0, '0000-00-00 00:00:00', 0, 0), + ('protostar', 'template', 'protostar', '', 0, 1, 1, 0, '{"name":"protostar","type":"template","creationDate":"4\\/30\\/2012","author":"Kyle Ledbetter","copyright":"Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"","version":"1.0","description":"TPL_PROTOSTAR_XML_DESCRIPTION","group":""}', '{"templateColor":"","logoFile":"","googleFont":"1","googleFontName":"Open+Sans","fluidContainer":"0"}', '', '', 0, '0000-00-00 00:00:00', 0, 0), + ('beez3', 'template', 'beez3', '', 0, 1, 1, 0, '{"legacy":false,"name":"beez3","type":"template","creationDate":"25 November 2009","author":"Angie Radtke","copyright":"Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.","authorEmail":"a.radtke@derauftritt.de","authorUrl":"http:\\/\\/www.der-auftritt.de","version":"1.6.0","description":"TPL_BEEZ3_XML_DESCRIPTION","group":""}', '{"wrapperSmall":"53","wrapperLarge":"72","sitetitle":"","sitedescription":"","navposition":"center","templatecolor":"nature"}', '', '', 0, '0000-00-00 00:00:00', 0, 0); INSERT INTO `#__template_styles` (`template`, `client_id`, `home`, `title`, `params`) VALUES ('protostar', 0, '0', 'protostar - Default', '{"templateColor":"","logoFile":"","googleFont":"1","googleFontName":"Open+Sans","fluidContainer":"0"}'), @@ -139,7 +139,7 @@ SET home = 0 WHERE template = 'bluestork'; INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES -(315, 'mod_stats_admin', 'module', 'mod_stats_admin', '', 1, 1, 1, 0, '{"name":"mod_stats_admin","type":"module","creationDate":"September 2012","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"MOD_STATS_XML_DESCRIPTION","group":""}', '{"serverinfo":"0","siteinfo":"0","counter":"0","increase":"0","cache":"1","cache_time":"900","cachemode":"static"}', '', '', 0, '0000-00-00 00:00:00', 0, 0); +(315, 'mod_stats_admin', 'module', 'mod_stats_admin', '', 1, 1, 1, 0, '{"name":"mod_stats_admin","type":"module","creationDate":"September 2012","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"MOD_STATS_XML_DESCRIPTION","group":""}', '{"serverinfo":"0","siteinfo":"0","counter":"0","increase":"0","cache":"1","cache_time":"900","cachemode":"static"}', '', '', 0, '0000-00-00 00:00:00', 0, 0); UPDATE `#__update_sites` SET location = 'http://update.joomla.org/language/translationlist_3.xml' diff --git a/administrator/components/com_admin/sql/updates/mysql/3.1.0.sql b/administrator/components/com_admin/sql/updates/mysql/3.1.0.sql index 01b93ec654c73..29ec9e2fe7f74 100644 --- a/administrator/components/com_admin/sql/updates/mysql/3.1.0.sql +++ b/administrator/components/com_admin/sql/updates/mysql/3.1.0.sql @@ -157,8 +157,8 @@ CREATE TABLE IF NOT EXISTS `#__ucm_content` ( INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES (29, 'com_tags', 'component', 'com_tags', '', 1, 1, 1, 1, '{"legacy":false,"name":"com_tags","type":"component","creationDate":"March 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2016 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"COM_TAGS_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0), -(316, 'mod_tags_popular', 'module', 'mod_tags_popular', '', 0, 1, 1, 0, '{"name":"mod_tags_popular","type":"module","creationDate":"January 2013","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.1.0","description":"MOD_TAGS_POPULAR_XML_DESCRIPTION","group":""}', '{"maximum":"5","timeframe":"alltime","owncache":"1"}', '', '', 0, '0000-00-00 00:00:00', 0, 0), -(317, 'mod_tags_similar', 'module', 'mod_tags_similar', '', 0, 1, 1, 0, '{"name":"mod_tags_similar","type":"module","creationDate":"January 2013","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.1.0","description":"MOD_TAGS_SIMILAR_XML_DESCRIPTION","group":""}', '{"maximum":"5","matchtype":"any","owncache":"1"}', '', '', 0, '0000-00-00 00:00:00', 0, 0), +(316, 'mod_tags_popular', 'module', 'mod_tags_popular', '', 0, 1, 1, 0, '{"name":"mod_tags_popular","type":"module","creationDate":"January 2013","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.1.0","description":"MOD_TAGS_POPULAR_XML_DESCRIPTION","group":""}', '{"maximum":"5","timeframe":"alltime","owncache":"1"}', '', '', 0, '0000-00-00 00:00:00', 0, 0), +(317, 'mod_tags_similar', 'module', 'mod_tags_similar', '', 0, 1, 1, 0, '{"name":"mod_tags_similar","type":"module","creationDate":"January 2013","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.1.0","description":"MOD_TAGS_SIMILAR_XML_DESCRIPTION","group":""}', '{"maximum":"5","matchtype":"any","owncache":"1"}', '', '', 0, '0000-00-00 00:00:00', 0, 0), (447, 'plg_finder_tags', 'plugin', 'tags', 'finder', 0, 1, 1, 0, '{"name":"plg_finder_tags","type":"plugin","creationDate":"February 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2016 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"PLG_FINDER_TAGS_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0); INSERT INTO `#__menu` (`menutype`, `title`, `alias`, `note`, `path`, `link`, `type`, `published`, `parent_id`, `level`, `component_id`, `checked_out`, `checked_out_time`, `browserNav`, `access`, `img`, `template_style_id`, `params`, `lft`, `rgt`, `home`, `language`, `client_id`) VALUES diff --git a/administrator/components/com_admin/sql/updates/mysql/3.2.0.sql b/administrator/components/com_admin/sql/updates/mysql/3.2.0.sql index 20efac2137959..02b067d2e97b6 100644 --- a/administrator/components/com_admin/sql/updates/mysql/3.2.0.sql +++ b/administrator/components/com_admin/sql/updates/mysql/3.2.0.sql @@ -24,7 +24,7 @@ INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder` (32, 'com_postinstall', 'component', 'com_postinstall', '', 1, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0), (105, 'FOF', 'library', 'fof', '', 0, 1, 1, 1, '{"legacy":false,"name":"FOF","type":"library","creationDate":"2013-10-08","author":"Nicholas K. Dionysopoulos \/ Akeeba Ltd","copyright":"(C)2011-2013 Nicholas K. Dionysopoulos","authorEmail":"nicholas@akeebabackup.com","authorUrl":"https:\/\/www.akeebabackup.com","version":"2.1.rc4","description":"Framework-on-Framework (FOF) - A rapid component development framework for Joomla!","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0), (448, 'plg_twofactorauth_totp', 'plugin', 'totp', 'twofactorauth', 0, 0, 1, 0, '{"name":"plg_twofactorauth_totp","type":"plugin","creationDate":"August 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2016 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.0","description":"PLG_TWOFACTORAUTH_TOTP_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0), -(449, 'plg_authentication_cookie', 'plugin', 'cookie', 'authentication', 0, 1, 1, 0, '{"name":"plg_authentication_cookie","type":"plugin","creationDate":"July 2013","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"PLG_AUTH_COOKIE_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0), +(449, 'plg_authentication_cookie', 'plugin', 'cookie', 'authentication', 0, 1, 1, 0, '{"name":"plg_authentication_cookie","type":"plugin","creationDate":"July 2013","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"PLG_AUTH_COOKIE_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0), (450, 'plg_twofactorauth_yubikey', 'plugin', 'yubikey', 'twofactorauth', 0, 0, 1, 0, '{"name":"plg_twofactorauth_yubikey","type":"plugin","creationDate":"Se[ptember 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2016 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.0","description":"PLG_TWOFACTORAUTH_YUBIKEY_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0); INSERT INTO `#__menu` (`menutype`, `title`, `alias`, `note`, `path`, `link`, `type`, `published`, `parent_id`, `level`, `component_id`, `checked_out`, `checked_out_time`, `browserNav`, `access`, `img`, `template_style_id`, `params`, `lft`, `rgt`, `home`, `language`, `client_id`) VALUES diff --git a/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-11-19.sql b/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-11-19.sql new file mode 100644 index 0000000000000..4b2cabfb8b5ec --- /dev/null +++ b/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-11-19.sql @@ -0,0 +1,3 @@ +ALTER TABLE `#__menu_types` ADD `client_id` int(11) NOT NULL DEFAULT 0; + +UPDATE `#__menu` SET `published` = 1 WHERE `menutype` = 'main' OR `menutype` = 'menu'; diff --git a/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-01-15.sql b/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-01-15.sql new file mode 100644 index 0000000000000..5b309f020fa4a --- /dev/null +++ b/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-01-15.sql @@ -0,0 +1,2 @@ +INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES +(34, 'com_associations', 'component', 'com_associations', '', 1, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0); diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.1.0.sql b/administrator/components/com_admin/sql/updates/postgresql/3.1.0.sql index fe5c364e0a808..7a7ec83dd5247 100644 --- a/administrator/components/com_admin/sql/updates/postgresql/3.1.0.sql +++ b/administrator/components/com_admin/sql/updates/postgresql/3.1.0.sql @@ -184,9 +184,9 @@ CREATE INDEX "#__ucm_content_idx_core_type_id" ON "#__ucm_content" ("core_type_i -- INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES (29, 'com_tags', 'component', 'com_tags', '', 1, 1, 1, 1, '{"legacy":false,"name":"com_tags","type":"component","creationDate":"March 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2016 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"COM_TAGS_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0), -(315, 'mod_stats_admin', 'module', 'mod_stats_admin', '', 1, 1, 1, 0, '{"name":"mod_stats_admin","type":"module","creationDate":"September 2012","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"MOD_STATS_XML_DESCRIPTION","group":""}', '{"serverinfo":"0","siteinfo":"0","counter":"0","increase":"0","cache":"1","cache_time":"900","cachemode":"static"}', '', '', 0, '1970-01-01 00:00:00', 0, 0), -(316, 'mod_tags_popular', 'module', 'mod_tags_popular', '', 0, 1, 1, 0, '{"name":"mod_tags_popular","type":"module","creationDate":"January 2013","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.1.0","description":"MOD_TAGS_POPULAR_XML_DESCRIPTION","group":""}', '{"maximum":"5","timeframe":"alltime","owncache":"1"}', '', '', 0, '1970-01-01 00:00:00', 0, 0), -(317, 'mod_tags_similar', 'module', 'mod_tags_similar', '', 0, 1, 1, 0, '{"name":"mod_tags_similar","type":"module","creationDate":"January 2013","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.1.0","description":"MOD_TAGS_SIMILAR_XML_DESCRIPTION","group":""}', '{"maximum":"5","matchtype":"any","owncache":"1"}', '', '', 0, '1970-01-01 00:00:00', 0, 0), +(315, 'mod_stats_admin', 'module', 'mod_stats_admin', '', 1, 1, 1, 0, '{"name":"mod_stats_admin","type":"module","creationDate":"September 2012","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"MOD_STATS_XML_DESCRIPTION","group":""}', '{"serverinfo":"0","siteinfo":"0","counter":"0","increase":"0","cache":"1","cache_time":"900","cachemode":"static"}', '', '', 0, '1970-01-01 00:00:00', 0, 0), +(316, 'mod_tags_popular', 'module', 'mod_tags_popular', '', 0, 1, 1, 0, '{"name":"mod_tags_popular","type":"module","creationDate":"January 2013","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.1.0","description":"MOD_TAGS_POPULAR_XML_DESCRIPTION","group":""}', '{"maximum":"5","timeframe":"alltime","owncache":"1"}', '', '', 0, '1970-01-01 00:00:00', 0, 0), +(317, 'mod_tags_similar', 'module', 'mod_tags_similar', '', 0, 1, 1, 0, '{"name":"mod_tags_similar","type":"module","creationDate":"January 2013","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.1.0","description":"MOD_TAGS_SIMILAR_XML_DESCRIPTION","group":""}', '{"maximum":"5","matchtype":"any","owncache":"1"}', '', '', 0, '1970-01-01 00:00:00', 0, 0), (447, 'plg_finder_tags', 'plugin', 'tags', 'finder', 0, 1, 1, 0, '{"name":"plg_finder_tags","type":"plugin","creationDate":"February 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2016 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"PLG_FINDER_TAGS_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0); -- diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.2.0.sql b/administrator/components/com_admin/sql/updates/postgresql/3.2.0.sql index 82047821dfbb2..b6020f0a3b936 100644 --- a/administrator/components/com_admin/sql/updates/postgresql/3.2.0.sql +++ b/administrator/components/com_admin/sql/updates/postgresql/3.2.0.sql @@ -24,7 +24,7 @@ INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder" (32, 'com_postinstall', 'component', 'com_postinstall', '', 1, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0), (105, 'FOF', 'library', 'fof', '', 0, 1, 1, 1, '{"legacy":false,"name":"FOF","type":"library","creationDate":"2013-10-08","author":"Nicholas K. Dionysopoulos \/ Akeeba Ltd","copyright":"(C)2011-2013 Nicholas K. Dionysopoulos","authorEmail":"nicholas@akeebabackup.com","authorUrl":"https:\/\/www.akeebabackup.com","version":"2.1.rc4","description":"Framework-on-Framework (FOF) - A rapid component development framework for Joomla!","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0), (448, 'plg_twofactorauth_totp', 'plugin', 'totp', 'twofactorauth', 0, 0, 1, 0, '{"name":"plg_twofactorauth_totp","type":"plugin","creationDate":"August 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2016 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.0","description":"PLG_TWOFACTORAUTH_TOTP_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0), -(449, 'plg_authentication_cookie', 'plugin', 'cookie', 'authentication', 0, 1, 1, 0, '{"name":"plg_authentication_cookie","type":"plugin","creationDate":"July 2013","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"PLG_AUTH_COOKIE_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0), +(449, 'plg_authentication_cookie', 'plugin', 'cookie', 'authentication', 0, 1, 1, 0, '{"name":"plg_authentication_cookie","type":"plugin","creationDate":"July 2013","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"PLG_AUTH_COOKIE_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0), (450, 'plg_twofactorauth_yubikey', 'plugin', 'yubikey', 'twofactorauth', 0, 0, 1, 0, '{"name":"plg_twofactorauth_yubikey","type":"plugin","creationDate":"Se[ptember 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2016 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.0","description":"PLG_TWOFACTORAUTH_YUBIKEY_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0); INSERT INTO "#__menu" ("menutype", "title", "alias", "note", "path", "link", "type", "published", "parent_id", "level", "component_id", "checked_out", "checked_out_time", "browserNav", "access", "img", "template_style_id", "params", "lft", "rgt", "home", "language", "client_id") VALUES diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-11-19.sql b/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-11-19.sql new file mode 100644 index 0000000000000..da2b368041418 --- /dev/null +++ b/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-11-19.sql @@ -0,0 +1,3 @@ +ALTER TABLE "#__menu_types" ADD "client_id" int DEFAULT 0 NOT NULL; + +UPDATE "#__menu" SET "published" = 1 WHERE "menutype" = 'main' OR "menutype" = 'menu'; diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-01-15.sql b/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-01-15.sql new file mode 100644 index 0000000000000..f244b43bedf4e --- /dev/null +++ b/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-01-15.sql @@ -0,0 +1,2 @@ +INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES +(34, 'com_associations', 'component', 'com_associations', '', 1, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0); diff --git a/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-11-19.sql b/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-11-19.sql new file mode 100644 index 0000000000000..01bd65750ac80 --- /dev/null +++ b/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-11-19.sql @@ -0,0 +1,3 @@ +ALTER TABLE [#__menu_types] ADD [client_id] [tinyint] NOT NULL DEFAULT 0; + +UPDATE [#__menu] SET [published] = 1 WHERE [menutype] = 'main' OR [menutype] = 'menu'; diff --git a/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-01-15.sql b/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-01-15.sql new file mode 100644 index 0000000000000..321dd4b074356 --- /dev/null +++ b/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-01-15.sql @@ -0,0 +1,2 @@ +INSERT INTO [#__extensions] ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state]) VALUES +(34, 'com_associations', 'component', 'com_associations', '', 1, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0); diff --git a/administrator/components/com_admin/views/help/tmpl/default.php b/administrator/components/com_admin/views/help/tmpl/default.php index cc8b422a893dd..11ccf31de0e96 100644 --- a/administrator/components/com_admin/views/help/tmpl/default.php +++ b/administrator/components/com_admin/views/help/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_admin/views/help/tmpl/default.xml b/administrator/components/com_admin/views/help/tmpl/default.xml new file mode 100755 index 0000000000000..098e8f184d6e2 --- /dev/null +++ b/administrator/components/com_admin/views/help/tmpl/default.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/administrator/components/com_admin/views/help/view.html.php b/administrator/components/com_admin/views/help/view.html.php index d379ad41f26f6..f872b010e0ea4 100644 --- a/administrator/components/com_admin/views/help/view.html.php +++ b/administrator/components/com_admin/views/help/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_admin/views/profile/tmpl/edit.php b/administrator/components/com_admin/views/profile/tmpl/edit.php index 1547409f33ae8..4649c3788f61f 100644 --- a/administrator/components/com_admin/views/profile/tmpl/edit.php +++ b/administrator/components/com_admin/views/profile/tmpl/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_admin/views/profile/view.html.php b/administrator/components/com_admin/views/profile/view.html.php index a6879f36a65f5..c90ff83d22f7e 100644 --- a/administrator/components/com_admin/views/profile/view.html.php +++ b/administrator/components/com_admin/views/profile/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_admin/views/sysinfo/tmpl/default.php b/administrator/components/com_admin/views/sysinfo/tmpl/default.php index 69d9095eb02d2..2a1c7aaa2685a 100644 --- a/administrator/components/com_admin/views/sysinfo/tmpl/default.php +++ b/administrator/components/com_admin/views/sysinfo/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_admin/views/sysinfo/tmpl/default.xml b/administrator/components/com_admin/views/sysinfo/tmpl/default.xml new file mode 100755 index 0000000000000..479fa92087a8c --- /dev/null +++ b/administrator/components/com_admin/views/sysinfo/tmpl/default.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/administrator/components/com_admin/views/sysinfo/tmpl/default_config.php b/administrator/components/com_admin/views/sysinfo/tmpl/default_config.php index 387b065b7df1a..4510e23390421 100644 --- a/administrator/components/com_admin/views/sysinfo/tmpl/default_config.php +++ b/administrator/components/com_admin/views/sysinfo/tmpl/default_config.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_admin/views/sysinfo/tmpl/default_directory.php b/administrator/components/com_admin/views/sysinfo/tmpl/default_directory.php index 4d4d32534c5fb..07fe5a24437c8 100644 --- a/administrator/components/com_admin/views/sysinfo/tmpl/default_directory.php +++ b/administrator/components/com_admin/views/sysinfo/tmpl/default_directory.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_admin/views/sysinfo/tmpl/default_phpinfo.php b/administrator/components/com_admin/views/sysinfo/tmpl/default_phpinfo.php index 74d77a04c524a..28909428f0ce8 100644 --- a/administrator/components/com_admin/views/sysinfo/tmpl/default_phpinfo.php +++ b/administrator/components/com_admin/views/sysinfo/tmpl/default_phpinfo.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_admin/views/sysinfo/tmpl/default_phpsettings.php b/administrator/components/com_admin/views/sysinfo/tmpl/default_phpsettings.php index 6d88f141ff5f8..d17f2869a1ac0 100644 --- a/administrator/components/com_admin/views/sysinfo/tmpl/default_phpsettings.php +++ b/administrator/components/com_admin/views/sysinfo/tmpl/default_phpsettings.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_admin/views/sysinfo/tmpl/default_system.php b/administrator/components/com_admin/views/sysinfo/tmpl/default_system.php index 41c6db9e28d71..4e1f1ab2df9a4 100644 --- a/administrator/components/com_admin/views/sysinfo/tmpl/default_system.php +++ b/administrator/components/com_admin/views/sysinfo/tmpl/default_system.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_admin/views/sysinfo/view.html.php b/administrator/components/com_admin/views/sysinfo/view.html.php index ca49f48397087..fc1a93a1bf795 100644 --- a/administrator/components/com_admin/views/sysinfo/view.html.php +++ b/administrator/components/com_admin/views/sysinfo/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_admin/views/sysinfo/view.json.php b/administrator/components/com_admin/views/sysinfo/view.json.php index cd6a077637d2f..92455c573581b 100644 --- a/administrator/components/com_admin/views/sysinfo/view.json.php +++ b/administrator/components/com_admin/views/sysinfo/view.json.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_admin/views/sysinfo/view.text.php b/administrator/components/com_admin/views/sysinfo/view.text.php index 039b1e2484ba7..f284e2cf3e6b7 100644 --- a/administrator/components/com_admin/views/sysinfo/view.text.php +++ b/administrator/components/com_admin/views/sysinfo/view.text.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_ajax/ajax.php b/administrator/components/com_ajax/ajax.php index 17d705d268047..665c30efbadeb 100644 --- a/administrator/components/com_ajax/ajax.php +++ b/administrator/components/com_ajax/ajax.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_ajax * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_associations/access.xml b/administrator/components/com_associations/access.xml new file mode 100644 index 0000000000000..e6fd1ec5258d2 --- /dev/null +++ b/administrator/components/com_associations/access.xml @@ -0,0 +1,8 @@ + + +
+ + + +
+ diff --git a/administrator/components/com_associations/associations.php b/administrator/components/com_associations/associations.php new file mode 100644 index 0000000000000..fdc4e88837ede --- /dev/null +++ b/administrator/components/com_associations/associations.php @@ -0,0 +1,41 @@ +authorise('core.manage', 'com_associations')) +{ + throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403); +} + +JLoader::register('AssociationsHelper', __DIR__ . '/helpers/associations.php'); + +// Check if user has permission to access the component item type. +$itemtype = JFactory::getApplication()->input->get('itemtype', '', 'string'); + +if ($itemtype !== '') +{ + list($extensionName, $typeName) = explode('.', $itemtype); + + if (!AssociationsHelper::hasSupport($extensionName)) + { + throw new Exception(JText::sprintf('COM_ASSOCIATIONS_COMPONENT_NOT_SUPPORTED', JText::_($extensionName)), 404); + } + + if (!JFactory::getUser()->authorise('core.manage', $extensionName)) + { + throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403); + } +} + +$controller = JControllerLegacy::getInstance('Associations'); +$controller->execute(JFactory::getApplication()->input->get('task')); +$controller->redirect(); diff --git a/administrator/components/com_associations/associations.xml b/administrator/components/com_associations/associations.xml new file mode 100644 index 0000000000000..2e058c522c09b --- /dev/null +++ b/administrator/components/com_associations/associations.xml @@ -0,0 +1,30 @@ + + + com_associations + Joomla! Project + Januar 2017 + (C) 2005 - 2016 Open Source Matters. All rights reserved. + GNU General Public License version 2 or later; see LICENSE.txt + admin@joomla.org + www.joomla.org + __DEPLOY_VERSION__ + COM_ASSOCIATIONS_XML_DESCRIPTION + + COM_ASSOCIATIONS + + access.xml + config.xml + associations.php + controller.php + controllers + helpers + layouts + models + views + + + language/en-GB.com_associations.ini + language/en-GB.com_associations.sys.ini + + + diff --git a/administrator/components/com_associations/config.xml b/administrator/components/com_associations/config.xml new file mode 100644 index 0000000000000..1074b48ec73fb --- /dev/null +++ b/administrator/components/com_associations/config.xml @@ -0,0 +1,17 @@ + + +
+ +
+ diff --git a/administrator/components/com_associations/controller.php b/administrator/components/com_associations/controller.php new file mode 100644 index 0000000000000..da3f9ed60e9fe --- /dev/null +++ b/administrator/components/com_associations/controller.php @@ -0,0 +1,27 @@ +input->get('itemtype')); + + $id = $this->input->get('id', 0); + + // Check if reference item can be edited. + if (!AssociationsHelper::allowEdit($extensionName, $typeName, $id)) + { + JFactory::getApplication()->enqueueMessage(JText::_('JLIB_APPLICATION_ERROR_EDIT_NOT_PERMITTED'), 'error'); + $this->setRedirect(JRoute::_('index.php?option=com_associations&view=associations', false)); + + return false; + } + + return parent::display(); + } + + /** + * Method for canceling the edit action + * + * @param string $key The name of the primary key of the URL variable. + * + * @return void. + * + * @since __DEPLOY_VERSION__ + */ + public function cancel($key = null) + { + JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN')); + + list($extensionName, $typeName) = explode('.', $this->input->get('itemtype')); + + // Only check in, if component item type allows to check out. + if (AssociationsHelper::typeSupportsCheckout($extensionName, $typeName)) + { + $ids = array(); + $targetId = $this->input->get('target-id', '', 'string'); + + if ($targetId !== '') + { + $ids = array_unique(explode(',', $targetId)); + } + + $ids[] = $this->input->get('id', 0); + + foreach ($ids as $key => $id) + { + AssociationsHelper::getItem($extensionName, $typeName, $id)->checkin(); + } + } + + $this->setRedirect(JRoute::_('index.php?option=com_associations&view=associations', false)); + } +} diff --git a/administrator/components/com_associations/controllers/associations.php b/administrator/components/com_associations/controllers/associations.php new file mode 100644 index 0000000000000..71ff7ef84bf00 --- /dev/null +++ b/administrator/components/com_associations/controllers/associations.php @@ -0,0 +1,71 @@ + true)) + { + return parent::getModel($name, $prefix, $config); + } + + /** + * Method to purge the associations table. + * + * @return void + * + * @since __DEPLOY_VERSION__ + */ + public function purge() + { + $this->getModel('associations')->purge(); + $this->setRedirect(JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list, false)); + } + + /** + * Method to delete the orphans from the associations table. + * + * @return void + * + * @since __DEPLOY_VERSION__ + */ + public function clean() + { + $this->getModel('associations')->clean(); + $this->setRedirect(JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list, false)); + } +} diff --git a/administrator/components/com_associations/helpers/associations.php b/administrator/components/com_associations/helpers/associations.php new file mode 100644 index 0000000000000..9e0252667f1a5 --- /dev/null +++ b/administrator/components/com_associations/helpers/associations.php @@ -0,0 +1,528 @@ +getAssociationList($typeName, $itemId); + + } + + /** + * Get the the instance of the extension helper class + * + * @param string $extensionName The extension name with com_ + * + * @return HelperClass|null + * + * @since __DEPLOY_VERSION__ + */ + public static function getExtensionHelper($extensionName) + { + if (!self::hasSupport($extensionName)) + { + return null; + } + + $support = self::$extensionsSupport[$extensionName]; + + return $support->get('helper'); + } + + /** + * Get item information + * + * @param string $extensionName The extension name with com_ + * @param string $typeName The item type + * @param int $itemId The id of item for which we need the associated items + * + * @return JTable|null + * + * @since __DEPLOY_VERSION__ + */ + public static function getItem($extensionName, $typeName, $itemId) + { + if (!self::hasSupport($extensionName)) + { + return array(); + } + + // Get the extension specific helper method + $helper = self::getExtensionHelper($extensionName); + + return $helper->getItem($typeName, $itemId); + } + + /** + * Check if extension supports associations + * + * @param string $extensionName The extension name with com_ + * + * @return bool + * + * @since __DEPLOY_VERSION__ + */ + public static function hasSupport($extensionName) + { + if (is_null(self::$extensionsSupport)) + { + self::getSupportedExtensions(); + } + + return in_array($extensionName, self::$supportedExtensionsList); + } + + /** + * Get the extension specific helper class name + * + * @param string $extensionName The extension name with com_ + * + * @return bool + * + * @since __DEPLOY_VERSION__ + */ + private static function getExtensionHelperClassName($extensionName) + { + $realName = self::getExtensionRealName($extensionName); + + return ucfirst($realName) . 'AssociationsHelper'; + } + + /** + * Get the real extension name. This means without com_ + * + * @param string $extensionName The extension name with com_ + * + * @return string + * + * @since __DEPLOY_VERSION__ + */ + private static function getExtensionRealName($extensionName) + { + return strpos($extensionName, 'com_') === false ? $extensionName : substr($extensionName, 4); + } + + /** + * Get the associated language edit links Html. + * + * @param string $extensionName Extension Name + * @param string $typeName ItemType + * @param integer $itemId Item id. + * @param string $itemLanguage Item language code. + * @param boolean $addLink True for adding edit links. False for just text. + * @param boolean $allLanguages True for showing all content languages. False only languages with associations. + * + * @return string The language HTML + * + * @since __DEPLOY_VERSION__ + */ + public static function getAssociationHtmlList($extensionName, $typeName, $itemId, $itemLanguage, $addLink = true, $allLanguages = true) + { + // Get the associations list for this item. + $items = self::getAssociationList($extensionName, $typeName, $itemId); + + $titleFieldName = self::getTypeFieldName($extensionName, $typeName, 'title'); + + // Get all content languages. + $languages = self::getContentLanguages(); + + $canEditReference = self::allowEdit($extensionName, $typeName, $itemId); + $canCreate = self::allowAdd($extensionName, $typeName); + + // Create associated items list. + foreach ($languages as $langCode => $language) + { + // Don't do for the reference language. + if ($langCode == $itemLanguage) + { + continue; + } + + // Don't show languages without associations, if we don't want to show them. + if (!$allLanguages && !isset($items[$langCode])) + { + continue; + } + + // Get html parameters. + if (isset($items[$langCode])) + { + $title = '

' . $items[$langCode][$titleFieldName]; + $additional = ''; + + if (isset($items[$langCode]['category_title'])) + { + $additional = '
' . JText::_('JCATEGORY') . ': ' . $items[$langCode]['category_title']; + } + elseif (isset($items[$langCode]['menu_title'])) + { + $additional = '
' . JText::_('COM_ASSOCIATIONS_HEADING_MENUTYPE') . ': ' . $items[$langCode]['menu_title']; + } + + $additional .= $addLink ? '

' . JText::_('COM_ASSOCIATIONS_EDIT_ASSOCIATION') : ''; + $labelClass = 'label'; + $target = $langCode . ':' . $items[$langCode]['id'] . ':edit'; + $allow = $canEditReference && self::allowEdit($extensionName, $typeName, $items[$langCode]['id']); + } + else + { + $items[$langCode] = array(); + + $title = '

' . JText::_('COM_ASSOCIATIONS_NO_ASSOCIATION'); + $additional = $addLink ? '

' . JText::_('COM_ASSOCIATIONS_ADD_NEW_ASSOCIATION') : ''; + $labelClass = 'label label-warning'; + $target = $langCode . ':0:add'; + $allow = $canCreate; + } + + // Generate item Html. + $options = array( + 'option' => 'com_associations', + 'view' => 'association', + 'layout' => 'edit', + 'itemtype' => $extensionName . '.' . $typeName, + 'task' => 'association.edit', + 'id' => $itemId, + 'target' => $target, + ); + + $url = JRoute::_('index.php?' . http_build_query($options)); + $text = strtoupper($language->sef); + $langImage = JHtml::_('image', 'mod_languages/' . $language->image . '.gif', $language->title, array('title' => $language->title), true); + $tooltip = implode(' ', array($langImage, $language->title, $title, $additional)); + + $items[$langCode]['link'] = JHtml::_('tooltip', $tooltip, null, null, $text, $allow && $addLink ? $url : '', null, 'hasTooltip ' . $labelClass); + } + + return JLayoutHelper::render('joomla.content.associations', $items); + } + + /** + * Get all extensions with associations support. + * + * @return array The extensions. + * + * @since __DEPLOY_VERSION__ + */ + public static function getSupportedExtensions() + { + if (!is_null(self::$extensionsSupport)) + { + return self::$extensionsSupport; + } + + self::$extensionsSupport = array(); + + $extensions = self::getEnabledExtensions(); + + foreach ($extensions as $extension) + { + $support = self::getSupportedExtension($extension->element); + + if ($support->get('associationssupport') === true) + { + self::$supportedExtensionsList[] = $extension->element; + } + + self::$extensionsSupport[$extension->element] = $support; + } + + return self::$extensionsSupport; + } + + /** + * Get item context based on the item key. + * + * @param string $extensionName The extension identifier. + * + * @return Joomla\Registry\Registry The item properties. + * + * @since __DEPLOY_VERSION__ + */ + public static function getSupportedExtension($extensionName) + { + $result = new Registry; + + $result->def('component', $extensionName); + $result->def('associationssupport', false); + $result->def('helper', null); + + // Check if associations helper exists + if (!file_exists(JPATH_ADMINISTRATOR . '/components/' . $extensionName . '/helpers/associations.php')) + { + return $result; + } + + require_once JPATH_ADMINISTRATOR . '/components/' . $extensionName . '/helpers/associations.php'; + + $componentAssociationsHelperClassName = self::getExtensionHelperClassName($extensionName); + + if (!class_exists($componentAssociationsHelperClassName, false)) + { + return $result; + } + + // Create an instance of the helper class + $helper = new $componentAssociationsHelperClassName; + $result->set('helper', $helper); + + if ($helper->hasAssociationsSupport() === false) + { + return $result; + } + + $result->set('associationssupport', true); + + // Get the translated titles. + $languagePath = JPATH_ADMINISTRATOR . '/components/' . $extensionName; + $lang = JFactory::getLanguage(); + + $lang->load($extensionName . '.sys', JPATH_ADMINISTRATOR); + $lang->load($extensionName . '.sys', $languagePath); + $lang->load($extensionName, JPATH_ADMINISTRATOR); + $lang->load($extensionName, $languagePath); + + $result->def('title', JText::_(strtoupper($extensionName))); + + // Get the supported types + $types = $helper->getItemTypes(); + $rTypes = array(); + + foreach ($types as $typeName) + { + $details = $helper->getType($typeName); + $context = 'component'; + $title = $helper->getTypeTitle($typeName); + $languageKey = $typeName; + + if ($typeName === 'category') + { + $languageKey = strtoupper($extensionName) . '_CATEGORIES'; + $context = 'category'; + } + + if ($lang->hasKey(strtoupper($extensionName . '_' . $title . 'S'))) + { + $languageKey = strtoupper($extensionName . '_' . $title . 'S'); + } + + $title = $lang->hasKey($languageKey) ? JText::_($languageKey) : JText::_('COM_ASSOCIATIONS_ITEMS'); + + $rType = new Registry; + + $rType->def('name', $typeName); + $rType->def('details', $details); + $rType->def('title', $title); + $rType->def('context', $context); + + $rTypes[$typeName] = $rType; + } + + $result->def('types', $rTypes); + + return $result; + } + + /** + * Get all installed and enabled extensions + * + * @return mixed + * + * @since __DEPLOY_VERSION__ + */ + private static function getEnabledExtensions() + { + $db = JFactory::getDbo(); + + $query = $db->getQuery(true) + ->select('*') + ->from($db->quoteName('#__extensions')) + ->where($db->quoteName('type') . ' = ' . $db->quote('component')) + ->where($db->quoteName('enabled') . ' = 1'); + + $db->setQuery($query); + + return $db->loadObjectList(); + } + + /** + * Get all the content languages. + * + * @return array Array of objects all content languages by language code. + * + * @since __DEPLOY_VERSION__ + */ + public static function getContentLanguages() + { + $db = JFactory::getDbo(); + + // Get all content languages. + $query = $db->getQuery(true) + ->select($db->quoteName(array('sef', 'lang_code', 'image', 'title', 'published'))) + ->from($db->quoteName('#__languages')) + ->order($db->quoteName('ordering') . ' ASC'); + + $db->setQuery($query); + + return $db->loadObjectList('lang_code'); + } + + /** + * Get the associated items for an item + * + * @param string $extensionName The extension name with com_ + * @param string $typeName The item type + * @param int $itemId The id of item for which we need the associated items + * + * @return bool + * + * @since __DEPLOY_VERSION__ + */ + public static function allowEdit($extensionName, $typeName, $itemId) + { + if (!self::hasSupport($extensionName)) + { + return false; + } + + // Get the extension specific helper method + $helper= self::getExtensionHelper($extensionName); + + if (method_exists($helper, 'allowEdit')) + { + return $helper->allowEdit($typeName, $itemId); + } + + return JFactory::getUser()->authorise('core.edit', $extensionName); + } + + /** + * Check if user is allowed to create items. + * + * @param string $extensionName The extension name with com_ + * @param string $typeName The item type + * + * @return boolean True on allowed. + * + * @since __DEPLOY_VERSION__ + */ + public static function allowAdd($extensionName, $typeName) + { + if (!self::hasSupport($extensionName)) + { + return false; + } + + // Get the extension specific helper method + $helper= self::getExtensionHelper($extensionName); + + if (method_exists($helper, 'allowAdd')) + { + return $helper->allowAdd($typeName); + } + + return JFactory::getUser()->authorise('core.create', $extensionName); + } + + /** + * Check if the type supports checkout + * + * @param string $extensionName The extension name with com_ + * @param string $typeName The item type + * + * @return boolean True on allowed. + * + * @since __DEPLOY_VERSION__ + */ + public static function typeSupportsCheckout($extensionName, $typeName) + { + if (!self::hasSupport($extensionName)) + { + return false; + } + + // Get the extension specific helper method + $helper = self::getExtensionHelper($extensionName); + + $support = $helper->getTypeSupport($typeName); + + return !empty($support['checkout']); + } + + /** + * Get a table field name for a type + * + * @param string $extensionName The extension name with com_ + * @param string $typeName The item type + * @param string $fieldName The item type + * + * @return boolean True on allowed. + * + * @since __DEPLOY_VERSION__ + */ + public static function getTypeFieldName($extensionName, $typeName, $fieldName) + { + if (!self::hasSupport($extensionName)) + { + return false; + } + + // Get the extension specific helper method + $helper = self::getExtensionHelper($extensionName); + + return $helper->getTypeFieldName($typeName, $fieldName); + } +} diff --git a/administrator/components/com_associations/layouts/joomla/searchtools/default/bar.php b/administrator/components/com_associations/layouts/joomla/searchtools/default/bar.php new file mode 100644 index 0000000000000..2c2bf13c8adb5 --- /dev/null +++ b/administrator/components/com_associations/layouts/joomla/searchtools/default/bar.php @@ -0,0 +1,32 @@ + + + + + input->get('forcedItemType', '', 'string') == '') : ?> + filterForm->getField('itemtype'); ?> +
+ input; ?> +
+ + input->get('forcedLanguage', '', 'cmd') == '') : ?> + filterForm->getField('language'); ?> +
+ input; ?> +
+ + + + 'none')); ?> diff --git a/administrator/components/com_associations/models/association.php b/administrator/components/com_associations/models/association.php new file mode 100644 index 0000000000000..d90a792501c85 --- /dev/null +++ b/administrator/components/com_associations/models/association.php @@ -0,0 +1,36 @@ +loadForm('com_associations.association', 'association', array('control' => 'jform', 'load_data' => $loadData)); + + return !empty($form) ? $form : false; + } +} diff --git a/administrator/components/com_associations/models/associations.php b/administrator/components/com_associations/models/associations.php new file mode 100644 index 0000000000000..0c3b1d8f12c01 --- /dev/null +++ b/administrator/components/com_associations/models/associations.php @@ -0,0 +1,529 @@ +input->get('forcedLanguage', '', 'cmd'); + $forcedItemType = $app->input->get('forcedItemType', '', 'string'); + + // Adjust the context to support modal layouts. + if ($layout = $app->input->get('layout')) + { + $this->context .= '.' . $layout; + } + + // Adjust the context to support forced languages. + if ($forcedLanguage) + { + $this->context .= '.' . $forcedLanguage; + } + + // Adjust the context to support forced component item types. + if ($forcedItemType) + { + $this->context .= '.' . $forcedItemType; + } + + $this->setState('itemtype', $this->getUserStateFromRequest($this->context . '.itemtype', 'itemtype', '', 'string')); + $this->setState('language', $this->getUserStateFromRequest($this->context . '.language', 'language', '', 'string')); + + $this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string')); + $this->setState('filter.state', $this->getUserStateFromRequest($this->context . '.filter.state', 'filter_state', '', 'cmd')); + $this->setState('filter.category_id', $this->getUserStateFromRequest($this->context . '.filter.category_id', 'filter_category_id', '', 'cmd')); + $this->setState('filter.menutype', $this->getUserStateFromRequest($this->context . '.filter.menutype', 'filter_menutype', '', 'string')); + $this->setState('filter.access', $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', '', 'string')); + $this->setState('filter.level', $this->getUserStateFromRequest($this->context . '.filter.level', 'filter_level', '', 'cmd')); + + // List state information. + parent::populateState($ordering, $direction); + + // Force a language. + if (!empty($forcedLanguage)) + { + $this->setState('language', $forcedLanguage); + } + + // Force a component item type. + if (!empty($forcedItemType)) + { + $this->setState('itemtype', $forcedItemType); + } + } + + /** + * 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 __DEPLOY_VERSION__ + */ + protected function getStoreId($id = '') + { + // Compile the store id. + $id .= ':' . $this->getState('itemtype'); + $id .= ':' . $this->getState('language'); + $id .= ':' . $this->getState('filter.search'); + $id .= ':' . $this->getState('filter.state'); + $id .= ':' . $this->getState('filter.category_id'); + $id .= ':' . $this->getState('filter.menutype'); + $id .= ':' . $this->getState('filter.access'); + $id .= ':' . $this->getState('filter.level'); + + return parent::getStoreId($id); + } + + /** + * Build an SQL query to load the list data. + * + * @return JDatabaseQuery|bool + * + * @since __DEPLOY_VERSION__ + */ + protected function getListQuery() + { + $type = null; + + list($extensionName, $typeName) = explode('.', $this->state->get('itemtype')); + + $extension = AssociationsHelper::getSupportedExtension($extensionName); + $types = $extension->get('types'); + + if (array_key_exists($typeName, $types)) + { + $type = $types[$typeName]; + } + + if (is_null($type)) + { + return false; + } + + // Create a new query object. + $user = JFactory::getUser(); + $db = $this->getDbo(); + $query = $db->getQuery(true); + + $details = $type->get('details'); + + if (!array_key_exists('support', $details)) + { + return false; + } + + $support = $details['support']; + + if (!array_key_exists('fields', $details)) + { + return false; + } + + $fields = $details['fields']; + + // Main query. + $query->select($db->qn($fields['id'], 'id')) + ->select($db->qn($fields['title'], 'title')) + ->select($db->qn($fields['alias'], 'alias')); + + if (!array_key_exists('tables', $details)) + { + return false; + } + + $tables = $details['tables']; + + foreach ($tables as $key => $table) + { + $query->from($db->qn($table, $key)); + } + + if (!array_key_exists('joins', $details)) + { + return false; + } + + $joins = $details['joins']; + + foreach ($joins as $join) + { + $query->join($join['type'], $db->qn($join['condition'])); + } + + // Join over the language. + $query->select($db->qn($fields['language'], 'language')) + ->select($db->qn('l.title', 'language_title')) + ->select($db->qn('l.image', 'language_image')) + ->join('LEFT', $db->qn('#__languages', 'l') . ' ON ' . $db->qn('l.lang_code') . ' = ' . $db->qn($fields['language'])); + + // Join over the associations. + $query->select('COUNT(' . $db->qn('asso2.id') . ') > 1 AS ' . $db->qn('association')) + ->join( + 'LEFT', + $db->qn('#__associations', 'asso') . ' ON ' . $db->qn('asso.id') . ' = ' . $db->qn($fields['id']) + . ' AND ' . $db->qn('asso.context') . ' = ' . $db->quote($extensionName . '.' . 'item') + ) + ->join('LEFT', $db->qn('#__associations', 'asso2') . ' ON ' . $db->qn('asso2.key') . ' = ' . $db->qn('asso.key')); + + // Prepare the group by clause. + $groupby = array( + $fields['id'], + $fields['title'], + $fields['language'], + 'l.title', + 'l.image', + ); + + // Select author for ACL checks. + if (!empty($fields['created_user_id'])) + { + $query->select($db->qn($fields['created_user_id'], 'created_user_id')); + } + + // Select checked out data for check in checkins. + if (!empty($fields['checked_out']) && !empty($fields['checked_out_time'])) + { + $query->select($db->qn($fields['checked_out'], 'checked_out')) + ->select($db->qn($fields['checked_out_time'], 'checked_out_time')); + + // Join over the users. + $query->select($db->qn('u.name', 'editor')) + ->join('LEFT', $db->qn('#__users', 'u') . ' ON ' . $db->qn('u.id') . ' = ' . $db->qn($fields['checked_out'])); + + $groupby[] = 'u.name'; + } + + // If component item type supports ordering, select the ordering also. + if (!empty($fields['ordering'])) + { + $query->select($db->qn($fields['ordering'], 'ordering')); + } + + // If component item type supports state, select the item state also. + if (!empty($fields['state'])) + { + $query->select($db->qn($fields['state'], 'state')); + } + + // If component item type supports level, select the level also. + if (!empty($fields['level'])) + { + $query->select($db->qn($fields['level'], 'level')); + } + + // If component item type supports categories, select the category also. + if (!empty($fields['catid'])) + { + $query->select($db->qn($fields['catid'], 'catid')); + + // Join over the categories. + $query->select($db->qn('c.title', 'category_title')) + ->join('LEFT', $db->qn('#__categories', 'c') . ' ON ' . $db->qn('c.id') . ' = ' . $db->qn($fields['catid'])); + + $groupby[] = 'c.title'; + } + + // If component item type supports menu type, select the menu type also. + if (!empty($fields['menutype'])) + { + $query->select($db->qn($fields['menutype'], 'menutype')); + + // Join over the menu types. + $query->select($db->qn('mt.title', 'menutype_title')) + ->select($db->qn('mt.id', 'menutypeid')) + ->join('LEFT', $db->qn('#__menu_types', 'mt') . ' ON ' . $db->qn('mt.menutype') . ' = ' . $db->qn($fields['menutype'])); + + $groupby[] = 'mt.title'; + $groupby[] = 'mt.id'; + } + + // If component item type supports access level, select the access level also. + if (array_key_exists('acl', $support) && $support['acl'] == true && !empty($fields['access'])) + { + $query->select($db->qn($fields['access'], 'access')); + + // Join over the access levels. + $query->select($db->qn('ag.title', 'access_level')) + ->join('LEFT', $db->qn('#__viewlevels', 'ag') . ' ON ' . $db->qn('ag.id') . ' = ' . $db->qn($fields['access'])); + + $groupby[] = 'ag.title'; + + // Implement View Level Access. + if (!$user->authorise('core.admin', $extensionName)) + { + $query->where($fields['access'] . ' IN (' . implode(',', $user->getAuthorisedViewLevels()) . ')'); + } + } + + // If component item type is menus we need to remove the root item and the administrator menu. + if ($extensionName === 'com_menus') + { + $query->where($db->qn($fields['id']) . ' > 1') + ->where($db->qn('a.client_id') . ' = 0'); + } + + // If component item type is category we need to remove all other component categories. + if ($typeName === 'category') + { + $query->where($db->qn('a.extension') . ' = ' . $db->quote($extensionName)); + } + + // Filter on the language. + if ($language = $this->getState('language')) + { + $query->where($db->qn($fields['language']) . ' = ' . $db->quote($language)); + } + + // Filter by item state. + $state = $this->getState('filter.state'); + + if (is_numeric($state)) + { + $query->where($db->qn($fields['state']) . ' = ' . (int) $state); + } + elseif ($state === '') + { + $query->where($db->qn($fields['state']) . ' IN (0, 1)'); + } + + // Filter on the category. + $baselevel = 1; + + if ($categoryId = $this->getState('filter.category_id')) + { + $categoryTable = JTable::getInstance('Category', 'JTable'); + $categoryTable->load($categoryId); + $baselevel = (int) $categoryTable->level; + + $query->where($db->qn('c.lft') . ' >= ' . (int) $categoryTable->lft) + ->where($db->qn('c.rgt') . ' <= ' . (int) $categoryTable->rgt); + } + + // Filter on the level. + if ($level = $this->getState('filter.level')) + { + $tableAlias = in_array($extensionName, array('com_menus', 'com_categories')) ? 'a' : 'c'; + $query->where($db->qn($tableAlias . '.level') . ' <= ' . ((int) $level + (int) $baselevel - 1)); + } + + // Filter by menu type. + if ($menutype = $this->getState('filter.menutype')) + { + $query->where($fields['menutype'] . ' = ' . $db->quote($menutype)); + } + + // Filter by access level. + if ($access = $this->getState('filter.access')) + { + $query->where($fields['access'] . ' = ' . (int) $access); + } + + // Filter by search in name. + if ($search = $this->getState('filter.search')) + { + if (stripos($search, 'id:') === 0) + { + $query->where($db->qn($fields['id']) . ' = ' . (int) substr($search, 3)); + } + else + { + $search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%')); + $query->where('(' . $db->qn($fields['title']) . ' LIKE ' . $search + . ' OR ' . $db->qn($fields['alias']) . ' LIKE ' . $search . ')'); + } + } + + // Add the group by clause + $query->group($db->qn($groupby)); + + // Add the list ordering clause. + $query->order($db->escape($this->getState('list.ordering') . ' ' . $this->getState('list.direction'))); + + return $query; + } + + /** + * Delete associations from #__associations table. + * + * @param string $context The associations context. Empty for all. + * @param string $key The associations key. Empty for all. + * + * @return boolean True on success. + * + * @since __DEPLOY_VERSION__ + */ + public function purge($context = '', $key = '') + { + $app = JFactory::getApplication(); + $db = $this->getDbo(); + $query = $db->getQuery(true)->delete($db->qn('#__associations')); + + // Filter by associations context. + if ($context) + { + $query->where($db->qn('context') . ' = ' . $db->quote($context)); + } + + // Filter by key. + if ($key) + { + $query->where($db->qn('key') . ' = ' . $db->quote($key)); + } + + $db->setQuery($query); + + try + { + $db->execute(); + } + catch (JDatabaseExceptionExecuting $e) + { + $app->enqueueMessage(JText::_('COM_ASSOCIATIONS_PURGE_FAILED'), 'error'); + + return false; + } + + $app->enqueueMessage( + JText::_((int) $db->getAffectedRows() > 0 ? 'COM_ASSOCIATIONS_PURGE_SUCCESS' : 'COM_ASSOCIATIONS_PURGE_NONE'), + 'message' + ); + + return true; + } + + /** + * Delete orphans from the #__associations table. + * + * @param string $context The associations context. Empty for all. + * @param string $key The associations key. Empty for all. + * + * @return boolean True on success + * + * @since __DEPLOY_VERSION__ + */ + public function clean($context = '', $key = '') + { + $app = JFactory::getApplication(); + $db = $this->getDbo(); + $query = $db->getQuery(true) + ->select($db->qn('key') . ', COUNT(*)') + ->from($db->qn('#__associations')) + ->group($db->qn('key')) + ->having('COUNT(*) = 1'); + + // Filter by associations context. + if ($context) + { + $query->where($db->qn('context') . ' = ' . $db->quote($context)); + } + + // Filter by key. + if ($key) + { + $query->where($db->qn('key') . ' = ' . $db->quote($key)); + } + + $db->setQuery($query); + + $assocKeys = $db->loadObjectList(); + + $count = 0; + + // We have orphans. Let's delete them. + foreach ($assocKeys as $value) + { + $query->clear() + ->delete($db->qn('#__associations')) + ->where($db->qn('key') . ' = ' . $db->quote($value->key)); + + $db->setQuery($query); + + try + { + $db->execute(); + } + catch (JDatabaseExceptionExecuting $e) + { + $app->enqueueMessage(JText::_('COM_ASSOCIATIONS_DELETE_ORPHANS_FAILED'), 'error'); + + return false; + } + + $count += (int) $db->getAffectedRows(); + } + + $app->enqueueMessage( + JText::_($count > 0 ? 'COM_ASSOCIATIONS_DELETE_ORPHANS_SUCCESS' : 'COM_ASSOCIATIONS_DELETE_ORPHANS_NONE'), + 'message' + ); + + return true; + } +} diff --git a/administrator/components/com_associations/models/fields/itemlanguage.php b/administrator/components/com_associations/models/fields/itemlanguage.php new file mode 100644 index 0000000000000..d1b5e21996879 --- /dev/null +++ b/administrator/components/com_associations/models/fields/itemlanguage.php @@ -0,0 +1,115 @@ +input; + + list($extensionName, $typeName) = explode('.', $input->get('itemtype')); + + $extension = AssociationsHelper::getSupportedExtension($extensionName); + $types = $extension->get('types'); + + if (array_key_exists($typeName, $types)) + { + $type = $types[$typeName]; + } + + $details = $type->get('details'); + + if (array_key_exists('fields', $details)) + { + $fields = $details['fields']; + } + + $languageField = substr($fields['language'], 2); + $referenceId = $input->get('id', 0, 'int'); + $reference = ArrayHelper::fromObject(AssociationsHelper::getItem($extensionName, $typeName, $referenceId)); + $referenceLang = $reference[$languageField]; + + // Get item associations given ID and item type + $associations = AssociationsHelper::getAssociationList($extensionName, $typeName, $referenceId); + + // Check if user can create items in this component item type. + $canCreate = AssociationsHelper::allowAdd($extensionName, $typeName); + + // Gets existing languages. + $existingLanguages = AssociationsHelper::getContentLanguages(); + + $options = array(); + + // Each option has the format "|", example: "en-GB|1" + foreach ($existingLanguages as $langCode => $language) + { + // If language code is equal to reference language we don't need it. + if ($language->lang_code == $referenceLang) + { + continue; + } + + $options[$langCode] = new stdClass; + $options[$langCode]->text = $language->title; + + // If association exists in this language. + if (isset($associations[$language->lang_code])) + { + $itemId = (int) $associations[$language->lang_code]['id']; + $options[$langCode]->value = $language->lang_code . ':' . $itemId . ':edit'; + + // Check if user does have permission to edit the associated item. + $canEdit = AssociationsHelper::allowEdit($extensionName, $typeName, $itemId); + + // ToDo: Do an additional check to check if user can edit a checked out item (if component item type supports it). + $canCheckout = true; + + // Disable language if user is not allowed to edit the item associated to it. + $options[$langCode]->disable = !($canEdit && $canCheckout); + } + else + { + // New item, id = 0 and disabled if user is not allowed to create new items. + $options[$langCode]->value = $language->lang_code . ':0:add'; + + // Disable language if user is not allowed to create items. + $options[$langCode]->disable = !$canCreate; + } + } + + return array_merge(parent::getOptions(), $options); + } +} diff --git a/administrator/components/com_associations/models/fields/itemtype.php b/administrator/components/com_associations/models/fields/itemtype.php new file mode 100644 index 0000000000000..d077f711d7530 --- /dev/null +++ b/administrator/components/com_associations/models/fields/itemtype.php @@ -0,0 +1,62 @@ +get('associationssupport') === true) + { + foreach ($extension->get('types') as $type) + { + $context = $extension->get('component') . '.' . $type->get('name'); + $options[$extension->get('title')][] = JHtml::_('select.option', $context, $type->get('title')); + } + } + } + + // Sort by alpha order. + ksort($options, SORT_NATURAL); + + // Add options to parent array. + return array_merge(parent::getGroups(), $options); + } +} diff --git a/administrator/components/com_associations/models/fields/modalassociation.php b/administrator/components/com_associations/models/fields/modalassociation.php new file mode 100644 index 0000000000000..ee3f593095c9b --- /dev/null +++ b/administrator/components/com_associations/models/fields/modalassociation.php @@ -0,0 +1,105 @@ +value > 0 ? (int) $this->value : ''; + + // Build the script. + $script = array(); + + // Select button script + $script[] = 'function jSelectAssociation_' . $this->id . '(id) {'; + $script[] = ' target = document.getElementById("target-association");'; + $script[] = ' document.getElementById("target-association").src = target.getAttribute("data-editurl") + ' + . '"&task=" + target.getAttribute("data-item") + ".edit" + "&id=" + id'; + $script[] = ' jQuery("#associationSelect' . $this->id . 'Modal").modal("hide");'; + $script[] = '}'; + + // Add the script to the document head. + JFactory::getDocument()->addScriptDeclaration(implode("\n", $script)); + + // Setup variables for display. + $html = array(); + + $linkAssociations = 'index.php?option=com_associations&view=associations&layout=modal&tmpl=component' + . '&forcedItemType=' . JFactory::getApplication()->input->get('itemtype', '', 'string') . '&function=jSelectAssociation_' . $this->id; + + $linkAssociations .= "&forcedLanguage=' + document.getElementById('target-association').getAttribute('data-language') + '"; + + $urlSelect = $linkAssociations . '&' . JSession::getFormToken() . '=1'; + + // Select custom association button + $html[] = '' + . '' + . '' + . ''; + + // Clear association button + $html[] = '' + . '' . JText::_('JCLEAR') + . ''; + + $html[] = ''; + + // Select custom association modal + $html[] = JHtml::_( + 'bootstrap.renderModal', + 'associationSelect' . $this->id . 'Modal', + array( + 'title' => JText::_('COM_ASSOCIATIONS_SELECT_TARGET'), + 'backdrop' => 'static', + 'url' => $urlSelect, + 'height' => '400px', + 'width' => '800px', + 'bodyHeight' => '70', + 'modalWidth' => '80', + 'footer' => '', + ) + ); + + return implode("\n", $html); + } +} diff --git a/administrator/components/com_associations/models/forms/association.xml b/administrator/components/com_associations/models/forms/association.xml new file mode 100644 index 0000000000000..89add5542b210 --- /dev/null +++ b/administrator/components/com_associations/models/forms/association.xml @@ -0,0 +1,21 @@ + +
+
+ + + + + +
+ + + +
diff --git a/administrator/components/com_associations/models/forms/filter_associations.xml b/administrator/components/com_associations/models/forms/filter_associations.xml new file mode 100644 index 0000000000000..fb2199975e28a --- /dev/null +++ b/administrator/components/com_associations/models/forms/filter_associations.xml @@ -0,0 +1,116 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/administrator/components/com_associations/views/association/tmpl/edit.php b/administrator/components/com_associations/views/association/tmpl/edit.php new file mode 100644 index 0000000000000..49bee064e18f3 --- /dev/null +++ b/administrator/components/com_associations/views/association/tmpl/edit.php @@ -0,0 +1,70 @@ + $this->app->input->get('layout', '', 'string'), + 'itemtype' => $this->itemtype, + 'id' => $this->referenceId, + ); +?> + + +
+
+
+
+

+ +
+
+
+
+
+

+ form->getInput('modalassociation'); ?> + form->getInput('itemlanguage'); ?> +
+ +
+
+ +
+ + + + +
diff --git a/administrator/components/com_associations/views/association/view.html.php b/administrator/components/com_associations/views/association/view.html.php new file mode 100644 index 0000000000000..033dbeacda809 --- /dev/null +++ b/administrator/components/com_associations/views/association/view.html.php @@ -0,0 +1,197 @@ +get('Errors'))) + { + throw new Exception(implode("\n", $errors), 500); + + return false; + } + + $this->app = JFactory::getApplication(); + $this->form = $this->get('Form'); + $input = $this->app->input; + + $this->referenceId = $input->get('id', 0, 'int'); + + list($extensionName, $typeName) = explode('.', $input->get('itemtype')); + + $this->extensionName = $extensionName; + $this->typeName = $typeName; + $this->itemtype = $extensionName . '.' . $typeName; + + $languageField = AssociationsHelper::getTypeFieldName($extensionName, $typeName, 'language'); + $referenceId = $input->get('id', 0, 'int'); + $reference = ArrayHelper::fromObject(AssociationsHelper::getItem($extensionName, $typeName, $referenceId)); + + $this->referenceLanguage = $reference[$languageField]; + + $options = array( + 'option' => $typeName === 'category' ? 'com_categories' : $extensionName, + 'view' => $typeName, + 'extension' => $extensionName, + 'tmpl' => 'component', + ); + + // Reference and target edit links. + $this->editUri = 'index.php?' . http_build_query($options); + + // Get target language. + $this->targetId = '0'; + $this->targetLanguage = ''; + $this->defaultTargetSrc = ''; + $this->targetAction = ''; + + if ($target = $input->get('target', '', 'string')) + { + $matches = preg_split("#[\:]+#", $target); + $this->targetAction = $matches[2]; + $this->targetId = $matches[1]; + $this->targetLanguage = $matches[0]; + $task = $typeName . '.' . $this->targetAction; + $this->defaultTargetSrc = JRoute::_($this->editUri . '&task= ' . $task . ' &id=' . (int) $this->targetId); + $this->form->setValue('itemlanguage', '', $this->targetLanguage . ':' . $this->targetId . ':' . $this->targetAction); + } + + /* + * @todo Review later + */ + + // We don't need toolbar in the modal window. + if ($this->getLayout() !== 'modal') + { + $this->addToolbar(); + $this->sidebar = JHtmlSidebar::render(); + } + else + { + // In article associations modal we need to remove language filter if forcing a language. + // We also need to change the category filter to show show categories with All or the forced language. + if ($forcedLanguage = JFactory::getApplication()->input->get('forcedLanguage', '', 'CMD')) + { + // If the language is forced we can't allow to select the language, so transform the language selector filter into an hidden field. + $languageXml = new SimpleXMLElement(''); + $this->filterForm->setField($languageXml, 'filter', true); + + // Also, unset the active language filter so the search tools is not open by default with this filter. + unset($this->activeFilters['language']); + + // One last changes needed is to change the category filter to just show categories with All language or with the forced language. + $this->filterForm->setFieldAttribute('category_id', 'language', '*,' . $forcedLanguage, 'filter'); + } + } + + parent::display($tpl); + } + + /** + * Add the page title and toolbar. + * + * @return void + * + * @since __DEPLOY_VERSION__ + */ + protected function addToolbar() + { + // Hide main menu. + JFactory::getApplication()->input->set('hidemainmenu', 1); + + $helper = AssociationsHelper::getExtensionHelper($this->extensionName); + $title = $helper->getTypeTitle($this->typeName); + + $languageKey = strtoupper($this->extensionName . '_' . $title . 'S'); + + if ($this->typeName === 'category') + { + $languageKey = strtoupper($this->extensionName) . '_CATEGORIES'; + } + + JToolbarHelper::title(JText::sprintf('COM_ASSOCIATIONS_TITLE_EDIT', JText::_($this->extensionName), JText::_($languageKey)), 'contract'); + + $bar = JToolbar::getInstance('toolbar'); + + $bar->appendButton( + 'Custom', '', 'reference' + ); + + $bar->appendButton( + 'Custom', '', 'target' + ); + + JToolBarHelper::custom('copy', 'copy.png', '', 'COM_ASSOCIATIONS_COPY_REFERENCE', false); + + JToolbarHelper::cancel('association.cancel', 'JTOOLBAR_CLOSE'); + JToolbarHelper::help('JGLOBAL_HELP'); + + JHtmlSidebar::setAction('index.php?option=com_associations'); + } +} diff --git a/administrator/components/com_associations/views/associations/tmpl/default.php b/administrator/components/com_associations/views/associations/tmpl/default.php new file mode 100644 index 0000000000000..1690367692d49 --- /dev/null +++ b/administrator/components/com_associations/views/associations/tmpl/default.php @@ -0,0 +1,171 @@ +escape($this->state->get('list.ordering')); +$listDirn = $this->escape($this->state->get('list.direction')); +$canManageCheckin = JFactory::getUser()->authorise('core.manage', 'com_checkin'); +$colSpan = 5; + +$iconStates = array( + -2 => 'icon-trash', + 0 => 'icon-unpublish', + 1 => 'icon-publish', + 2 => 'icon-archive', +); + +JText::script('COM_ASSOCIATIONS_PURGE_CONFIRM_PROMPT'); + +JFactory::getDocument()->addScriptDeclaration(' + Joomla.submitbutton = function(pressbutton) + { + if (pressbutton == "associations.purge") + { + if (confirm(Joomla.JText._("COM_ASSOCIATIONS_PURGE_CONFIRM_PROMPT"))) + { + Joomla.submitform(pressbutton); + } + else + { + return false; + } + } + else + { + Joomla.submitform(pressbutton); + } + }; +'); +?> +
+sidebar)) : ?> +
+ sidebar; ?> +
+
+ +
+ + $this)); ?> + items)) : ?> +
+ +
+ + + + + typeSupports['state'])) : ?> + + + + + + typeFields['menutype'])) : ?> + + + typeFields['access'])) : ?> + + + + + + + + + + + + items as $i => $item) : + $canCheckin = true; + $canEdit = AssociationsHelper::allowEdit($this->extensionName, $this->typeName, $item->id); + $canCheckin = $canManageCheckin || AssociationsHelper::typeSupportsCheckout($this->extensionName, $this->typeName); + ?> + + typeSupports['state'])) : ?> + + + + + + typeFields['menutype'])) : ?> + + + typeFields['access'])) : ?> + + + + + + +
+ + + + + + + + + + + + + +
+ pagination->getListFooter(); ?> +
+ + + level)) : ?> + $item->level)); ?> + + checked_out) && $item->checked_out) : ?> + editor, $item->checked_out_time, 'associations.', $canCheckin); ?> + + + + escape($item->title); ?> + + escape($item->title); ?> + + typeFields['alias'])) : ?> + + escape($item->alias)); ?> + + + typeFields['catid'])) : ?> +
+ escape($item->category_title); ?> +
+ + 		+ language_title ? JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true) . ' ' . $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> + + extensionName, $this->typeName, (int) $item->id, $item->language); ?> + + escape($item->menutype_title); ?> + + escape($item->access_level); ?> + + id; ?> +
+ + + +
+ diff --git a/administrator/components/com_associations/views/associations/tmpl/modal.php b/administrator/components/com_associations/views/associations/tmpl/modal.php new file mode 100644 index 0000000000000..d97db3616e8d2 --- /dev/null +++ b/administrator/components/com_associations/views/associations/tmpl/modal.php @@ -0,0 +1,161 @@ +isClient('site')) +{ + JSession::checkToken('get') or die(JText::_('JINVALID_TOKEN')); +} + +JHtml::_('jquery.framework'); +JHtml::_('bootstrap.tooltip', '.hasTooltip', array('placement' => 'bottom')); +JHtml::_('behavior.multiselect'); +JHtml::_('formbehavior.chosen', 'select'); + +$function = $app->input->getCmd('function', 'jSelectAssociation'); +$listOrder = $this->escape($this->state->get('list.ordering')); +$listDirn = $this->escape($this->state->get('list.direction')); +$colSpan = 4; +$iconStates = array( + -2 => 'icon-trash', + 0 => 'icon-unpublish', + 1 => 'icon-publish', + 2 => 'icon-archive', +); + +$app->getDocument()->addScriptDeclaration( + "jQuery(document).ready(function($) { + // Run function on parent window. + $('.select-link').on('click', function() { + if (self != top) + { + window.parent." . $function . "(this.getAttribute('data-id')); + } + }); + });" +); +?> +
+ +sidebar)) : ?> +
+ sidebar; ?> +
+
+ +
+ + $this)); ?> + items)) : ?> +
+ +
+ + + + + typeSupports['state'])) : ?> + + + + + + typeFields['menutype'])) : ?> + + + typeSupports['acl'])) : ?> + + + + + + + + + + + + items as $i => $item) : + ?> + + typeSupports['state'])) : ?> + + + + + + typeFields['menutype'])) : ?> + + + typeSupports['acl'])) : ?> + + + + + + +
+ + + + + + + + + + + + + +
+ pagination->getListFooter(); ?> +
+ + + level)) : ?> + $item->level)); ?> + + escape($item->title); ?> + typeFields['alias'])) : ?> + + escape($item->alias)); ?> + + + typeFields['catid'])) : ?> +
+ escape($item->category_title); ?> +
+ + 		+ language_title ? JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true) . ' ' . $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> + + association) : ?> + extensionName, $this->typeName, (int) $item->id, $item->language, false); ?> + + + escape($item->menutype_title); ?> + + escape($item->access_level); ?> + + id; ?> +
+ + + + + + + +
+ diff --git a/administrator/components/com_associations/views/associations/view.html.php b/administrator/components/com_associations/views/associations/view.html.php new file mode 100644 index 0000000000000..08c81633701a9 --- /dev/null +++ b/administrator/components/com_associations/views/associations/view.html.php @@ -0,0 +1,232 @@ +state = $this->get('State'); + $this->filterForm = $this->get('FilterForm'); + $this->activeFilters = $this->get('ActiveFilters'); + + if (!JLanguageAssociations::isEnabled()) + { + JFactory::getApplication()->enqueueMessage(JText::_('COM_ASSOCIATIONS_ERROR_NO_ASSOC'), 'warning'); + } + elseif ($this->state->get('itemtype') == '' || $this->state->get('language') == '') + { + JFactory::getApplication()->enqueueMessage(JText::_('COM_ASSOCIATIONS_NOTICE_NO_SELECTORS'), 'notice'); + } + else + { + $type = null; + + list($extensionName, $typeName) = explode('.', $this->state->get('itemtype')); + + $extension = AssociationsHelper::getSupportedExtension($extensionName); + + $types = $extension->get('types'); + + if (array_key_exists($typeName, $types)) + { + $type = $types[$typeName]; + } + + $this->itemType = $type; + + if (is_null($type)) + { + JFactory::getApplication()->enqueueMessage(JText::_('COM_ASSOCIATIONS_ERROR_NO_TYPE'), 'warning'); + } + else + { + $this->extensionName = $extensionName; + $this->typeName = $typeName; + $this->typeSupports = array(); + $this->typeFields = array(); + + $details = $type->get('details'); + + if (array_key_exists('support', $details)) + { + $support = $details['support']; + $this->typeSupports = $support; + } + + if (array_key_exists('fields', $details)) + { + $fields = $details['fields']; + $this->typeFields = $fields; + } + + // Dynamic filter form. + // This selectors doesn't have to activate the filter bar. + unset($this->activeFilters['itemtype']); + unset($this->activeFilters['language']); + + // Remove filters options depending on selected type. + if (empty($support['state'])) + { + unset($this->activeFilters['state']); + $this->filterForm->removeField('state', 'filter'); + } + if ($type !== 'category') + { + unset($this->activeFilters['category_id']); + $this->filterForm->removeField('category_id', 'filter'); + } + if ($extensionName !== 'com_menus') + { + unset($this->activeFilters['menutype']); + $this->filterForm->removeField('menutype', 'filter'); + } + if (!in_array($extensionName, array('com_categories', 'com_menus'))) + { + unset($this->activeFilters['level']); + $this->filterForm->removeField('level', 'filter'); + } + if (empty($support['acl'])) + { + unset($this->activeFilters['access']); + $this->filterForm->removeField('access', 'filter'); + } + + // Add extension attribute to category filter. + if (empty($support['catid'])) + { + $this->filterForm->setFieldAttribute('category_id', 'extension', $extensionName, 'filter'); + } + + $this->items = $this->get('Items'); + $this->pagination = $this->get('Pagination'); + + $linkParameters = array( + 'layout' => 'edit', + 'itemtype' => $extensionName . '.' . $typeName, + 'task' => 'association.edit', + ); + + $this->editUri = 'index.php?option=com_associations&view=association&' . http_build_query($linkParameters); + } + } + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + throw new Exception(implode("\n", $errors), 500); + } + + $this->addToolbar(); + + // Will add sidebar if needed $this->sidebar = JHtmlSidebar::render(); + parent::display($tpl); + } + + /** + * Add the page title and toolbar. + * + * @return void + * + * @since __DEPLOY_VERSION__ + */ + protected function addToolbar() + { + $user = JFactory::getUser(); + + if (isset($this->typeName) && isset($this->extensionName)) + { + $helper = AssociationsHelper::getExtensionHelper($this->extensionName); + $title = $helper->getTypeTitle($this->typeName); + + $languageKey = strtoupper($this->extensionName . '_' . $title . 'S'); + + if ($this->typeName === 'category') + { + $languageKey = strtoupper($this->extensionName) . '_CATEGORIES'; + } + + JToolbarHelper::title( + JText::sprintf( + 'COM_ASSOCIATIONS_TITLE_LIST', JText::_($this->extensionName), JText::_($languageKey) + ), 'contract' + ); + } + else + { + JToolbarHelper::title(JText::_('COM_ASSOCIATIONS_TITLE_LIST_SELECT'), 'contract'); + } + + if ($user->authorise('core.admin', 'com_associations') || $user->authorise('core.options', 'com_associations')) + { + if (!isset($this->typeName)) + { + JToolbarHelper::custom('associations.purge', 'purge', 'purge', 'COM_ASSOCIATIONS_PURGE', false, false); + JToolbarHelper::custom('associations.clean', 'refresh', 'refresh', 'COM_ASSOCIATIONS_DELETE_ORPHANS', false, false); + } + JToolbarHelper::preferences('com_associations'); + } + + /* + * @todo Help page + */ + JToolbarHelper::help('JGLOBAL_HELP'); + } +} diff --git a/administrator/components/com_banners/banners.php b/administrator/components/com_banners/banners.php index 2db000db4c36f..f1afc76b48e61 100644 --- a/administrator/components/com_banners/banners.php +++ b/administrator/components/com_banners/banners.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/controller.php b/administrator/components/com_banners/controller.php index c64d7edb3aa96..1b0ade39020df 100644 --- a/administrator/components/com_banners/controller.php +++ b/administrator/components/com_banners/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/controllers/banner.php b/administrator/components/com_banners/controllers/banner.php index 62d35f146e099..170c03d201f37 100644 --- a/administrator/components/com_banners/controllers/banner.php +++ b/administrator/components/com_banners/controllers/banner.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/controllers/banners.php b/administrator/components/com_banners/controllers/banners.php index 7bb5318461c3d..59c3d33e38de0 100644 --- a/administrator/components/com_banners/controllers/banners.php +++ b/administrator/components/com_banners/controllers/banners.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/controllers/client.php b/administrator/components/com_banners/controllers/client.php index 1d8b0e5f5a8b1..3e5272e9b2d30 100644 --- a/administrator/components/com_banners/controllers/client.php +++ b/administrator/components/com_banners/controllers/client.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/controllers/clients.php b/administrator/components/com_banners/controllers/clients.php index b19d648421a10..9cae8d477439e 100644 --- a/administrator/components/com_banners/controllers/clients.php +++ b/administrator/components/com_banners/controllers/clients.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/controllers/tracks.php b/administrator/components/com_banners/controllers/tracks.php index aed491752bf46..d6fb9bc7b15cd 100644 --- a/administrator/components/com_banners/controllers/tracks.php +++ b/administrator/components/com_banners/controllers/tracks.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/controllers/tracks.raw.php b/administrator/components/com_banners/controllers/tracks.raw.php index d2fd8622ebbcc..9cedb621b0723 100644 --- a/administrator/components/com_banners/controllers/tracks.raw.php +++ b/administrator/components/com_banners/controllers/tracks.raw.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/helpers/banners.php b/administrator/components/com_banners/helpers/banners.php index ee8772470d162..b73dcfa3c50ff 100644 --- a/administrator/components/com_banners/helpers/banners.php +++ b/administrator/components/com_banners/helpers/banners.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/helpers/html/banner.php b/administrator/components/com_banners/helpers/html/banner.php index 717c6ed8835fb..cd22e593e87f6 100644 --- a/administrator/components/com_banners/helpers/html/banner.php +++ b/administrator/components/com_banners/helpers/html/banner.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/models/banner.php b/administrator/components/com_banners/models/banner.php index 866885bfafbc9..d764c462d57a6 100644 --- a/administrator/components/com_banners/models/banner.php +++ b/administrator/components/com_banners/models/banner.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/models/banners.php b/administrator/components/com_banners/models/banners.php index 52ecdd2a5d131..e2e9495da0b26 100644 --- a/administrator/components/com_banners/models/banners.php +++ b/administrator/components/com_banners/models/banners.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/models/client.php b/administrator/components/com_banners/models/client.php index 4cec12149b146..97c792d541248 100644 --- a/administrator/components/com_banners/models/client.php +++ b/administrator/components/com_banners/models/client.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/models/clients.php b/administrator/components/com_banners/models/clients.php index 81d483a8ca5dd..380c72b34dbb9 100644 --- a/administrator/components/com_banners/models/clients.php +++ b/administrator/components/com_banners/models/clients.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/models/download.php b/administrator/components/com_banners/models/download.php index f810cb098d535..c01de0b0e29f7 100644 --- a/administrator/components/com_banners/models/download.php +++ b/administrator/components/com_banners/models/download.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/models/fields/bannerclient.php b/administrator/components/com_banners/models/fields/bannerclient.php index b18df7fa68d94..01bfd40004bf9 100644 --- a/administrator/components/com_banners/models/fields/bannerclient.php +++ b/administrator/components/com_banners/models/fields/bannerclient.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/models/fields/clicks.php b/administrator/components/com_banners/models/fields/clicks.php index 3a6719e29bdb0..348e737abae33 100644 --- a/administrator/components/com_banners/models/fields/clicks.php +++ b/administrator/components/com_banners/models/fields/clicks.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/models/fields/impmade.php b/administrator/components/com_banners/models/fields/impmade.php index bec103c3d8844..1fdc7960e3958 100644 --- a/administrator/components/com_banners/models/fields/impmade.php +++ b/administrator/components/com_banners/models/fields/impmade.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/models/fields/imptotal.php b/administrator/components/com_banners/models/fields/imptotal.php index 287de900c4d82..d780a5973f5cc 100644 --- a/administrator/components/com_banners/models/fields/imptotal.php +++ b/administrator/components/com_banners/models/fields/imptotal.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/models/forms/banner.xml b/administrator/components/com_banners/models/forms/banner.xml index 9d51523200129..b1b0551b740e0 100644 --- a/administrator/components/com_banners/models/forms/banner.xml +++ b/administrator/components/com_banners/models/forms/banner.xml @@ -133,7 +133,8 @@ label="COM_BANNERS_FIELD_CREATED_LABEL" description="COM_BANNERS_FIELD_CREATED_DESC" size="22" - format="%Y-%m-%d %H:%M:%S" + translateformat="true" + showtime="true" filter="user_utc" /> @@ -160,7 +161,8 @@ class="readonly" size="22" readonly="true" - format="%Y-%m-%d %H:%M:%S" + translateformat="true" + showtime="true" filter="user_utc" /> @@ -190,7 +192,8 @@ type="calendar" label="COM_BANNERS_FIELD_PUBLISH_UP_LABEL" description="COM_BANNERS_FIELD_PUBLISH_UP_DESC" - format="%Y-%m-%d %H:%M:%S" + translateformat="true" + showtime="true" size="22" filter="user_utc" /> @@ -200,7 +203,8 @@ type="calendar" label="COM_BANNERS_FIELD_PUBLISH_DOWN_LABEL" description="COM_BANNERS_FIELD_PUBLISH_DOWN_DESC" - format="%Y-%m-%d %H:%M:%S" + translateformat="true" + showtime="true" size="22" filter="user_utc" /> diff --git a/administrator/components/com_banners/models/tracks.php b/administrator/components/com_banners/models/tracks.php index 70a251234d756..e7af9c2c18bc3 100644 --- a/administrator/components/com_banners/models/tracks.php +++ b/administrator/components/com_banners/models/tracks.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/tables/banner.php b/administrator/components/com_banners/tables/banner.php index dad1d16ae76d5..3bc75e59e20b8 100644 --- a/administrator/components/com_banners/tables/banner.php +++ b/administrator/components/com_banners/tables/banner.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/tables/client.php b/administrator/components/com_banners/tables/client.php index 998e63d87855d..fea12f8715da8 100644 --- a/administrator/components/com_banners/tables/client.php +++ b/administrator/components/com_banners/tables/client.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/views/banner/tmpl/edit.php b/administrator/components/com_banners/views/banner/tmpl/edit.php index cce02b41372b0..e78de7fea63f8 100644 --- a/administrator/components/com_banners/views/banner/tmpl/edit.php +++ b/administrator/components/com_banners/views/banner/tmpl/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/views/banner/view.html.php b/administrator/components/com_banners/views/banner/view.html.php index 0c33322a0074d..534bed0c3f001 100644 --- a/administrator/components/com_banners/views/banner/view.html.php +++ b/administrator/components/com_banners/views/banner/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/views/banners/tmpl/default.php b/administrator/components/com_banners/views/banners/tmpl/default.php index 8c7d83ec59194..f0fe7b17fd58a 100644 --- a/administrator/components/com_banners/views/banners/tmpl/default.php +++ b/administrator/components/com_banners/views/banners/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/views/banners/tmpl/default_batch_body.php b/administrator/components/com_banners/views/banners/tmpl/default_batch_body.php index cb3564b125479..c9b5127e1f43d 100644 --- a/administrator/components/com_banners/views/banners/tmpl/default_batch_body.php +++ b/administrator/components/com_banners/views/banners/tmpl/default_batch_body.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/views/banners/tmpl/default_batch_footer.php b/administrator/components/com_banners/views/banners/tmpl/default_batch_footer.php index 07f8ab81def67..a321f809f6395 100644 --- a/administrator/components/com_banners/views/banners/tmpl/default_batch_footer.php +++ b/administrator/components/com_banners/views/banners/tmpl/default_batch_footer.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/views/banners/view.html.php b/administrator/components/com_banners/views/banners/view.html.php index 7dceb56355d30..d954cff9ccb0e 100644 --- a/administrator/components/com_banners/views/banners/view.html.php +++ b/administrator/components/com_banners/views/banners/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/views/client/tmpl/edit.php b/administrator/components/com_banners/views/client/tmpl/edit.php index e66b4436893d1..7aec5da2e5b8d 100644 --- a/administrator/components/com_banners/views/client/tmpl/edit.php +++ b/administrator/components/com_banners/views/client/tmpl/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/views/client/view.html.php b/administrator/components/com_banners/views/client/view.html.php index 01ee19da0d442..cf176e6cb1aa4 100644 --- a/administrator/components/com_banners/views/client/view.html.php +++ b/administrator/components/com_banners/views/client/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/views/clients/tmpl/default.php b/administrator/components/com_banners/views/clients/tmpl/default.php index 9e903a9e945f6..d1cb100550033 100644 --- a/administrator/components/com_banners/views/clients/tmpl/default.php +++ b/administrator/components/com_banners/views/clients/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/views/clients/view.html.php b/administrator/components/com_banners/views/clients/view.html.php index 5bde6f4d9bd5f..efdc218fc5df4 100644 --- a/administrator/components/com_banners/views/clients/view.html.php +++ b/administrator/components/com_banners/views/clients/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/views/download/tmpl/default.php b/administrator/components/com_banners/views/download/tmpl/default.php index 5cd07fb739a35..90f43945fc5a1 100644 --- a/administrator/components/com_banners/views/download/tmpl/default.php +++ b/administrator/components/com_banners/views/download/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/views/download/view.html.php b/administrator/components/com_banners/views/download/view.html.php index 407370c0d524e..a4b0a4243a313 100644 --- a/administrator/components/com_banners/views/download/view.html.php +++ b/administrator/components/com_banners/views/download/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/views/tracks/tmpl/default.php b/administrator/components/com_banners/views/tracks/tmpl/default.php index db1b271d603e4..ef99d78bb6b09 100644 --- a/administrator/components/com_banners/views/tracks/tmpl/default.php +++ b/administrator/components/com_banners/views/tracks/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/views/tracks/view.html.php b/administrator/components/com_banners/views/tracks/view.html.php index 07a1faf41271b..413175de35def 100644 --- a/administrator/components/com_banners/views/tracks/view.html.php +++ b/administrator/components/com_banners/views/tracks/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/views/tracks/view.raw.php b/administrator/components/com_banners/views/tracks/view.raw.php index a05bebeded6b0..918fca9583554 100644 --- a/administrator/components/com_banners/views/tracks/view.raw.php +++ b/administrator/components/com_banners/views/tracks/view.raw.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_cache/cache.php b/administrator/components/com_cache/cache.php index f42244702f049..b78b099d45938 100644 --- a/administrator/components/com_cache/cache.php +++ b/administrator/components/com_cache/cache.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_cache * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_cache/controller.php b/administrator/components/com_cache/controller.php index 88d2f30e51ec9..84c47023b77a7 100644 --- a/administrator/components/com_cache/controller.php +++ b/administrator/components/com_cache/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_cache * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_cache/helpers/cache.php b/administrator/components/com_cache/helpers/cache.php index 9b9e61e307d93..f4e1c6c2b262b 100644 --- a/administrator/components/com_cache/helpers/cache.php +++ b/administrator/components/com_cache/helpers/cache.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_cache * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_cache/models/cache.php b/administrator/components/com_cache/models/cache.php index a21d33c65e425..5b5b3c627d84d 100644 --- a/administrator/components/com_cache/models/cache.php +++ b/administrator/components/com_cache/models/cache.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_cache * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_cache/views/cache/tmpl/default.php b/administrator/components/com_cache/views/cache/tmpl/default.php index d29f16776caed..d18b1c5be061c 100644 --- a/administrator/components/com_cache/views/cache/tmpl/default.php +++ b/administrator/components/com_cache/views/cache/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_cache * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_cache/views/cache/tmpl/default.xml b/administrator/components/com_cache/views/cache/tmpl/default.xml new file mode 100755 index 0000000000000..82466a2128618 --- /dev/null +++ b/administrator/components/com_cache/views/cache/tmpl/default.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/administrator/components/com_cache/views/cache/view.html.php b/administrator/components/com_cache/views/cache/view.html.php index 2239069e1872e..35e56171b5751 100644 --- a/administrator/components/com_cache/views/cache/view.html.php +++ b/administrator/components/com_cache/views/cache/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_cache * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_cache/views/purge/tmpl/default.php b/administrator/components/com_cache/views/purge/tmpl/default.php index 966757dc761ec..caaaa68e6684b 100644 --- a/administrator/components/com_cache/views/purge/tmpl/default.php +++ b/administrator/components/com_cache/views/purge/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_cache * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_cache/views/purge/tmpl/default.xml b/administrator/components/com_cache/views/purge/tmpl/default.xml new file mode 100755 index 0000000000000..98fcff1baed46 --- /dev/null +++ b/administrator/components/com_cache/views/purge/tmpl/default.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/administrator/components/com_cache/views/purge/view.html.php b/administrator/components/com_cache/views/purge/view.html.php index 2075833e91dd7..1e3736bf2b3b4 100644 --- a/administrator/components/com_cache/views/purge/view.html.php +++ b/administrator/components/com_cache/views/purge/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_cache * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_categories/categories.php b/administrator/components/com_categories/categories.php index b06ab6761a19b..4921a02e369dd 100644 --- a/administrator/components/com_categories/categories.php +++ b/administrator/components/com_categories/categories.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_categories/controller.php b/administrator/components/com_categories/controller.php index 93468f2cd0293..1cedd1c69f456 100644 --- a/administrator/components/com_categories/controller.php +++ b/administrator/components/com_categories/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_categories/controllers/categories.php b/administrator/components/com_categories/controllers/categories.php index 354b68857c193..eeabedfeb979e 100644 --- a/administrator/components/com_categories/controllers/categories.php +++ b/administrator/components/com_categories/controllers/categories.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_categories/controllers/category.php b/administrator/components/com_categories/controllers/category.php index 3837e1d867743..79fecc0742acd 100644 --- a/administrator/components/com_categories/controllers/category.php +++ b/administrator/components/com_categories/controllers/category.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_categories/helpers/association.php b/administrator/components/com_categories/helpers/association.php index cffde3e44ec5c..ddda743cd1a95 100644 --- a/administrator/components/com_categories/helpers/association.php +++ b/administrator/components/com_categories/helpers/association.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_categories/helpers/categories.php b/administrator/components/com_categories/helpers/categories.php index bb6b41a6d397c..2ab017bda8236 100644 --- a/administrator/components/com_categories/helpers/categories.php +++ b/administrator/components/com_categories/helpers/categories.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_categories/helpers/html/categoriesadministrator.php b/administrator/components/com_categories/helpers/html/categoriesadministrator.php index 4d19d46cce04b..049bb65fb82b0 100644 --- a/administrator/components/com_categories/helpers/html/categoriesadministrator.php +++ b/administrator/components/com_categories/helpers/html/categoriesadministrator.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_categories/models/categories.php b/administrator/components/com_categories/models/categories.php index c2cfc858901df..061603e82d62d 100644 --- a/administrator/components/com_categories/models/categories.php +++ b/administrator/components/com_categories/models/categories.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_categories/models/category.php b/administrator/components/com_categories/models/category.php index ac20b7c1cee5e..10605fdc6354c 100644 --- a/administrator/components/com_categories/models/category.php +++ b/administrator/components/com_categories/models/category.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_categories/models/fields/categoryedit.php b/administrator/components/com_categories/models/fields/categoryedit.php index 293c5cb04a3fb..a5fa50bd78f0f 100644 --- a/administrator/components/com_categories/models/fields/categoryedit.php +++ b/administrator/components/com_categories/models/fields/categoryedit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_categories/models/fields/categoryparent.php b/administrator/components/com_categories/models/fields/categoryparent.php index bbb4954f7e81a..0f1faac507f49 100644 --- a/administrator/components/com_categories/models/fields/categoryparent.php +++ b/administrator/components/com_categories/models/fields/categoryparent.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_categories/models/fields/modal/category.php b/administrator/components/com_categories/models/fields/modal/category.php index d625e88e0116b..5dcca6bc875f8 100644 --- a/administrator/components/com_categories/models/fields/modal/category.php +++ b/administrator/components/com_categories/models/fields/modal/category.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_categories/tables/category.php b/administrator/components/com_categories/tables/category.php index fdb16cd066d40..066540fcf078d 100644 --- a/administrator/components/com_categories/tables/category.php +++ b/administrator/components/com_categories/tables/category.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_categories/views/categories/tmpl/default.php b/administrator/components/com_categories/views/categories/tmpl/default.php index ceae0d7765d9c..f663a54d96147 100644 --- a/administrator/components/com_categories/views/categories/tmpl/default.php +++ b/administrator/components/com_categories/views/categories/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_categories/views/categories/tmpl/default.xml b/administrator/components/com_categories/views/categories/tmpl/default.xml new file mode 100755 index 0000000000000..d1eadb14baa6d --- /dev/null +++ b/administrator/components/com_categories/views/categories/tmpl/default.xml @@ -0,0 +1,19 @@ + + + + + + + +
+ + + +
+ diff --git a/administrator/components/com_categories/views/categories/tmpl/default_batch_body.php b/administrator/components/com_categories/views/categories/tmpl/default_batch_body.php index 3fb68af08f373..1096f3b0cad69 100644 --- a/administrator/components/com_categories/views/categories/tmpl/default_batch_body.php +++ b/administrator/components/com_categories/views/categories/tmpl/default_batch_body.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_categories/views/categories/tmpl/default_batch_footer.php b/administrator/components/com_categories/views/categories/tmpl/default_batch_footer.php index 2b4732310913e..3fb1e571a8478 100644 --- a/administrator/components/com_categories/views/categories/tmpl/default_batch_footer.php +++ b/administrator/components/com_categories/views/categories/tmpl/default_batch_footer.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_categories/views/categories/tmpl/modal.php b/administrator/components/com_categories/views/categories/tmpl/modal.php index 7d3cbde5fb44b..ccd3539d3528f 100644 --- a/administrator/components/com_categories/views/categories/tmpl/modal.php +++ b/administrator/components/com_categories/views/categories/tmpl/modal.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_categories/views/categories/view.html.php b/administrator/components/com_categories/views/categories/view.html.php index 6b2c516fa8de1..f60d332b7af9d 100644 --- a/administrator/components/com_categories/views/categories/view.html.php +++ b/administrator/components/com_categories/views/categories/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_categories/views/category/tmpl/edit.php b/administrator/components/com_categories/views/category/tmpl/edit.php index 8e2ac4bc7b513..ad2878832d421 100644 --- a/administrator/components/com_categories/views/category/tmpl/edit.php +++ b/administrator/components/com_categories/views/category/tmpl/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_categories/views/category/tmpl/edit.xml b/administrator/components/com_categories/views/category/tmpl/edit.xml new file mode 100755 index 0000000000000..3bdf3cee46f20 --- /dev/null +++ b/administrator/components/com_categories/views/category/tmpl/edit.xml @@ -0,0 +1,24 @@ + + + + + + + +
+ + + + +
+ diff --git a/administrator/components/com_categories/views/category/tmpl/edit_associations.php b/administrator/components/com_categories/views/category/tmpl/edit_associations.php index b8751b02e7143..54f4fb1d3791a 100644 --- a/administrator/components/com_categories/views/category/tmpl/edit_associations.php +++ b/administrator/components/com_categories/views/category/tmpl/edit_associations.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_categories/views/category/tmpl/edit_metadata.php b/administrator/components/com_categories/views/category/tmpl/edit_metadata.php index 9b229292958cc..b5a7e8d257264 100644 --- a/administrator/components/com_categories/views/category/tmpl/edit_metadata.php +++ b/administrator/components/com_categories/views/category/tmpl/edit_metadata.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_categories/views/category/tmpl/modal.php b/administrator/components/com_categories/views/category/tmpl/modal.php index b6e6708ef2072..685c65d39fa6e 100644 --- a/administrator/components/com_categories/views/category/tmpl/modal.php +++ b/administrator/components/com_categories/views/category/tmpl/modal.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_categories/views/category/tmpl/modal_associations.php b/administrator/components/com_categories/views/category/tmpl/modal_associations.php index b8751b02e7143..54f4fb1d3791a 100644 --- a/administrator/components/com_categories/views/category/tmpl/modal_associations.php +++ b/administrator/components/com_categories/views/category/tmpl/modal_associations.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_categories/views/category/tmpl/modal_extrafields.php b/administrator/components/com_categories/views/category/tmpl/modal_extrafields.php index bb2b8dfd6d714..a1e64b1bae479 100644 --- a/administrator/components/com_categories/views/category/tmpl/modal_extrafields.php +++ b/administrator/components/com_categories/views/category/tmpl/modal_extrafields.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_categories/views/category/tmpl/modal_metadata.php b/administrator/components/com_categories/views/category/tmpl/modal_metadata.php index 9b229292958cc..b5a7e8d257264 100644 --- a/administrator/components/com_categories/views/category/tmpl/modal_metadata.php +++ b/administrator/components/com_categories/views/category/tmpl/modal_metadata.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_categories/views/category/tmpl/modal_options.php b/administrator/components/com_categories/views/category/tmpl/modal_options.php index 8d37aeb613cad..cfb84b04f1fcf 100644 --- a/administrator/components/com_categories/views/category/tmpl/modal_options.php +++ b/administrator/components/com_categories/views/category/tmpl/modal_options.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_categories/views/category/view.html.php b/administrator/components/com_categories/views/category/view.html.php index d1a76b9d0419c..90fe717bcff57 100644 --- a/administrator/components/com_categories/views/category/view.html.php +++ b/administrator/components/com_categories/views/category/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_checkin/checkin.php b/administrator/components/com_checkin/checkin.php index 9f7d1f7417495..f0f4a61bc1567 100644 --- a/administrator/components/com_checkin/checkin.php +++ b/administrator/components/com_checkin/checkin.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_checkin * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_checkin/controller.php b/administrator/components/com_checkin/controller.php index 10c98ab196783..a932caaf8e8e8 100644 --- a/administrator/components/com_checkin/controller.php +++ b/administrator/components/com_checkin/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_checkin * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_checkin/models/checkin.php b/administrator/components/com_checkin/models/checkin.php index 0237590168d3e..a1e30fee3980b 100644 --- a/administrator/components/com_checkin/models/checkin.php +++ b/administrator/components/com_checkin/models/checkin.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_checkin * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_checkin/views/checkin/tmpl/default.php b/administrator/components/com_checkin/views/checkin/tmpl/default.php index 7660443a45219..a69f006c2e4f8 100644 --- a/administrator/components/com_checkin/views/checkin/tmpl/default.php +++ b/administrator/components/com_checkin/views/checkin/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_checkin * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_checkin/views/checkin/tmpl/default.xml b/administrator/components/com_checkin/views/checkin/tmpl/default.xml new file mode 100755 index 0000000000000..e0086bef3983c --- /dev/null +++ b/administrator/components/com_checkin/views/checkin/tmpl/default.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/administrator/components/com_checkin/views/checkin/view.html.php b/administrator/components/com_checkin/views/checkin/view.html.php index 0aea322ec49b5..4594dbd113411 100644 --- a/administrator/components/com_checkin/views/checkin/view.html.php +++ b/administrator/components/com_checkin/views/checkin/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_checkin * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/config.php b/administrator/components/com_config/config.php index 49802926eb3a4..8b53654a73aee 100644 --- a/administrator/components/com_config/config.php +++ b/administrator/components/com_config/config.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/controller.php b/administrator/components/com_config/controller.php index b5a95534648ed..b291db0075920 100644 --- a/administrator/components/com_config/controller.php +++ b/administrator/components/com_config/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/controller/application/cancel.php b/administrator/components/com_config/controller/application/cancel.php index 25cd0a63354af..217eef0c04cb8 100644 --- a/administrator/components/com_config/controller/application/cancel.php +++ b/administrator/components/com_config/controller/application/cancel.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/controller/application/display.php b/administrator/components/com_config/controller/application/display.php index 1ead622341215..c4a6b5b9774fc 100644 --- a/administrator/components/com_config/controller/application/display.php +++ b/administrator/components/com_config/controller/application/display.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/controller/application/removeroot.php b/administrator/components/com_config/controller/application/removeroot.php index 4ee0281443d79..98806f6d60f6f 100644 --- a/administrator/components/com_config/controller/application/removeroot.php +++ b/administrator/components/com_config/controller/application/removeroot.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_config/controller/application/save.php b/administrator/components/com_config/controller/application/save.php index a2e3ced9f61eb..675a603ae79e6 100644 --- a/administrator/components/com_config/controller/application/save.php +++ b/administrator/components/com_config/controller/application/save.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_config/controller/application/sendtestmail.php b/administrator/components/com_config/controller/application/sendtestmail.php index 56070cc987955..b4636df201912 100644 --- a/administrator/components/com_config/controller/application/sendtestmail.php +++ b/administrator/components/com_config/controller/application/sendtestmail.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_config/controller/application/store.php b/administrator/components/com_config/controller/application/store.php index 42b653695c6a8..ef588f3ebc8fc 100644 --- a/administrator/components/com_config/controller/application/store.php +++ b/administrator/components/com_config/controller/application/store.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_config/controller/component/cancel.php b/administrator/components/com_config/controller/component/cancel.php index d2260df7dfe50..ec42372327829 100644 --- a/administrator/components/com_config/controller/component/cancel.php +++ b/administrator/components/com_config/controller/component/cancel.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/controller/component/display.php b/administrator/components/com_config/controller/component/display.php index da82f6cb0bf79..c0d7aed521f19 100644 --- a/administrator/components/com_config/controller/component/display.php +++ b/administrator/components/com_config/controller/component/display.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/controller/component/save.php b/administrator/components/com_config/controller/component/save.php index 4abc6c1c2cd63..f5dd80b954ae5 100644 --- a/administrator/components/com_config/controller/component/save.php +++ b/administrator/components/com_config/controller/component/save.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/controllers/application.php b/administrator/components/com_config/controllers/application.php index f51de6fcd8b2c..a569b3900ceb7 100644 --- a/administrator/components/com_config/controllers/application.php +++ b/administrator/components/com_config/controllers/application.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/controllers/component.php b/administrator/components/com_config/controllers/component.php index 76b711c5fbb5a..fe095dda70bb6 100644 --- a/administrator/components/com_config/controllers/component.php +++ b/administrator/components/com_config/controllers/component.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/helper/config.php b/administrator/components/com_config/helper/config.php index 7d6c74eccec29..50b9e1f7838c2 100644 --- a/administrator/components/com_config/helper/config.php +++ b/administrator/components/com_config/helper/config.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/model/application.php b/administrator/components/com_config/model/application.php index ef94a83ef47a0..fdbec42865259 100644 --- a/administrator/components/com_config/model/application.php +++ b/administrator/components/com_config/model/application.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/model/component.php b/administrator/components/com_config/model/component.php index e38aaa06dfb3a..120533f97735b 100644 --- a/administrator/components/com_config/model/component.php +++ b/administrator/components/com_config/model/component.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/model/field/filters.php b/administrator/components/com_config/model/field/filters.php index b11e9ad95ac46..897145d7411b0 100644 --- a/administrator/components/com_config/model/field/filters.php +++ b/administrator/components/com_config/model/field/filters.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/models/application.php b/administrator/components/com_config/models/application.php index 6f6d2fb8f4e5c..ac90cb74caad7 100644 --- a/administrator/components/com_config/models/application.php +++ b/administrator/components/com_config/models/application.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/models/component.php b/administrator/components/com_config/models/component.php index c5e280bf0aa02..471baf4cfed8f 100644 --- a/administrator/components/com_config/models/component.php +++ b/administrator/components/com_config/models/component.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/view/application/html.php b/administrator/components/com_config/view/application/html.php index d864bd9faa433..f9dc43ba62a3c 100644 --- a/administrator/components/com_config/view/application/html.php +++ b/administrator/components/com_config/view/application/html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/view/application/json.php b/administrator/components/com_config/view/application/json.php index c113e6dd34638..9e4b212957a89 100644 --- a/administrator/components/com_config/view/application/json.php +++ b/administrator/components/com_config/view/application/json.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/view/application/tmpl/default.php b/administrator/components/com_config/view/application/tmpl/default.php index 8fc845a3d4da3..0fbfa4390daa1 100644 --- a/administrator/components/com_config/view/application/tmpl/default.php +++ b/administrator/components/com_config/view/application/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/view/application/tmpl/default.xml b/administrator/components/com_config/view/application/tmpl/default.xml new file mode 100755 index 0000000000000..2cd0ed3287f1b --- /dev/null +++ b/administrator/components/com_config/view/application/tmpl/default.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/administrator/components/com_config/view/application/tmpl/default_cache.php b/administrator/components/com_config/view/application/tmpl/default_cache.php index c7efa368a3a08..801303c25b1a4 100644 --- a/administrator/components/com_config/view/application/tmpl/default_cache.php +++ b/administrator/components/com_config/view/application/tmpl/default_cache.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/view/application/tmpl/default_cookie.php b/administrator/components/com_config/view/application/tmpl/default_cookie.php index 4415f6ba39558..1a12b54946010 100644 --- a/administrator/components/com_config/view/application/tmpl/default_cookie.php +++ b/administrator/components/com_config/view/application/tmpl/default_cookie.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/view/application/tmpl/default_database.php b/administrator/components/com_config/view/application/tmpl/default_database.php index 677fe190478e9..9361dea9bf596 100644 --- a/administrator/components/com_config/view/application/tmpl/default_database.php +++ b/administrator/components/com_config/view/application/tmpl/default_database.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/view/application/tmpl/default_debug.php b/administrator/components/com_config/view/application/tmpl/default_debug.php index c60b92fc58679..d6a72c9578e62 100644 --- a/administrator/components/com_config/view/application/tmpl/default_debug.php +++ b/administrator/components/com_config/view/application/tmpl/default_debug.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/view/application/tmpl/default_filters.php b/administrator/components/com_config/view/application/tmpl/default_filters.php index dc1efa587ee65..f6126af0ecc3f 100644 --- a/administrator/components/com_config/view/application/tmpl/default_filters.php +++ b/administrator/components/com_config/view/application/tmpl/default_filters.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/view/application/tmpl/default_ftp.php b/administrator/components/com_config/view/application/tmpl/default_ftp.php index bf3305073dc8f..a0fffe48ecc0e 100644 --- a/administrator/components/com_config/view/application/tmpl/default_ftp.php +++ b/administrator/components/com_config/view/application/tmpl/default_ftp.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/view/application/tmpl/default_ftplogin.php b/administrator/components/com_config/view/application/tmpl/default_ftplogin.php index c10586c234035..864ce4bb53090 100644 --- a/administrator/components/com_config/view/application/tmpl/default_ftplogin.php +++ b/administrator/components/com_config/view/application/tmpl/default_ftplogin.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/view/application/tmpl/default_locale.php b/administrator/components/com_config/view/application/tmpl/default_locale.php index fe4efb5439a5d..1774bb3828194 100644 --- a/administrator/components/com_config/view/application/tmpl/default_locale.php +++ b/administrator/components/com_config/view/application/tmpl/default_locale.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/view/application/tmpl/default_mail.php b/administrator/components/com_config/view/application/tmpl/default_mail.php index d458d430e37cb..a4faab3145e6f 100644 --- a/administrator/components/com_config/view/application/tmpl/default_mail.php +++ b/administrator/components/com_config/view/application/tmpl/default_mail.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/view/application/tmpl/default_metadata.php b/administrator/components/com_config/view/application/tmpl/default_metadata.php index f8f8b57faa234..3a55cf5d20c02 100644 --- a/administrator/components/com_config/view/application/tmpl/default_metadata.php +++ b/administrator/components/com_config/view/application/tmpl/default_metadata.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/view/application/tmpl/default_navigation.php b/administrator/components/com_config/view/application/tmpl/default_navigation.php index 0f93b6d8334d8..3d4fccee52bb1 100644 --- a/administrator/components/com_config/view/application/tmpl/default_navigation.php +++ b/administrator/components/com_config/view/application/tmpl/default_navigation.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/view/application/tmpl/default_permissions.php b/administrator/components/com_config/view/application/tmpl/default_permissions.php index 56f0f6b70d9cf..72f4128d70b0b 100644 --- a/administrator/components/com_config/view/application/tmpl/default_permissions.php +++ b/administrator/components/com_config/view/application/tmpl/default_permissions.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/view/application/tmpl/default_proxy.php b/administrator/components/com_config/view/application/tmpl/default_proxy.php index 2c9a68033852a..528025e522c76 100644 --- a/administrator/components/com_config/view/application/tmpl/default_proxy.php +++ b/administrator/components/com_config/view/application/tmpl/default_proxy.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/view/application/tmpl/default_seo.php b/administrator/components/com_config/view/application/tmpl/default_seo.php index a8137eac54253..7a65e47626868 100644 --- a/administrator/components/com_config/view/application/tmpl/default_seo.php +++ b/administrator/components/com_config/view/application/tmpl/default_seo.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/view/application/tmpl/default_server.php b/administrator/components/com_config/view/application/tmpl/default_server.php index 21d7bdb873a06..1fab0987b7a0e 100644 --- a/administrator/components/com_config/view/application/tmpl/default_server.php +++ b/administrator/components/com_config/view/application/tmpl/default_server.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/view/application/tmpl/default_session.php b/administrator/components/com_config/view/application/tmpl/default_session.php index fae4c6c12c294..c34c46f51138b 100644 --- a/administrator/components/com_config/view/application/tmpl/default_session.php +++ b/administrator/components/com_config/view/application/tmpl/default_session.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/view/application/tmpl/default_site.php b/administrator/components/com_config/view/application/tmpl/default_site.php index 585556df82b48..5cd4d6cfbc01d 100644 --- a/administrator/components/com_config/view/application/tmpl/default_site.php +++ b/administrator/components/com_config/view/application/tmpl/default_site.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/view/application/tmpl/default_system.php b/administrator/components/com_config/view/application/tmpl/default_system.php index 05601f1f54604..91cc59ded441f 100644 --- a/administrator/components/com_config/view/application/tmpl/default_system.php +++ b/administrator/components/com_config/view/application/tmpl/default_system.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/view/component/html.php b/administrator/components/com_config/view/component/html.php index 8d4862f05395d..8e1b094c9ffd3 100644 --- a/administrator/components/com_config/view/component/html.php +++ b/administrator/components/com_config/view/component/html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/view/component/tmpl/default.php b/administrator/components/com_config/view/component/tmpl/default.php index 62035c994bd8b..7aa4de4244dfb 100644 --- a/administrator/components/com_config/view/component/tmpl/default.php +++ b/administrator/components/com_config/view/component/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -60,7 +60,7 @@ showon)) : ?> 'auto', 'relative' => true)); ?> - formControl, $fieldSet->showon)) . '\''; ?> + showon, $this->formControl)) . '\''; ?> label) ? 'COM_CONFIG_' . $name . '_FIELDSET_LABEL' : $fieldSet->label; ?>
  • >
    • @@ -80,7 +80,7 @@ showon) : ?> 'auto', 'relative' => true)); ?> - formControl, $field->showon)) . '\''; ?> + showon, $field->formControl, $field->group)) . '\''; ?> hidden) : ?> input; ?> diff --git a/administrator/components/com_config/view/component/tmpl/default.xml b/administrator/components/com_config/view/component/tmpl/default.xml new file mode 100755 index 0000000000000..2ddf42d8b8967 --- /dev/null +++ b/administrator/components/com_config/view/component/tmpl/default.xml @@ -0,0 +1,19 @@ + + + + + + + + +
    + +
    +     +     diff --git a/administrator/components/com_config/view/component/tmpl/default_navigation.php b/administrator/components/com_config/view/component/tmpl/default_navigation.php index 12ac1d93992b0..96aab12207dd5 100644 --- a/administrator/components/com_config/view/component/tmpl/default_navigation.php +++ b/administrator/components/com_config/view/component/tmpl/default_navigation.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contact/contact.php b/administrator/components/com_contact/contact.php index 0085da569d117..409cb879759b4 100644 --- a/administrator/components/com_contact/contact.php +++ b/administrator/components/com_contact/contact.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contact/controller.php b/administrator/components/com_contact/controller.php index f95496c9033fb..cb71019a3dee0 100644 --- a/administrator/components/com_contact/controller.php +++ b/administrator/components/com_contact/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contact/controllers/contact.php b/administrator/components/com_contact/controllers/contact.php index f8a11cf83b466..088f51b5b4958 100644 --- a/administrator/components/com_contact/controllers/contact.php +++ b/administrator/components/com_contact/controllers/contact.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contact/controllers/contacts.php b/administrator/components/com_contact/controllers/contacts.php index 3614051442973..4f0458f5a77c6 100644 --- a/administrator/components/com_contact/controllers/contacts.php +++ b/administrator/components/com_contact/controllers/contacts.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contact/helpers/associations.php b/administrator/components/com_contact/helpers/associations.php new file mode 100644 index 0000000000000..ec28ad98ca6d4 --- /dev/null +++ b/administrator/components/com_contact/helpers/associations.php @@ -0,0 +1,191 @@ +getType($typeName); + + $context = $this->extension . '.item'; + $catidField = 'catid'; + + if ($typeName === 'category') + { + $context = 'com_categories.item'; + $catidField = ''; + } + + // Get the associations. + $associations = JLanguageAssociations::getAssociations( + $this->extension, + $type['tables']['a'], + $context, + $id, + 'id', + 'alias', + $catidField + ); + + return $associations; + } + + /** + * Get item information + * + * @param string $typeName The item type + * @param int $id The id of item for which we need the associated items + * + * @return JTable|null + * + * @since __DEPLOY_VERSION__ + */ + public function getItem($typeName, $id) + { + if (empty($id)) + { + return null; + } + + $table = null; + + switch ($typeName) + { + case 'contact': + $table = JTable::getInstance('Contact', 'ContactTable'); + break; + + case 'category': + $table = JTable::getInstance('Category'); + break; + } + + if (empty($table)) + { + return null; + } + + $table->load($id); + + return $table; + } + + /** + * Get information about the type + * + * @param string $typeName The item type + * + * @return array Array of item types + * + * @since __DEPLOY_VERSION__ + */ + public function getType($typeName = '') + { + $fields = $this->getFieldsTemplate(); + $tables = array(); + $joins = array(); + $support = $this->getSupportTemplate(); + $title = ''; + + if (in_array($typeName, $this->itemTypes)) + { + switch ($typeName) + { + case 'contact': + $fields['title'] = 'a.name'; + $fields['state'] = 'a.published'; + + $support['state'] = true; + $support['acl'] = true; + $support['checkout'] = true; + + $tables = array( + 'a' => '#__contact_details' + ); + + $title = 'contact'; + break; + + case 'category': + $fields['created_user_id'] = 'a.created_user_id'; + $fields['ordering'] = 'a.lft'; + $fields['level'] = 'a.level'; + $fields['catid'] = ''; + $fields['state'] = 'a.published'; + + $support['state'] = true; + $support['acl'] = true; + $support['checkout'] = true; + + $tables = array( + 'a' => '#__categories' + ); + + $title = 'category'; + break; + } + } + + return array( + 'fields' => $fields, + 'support' => $support, + 'tables' => $tables, + 'joins' => $joins, + 'title' => $title + ); + } +} diff --git a/administrator/components/com_contact/helpers/contact.php b/administrator/components/com_contact/helpers/contact.php index 8a3ed495e56d5..eeb3cac781083 100644 --- a/administrator/components/com_contact/helpers/contact.php +++ b/administrator/components/com_contact/helpers/contact.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contact/helpers/html/contact.php b/administrator/components/com_contact/helpers/html/contact.php index 7e206075f2ed9..f2448c1bcd6c8 100644 --- a/administrator/components/com_contact/helpers/html/contact.php +++ b/administrator/components/com_contact/helpers/html/contact.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contact/models/contact.php b/administrator/components/com_contact/models/contact.php index 7af8644a19c8d..c6881272e9f88 100644 --- a/administrator/components/com_contact/models/contact.php +++ b/administrator/components/com_contact/models/contact.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contact/models/contacts.php b/administrator/components/com_contact/models/contacts.php index c981cb8901d98..4604a36f46674 100644 --- a/administrator/components/com_contact/models/contacts.php +++ b/administrator/components/com_contact/models/contacts.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contact/models/fields/modal/contact.php b/administrator/components/com_contact/models/fields/modal/contact.php index 9a27c0606c29e..0546122cc982a 100644 --- a/administrator/components/com_contact/models/fields/modal/contact.php +++ b/administrator/components/com_contact/models/fields/modal/contact.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contact/models/forms/contact.xml b/administrator/components/com_contact/models/forms/contact.xml index f762d968f1ab0..6307fc1ee9882 100644 --- a/administrator/components/com_contact/models/forms/contact.xml +++ b/administrator/components/com_contact/models/forms/contact.xml @@ -117,7 +117,8 @@ label="COM_CONTACT_FIELD_CREATED_LABEL" description="COM_CONTACT_FIELD_CREATED_DESC" size="22" - format="%Y-%m-%d %H:%M:%S" + translateformat="true" + showtime="true" filter="user_utc" /> @@ -129,7 +130,8 @@ class="readonly" size="22" readonly="true" - format="%Y-%m-%d %H:%M:%S" + translateformat="true" + showtime="true" filter="user_utc" /> @@ -168,7 +170,9 @@ type="calendar" label="COM_CONTACT_FIELD_PUBLISH_UP_LABEL" description="COM_CONTACT_FIELD_PUBLISH_UP_DESC" - format="%Y-%m-%d %H:%M:%S" size="22" + translateformat="true" + showtime="true" + size="22" filter="user_utc" /> @@ -177,7 +181,9 @@ type="calendar" label="COM_CONTACT_FIELD_PUBLISH_DOWN_LABEL" description="COM_CONTACT_FIELD_PUBLISH_DOWN_DESC" - format="%Y-%m-%d %H:%M:%S" size="22" + translateformat="true" + showtime="true" + size="22" filter="user_utc" /> diff --git a/administrator/components/com_contact/models/forms/filter_contacts.xml b/administrator/components/com_contact/models/forms/filter_contacts.xml old mode 100755 new mode 100644 diff --git a/administrator/components/com_contact/tables/contact.php b/administrator/components/com_contact/tables/contact.php index 196a5901e699d..556baa184e63a 100644 --- a/administrator/components/com_contact/tables/contact.php +++ b/administrator/components/com_contact/tables/contact.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contact/views/contact/tmpl/edit.php b/administrator/components/com_contact/views/contact/tmpl/edit.php index 2f5eec59c586d..1d177c349b584 100644 --- a/administrator/components/com_contact/views/contact/tmpl/edit.php +++ b/administrator/components/com_contact/views/contact/tmpl/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contact/views/contact/tmpl/edit_associations.php b/administrator/components/com_contact/views/contact/tmpl/edit_associations.php index a01793eee3932..152abcd82c017 100644 --- a/administrator/components/com_contact/views/contact/tmpl/edit_associations.php +++ b/administrator/components/com_contact/views/contact/tmpl/edit_associations.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contact/views/contact/tmpl/edit_metadata.php b/administrator/components/com_contact/views/contact/tmpl/edit_metadata.php index 197e13c771fe8..3e815e20f2dc2 100644 --- a/administrator/components/com_contact/views/contact/tmpl/edit_metadata.php +++ b/administrator/components/com_contact/views/contact/tmpl/edit_metadata.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contact/views/contact/tmpl/edit_params.php b/administrator/components/com_contact/views/contact/tmpl/edit_params.php index 6cef8b8f8b3a7..92115983f4213 100644 --- a/administrator/components/com_contact/views/contact/tmpl/edit_params.php +++ b/administrator/components/com_contact/views/contact/tmpl/edit_params.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contact/views/contact/tmpl/modal.php b/administrator/components/com_contact/views/contact/tmpl/modal.php index be29f08cc5b80..50bee08bf17b0 100644 --- a/administrator/components/com_contact/views/contact/tmpl/modal.php +++ b/administrator/components/com_contact/views/contact/tmpl/modal.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contact/views/contact/tmpl/modal_associations.php b/administrator/components/com_contact/views/contact/tmpl/modal_associations.php index a01793eee3932..152abcd82c017 100644 --- a/administrator/components/com_contact/views/contact/tmpl/modal_associations.php +++ b/administrator/components/com_contact/views/contact/tmpl/modal_associations.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contact/views/contact/tmpl/modal_metadata.php b/administrator/components/com_contact/views/contact/tmpl/modal_metadata.php index 197e13c771fe8..3e815e20f2dc2 100644 --- a/administrator/components/com_contact/views/contact/tmpl/modal_metadata.php +++ b/administrator/components/com_contact/views/contact/tmpl/modal_metadata.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contact/views/contact/tmpl/modal_params.php b/administrator/components/com_contact/views/contact/tmpl/modal_params.php index 6cef8b8f8b3a7..92115983f4213 100644 --- a/administrator/components/com_contact/views/contact/tmpl/modal_params.php +++ b/administrator/components/com_contact/views/contact/tmpl/modal_params.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contact/views/contact/view.html.php b/administrator/components/com_contact/views/contact/view.html.php index 876cd5273f33a..4d5f643159504 100644 --- a/administrator/components/com_contact/views/contact/view.html.php +++ b/administrator/components/com_contact/views/contact/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contact/views/contacts/tmpl/default.php b/administrator/components/com_contact/views/contacts/tmpl/default.php index 8c53430afdc94..ba2dff4fbd8f7 100644 --- a/administrator/components/com_contact/views/contacts/tmpl/default.php +++ b/administrator/components/com_contact/views/contacts/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contact/views/contacts/tmpl/default_batch.php b/administrator/components/com_contact/views/contacts/tmpl/default_batch.php index 8d4756797e2de..2db7676252bb0 100644 --- a/administrator/components/com_contact/views/contacts/tmpl/default_batch.php +++ b/administrator/components/com_contact/views/contacts/tmpl/default_batch.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contact/views/contacts/tmpl/default_batch_body.php b/administrator/components/com_contact/views/contacts/tmpl/default_batch_body.php index 54347c712dfb9..e2c5559d3aa59 100644 --- a/administrator/components/com_contact/views/contacts/tmpl/default_batch_body.php +++ b/administrator/components/com_contact/views/contacts/tmpl/default_batch_body.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_contact/views/contacts/tmpl/default_batch_footer.php b/administrator/components/com_contact/views/contacts/tmpl/default_batch_footer.php index 47cc858028c8b..8ae3967aaf3e7 100644 --- a/administrator/components/com_contact/views/contacts/tmpl/default_batch_footer.php +++ b/administrator/components/com_contact/views/contacts/tmpl/default_batch_footer.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_contact/views/contacts/tmpl/modal.php b/administrator/components/com_contact/views/contacts/tmpl/modal.php index f503e1f6cf14b..dfcf065b567d3 100644 --- a/administrator/components/com_contact/views/contacts/tmpl/modal.php +++ b/administrator/components/com_contact/views/contacts/tmpl/modal.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contact/views/contacts/view.html.php b/administrator/components/com_contact/views/contacts/view.html.php index 81d360f4f2320..81a2a48b2251c 100644 --- a/administrator/components/com_contact/views/contacts/view.html.php +++ b/administrator/components/com_contact/views/contacts/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_content/config.xml b/administrator/components/com_content/config.xml index 8fc56e110df35..9c129ecd5ce12 100644 --- a/administrator/components/com_content/config.xml +++ b/administrator/components/com_content/config.xml @@ -20,7 +20,8 @@ class="switcher" default="1" label="JGLOBAL_SHOW_TITLE_LABEL" - description="JGLOBAL_SHOW_TITLE_DESC"> + description="JGLOBAL_SHOW_TITLE_DESC" + > @@ -32,7 +33,8 @@ default="1" label="JGLOBAL_LINKED_TITLES_LABEL" description="JGLOBAL_LINKED_TITLES_DESC" - showon="show_title:1"> + showon="show_title:1" + > @@ -43,7 +45,8 @@ class="switcher" default="1" label="JGLOBAL_SHOW_INTRO_LABEL" - description="JGLOBAL_SHOW_INTRO_DESC"> + description="JGLOBAL_SHOW_INTRO_DESC" + > @@ -65,7 +68,8 @@ class="switcher" label="COM_CONTENT_FIELD_INFOBLOCK_TITLE_LABEL" description="COM_CONTENT_FIELD_INFOBLOCK_TITLE_DESC" - default="1"> + default="1" + > @@ -76,7 +80,8 @@ class="switcher" label="JGLOBAL_SHOW_CATEGORY_LABEL" description="JGLOBAL_SHOW_CATEGORY_DESC" - default="1"> + default="1" + > @@ -88,7 +93,8 @@ label="JGLOBAL_LINK_CATEGORY_LABEL" description="JGLOBAL_LINK_CATEGORY_DESC" default="1" - showon="show_category:1"> + showon="show_category:1" + > @@ -99,7 +105,8 @@ class="switcher" label="JGLOBAL_SHOW_PARENT_CATEGORY_LABEL" description="JGLOBAL_SHOW_PARENT_CATEGORY_DESC" - default="1"> + default="1" + > @@ -111,7 +118,8 @@ label="JGLOBAL_LINK_PARENT_CATEGORY_LABEL" description="JGLOBAL_LINK_PARENT_CATEGORY_DESC" default="1" - showon="show_parent_category:1"> + showon="show_parent_category:1" + > @@ -120,7 +128,7 @@ name="spacer1" type="spacer" hr="true" - /> + /> + /> + default="1" + > @@ -171,7 +180,8 @@ label="JGLOBAL_LINK_AUTHOR_LABEL" description="JGLOBAL_LINK_AUTHOR_DESC" default="0" - showon="show_author:1"> + showon="show_author:1" + > @@ -182,7 +192,8 @@ class="switcher" label="JGLOBAL_SHOW_CREATE_DATE_LABEL" description="JGLOBAL_SHOW_CREATE_DATE_DESC" - default="1"> + default="1" + > @@ -193,7 +204,8 @@ class="switcher" label="JGLOBAL_SHOW_MODIFY_DATE_LABEL" description="JGLOBAL_SHOW_MODIFY_DATE_DESC" - default="1"> + default="1" + > @@ -204,7 +216,8 @@ class="switcher" label="JGLOBAL_SHOW_PUBLISH_DATE_LABEL" description="JGLOBAL_SHOW_PUBLISH_DATE_DESC" - default="1"> + default="1" + > @@ -215,7 +228,8 @@ class="switcher" label="JGLOBAL_SHOW_NAVIGATION_LABEL" description="JGLOBAL_SHOW_NAVIGATION_DESC" - default="1"> + default="1" + > @@ -226,7 +240,8 @@ class="switcher" label="JGLOBAL_SHOW_VOTE_LABEL" description="JGLOBAL_SHOW_VOTE_DESC" - default="0"> + default="0" + > @@ -236,7 +251,8 @@ class="switcher" label="JGLOBAL_SHOW_READMORE_LABEL" description="JGLOBAL_SHOW_READMORE_DESC" - default="1"> + default="1" + > @@ -248,7 +264,8 @@ label="JGLOBAL_SHOW_READMORE_TITLE_LABEL" description="JGLOBAL_SHOW_READMORE_TITLE_DESC" default="1" - showon="show_readmore:1"> + showon="show_readmore:1" + > @@ -269,7 +286,8 @@ class="switcher" default="1" label="COM_CONTENT_FIELD_SHOW_TAGS_LABEL" - description="COM_CONTENT_FIELD_SHOW_TAGS_DESC"> + description="COM_CONTENT_FIELD_SHOW_TAGS_DESC" + > @@ -278,14 +296,15 @@ name="spacer2" type="spacer" hr="true" - /> + /> + default="1" + > @@ -296,7 +315,8 @@ class="switcher" label="JGLOBAL_SHOW_PRINT_ICON_LABEL" description="JGLOBAL_SHOW_PRINT_ICON_DESC" - default="1"> + default="1" + > @@ -307,7 +327,8 @@ class="switcher" label="JGLOBAL_SHOW_EMAIL_ICON_LABEL" description="JGLOBAL_SHOW_EMAIL_ICON_DESC" - default="1"> + default="1" + > @@ -318,7 +339,8 @@ class="switcher" label="JGLOBAL_SHOW_HITS_LABEL" description="JGLOBAL_SHOW_HITS_DESC" - default="1"> + default="1" + > @@ -329,22 +351,24 @@ class="switcher" default="0" label="JGLOBAL_SHOW_UNAUTH_LINKS_LABEL" - description="JGLOBAL_SHOW_UNAUTH_LINKS_DESC"> + description="JGLOBAL_SHOW_UNAUTH_LINKS_DESC" + > - + description="COM_CONTENT_FIELD_URLSPOSITION_DESC" + >
    + description="COM_CONTENT_CONFIG_EDITOR_LAYOUT"> + > @@ -364,7 +388,7 @@ default="1" label="COM_CONTENT_SHOW_PUBLISHING_OPTIONS_LABEL" description="COM_CONTENT_SHOW_PUBLISHING_OPTIONS_DESC" - > + > @@ -375,7 +399,7 @@ default="1" label="COM_CONTENT_SHOW_ARTICLE_OPTIONS_LABEL" description="COM_CONTENT_SHOW_ARTICLE_OPTIONS_DESC" - > + > @@ -386,7 +410,7 @@ default="0" label="JGLOBAL_SAVE_HISTORY_OPTIONS_LABEL" description="JGLOBAL_SAVE_HISTORY_OPTIONS_DESC" - > + > @@ -406,7 +430,7 @@ default="0" label="COM_CONTENT_SHOW_IMAGES_URLS_FRONT_LABEL" description="COM_CONTENT_SHOW_IMAGES_URLS_FRONT_DESC" - > + > @@ -417,7 +441,7 @@ default="0" label="COM_CONTENT_SHOW_IMAGES_URLS_BACK_LABEL" description="COM_CONTENT_SHOW_IMAGES_URLS_BACK_DESC" - > + > @@ -425,7 +449,8 @@ name="spacer3" type="spacer" hr="true" - /> + showon="show_urls_images_backend:1[OR]show_urls_images_frontend:1" + /> - - - - + > + + + + - - - - + > + + + + - - - - + > + + + + + showon="show_urls_images_backend:1[OR]show_urls_images_frontend:1" + /> - - - + > + + + - - - + > + + +
    @@ -502,7 +528,7 @@
    + > - - + default="1" + > + + - - + > + + - - + description="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_DESC" + > + + - - + description="JGLOBAL_SHOW_CATEGORY_IMAGE_DESC" + > + + + > @@ -606,7 +635,7 @@ label="COM_CONTENT_NUMBER_CATEGORY_ITEMS_LABEL" description="COM_CONTENT_NUMBER_CATEGORY_ITEMS_DESC" default="1" - > + > @@ -626,14 +655,14 @@
    + > + > @@ -692,7 +721,7 @@
    + > - - + > + + + /> + default="0" + description="JGLOBAL_SHOW_SUBCATEGORY_CONTENT_DESC" + label="JGLOBAL_SHOW_SUBCATEGORY_CONTENT_LABEL" + > @@ -758,14 +785,15 @@
    + > + description="JGLOBAL_DISPLAY_SELECT_DESC" + > @@ -774,12 +802,13 @@ type="list" default="hide" label="JGLOBAL_FILTER_FIELD_LABEL" - description="JGLOBAL_FILTER_FIELD_DESC"> - - - - - + description="JGLOBAL_FILTER_FIELD_DESC" + > + + + + + - - + description="JGLOBAL_SHOW_HEADINGS_DESC" + > + + - - - - + description="JGLOBAL_SHOW_DATE_DESC" + > + + + + @@ -816,9 +847,10 @@ class="switcher" default="1" label="JGLOBAL_LIST_HITS_LABEL" - description="JGLOBAL_LIST_HITS_DESC"> - - + description="JGLOBAL_LIST_HITS_DESC" + > + + - - + description="JGLOBAL_LIST_AUTHOR_DESC" + > + + - - + description="JGLOBAL_LIST_VOTES_DESC" + > + + - - + description="JGLOBAL_LIST_RATINGS_DESC" + > + +
    @@ -854,74 +889,59 @@
    - + - - - - + description="JGLOBAL_CATEGORY_ORDER_DESC" + > + + + + - - - - - - - - - - - - - + description="JGLOBAL_ARTICLE_ORDER_DESC" + > + + + + + + + + + + + + + - - - - + default="published" + description="JGLOBAL_ORDERING_DATE_DESC" + label="JGLOBAL_ORDERING_DATE_LABEL" + showon="orderby_sec:rdate,date" + > + + + + - - - + + + - - + > + + + label="JGLOBAL_SHOW_FEATURED_ARTICLES_LABEL" + description="JGLOBAL_SHOW_FEATURED_ARTICLES_DESC" + > @@ -950,17 +970,17 @@
    - + > - - + description="JGLOBAL_SHOW_FEED_LINK_DESC" + > + + - - + + + filter="integer" + > @@ -1010,7 +1029,8 @@ label="JGLOBAL_SEF_NOIDS_LABEL" description="JGLOBAL_SEF_NOIDS_DESC" showon="sef_advanced:1" - filter="integer"> + filter="integer" + > @@ -1022,7 +1042,7 @@ label="JGLOBAL_CUSTOM_FIELDS_ENABLE_LABEL" description="JGLOBAL_CUSTOM_FIELDS_ENABLE_DESC" default="1" - > + > @@ -1033,8 +1053,7 @@ name="permissions" label="JCONFIG_PERMISSIONS_LABEL" description="JCONFIG_PERMISSIONS_DESC" - > - + > + section="component"/>
    diff --git a/administrator/components/com_content/content.php b/administrator/components/com_content/content.php index 78bb8fee16650..1f8504b1e6f70 100644 --- a/administrator/components/com_content/content.php +++ b/administrator/components/com_content/content.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_content/controller.php b/administrator/components/com_content/controller.php index 0795409348d67..d3439dfdddfa4 100644 --- a/administrator/components/com_content/controller.php +++ b/administrator/components/com_content/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_content/controllers/article.php b/administrator/components/com_content/controllers/article.php index e8618ebee9162..705584b51db57 100644 --- a/administrator/components/com_content/controllers/article.php +++ b/administrator/components/com_content/controllers/article.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_content/controllers/articles.php b/administrator/components/com_content/controllers/articles.php index e09d293812d47..82ae9ccbcd184 100644 --- a/administrator/components/com_content/controllers/articles.php +++ b/administrator/components/com_content/controllers/articles.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_content/controllers/featured.php b/administrator/components/com_content/controllers/featured.php index eb8af65bbfb14..e3ef401689e91 100644 --- a/administrator/components/com_content/controllers/featured.php +++ b/administrator/components/com_content/controllers/featured.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_content/helpers/associations.php b/administrator/components/com_content/helpers/associations.php new file mode 100644 index 0000000000000..0d7c66f02074a --- /dev/null +++ b/administrator/components/com_content/helpers/associations.php @@ -0,0 +1,189 @@ +getType($typeName); + + $context = $this->extension . '.item'; + $catidField = 'catid'; + + if ($typeName === 'category') + { + $context = 'com_categories.item'; + $catidField = ''; + } + + // Get the associations. + $associations = JLanguageAssociations::getAssociations( + $this->extension, + $type['tables']['a'], + $context, + $id, + 'id', + 'alias', + $catidField + ); + + return $associations; + } + + /** + * Get item information + * + * @param string $typeName The item type + * @param int $id The id of item for which we need the associated items + * + * @return JTable|null + * + * @since __DEPLOY_VERSION__ + */ + public function getItem($typeName, $id) + { + if (empty($id)) + { + return null; + } + + $table = null; + + switch ($typeName) + { + case 'article': + $table = JTable::getInstance('Content'); + break; + + case 'category': + $table = JTable::getInstance('Category'); + break; + } + + if (is_null($table)) + { + return null; + } + + $table->load($id); + + return $table; + } + + /** + * Get information about the type + * + * @param string $typeName The item type + * + * @return array Array of item types + * + * @since __DEPLOY_VERSION__ + */ + public function getType($typeName = '') + { + $fields = $this->getFieldsTemplate(); + $tables = array(); + $joins = array(); + $support = $this->getSupportTemplate(); + $title = ''; + + if (in_array($typeName, $this->itemTypes)) + { + + switch ($typeName) + { + case 'article': + + $support['state'] = true; + $support['acl'] = true; + $support['checkout'] = true; + + $tables = array( + 'a' => '#__content' + ); + + $title = 'article'; + break; + + case 'category': + $fields['created_user_id'] = 'a.created_user_id'; + $fields['ordering'] = 'a.lft'; + $fields['level'] = 'a.level'; + $fields['catid'] = ''; + $fields['state'] = 'a.published'; + + $support['state'] = true; + $support['acl'] = true; + $support['checkout'] = true; + + $tables = array( + 'a' => '#__categories' + ); + + $title = 'category'; + break; + } + } + + return array( + 'fields' => $fields, + 'support' => $support, + 'tables' => $tables, + 'joins' => $joins, + 'title' => $title + ); + } +} diff --git a/administrator/components/com_content/helpers/content.php b/administrator/components/com_content/helpers/content.php index 7f02abcdd8c56..378f45b726122 100644 --- a/administrator/components/com_content/helpers/content.php +++ b/administrator/components/com_content/helpers/content.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_content/helpers/html/contentadministrator.php b/administrator/components/com_content/helpers/html/contentadministrator.php index 52078e7ad3646..d519161c61a7c 100644 --- a/administrator/components/com_content/helpers/html/contentadministrator.php +++ b/administrator/components/com_content/helpers/html/contentadministrator.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_content/models/article.php b/administrator/components/com_content/models/article.php index df3bd3d923487..f0398d220d6e0 100644 --- a/administrator/components/com_content/models/article.php +++ b/administrator/components/com_content/models/article.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_content/models/articles.php b/administrator/components/com_content/models/articles.php index dc8c11216d28c..dd4606404256a 100644 --- a/administrator/components/com_content/models/articles.php +++ b/administrator/components/com_content/models/articles.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_content/models/feature.php b/administrator/components/com_content/models/feature.php index e9c5d4aa4909c..69fe1346bcc27 100644 --- a/administrator/components/com_content/models/feature.php +++ b/administrator/components/com_content/models/feature.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_content/models/featured.php b/administrator/components/com_content/models/featured.php index 053c3f0b301f2..1293c1abacc2a 100644 --- a/administrator/components/com_content/models/featured.php +++ b/administrator/components/com_content/models/featured.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_content/models/fields/modal/article.php b/administrator/components/com_content/models/fields/modal/article.php index 18fe779aaefd4..c89b6b7d57ac8 100644 --- a/administrator/components/com_content/models/fields/modal/article.php +++ b/administrator/components/com_content/models/fields/modal/article.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_content/models/forms/article.xml b/administrator/components/com_content/models/forms/article.xml index 64049b415e70c..c83638006e01f 100644 --- a/administrator/components/com_content/models/forms/article.xml +++ b/administrator/components/com_content/models/forms/article.xml @@ -107,8 +107,10 @@ size="22" filter="user_utc" /> - + + + + + + +
    + + + +
    +     diff --git a/administrator/components/com_content/views/article/tmpl/edit_associations.php b/administrator/components/com_content/views/article/tmpl/edit_associations.php index e65a294fdea1c..76cd3dd2e934f 100644 --- a/administrator/components/com_content/views/article/tmpl/edit_associations.php +++ b/administrator/components/com_content/views/article/tmpl/edit_associations.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_content/views/article/tmpl/edit_metadata.php b/administrator/components/com_content/views/article/tmpl/edit_metadata.php index 7b4a0fc70c4be..cfe7d0f04d196 100644 --- a/administrator/components/com_content/views/article/tmpl/edit_metadata.php +++ b/administrator/components/com_content/views/article/tmpl/edit_metadata.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_content/views/article/tmpl/modal.php b/administrator/components/com_content/views/article/tmpl/modal.php index fa6e7124d8649..84b0775f5a2a0 100644 --- a/administrator/components/com_content/views/article/tmpl/modal.php +++ b/administrator/components/com_content/views/article/tmpl/modal.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_content/views/article/tmpl/modal_associations.php b/administrator/components/com_content/views/article/tmpl/modal_associations.php index e65a294fdea1c..76cd3dd2e934f 100644 --- a/administrator/components/com_content/views/article/tmpl/modal_associations.php +++ b/administrator/components/com_content/views/article/tmpl/modal_associations.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_content/views/article/tmpl/modal_metadata.php b/administrator/components/com_content/views/article/tmpl/modal_metadata.php index 7b4a0fc70c4be..cfe7d0f04d196 100644 --- a/administrator/components/com_content/views/article/tmpl/modal_metadata.php +++ b/administrator/components/com_content/views/article/tmpl/modal_metadata.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_content/views/article/tmpl/pagebreak.php b/administrator/components/com_content/views/article/tmpl/pagebreak.php index 7de7e81285804..9406082c88161 100644 --- a/administrator/components/com_content/views/article/tmpl/pagebreak.php +++ b/administrator/components/com_content/views/article/tmpl/pagebreak.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_content/views/article/view.html.php b/administrator/components/com_content/views/article/view.html.php index 0ddb8e62041b9..9335da4b31ef8 100644 --- a/administrator/components/com_content/views/article/view.html.php +++ b/administrator/components/com_content/views/article/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_content/views/articles/tmpl/default.php b/administrator/components/com_content/views/articles/tmpl/default.php index 5ab8bae60f834..06ec7c6a11252 100644 --- a/administrator/components/com_content/views/articles/tmpl/default.php +++ b/administrator/components/com_content/views/articles/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_content/views/articles/tmpl/default.xml b/administrator/components/com_content/views/articles/tmpl/default.xml new file mode 100755 index 0000000000000..b3dec7f7be330 --- /dev/null +++ b/administrator/components/com_content/views/articles/tmpl/default.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/administrator/components/com_content/views/articles/tmpl/default_batch_body.php b/administrator/components/com_content/views/articles/tmpl/default_batch_body.php index a8cbcc6249fc4..6195785fd695d 100644 --- a/administrator/components/com_content/views/articles/tmpl/default_batch_body.php +++ b/administrator/components/com_content/views/articles/tmpl/default_batch_body.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_content/views/articles/tmpl/default_batch_footer.php b/administrator/components/com_content/views/articles/tmpl/default_batch_footer.php index 49ed6df48a6c8..e01b80118d21c 100644 --- a/administrator/components/com_content/views/articles/tmpl/default_batch_footer.php +++ b/administrator/components/com_content/views/articles/tmpl/default_batch_footer.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_content/views/articles/tmpl/modal.php b/administrator/components/com_content/views/articles/tmpl/modal.php index 76521c046ee1f..02a13b3b1b5ac 100644 --- a/administrator/components/com_content/views/articles/tmpl/modal.php +++ b/administrator/components/com_content/views/articles/tmpl/modal.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_content/views/articles/view.html.php b/administrator/components/com_content/views/articles/view.html.php index fa42e31ed8c3e..76b97bddcdc3c 100644 --- a/administrator/components/com_content/views/articles/view.html.php +++ b/administrator/components/com_content/views/articles/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_content/views/featured/tmpl/default.php b/administrator/components/com_content/views/featured/tmpl/default.php index c27a2955aac61..061e77df17f6a 100644 --- a/administrator/components/com_content/views/featured/tmpl/default.php +++ b/administrator/components/com_content/views/featured/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_content/views/featured/tmpl/default.xml b/administrator/components/com_content/views/featured/tmpl/default.xml new file mode 100755 index 0000000000000..4697ce1704542 --- /dev/null +++ b/administrator/components/com_content/views/featured/tmpl/default.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/administrator/components/com_content/views/featured/view.html.php b/administrator/components/com_content/views/featured/view.html.php index d7cb111775345..0fbd1bd3aa920 100644 --- a/administrator/components/com_content/views/featured/view.html.php +++ b/administrator/components/com_content/views/featured/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contenthistory/contenthistory.php b/administrator/components/com_contenthistory/contenthistory.php index 58de68d98de01..e77df780dbc03 100644 --- a/administrator/components/com_contenthistory/contenthistory.php +++ b/administrator/components/com_contenthistory/contenthistory.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contenthistory * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contenthistory/controller.php b/administrator/components/com_contenthistory/controller.php index 341e1db177d4e..e7187bb833463 100644 --- a/administrator/components/com_contenthistory/controller.php +++ b/administrator/components/com_contenthistory/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contenthistory * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contenthistory/controllers/history.php b/administrator/components/com_contenthistory/controllers/history.php index d5670725a6579..a41d010d73ad5 100644 --- a/administrator/components/com_contenthistory/controllers/history.php +++ b/administrator/components/com_contenthistory/controllers/history.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contenthistory * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contenthistory/controllers/preview.php b/administrator/components/com_contenthistory/controllers/preview.php index 54da2cddf759e..2d18cbe9ef611 100644 --- a/administrator/components/com_contenthistory/controllers/preview.php +++ b/administrator/components/com_contenthistory/controllers/preview.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contenthistory * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contenthistory/helpers/contenthistory.php b/administrator/components/com_contenthistory/helpers/contenthistory.php index 4dc0a709a7588..5b4d971fdb0f3 100644 --- a/administrator/components/com_contenthistory/helpers/contenthistory.php +++ b/administrator/components/com_contenthistory/helpers/contenthistory.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contenthistory * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contenthistory/helpers/html/textdiff.php b/administrator/components/com_contenthistory/helpers/html/textdiff.php index 8e63c6de8d58c..8a2407e34a14d 100644 --- a/administrator/components/com_contenthistory/helpers/html/textdiff.php +++ b/administrator/components/com_contenthistory/helpers/html/textdiff.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contenthistory * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_contenthistory/models/compare.php b/administrator/components/com_contenthistory/models/compare.php index 662b429e558f7..e753b3cc788c7 100644 --- a/administrator/components/com_contenthistory/models/compare.php +++ b/administrator/components/com_contenthistory/models/compare.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contenthistory * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contenthistory/models/history.php b/administrator/components/com_contenthistory/models/history.php index a7e26e70e3a2c..d05d7605fefec 100644 --- a/administrator/components/com_contenthistory/models/history.php +++ b/administrator/components/com_contenthistory/models/history.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contenthistory * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contenthistory/models/preview.php b/administrator/components/com_contenthistory/models/preview.php index b4d603fc197ac..334da24e88659 100644 --- a/administrator/components/com_contenthistory/models/preview.php +++ b/administrator/components/com_contenthistory/models/preview.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contenthistory * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contenthistory/views/compare/tmpl/compare.php b/administrator/components/com_contenthistory/views/compare/tmpl/compare.php index a9940f0e40325..0b6afe79140a8 100644 --- a/administrator/components/com_contenthistory/views/compare/tmpl/compare.php +++ b/administrator/components/com_contenthistory/views/compare/tmpl/compare.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contenthistory * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contenthistory/views/compare/view.html.php b/administrator/components/com_contenthistory/views/compare/view.html.php index 5fae9f48afaaa..701242388f6a0 100644 --- a/administrator/components/com_contenthistory/views/compare/view.html.php +++ b/administrator/components/com_contenthistory/views/compare/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contenthistory * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contenthistory/views/history/tmpl/modal.php b/administrator/components/com_contenthistory/views/history/tmpl/modal.php index fd790ec8f6fe7..52458591dd200 100644 --- a/administrator/components/com_contenthistory/views/history/tmpl/modal.php +++ b/administrator/components/com_contenthistory/views/history/tmpl/modal.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contenthistory * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contenthistory/views/history/view.html.php b/administrator/components/com_contenthistory/views/history/view.html.php index 28d2b2a5cdc37..a3596af43d3d3 100644 --- a/administrator/components/com_contenthistory/views/history/view.html.php +++ b/administrator/components/com_contenthistory/views/history/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contenthistory * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contenthistory/views/preview/tmpl/preview.php b/administrator/components/com_contenthistory/views/preview/tmpl/preview.php index bc3b33f87ee74..5243c14f14bfb 100644 --- a/administrator/components/com_contenthistory/views/preview/tmpl/preview.php +++ b/administrator/components/com_contenthistory/views/preview/tmpl/preview.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contenthistory * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contenthistory/views/preview/view.html.php b/administrator/components/com_contenthistory/views/preview/view.html.php index f18cdf452c49c..726cbd4c9b87a 100644 --- a/administrator/components/com_contenthistory/views/preview/view.html.php +++ b/administrator/components/com_contenthistory/views/preview/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contenthistory * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_cpanel/controller.php b/administrator/components/com_cpanel/controller.php index db88d03936161..8b6415e5c56d0 100644 --- a/administrator/components/com_cpanel/controller.php +++ b/administrator/components/com_cpanel/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_cpanel * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_cpanel/cpanel.php b/administrator/components/com_cpanel/cpanel.php index fa51a70f3364c..69e7e5853586e 100644 --- a/administrator/components/com_cpanel/cpanel.php +++ b/administrator/components/com_cpanel/cpanel.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_cpanel * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_cpanel/views/cpanel/tmpl/default.php b/administrator/components/com_cpanel/views/cpanel/tmpl/default.php index d70bcb2638b20..0e7d16672c7ac 100644 --- a/administrator/components/com_cpanel/views/cpanel/tmpl/default.php +++ b/administrator/components/com_cpanel/views/cpanel/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_cpanel * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_cpanel/views/cpanel/tmpl/default.xml b/administrator/components/com_cpanel/views/cpanel/tmpl/default.xml new file mode 100755 index 0000000000000..f9c3fdac00aea --- /dev/null +++ b/administrator/components/com_cpanel/views/cpanel/tmpl/default.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/administrator/components/com_cpanel/views/cpanel/view.html.php b/administrator/components/com_cpanel/views/cpanel/view.html.php index df6bf8b423a15..0e15c176a9f45 100644 --- a/administrator/components/com_cpanel/views/cpanel/view.html.php +++ b/administrator/components/com_cpanel/views/cpanel/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_cpanel * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_fields/controller.php b/administrator/components/com_fields/controller.php index ebc0f8fd73ef0..0a3b87741e305 100644 --- a/administrator/components/com_fields/controller.php +++ b/administrator/components/com_fields/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_fields * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_fields/controllers/field.php b/administrator/components/com_fields/controllers/field.php index 417104f852c89..83b0dbb8979ae 100644 --- a/administrator/components/com_fields/controllers/field.php +++ b/administrator/components/com_fields/controllers/field.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_fields * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_fields/controllers/fields.php b/administrator/components/com_fields/controllers/fields.php index 12d35d9162da3..5d98d5a14c3b3 100644 --- a/administrator/components/com_fields/controllers/fields.php +++ b/administrator/components/com_fields/controllers/fields.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_fields * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_fields/controllers/group.php b/administrator/components/com_fields/controllers/group.php index b057feca4c8f3..aa3277e258838 100644 --- a/administrator/components/com_fields/controllers/group.php +++ b/administrator/components/com_fields/controllers/group.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_fields * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_fields/controllers/groups.php b/administrator/components/com_fields/controllers/groups.php index da384ec5cde2e..8b051a1fb13e9 100644 --- a/administrator/components/com_fields/controllers/groups.php +++ b/administrator/components/com_fields/controllers/groups.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_fields * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_fields/fields.php b/administrator/components/com_fields/fields.php index 383ebc39e1be2..ef0dbf01d9c9a 100644 --- a/administrator/components/com_fields/fields.php +++ b/administrator/components/com_fields/fields.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_fields * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_fields/helpers/fields.php b/administrator/components/com_fields/helpers/fields.php index c2b09f1013b7a..2a71a375cde70 100644 --- a/administrator/components/com_fields/helpers/fields.php +++ b/administrator/components/com_fields/helpers/fields.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_fields * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; @@ -132,6 +132,11 @@ public static function getFields($context, $item = null, $prepareValue = false, $fields = self::$fieldsCache->getItems(); + if ($fields === false) + { + return array(); + } + if ($item && isset($item->id)) { if (self::$fieldCache === null) @@ -320,8 +325,11 @@ public static function prepareForm($context, JForm $form, $data) * has changed */ $form->setFieldAttribute('catid', 'onchange', 'categoryHasChanged(this);'); - JFactory::getDocument()->addScriptDeclaration( - "function categoryHasChanged(element){ + + // Preload spindle-wheel when we need to submit form due to category selector changed + JFactory::getDocument()->addScriptDeclaration(" + function categoryHasChanged(element) { + Joomla.loadingLayer('show'); var cat = jQuery(element); if (cat.val() == '" . $assignedCatids . "')return; jQuery('input[name=task]').val('field.storeform'); @@ -329,6 +337,7 @@ public static function prepareForm($context, JForm $form, $data) element.form.submit(); } jQuery( document ).ready(function() { + Joomla.loadingLayer('load'); var formControl = '#" . $form->getFormControl() . "_catid'; if (!jQuery(formControl).val() != '" . $assignedCatids . "'){jQuery(formControl).val('" . $assignedCatids . "');} });"); @@ -450,7 +459,7 @@ public static function prepareForm($context, JForm $form, $data) * If the field belongs to an assigned_cat_id but the assigned_cat_ids in the data * is not known, set the required flag to false on any circumstance. */ - if (! $assignedCatids && $field->assigned_cat_ids && $form->getField($field->alias)) + if (!$assignedCatids && !empty($field->assigned_cat_ids) && $form->getField($field->alias)) { $form->setFieldAttribute($field->alias, 'required', 'false'); } diff --git a/administrator/components/com_fields/libraries/fieldslistplugin.php b/administrator/components/com_fields/libraries/fieldslistplugin.php new file mode 100644 index 0000000000000..2b384b8b8433e --- /dev/null +++ b/administrator/components/com_fields/libraries/fieldslistplugin.php @@ -0,0 +1,82 @@ +getOptionsFromField($field) as $value => $name) + { + $option = new DOMElement('option', $value); + $option->nodeValue = JText::_($name); + + $element = $fieldNode->appendChild($option); + $element->setAttribute('value', $value); + } + + return $fieldNode; + } + + /** + * Returns an array of key values to put in a list from the given field. + * + * @param stdClass $field The field. + * + * @return array + * + * @since __DEPLOY_VERSION__ + */ + public function getOptionsFromField($field) + { + $data = array(); + + // Fetch the options from the plugin + foreach ($this->params->get('options', array()) as $option) + { + $op = (object) $option; + $data[$op->value] = $op->name; + } + + // Fetch the options from the field + foreach ($field->fieldparams->get('options', array()) as $option) + { + $data[$option->value] = $option->name; + } + + return $data; + } +} diff --git a/administrator/components/com_fields/libraries/fieldsplugin.php b/administrator/components/com_fields/libraries/fieldsplugin.php index 18e3bfc66ece4..e5cec3535f171 100644 --- a/administrator/components/com_fields/libraries/fieldsplugin.php +++ b/administrator/components/com_fields/libraries/fieldsplugin.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_fields * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; @@ -169,7 +169,7 @@ public function onCustomFieldsPrepareDom($field, DOMElement $parent, JForm $form $param = count($param) == count($param, COUNT_RECURSIVE) ? implode(',', $param) : ''; } - if ($param === '') + if ($param === '' || !is_string($param)) { continue; } diff --git a/administrator/components/com_fields/models/field.php b/administrator/components/com_fields/models/field.php index 5bf24384e2b8b..baac5d0ae9615 100644 --- a/administrator/components/com_fields/models/field.php +++ b/administrator/components/com_fields/models/field.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_fields * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_fields/models/fields.php b/administrator/components/com_fields/models/fields.php index eb2a6f840ce78..ef89c1e3f2644 100644 --- a/administrator/components/com_fields/models/fields.php +++ b/administrator/components/com_fields/models/fields.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_fields * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_fields/models/fields/fieldcontexts.php b/administrator/components/com_fields/models/fields/fieldcontexts.php index c83de2a335d74..7678f5a99c0d0 100644 --- a/administrator/components/com_fields/models/fields/fieldcontexts.php +++ b/administrator/components/com_fields/models/fields/fieldcontexts.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_fields * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_fields/models/fields/fieldgroups.php b/administrator/components/com_fields/models/fields/fieldgroups.php index 89fbb39bf4c9b..0adac1584a04a 100644 --- a/administrator/components/com_fields/models/fields/fieldgroups.php +++ b/administrator/components/com_fields/models/fields/fieldgroups.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_fields * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_fields/models/fields/section.php b/administrator/components/com_fields/models/fields/section.php index 7819c3d03d472..4d74202c1d61b 100644 --- a/administrator/components/com_fields/models/fields/section.php +++ b/administrator/components/com_fields/models/fields/section.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_fields * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_fields/models/fields/type.php b/administrator/components/com_fields/models/fields/type.php index 94e91c44522c6..48f9b02e2c2cb 100644 --- a/administrator/components/com_fields/models/fields/type.php +++ b/administrator/components/com_fields/models/fields/type.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_fields * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; @@ -86,13 +86,19 @@ function ($a, $b) $uri->setVar('view', null); $uri->setVar('layout', null); - JFactory::getDocument()->addScriptDeclaration( - "function typeHasChanged(element){ + + JFactory::getDocument()->addScriptDeclaration(" + jQuery( document ).ready(function() { + Joomla.loadingLayer('load'); + }); + function typeHasChanged(element){ + Joomla.loadingLayer('show'); var cat = jQuery(element); jQuery('input[name=task]').val('field.storeform'); element.form.action='" . $uri . "'; element.form.submit(); - }"); + } + "); return $options; } diff --git a/administrator/components/com_fields/models/group.php b/administrator/components/com_fields/models/group.php index 428d8e1867878..1a2d8d9c31fa7 100644 --- a/administrator/components/com_fields/models/group.php +++ b/administrator/components/com_fields/models/group.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_fields * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_fields/models/groups.php b/administrator/components/com_fields/models/groups.php index a8e445ed4381e..beb82f0d2ad4b 100644 --- a/administrator/components/com_fields/models/groups.php +++ b/administrator/components/com_fields/models/groups.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_fields * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_fields/tables/field.php b/administrator/components/com_fields/tables/field.php index 56659524ef322..77d1af408095c 100644 --- a/administrator/components/com_fields/tables/field.php +++ b/administrator/components/com_fields/tables/field.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_fields * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_fields/tables/group.php b/administrator/components/com_fields/tables/group.php index e3620a9f09256..718d72ecfa2be 100644 --- a/administrator/components/com_fields/tables/group.php +++ b/administrator/components/com_fields/tables/group.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_fields * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_fields/views/field/tmpl/edit.php b/administrator/components/com_fields/views/field/tmpl/edit.php index 5098094f98a09..735cee23638aa 100644 --- a/administrator/components/com_fields/views/field/tmpl/edit.php +++ b/administrator/components/com_fields/views/field/tmpl/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_fields * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_fields/views/field/view.html.php b/administrator/components/com_fields/views/field/view.html.php index 62829474918b0..f1b211c83fff7 100644 --- a/administrator/components/com_fields/views/field/view.html.php +++ b/administrator/components/com_fields/views/field/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_fields * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_fields/views/fields/tmpl/default.php b/administrator/components/com_fields/views/fields/tmpl/default.php index 85ae48b9db481..9d7c840c53529 100644 --- a/administrator/components/com_fields/views/fields/tmpl/default.php +++ b/administrator/components/com_fields/views/fields/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_fields * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_fields/views/fields/tmpl/default_batch_body.php b/administrator/components/com_fields/views/fields/tmpl/default_batch_body.php index 1256ae4df62d2..8b7276763b337 100644 --- a/administrator/components/com_fields/views/fields/tmpl/default_batch_body.php +++ b/administrator/components/com_fields/views/fields/tmpl/default_batch_body.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_fields * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_fields/views/fields/tmpl/default_batch_footer.php b/administrator/components/com_fields/views/fields/tmpl/default_batch_footer.php index d7865e9ec4543..9192d5745880c 100644 --- a/administrator/components/com_fields/views/fields/tmpl/default_batch_footer.php +++ b/administrator/components/com_fields/views/fields/tmpl/default_batch_footer.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_fields * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_fields/views/fields/view.html.php b/administrator/components/com_fields/views/fields/view.html.php index f360147a0a4fc..7e7915b81db8e 100644 --- a/administrator/components/com_fields/views/fields/view.html.php +++ b/administrator/components/com_fields/views/fields/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_fields * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_fields/views/group/tmpl/edit.php b/administrator/components/com_fields/views/group/tmpl/edit.php index a8a0d244526ff..6c40f38bab4f5 100644 --- a/administrator/components/com_fields/views/group/tmpl/edit.php +++ b/administrator/components/com_fields/views/group/tmpl/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_fields * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_fields/views/group/view.html.php b/administrator/components/com_fields/views/group/view.html.php index 4a79283b7dad2..2d4ab8ba92f95 100644 --- a/administrator/components/com_fields/views/group/view.html.php +++ b/administrator/components/com_fields/views/group/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_fields * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_fields/views/groups/tmpl/default.php b/administrator/components/com_fields/views/groups/tmpl/default.php index ba83b9bba792a..d1b99fc0750f4 100644 --- a/administrator/components/com_fields/views/groups/tmpl/default.php +++ b/administrator/components/com_fields/views/groups/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_fields * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_fields/views/groups/tmpl/default_batch_body.php b/administrator/components/com_fields/views/groups/tmpl/default_batch_body.php index c2d781171a4cf..0ca151bdc56bc 100644 --- a/administrator/components/com_fields/views/groups/tmpl/default_batch_body.php +++ b/administrator/components/com_fields/views/groups/tmpl/default_batch_body.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_fields * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_fields/views/groups/tmpl/default_batch_footer.php b/administrator/components/com_fields/views/groups/tmpl/default_batch_footer.php index acaf2f4babfb0..4a313168175e2 100644 --- a/administrator/components/com_fields/views/groups/tmpl/default_batch_footer.php +++ b/administrator/components/com_fields/views/groups/tmpl/default_batch_footer.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_fields * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_fields/views/groups/view.html.php b/administrator/components/com_fields/views/groups/view.html.php index a5e2abc19625b..6306e2c5f0f5a 100644 --- a/administrator/components/com_fields/views/groups/view.html.php +++ b/administrator/components/com_fields/views/groups/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_fields * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_finder/controller.php b/administrator/components/com_finder/controller.php index a570d9c33586f..8064b78886ed3 100644 --- a/administrator/components/com_finder/controller.php +++ b/administrator/components/com_finder/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/controllers/filter.php b/administrator/components/com_finder/controllers/filter.php index e60aa0a2bdd59..b3bba2c42a6c9 100644 --- a/administrator/components/com_finder/controllers/filter.php +++ b/administrator/components/com_finder/controllers/filter.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/controllers/filters.php b/administrator/components/com_finder/controllers/filters.php index b5e7d24e0f259..5a03f1a6c04f1 100644 --- a/administrator/components/com_finder/controllers/filters.php +++ b/administrator/components/com_finder/controllers/filters.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/controllers/index.php b/administrator/components/com_finder/controllers/index.php index a21f31575969b..fff73f3b77e2b 100644 --- a/administrator/components/com_finder/controllers/index.php +++ b/administrator/components/com_finder/controllers/index.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/controllers/indexer.json.php b/administrator/components/com_finder/controllers/indexer.json.php index 0a1a31398414f..fff74532c18b3 100644 --- a/administrator/components/com_finder/controllers/indexer.json.php +++ b/administrator/components/com_finder/controllers/indexer.json.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/controllers/maps.php b/administrator/components/com_finder/controllers/maps.php index aed0950692548..74e3df9052b4b 100644 --- a/administrator/components/com_finder/controllers/maps.php +++ b/administrator/components/com_finder/controllers/maps.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/finder.php b/administrator/components/com_finder/finder.php index 49f37bc9b2cac..c386a830d2758 100644 --- a/administrator/components/com_finder/finder.php +++ b/administrator/components/com_finder/finder.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/helpers/finder.php b/administrator/components/com_finder/helpers/finder.php index 9a0f44d727ad3..e9362e222d1b0 100644 --- a/administrator/components/com_finder/helpers/finder.php +++ b/administrator/components/com_finder/helpers/finder.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/helpers/html/finder.php b/administrator/components/com_finder/helpers/html/finder.php index 0e5e8993b3ec3..d31ebeb2f2447 100644 --- a/administrator/components/com_finder/helpers/html/finder.php +++ b/administrator/components/com_finder/helpers/html/finder.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/helpers/indexer/adapter.php b/administrator/components/com_finder/helpers/indexer/adapter.php index 6314ebece649c..eeb9ef0a77996 100644 --- a/administrator/components/com_finder/helpers/indexer/adapter.php +++ b/administrator/components/com_finder/helpers/indexer/adapter.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/helpers/indexer/driver/mysql.php b/administrator/components/com_finder/helpers/indexer/driver/mysql.php index a2b4577877c02..46ef27594e8b0 100644 --- a/administrator/components/com_finder/helpers/indexer/driver/mysql.php +++ b/administrator/components/com_finder/helpers/indexer/driver/mysql.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/helpers/indexer/driver/postgresql.php b/administrator/components/com_finder/helpers/indexer/driver/postgresql.php index 5cff3a7b8ce27..b52e41b8e67e6 100644 --- a/administrator/components/com_finder/helpers/indexer/driver/postgresql.php +++ b/administrator/components/com_finder/helpers/indexer/driver/postgresql.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/helpers/indexer/driver/sqlsrv.php b/administrator/components/com_finder/helpers/indexer/driver/sqlsrv.php index 9d12d69a169e5..bea14157e0430 100644 --- a/administrator/components/com_finder/helpers/indexer/driver/sqlsrv.php +++ b/administrator/components/com_finder/helpers/indexer/driver/sqlsrv.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/helpers/indexer/helper.php b/administrator/components/com_finder/helpers/indexer/helper.php index 84ed6b7879181..594288be597d3 100644 --- a/administrator/components/com_finder/helpers/indexer/helper.php +++ b/administrator/components/com_finder/helpers/indexer/helper.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/helpers/indexer/indexer.php b/administrator/components/com_finder/helpers/indexer/indexer.php index 288dc7382e0a5..8648d39326b03 100644 --- a/administrator/components/com_finder/helpers/indexer/indexer.php +++ b/administrator/components/com_finder/helpers/indexer/indexer.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/helpers/indexer/parser.php b/administrator/components/com_finder/helpers/indexer/parser.php index c804e7be458e7..943f0b5c6c12f 100644 --- a/administrator/components/com_finder/helpers/indexer/parser.php +++ b/administrator/components/com_finder/helpers/indexer/parser.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/helpers/indexer/parser/html.php b/administrator/components/com_finder/helpers/indexer/parser/html.php index 8d0a734d778ec..f7f3fcf2cac5e 100644 --- a/administrator/components/com_finder/helpers/indexer/parser/html.php +++ b/administrator/components/com_finder/helpers/indexer/parser/html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/helpers/indexer/parser/rtf.php b/administrator/components/com_finder/helpers/indexer/parser/rtf.php index 0e05cb90c341c..37872f5f2f773 100644 --- a/administrator/components/com_finder/helpers/indexer/parser/rtf.php +++ b/administrator/components/com_finder/helpers/indexer/parser/rtf.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/helpers/indexer/parser/txt.php b/administrator/components/com_finder/helpers/indexer/parser/txt.php index caaf10771b7ac..a58aa646163a3 100644 --- a/administrator/components/com_finder/helpers/indexer/parser/txt.php +++ b/administrator/components/com_finder/helpers/indexer/parser/txt.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/helpers/indexer/query.php b/administrator/components/com_finder/helpers/indexer/query.php index 98db5dd4512af..8a50c9aaa2644 100644 --- a/administrator/components/com_finder/helpers/indexer/query.php +++ b/administrator/components/com_finder/helpers/indexer/query.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/helpers/indexer/result.php b/administrator/components/com_finder/helpers/indexer/result.php index 78bcb6addde6d..623c57d753bba 100644 --- a/administrator/components/com_finder/helpers/indexer/result.php +++ b/administrator/components/com_finder/helpers/indexer/result.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/helpers/indexer/stemmer.php b/administrator/components/com_finder/helpers/indexer/stemmer.php index 3061a2de9b2b5..f1853a59d4809 100644 --- a/administrator/components/com_finder/helpers/indexer/stemmer.php +++ b/administrator/components/com_finder/helpers/indexer/stemmer.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/helpers/indexer/stemmer/fr.php b/administrator/components/com_finder/helpers/indexer/stemmer/fr.php index 4e68fe4df509b..6d0d77cc663fd 100644 --- a/administrator/components/com_finder/helpers/indexer/stemmer/fr.php +++ b/administrator/components/com_finder/helpers/indexer/stemmer/fr.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/helpers/indexer/stemmer/porter_en.php b/administrator/components/com_finder/helpers/indexer/stemmer/porter_en.php index 340a82d1e3f07..59b561a2465ef 100644 --- a/administrator/components/com_finder/helpers/indexer/stemmer/porter_en.php +++ b/administrator/components/com_finder/helpers/indexer/stemmer/porter_en.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/helpers/indexer/stemmer/snowball.php b/administrator/components/com_finder/helpers/indexer/stemmer/snowball.php index df1f23db4842a..e691d870714fd 100644 --- a/administrator/components/com_finder/helpers/indexer/stemmer/snowball.php +++ b/administrator/components/com_finder/helpers/indexer/stemmer/snowball.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/helpers/indexer/taxonomy.php b/administrator/components/com_finder/helpers/indexer/taxonomy.php index 9a9c9a831a87e..7e1170af79089 100644 --- a/administrator/components/com_finder/helpers/indexer/taxonomy.php +++ b/administrator/components/com_finder/helpers/indexer/taxonomy.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/helpers/indexer/token.php b/administrator/components/com_finder/helpers/indexer/token.php index 2b1f3edadbfe9..b359fd52f0704 100644 --- a/administrator/components/com_finder/helpers/indexer/token.php +++ b/administrator/components/com_finder/helpers/indexer/token.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/helpers/language.php b/administrator/components/com_finder/helpers/language.php index 3cacfce8bfdfb..3a84cb8ff3abb 100644 --- a/administrator/components/com_finder/helpers/language.php +++ b/administrator/components/com_finder/helpers/language.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/models/fields/branches.php b/administrator/components/com_finder/models/fields/branches.php index ae6f63e2d4ea0..2ec55293d90d2 100644 --- a/administrator/components/com_finder/models/fields/branches.php +++ b/administrator/components/com_finder/models/fields/branches.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/models/fields/contentmap.php b/administrator/components/com_finder/models/fields/contentmap.php index f0e8a819155ad..d168588784bf9 100644 --- a/administrator/components/com_finder/models/fields/contentmap.php +++ b/administrator/components/com_finder/models/fields/contentmap.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/models/fields/contenttypes.php b/administrator/components/com_finder/models/fields/contenttypes.php index 965be2e54f582..9cdbda8b583bd 100644 --- a/administrator/components/com_finder/models/fields/contenttypes.php +++ b/administrator/components/com_finder/models/fields/contenttypes.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/models/fields/directories.php b/administrator/components/com_finder/models/fields/directories.php index 0068fa7b5f6f5..890612c8727bc 100644 --- a/administrator/components/com_finder/models/fields/directories.php +++ b/administrator/components/com_finder/models/fields/directories.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/models/fields/searchfilter.php b/administrator/components/com_finder/models/fields/searchfilter.php index 4e5a034213606..371ca13ecdab9 100644 --- a/administrator/components/com_finder/models/fields/searchfilter.php +++ b/administrator/components/com_finder/models/fields/searchfilter.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/models/filter.php b/administrator/components/com_finder/models/filter.php index 9322e019a6ff2..fde588a811e63 100644 --- a/administrator/components/com_finder/models/filter.php +++ b/administrator/components/com_finder/models/filter.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/models/filters.php b/administrator/components/com_finder/models/filters.php index ab1ee4c7d0229..3f33df3b23944 100644 --- a/administrator/components/com_finder/models/filters.php +++ b/administrator/components/com_finder/models/filters.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/models/forms/filter.xml b/administrator/components/com_finder/models/forms/filter.xml index 505702a22d4da..79908bb830009 100644 --- a/administrator/components/com_finder/models/forms/filter.xml +++ b/administrator/components/com_finder/models/forms/filter.xml @@ -16,13 +16,29 @@ description="JFIELD_ALIAS_DESC" hint="JFIELD_ALIAS_PLACEHOLDER" size="45" /> - + - + @@ -73,9 +89,14 @@ - + COM_FINDER_FILTER_WHEN_AFTER - +
    diff --git a/administrator/components/com_finder/models/index.php b/administrator/components/com_finder/models/index.php index efd359e9702cc..3e72abe350942 100644 --- a/administrator/components/com_finder/models/index.php +++ b/administrator/components/com_finder/models/index.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/models/indexer.php b/administrator/components/com_finder/models/indexer.php index e84788b457f8b..107dc4e6c26e9 100644 --- a/administrator/components/com_finder/models/indexer.php +++ b/administrator/components/com_finder/models/indexer.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/models/maps.php b/administrator/components/com_finder/models/maps.php index bd194b823cb06..3c21e7192af71 100644 --- a/administrator/components/com_finder/models/maps.php +++ b/administrator/components/com_finder/models/maps.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/models/statistics.php b/administrator/components/com_finder/models/statistics.php index 6ef5f71df0342..eb9b361631dc0 100644 --- a/administrator/components/com_finder/models/statistics.php +++ b/administrator/components/com_finder/models/statistics.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/tables/filter.php b/administrator/components/com_finder/tables/filter.php index c1e53d432d88a..32a68ea75a339 100644 --- a/administrator/components/com_finder/tables/filter.php +++ b/administrator/components/com_finder/tables/filter.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/tables/link.php b/administrator/components/com_finder/tables/link.php index 9c9df444bdbfd..f3b47e8251d34 100644 --- a/administrator/components/com_finder/tables/link.php +++ b/administrator/components/com_finder/tables/link.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/tables/map.php b/administrator/components/com_finder/tables/map.php index c59a79da59adb..6d2f9d9b618d1 100644 --- a/administrator/components/com_finder/tables/map.php +++ b/administrator/components/com_finder/tables/map.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/views/filter/tmpl/edit.php b/administrator/components/com_finder/views/filter/tmpl/edit.php index b389cd5d305ba..75dbece593451 100644 --- a/administrator/components/com_finder/views/filter/tmpl/edit.php +++ b/administrator/components/com_finder/views/filter/tmpl/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/views/filter/view.html.php b/administrator/components/com_finder/views/filter/view.html.php index 54d3428722818..fb842f2bb7bf2 100644 --- a/administrator/components/com_finder/views/filter/view.html.php +++ b/administrator/components/com_finder/views/filter/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/views/filters/tmpl/default.php b/administrator/components/com_finder/views/filters/tmpl/default.php index 6834b440bc768..686e3969bb802 100644 --- a/administrator/components/com_finder/views/filters/tmpl/default.php +++ b/administrator/components/com_finder/views/filters/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/views/filters/view.html.php b/administrator/components/com_finder/views/filters/view.html.php index 1132f206a5f6c..e557b22c746c0 100644 --- a/administrator/components/com_finder/views/filters/view.html.php +++ b/administrator/components/com_finder/views/filters/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/views/index/tmpl/default.php b/administrator/components/com_finder/views/index/tmpl/default.php index 54901cb07dca2..70f7be062202f 100644 --- a/administrator/components/com_finder/views/index/tmpl/default.php +++ b/administrator/components/com_finder/views/index/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/views/index/view.html.php b/administrator/components/com_finder/views/index/view.html.php index b0448c7437c18..53fc3f7e27f1e 100644 --- a/administrator/components/com_finder/views/index/view.html.php +++ b/administrator/components/com_finder/views/index/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/views/indexer/tmpl/default.php b/administrator/components/com_finder/views/indexer/tmpl/default.php index 08f8b2e615d4c..d550de9871d3e 100644 --- a/administrator/components/com_finder/views/indexer/tmpl/default.php +++ b/administrator/components/com_finder/views/indexer/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/views/indexer/view.html.php b/administrator/components/com_finder/views/indexer/view.html.php index 3b787b9905400..4f86a099052aa 100644 --- a/administrator/components/com_finder/views/indexer/view.html.php +++ b/administrator/components/com_finder/views/indexer/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/views/maps/tmpl/default.php b/administrator/components/com_finder/views/maps/tmpl/default.php index 57dd37b814e15..4156de58c57d0 100644 --- a/administrator/components/com_finder/views/maps/tmpl/default.php +++ b/administrator/components/com_finder/views/maps/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/views/maps/view.html.php b/administrator/components/com_finder/views/maps/view.html.php index 4e2c1cb305e8d..e0f3287594f33 100644 --- a/administrator/components/com_finder/views/maps/view.html.php +++ b/administrator/components/com_finder/views/maps/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/views/statistics/tmpl/default.php b/administrator/components/com_finder/views/statistics/tmpl/default.php index 599e1a76dbdcb..b89304e8cba2e 100644 --- a/administrator/components/com_finder/views/statistics/tmpl/default.php +++ b/administrator/components/com_finder/views/statistics/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/views/statistics/view.html.php b/administrator/components/com_finder/views/statistics/view.html.php index 6f72e5d0aa81d..bb7ad0c0b8e93 100644 --- a/administrator/components/com_finder/views/statistics/view.html.php +++ b/administrator/components/com_finder/views/statistics/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_installer/controller.php b/administrator/components/com_installer/controller.php index e7484b522e8fd..e942bc3a1ccb5 100644 --- a/administrator/components/com_installer/controller.php +++ b/administrator/components/com_installer/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_installer/controllers/database.php b/administrator/components/com_installer/controllers/database.php index 00446bff9b95a..bd549005d683e 100644 --- a/administrator/components/com_installer/controllers/database.php +++ b/administrator/components/com_installer/controllers/database.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_installer/controllers/discover.php b/administrator/components/com_installer/controllers/discover.php index 2670fd8de849d..2d2ca5473c4a5 100644 --- a/administrator/components/com_installer/controllers/discover.php +++ b/administrator/components/com_installer/controllers/discover.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_installer/controllers/install.php b/administrator/components/com_installer/controllers/install.php index 07a92d8c09033..4ff949e3cc20d 100644 --- a/administrator/components/com_installer/controllers/install.php +++ b/administrator/components/com_installer/controllers/install.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_installer/controllers/manage.php b/administrator/components/com_installer/controllers/manage.php index c76649eed19e5..af9df3f34e942 100644 --- a/administrator/components/com_installer/controllers/manage.php +++ b/administrator/components/com_installer/controllers/manage.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_installer/controllers/update.php b/administrator/components/com_installer/controllers/update.php index 983dc16f853d2..a3b541c07a6ef 100644 --- a/administrator/components/com_installer/controllers/update.php +++ b/administrator/components/com_installer/controllers/update.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_installer/controllers/updatesites.php b/administrator/components/com_installer/controllers/updatesites.php index d82355d9d0248..99aa34fe2e59b 100644 --- a/administrator/components/com_installer/controllers/updatesites.php +++ b/administrator/components/com_installer/controllers/updatesites.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_installer/helpers/html/manage.php b/administrator/components/com_installer/helpers/html/manage.php index 85d508474dfb8..0ac6b08b7e35a 100644 --- a/administrator/components/com_installer/helpers/html/manage.php +++ b/administrator/components/com_installer/helpers/html/manage.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_installer/helpers/html/updatesites.php b/administrator/components/com_installer/helpers/html/updatesites.php index b5b58515a62f3..93667774a9845 100644 --- a/administrator/components/com_installer/helpers/html/updatesites.php +++ b/administrator/components/com_installer/helpers/html/updatesites.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_installer/helpers/installer.php b/administrator/components/com_installer/helpers/installer.php index eef635d2d5447..0fa9cb0013f36 100644 --- a/administrator/components/com_installer/helpers/installer.php +++ b/administrator/components/com_installer/helpers/installer.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_installer/installer.php b/administrator/components/com_installer/installer.php index a8726ed99b2ee..74e07d27a0157 100644 --- a/administrator/components/com_installer/installer.php +++ b/administrator/components/com_installer/installer.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_installer/models/database.php b/administrator/components/com_installer/models/database.php index 07daf72ba011c..40d356ca911d4 100644 --- a/administrator/components/com_installer/models/database.php +++ b/administrator/components/com_installer/models/database.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_installer/models/discover.php b/administrator/components/com_installer/models/discover.php index b3ca41282bf67..8b8f6bc496274 100644 --- a/administrator/components/com_installer/models/discover.php +++ b/administrator/components/com_installer/models/discover.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_installer/models/extension.php b/administrator/components/com_installer/models/extension.php index 4630a0a856c6a..cdeaa1e63601b 100644 --- a/administrator/components/com_installer/models/extension.php +++ b/administrator/components/com_installer/models/extension.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_installer/models/fields/extensionstatus.php b/administrator/components/com_installer/models/fields/extensionstatus.php index bcba01c3d1c38..1b55ed10d3f11 100644 --- a/administrator/components/com_installer/models/fields/extensionstatus.php +++ b/administrator/components/com_installer/models/fields/extensionstatus.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_installer/models/fields/folder.php b/administrator/components/com_installer/models/fields/folder.php index 41c9025974f11..36cf84d293d61 100644 --- a/administrator/components/com_installer/models/fields/folder.php +++ b/administrator/components/com_installer/models/fields/folder.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_installer/models/fields/location.php b/administrator/components/com_installer/models/fields/location.php index ebb88318c0795..07a8009297369 100644 --- a/administrator/components/com_installer/models/fields/location.php +++ b/administrator/components/com_installer/models/fields/location.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_installer/models/fields/type.php b/administrator/components/com_installer/models/fields/type.php index 0d609338871bc..7a542c6f7d5b9 100644 --- a/administrator/components/com_installer/models/fields/type.php +++ b/administrator/components/com_installer/models/fields/type.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_installer/models/install.php b/administrator/components/com_installer/models/install.php index 8412cb9b576ff..65d43a1d9aaac 100644 --- a/administrator/components/com_installer/models/install.php +++ b/administrator/components/com_installer/models/install.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_installer/models/languages.php b/administrator/components/com_installer/models/languages.php index 31dd77195d4e0..9c858fb8ec1cd 100644 --- a/administrator/components/com_installer/models/languages.php +++ b/administrator/components/com_installer/models/languages.php @@ -2,7 +2,7 @@ /** * @package Joomla.Administrator * @subpackage com_installer - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_installer/models/manage.php b/administrator/components/com_installer/models/manage.php index e088ba1784c5c..18ccb15b9e987 100644 --- a/administrator/components/com_installer/models/manage.php +++ b/administrator/components/com_installer/models/manage.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_installer/models/update.php b/administrator/components/com_installer/models/update.php index 6da398fb846bd..0fba10761df68 100644 --- a/administrator/components/com_installer/models/update.php +++ b/administrator/components/com_installer/models/update.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_installer/models/updatesites.php b/administrator/components/com_installer/models/updatesites.php index a122a08b4e81c..2ac0445b33b5a 100644 --- a/administrator/components/com_installer/models/updatesites.php +++ b/administrator/components/com_installer/models/updatesites.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_installer/models/warnings.php b/administrator/components/com_installer/models/warnings.php index 76e2ffba2bbd7..e62aea647785d 100644 --- a/administrator/components/com_installer/models/warnings.php +++ b/administrator/components/com_installer/models/warnings.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_installer/views/database/tmpl/default.php b/administrator/components/com_installer/views/database/tmpl/default.php index 9c49166369fb5..6e8fb469beb60 100644 --- a/administrator/components/com_installer/views/database/tmpl/default.php +++ b/administrator/components/com_installer/views/database/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_installer/views/database/tmpl/default.xml b/administrator/components/com_installer/views/database/tmpl/default.xml new file mode 100755 index 0000000000000..c028598367863 --- /dev/null +++ b/administrator/components/com_installer/views/database/tmpl/default.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/administrator/components/com_installer/views/database/view.html.php b/administrator/components/com_installer/views/database/view.html.php index 1c369d6c95184..4a061d62153c5 100644 --- a/administrator/components/com_installer/views/database/view.html.php +++ b/administrator/components/com_installer/views/database/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_installer/views/default/tmpl/default_ftp.php b/administrator/components/com_installer/views/default/tmpl/default_ftp.php index 52a5fb5b0bd7d..e896aa30407ca 100644 --- a/administrator/components/com_installer/views/default/tmpl/default_ftp.php +++ b/administrator/components/com_installer/views/default/tmpl/default_ftp.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_installer/views/default/tmpl/default_message.php b/administrator/components/com_installer/views/default/tmpl/default_message.php index ad9ccc07b1379..14dd265c8e605 100644 --- a/administrator/components/com_installer/views/default/tmpl/default_message.php +++ b/administrator/components/com_installer/views/default/tmpl/default_message.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_installer/views/default/view.php b/administrator/components/com_installer/views/default/view.php index b9c7bf98da883..07f98082d83ba 100644 --- a/administrator/components/com_installer/views/default/view.php +++ b/administrator/components/com_installer/views/default/view.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_installer/views/discover/tmpl/default.php b/administrator/components/com_installer/views/discover/tmpl/default.php index 4294ad18d1ac8..6fc428ac141ab 100644 --- a/administrator/components/com_installer/views/discover/tmpl/default.php +++ b/administrator/components/com_installer/views/discover/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_installer/views/discover/tmpl/default.xml b/administrator/components/com_installer/views/discover/tmpl/default.xml new file mode 100755 index 0000000000000..350dddaf66f10 --- /dev/null +++ b/administrator/components/com_installer/views/discover/tmpl/default.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/administrator/components/com_installer/views/discover/tmpl/default_item.php b/administrator/components/com_installer/views/discover/tmpl/default_item.php index 22b8e3428a023..2d982c55a8c4e 100644 --- a/administrator/components/com_installer/views/discover/tmpl/default_item.php +++ b/administrator/components/com_installer/views/discover/tmpl/default_item.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_installer/views/discover/view.html.php b/administrator/components/com_installer/views/discover/view.html.php index c7b312583a29f..2ce9baabd6a78 100644 --- a/administrator/components/com_installer/views/discover/view.html.php +++ b/administrator/components/com_installer/views/discover/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_installer/views/install/tmpl/default.php b/administrator/components/com_installer/views/install/tmpl/default.php index 311d64e7e837c..ced76916e7011 100644 --- a/administrator/components/com_installer/views/install/tmpl/default.php +++ b/administrator/components/com_installer/views/install/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_installer/views/install/tmpl/default.xml b/administrator/components/com_installer/views/install/tmpl/default.xml new file mode 100755 index 0000000000000..e6fd86b3287f9 --- /dev/null +++ b/administrator/components/com_installer/views/install/tmpl/default.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/administrator/components/com_installer/views/install/view.html.php b/administrator/components/com_installer/views/install/view.html.php index 1ede88a5fc87d..6e2c0b06862bd 100644 --- a/administrator/components/com_installer/views/install/view.html.php +++ b/administrator/components/com_installer/views/install/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_installer/views/languages/tmpl/default.php b/administrator/components/com_installer/views/languages/tmpl/default.php index 9edc4e44a2a6e..92d946c36bcb6 100644 --- a/administrator/components/com_installer/views/languages/tmpl/default.php +++ b/administrator/components/com_installer/views/languages/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_installer/views/languages/tmpl/default.xml b/administrator/components/com_installer/views/languages/tmpl/default.xml new file mode 100755 index 0000000000000..4f52293ea226d --- /dev/null +++ b/administrator/components/com_installer/views/languages/tmpl/default.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/administrator/components/com_installer/views/languages/view.html.php b/administrator/components/com_installer/views/languages/view.html.php index 25e0968389043..7c41f9cee388a 100644 --- a/administrator/components/com_installer/views/languages/view.html.php +++ b/administrator/components/com_installer/views/languages/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_installer/views/manage/tmpl/default.php b/administrator/components/com_installer/views/manage/tmpl/default.php index cc99b94828e4e..8e9aea19e9b2a 100644 --- a/administrator/components/com_installer/views/manage/tmpl/default.php +++ b/administrator/components/com_installer/views/manage/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_installer/views/manage/tmpl/default.xml b/administrator/components/com_installer/views/manage/tmpl/default.xml new file mode 100755 index 0000000000000..13dc66fc7c92c --- /dev/null +++ b/administrator/components/com_installer/views/manage/tmpl/default.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/administrator/components/com_installer/views/manage/view.html.php b/administrator/components/com_installer/views/manage/view.html.php index 7bfa0b6bfd55e..4f1b6d4aae3f7 100644 --- a/administrator/components/com_installer/views/manage/view.html.php +++ b/administrator/components/com_installer/views/manage/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_installer/views/update/tmpl/default.php b/administrator/components/com_installer/views/update/tmpl/default.php index 09dd85dc5ae63..269e794c4fa7c 100644 --- a/administrator/components/com_installer/views/update/tmpl/default.php +++ b/administrator/components/com_installer/views/update/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_installer/views/update/tmpl/default.xml b/administrator/components/com_installer/views/update/tmpl/default.xml new file mode 100755 index 0000000000000..d262a8a9750b2 --- /dev/null +++ b/administrator/components/com_installer/views/update/tmpl/default.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/administrator/components/com_installer/views/update/view.html.php b/administrator/components/com_installer/views/update/view.html.php index 00559a1a7c76b..09f0e58de07e3 100644 --- a/administrator/components/com_installer/views/update/view.html.php +++ b/administrator/components/com_installer/views/update/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_installer/views/updatesites/tmpl/default.php b/administrator/components/com_installer/views/updatesites/tmpl/default.php index 9b4f3ebd2d8f8..ef04063a95d3b 100644 --- a/administrator/components/com_installer/views/updatesites/tmpl/default.php +++ b/administrator/components/com_installer/views/updatesites/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_installer/views/updatesites/tmpl/default.xml b/administrator/components/com_installer/views/updatesites/tmpl/default.xml new file mode 100755 index 0000000000000..f9cf92a6b36fe --- /dev/null +++ b/administrator/components/com_installer/views/updatesites/tmpl/default.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/administrator/components/com_installer/views/updatesites/view.html.php b/administrator/components/com_installer/views/updatesites/view.html.php index 5b377d4d9af7d..75f957ec11cc6 100644 --- a/administrator/components/com_installer/views/updatesites/view.html.php +++ b/administrator/components/com_installer/views/updatesites/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_installer/views/warnings/tmpl/default.php b/administrator/components/com_installer/views/warnings/tmpl/default.php index 8b0a655e58ad7..6e8fb4791f4db 100644 --- a/administrator/components/com_installer/views/warnings/tmpl/default.php +++ b/administrator/components/com_installer/views/warnings/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_installer/views/warnings/tmpl/default.xml b/administrator/components/com_installer/views/warnings/tmpl/default.xml new file mode 100755 index 0000000000000..8e6472cdea1e9 --- /dev/null +++ b/administrator/components/com_installer/views/warnings/tmpl/default.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/administrator/components/com_installer/views/warnings/view.html.php b/administrator/components/com_installer/views/warnings/view.html.php index 67b394b77a33f..d70b851611dd4 100644 --- a/administrator/components/com_installer/views/warnings/view.html.php +++ b/administrator/components/com_installer/views/warnings/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_joomlaupdate/controller.php b/administrator/components/com_joomlaupdate/controller.php index bbc6d79e5aa59..cd4598ff07675 100644 --- a/administrator/components/com_joomlaupdate/controller.php +++ b/administrator/components/com_joomlaupdate/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_joomlaupdate * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_joomlaupdate/controllers/update.php b/administrator/components/com_joomlaupdate/controllers/update.php index e7c25d324e608..f42d62fc84374 100644 --- a/administrator/components/com_joomlaupdate/controllers/update.php +++ b/administrator/components/com_joomlaupdate/controllers/update.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_joomlaupdate * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_joomlaupdate/helpers/joomlaupdate.php b/administrator/components/com_joomlaupdate/helpers/joomlaupdate.php index 0ba8a22be5f9e..aa71edbef7263 100644 --- a/administrator/components/com_joomlaupdate/helpers/joomlaupdate.php +++ b/administrator/components/com_joomlaupdate/helpers/joomlaupdate.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_joomlaupdate * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_joomlaupdate/helpers/select.php b/administrator/components/com_joomlaupdate/helpers/select.php index b988054fcf1e4..1250a5055962c 100644 --- a/administrator/components/com_joomlaupdate/helpers/select.php +++ b/administrator/components/com_joomlaupdate/helpers/select.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_joomlaupdate * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_joomlaupdate/joomlaupdate.php b/administrator/components/com_joomlaupdate/joomlaupdate.php index 55cd7f8bb65d8..51371547a32ce 100644 --- a/administrator/components/com_joomlaupdate/joomlaupdate.php +++ b/administrator/components/com_joomlaupdate/joomlaupdate.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_joomlaupdate * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_joomlaupdate/models/default.php b/administrator/components/com_joomlaupdate/models/default.php index 49f5a19f051e2..8b339c9596ba9 100644 --- a/administrator/components/com_joomlaupdate/models/default.php +++ b/administrator/components/com_joomlaupdate/models/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_joomlaupdate * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_joomlaupdate/restore_finalisation.php b/administrator/components/com_joomlaupdate/restore_finalisation.php index 12ea98c878bf1..fd702319997b1 100644 --- a/administrator/components/com_joomlaupdate/restore_finalisation.php +++ b/administrator/components/com_joomlaupdate/restore_finalisation.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_joomlaupdate * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_joomlaupdate/views/default/tmpl/complete.php b/administrator/components/com_joomlaupdate/views/default/tmpl/complete.php index 33a134a299093..446f5b7b83457 100644 --- a/administrator/components/com_joomlaupdate/views/default/tmpl/complete.php +++ b/administrator/components/com_joomlaupdate/views/default/tmpl/complete.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_joomlaupdate * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_joomlaupdate/views/default/tmpl/default.php b/administrator/components/com_joomlaupdate/views/default/tmpl/default.php index 158c3d44904c5..0a9104c87adce 100644 --- a/administrator/components/com_joomlaupdate/views/default/tmpl/default.php +++ b/administrator/components/com_joomlaupdate/views/default/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_joomlaupdate * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_joomlaupdate/views/default/tmpl/default.xml b/administrator/components/com_joomlaupdate/views/default/tmpl/default.xml new file mode 100755 index 0000000000000..61f8dafe9a76b --- /dev/null +++ b/administrator/components/com_joomlaupdate/views/default/tmpl/default.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/administrator/components/com_joomlaupdate/views/default/tmpl/default_nodownload.php b/administrator/components/com_joomlaupdate/views/default/tmpl/default_nodownload.php index 2e78ea5172818..170762d8713ee 100644 --- a/administrator/components/com_joomlaupdate/views/default/tmpl/default_nodownload.php +++ b/administrator/components/com_joomlaupdate/views/default/tmpl/default_nodownload.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_joomlaupdate * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_joomlaupdate/views/default/tmpl/default_reinstall.php b/administrator/components/com_joomlaupdate/views/default/tmpl/default_reinstall.php index 5bd47f715ad28..395f3a5d6e69f 100644 --- a/administrator/components/com_joomlaupdate/views/default/tmpl/default_reinstall.php +++ b/administrator/components/com_joomlaupdate/views/default/tmpl/default_reinstall.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_joomlaupdate * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_joomlaupdate/views/default/tmpl/default_update.php b/administrator/components/com_joomlaupdate/views/default/tmpl/default_update.php index f730569456ebb..316f9f662a142 100644 --- a/administrator/components/com_joomlaupdate/views/default/tmpl/default_update.php +++ b/administrator/components/com_joomlaupdate/views/default/tmpl/default_update.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_joomlaupdate * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_joomlaupdate/views/default/tmpl/default_updatemefirst.php b/administrator/components/com_joomlaupdate/views/default/tmpl/default_updatemefirst.php index bf46cca6ef5fb..8af79ceb23f43 100644 --- a/administrator/components/com_joomlaupdate/views/default/tmpl/default_updatemefirst.php +++ b/administrator/components/com_joomlaupdate/views/default/tmpl/default_updatemefirst.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_joomlaupdate * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_joomlaupdate/views/default/tmpl/default_upload.php b/administrator/components/com_joomlaupdate/views/default/tmpl/default_upload.php index 08169ea3c1acf..e059354fa8fe8 100644 --- a/administrator/components/com_joomlaupdate/views/default/tmpl/default_upload.php +++ b/administrator/components/com_joomlaupdate/views/default/tmpl/default_upload.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_joomlaupdate * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_joomlaupdate/views/default/view.html.php b/administrator/components/com_joomlaupdate/views/default/view.html.php index e5c4a40f9f79c..5fdd89881c021 100644 --- a/administrator/components/com_joomlaupdate/views/default/view.html.php +++ b/administrator/components/com_joomlaupdate/views/default/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_joomlaupdate * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_joomlaupdate/views/update/tmpl/default.php b/administrator/components/com_joomlaupdate/views/update/tmpl/default.php index 582294fdcdca2..1289724fe5aba 100644 --- a/administrator/components/com_joomlaupdate/views/update/tmpl/default.php +++ b/administrator/components/com_joomlaupdate/views/update/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_joomlaupdate * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_joomlaupdate/views/update/tmpl/finaliseconfirm.php b/administrator/components/com_joomlaupdate/views/update/tmpl/finaliseconfirm.php index bbc3d72dc6d23..0a36d05d0e0ef 100644 --- a/administrator/components/com_joomlaupdate/views/update/tmpl/finaliseconfirm.php +++ b/administrator/components/com_joomlaupdate/views/update/tmpl/finaliseconfirm.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_joomlaupdate * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_joomlaupdate/views/update/view.html.php b/administrator/components/com_joomlaupdate/views/update/view.html.php index b1b1b73d5c3fb..a9067ece2dba2 100644 --- a/administrator/components/com_joomlaupdate/views/update/view.html.php +++ b/administrator/components/com_joomlaupdate/views/update/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_joomlaupdate * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_joomlaupdate/views/upload/tmpl/captive.php b/administrator/components/com_joomlaupdate/views/upload/tmpl/captive.php index 6329e21af5ec7..2ea53df7b6fed 100644 --- a/administrator/components/com_joomlaupdate/views/upload/tmpl/captive.php +++ b/administrator/components/com_joomlaupdate/views/upload/tmpl/captive.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_joomlaupdate * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_joomlaupdate/views/upload/view.html.php b/administrator/components/com_joomlaupdate/views/upload/view.html.php index 2ac4e036cfb45..bc720d4c355d2 100644 --- a/administrator/components/com_joomlaupdate/views/upload/view.html.php +++ b/administrator/components/com_joomlaupdate/views/upload/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_joomlaupdate * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_languages/controller.php b/administrator/components/com_languages/controller.php index f22c151d76a8b..070d2df7d0d8f 100644 --- a/administrator/components/com_languages/controller.php +++ b/administrator/components/com_languages/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_languages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_languages/controllers/installed.php b/administrator/components/com_languages/controllers/installed.php index 27306c430a02f..f8998bdab9c98 100644 --- a/administrator/components/com_languages/controllers/installed.php +++ b/administrator/components/com_languages/controllers/installed.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_languages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_languages/controllers/language.php b/administrator/components/com_languages/controllers/language.php index ab29ffb8d3735..33cd0293b7068 100644 --- a/administrator/components/com_languages/controllers/language.php +++ b/administrator/components/com_languages/controllers/language.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_languages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_languages/controllers/languages.php b/administrator/components/com_languages/controllers/languages.php index 629126325365c..25d89f20ab4d5 100644 --- a/administrator/components/com_languages/controllers/languages.php +++ b/administrator/components/com_languages/controllers/languages.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_languages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_languages/controllers/override.php b/administrator/components/com_languages/controllers/override.php index d16cf3d0774fc..98fc5f2ce1b71 100644 --- a/administrator/components/com_languages/controllers/override.php +++ b/administrator/components/com_languages/controllers/override.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_languages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_languages/controllers/overrides.php b/administrator/components/com_languages/controllers/overrides.php index 2cc1c1a3fcbfd..fda713a126d52 100644 --- a/administrator/components/com_languages/controllers/overrides.php +++ b/administrator/components/com_languages/controllers/overrides.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_languages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_languages/controllers/strings.json.php b/administrator/components/com_languages/controllers/strings.json.php index b721403f47b37..9fbd30259c699 100644 --- a/administrator/components/com_languages/controllers/strings.json.php +++ b/administrator/components/com_languages/controllers/strings.json.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_languages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_languages/helpers/html/languages.php b/administrator/components/com_languages/helpers/html/languages.php index 01468df548ff7..d69e3ae945053 100644 --- a/administrator/components/com_languages/helpers/html/languages.php +++ b/administrator/components/com_languages/helpers/html/languages.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_languages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_languages/helpers/jsonresponse.php b/administrator/components/com_languages/helpers/jsonresponse.php index 5d4f0fac0bd3c..a8c7a518d8913 100644 --- a/administrator/components/com_languages/helpers/jsonresponse.php +++ b/administrator/components/com_languages/helpers/jsonresponse.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_languages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_languages/helpers/languages.php b/administrator/components/com_languages/helpers/languages.php index 4c3e2483a7c09..e9a8809e921b9 100644 --- a/administrator/components/com_languages/helpers/languages.php +++ b/administrator/components/com_languages/helpers/languages.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_languages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_languages/helpers/multilangstatus.php b/administrator/components/com_languages/helpers/multilangstatus.php index 9e8d18bfdcc3e..f1b84283b3322 100644 --- a/administrator/components/com_languages/helpers/multilangstatus.php +++ b/administrator/components/com_languages/helpers/multilangstatus.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_languages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_languages/languages.php b/administrator/components/com_languages/languages.php index 913469ca5c57a..3a07360d932b5 100644 --- a/administrator/components/com_languages/languages.php +++ b/administrator/components/com_languages/languages.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_languages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_languages/models/installed.php b/administrator/components/com_languages/models/installed.php index b699f3b13cf08..6c1b5b9d9af8f 100644 --- a/administrator/components/com_languages/models/installed.php +++ b/administrator/components/com_languages/models/installed.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_languages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_languages/models/language.php b/administrator/components/com_languages/models/language.php index 42911fbc552ac..5b221e58c2beb 100644 --- a/administrator/components/com_languages/models/language.php +++ b/administrator/components/com_languages/models/language.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_languages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_languages/models/languages.php b/administrator/components/com_languages/models/languages.php index e2f98bd5f6a70..09fb317bb669d 100644 --- a/administrator/components/com_languages/models/languages.php +++ b/administrator/components/com_languages/models/languages.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_languages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_languages/models/override.php b/administrator/components/com_languages/models/override.php index 9c55c9001d80f..e76c752057425 100644 --- a/administrator/components/com_languages/models/override.php +++ b/administrator/components/com_languages/models/override.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_languages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_languages/models/overrides.php b/administrator/components/com_languages/models/overrides.php index 5a09688ea91bd..a30a891923505 100644 --- a/administrator/components/com_languages/models/overrides.php +++ b/administrator/components/com_languages/models/overrides.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_languages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_languages/models/strings.php b/administrator/components/com_languages/models/strings.php index 42395b2344ce6..5294b745a9f9c 100644 --- a/administrator/components/com_languages/models/strings.php +++ b/administrator/components/com_languages/models/strings.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_languages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_languages/views/installed/tmpl/default.php b/administrator/components/com_languages/views/installed/tmpl/default.php index d726cd28ee576..1844f74496c7d 100644 --- a/administrator/components/com_languages/views/installed/tmpl/default.php +++ b/administrator/components/com_languages/views/installed/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_languages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_languages/views/installed/tmpl/default.xml b/administrator/components/com_languages/views/installed/tmpl/default.xml new file mode 100755 index 0000000000000..3c92e7d97662c --- /dev/null +++ b/administrator/components/com_languages/views/installed/tmpl/default.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/administrator/components/com_languages/views/installed/view.html.php b/administrator/components/com_languages/views/installed/view.html.php index 9c2d9a2197e43..282bc9449612d 100644 --- a/administrator/components/com_languages/views/installed/view.html.php +++ b/administrator/components/com_languages/views/installed/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_languages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_languages/views/language/tmpl/edit.php b/administrator/components/com_languages/views/language/tmpl/edit.php index b48e375ee9d66..8dcbe39a0cf7d 100644 --- a/administrator/components/com_languages/views/language/tmpl/edit.php +++ b/administrator/components/com_languages/views/language/tmpl/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_languages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_languages/views/language/view.html.php b/administrator/components/com_languages/views/language/view.html.php index bdb6bbe0be0a4..5a9c35c67b63e 100644 --- a/administrator/components/com_languages/views/language/view.html.php +++ b/administrator/components/com_languages/views/language/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_languages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_languages/views/languages/tmpl/default.php b/administrator/components/com_languages/views/languages/tmpl/default.php index d2cd0bb83a143..45bf3a40f1c06 100644 --- a/administrator/components/com_languages/views/languages/tmpl/default.php +++ b/administrator/components/com_languages/views/languages/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_languages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_languages/views/languages/tmpl/default.xml b/administrator/components/com_languages/views/languages/tmpl/default.xml new file mode 100755 index 0000000000000..4c7a003f386bc --- /dev/null +++ b/administrator/components/com_languages/views/languages/tmpl/default.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/administrator/components/com_languages/views/languages/view.html.php b/administrator/components/com_languages/views/languages/view.html.php index 03f5490d88022..6c771d2a38f82 100644 --- a/administrator/components/com_languages/views/languages/view.html.php +++ b/administrator/components/com_languages/views/languages/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_languages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_languages/views/multilangstatus/tmpl/default.php b/administrator/components/com_languages/views/multilangstatus/tmpl/default.php index 8bf4be9300b5f..74a7987ef5ae6 100644 --- a/administrator/components/com_languages/views/multilangstatus/tmpl/default.php +++ b/administrator/components/com_languages/views/multilangstatus/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_languages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_languages/views/multilangstatus/view.html.php b/administrator/components/com_languages/views/multilangstatus/view.html.php index 5cee40bbc2abb..02495b29c32bf 100644 --- a/administrator/components/com_languages/views/multilangstatus/view.html.php +++ b/administrator/components/com_languages/views/multilangstatus/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_languages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_languages/views/override/tmpl/edit.php b/administrator/components/com_languages/views/override/tmpl/edit.php index 2d6af177fefb6..5db50626b8073 100644 --- a/administrator/components/com_languages/views/override/tmpl/edit.php +++ b/administrator/components/com_languages/views/override/tmpl/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_languages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_languages/views/override/view.html.php b/administrator/components/com_languages/views/override/view.html.php index 65a42c2b88ac4..4c4c32deaad9f 100644 --- a/administrator/components/com_languages/views/override/view.html.php +++ b/administrator/components/com_languages/views/override/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_languages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_languages/views/overrides/tmpl/default.php b/administrator/components/com_languages/views/overrides/tmpl/default.php index 094adc642c83f..ed0206feb2c47 100644 --- a/administrator/components/com_languages/views/overrides/tmpl/default.php +++ b/administrator/components/com_languages/views/overrides/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_languages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_languages/views/overrides/tmpl/default.xml b/administrator/components/com_languages/views/overrides/tmpl/default.xml new file mode 100755 index 0000000000000..54b63dcf72c9c --- /dev/null +++ b/administrator/components/com_languages/views/overrides/tmpl/default.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/administrator/components/com_languages/views/overrides/view.html.php b/administrator/components/com_languages/views/overrides/view.html.php index a188d53364b3d..8cdae9fb75a4d 100644 --- a/administrator/components/com_languages/views/overrides/view.html.php +++ b/administrator/components/com_languages/views/overrides/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_languages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_login/controller.php b/administrator/components/com_login/controller.php index 5d98739b8ecfc..488a8edf05b17 100644 --- a/administrator/components/com_login/controller.php +++ b/administrator/components/com_login/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_login * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_login/login.php b/administrator/components/com_login/login.php index 1c8e2ade310da..87665a673dd02 100644 --- a/administrator/components/com_login/login.php +++ b/administrator/components/com_login/login.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_login * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_login/models/login.php b/administrator/components/com_login/models/login.php index 1ec4f3b67eefc..3a1397abbc002 100644 --- a/administrator/components/com_login/models/login.php +++ b/administrator/components/com_login/models/login.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_login * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_login/views/login/tmpl/default.php b/administrator/components/com_login/views/login/tmpl/default.php index 216a0c0b932e2..909bc162cf18b 100644 --- a/administrator/components/com_login/views/login/tmpl/default.php +++ b/administrator/components/com_login/views/login/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_login * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_login/views/login/view.html.php b/administrator/components/com_login/views/login/view.html.php index e90850e6eeba3..0f9d047e4bf87 100644 --- a/administrator/components/com_login/views/login/view.html.php +++ b/administrator/components/com_login/views/login/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_login * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/controller.php b/administrator/components/com_media/controller.php index f90061d4c9ac1..2ff56abd6653c 100644 --- a/administrator/components/com_media/controller.php +++ b/administrator/components/com_media/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/controllers/file.json.php b/administrator/components/com_media/controllers/file.json.php index 3355777d36b1a..8408a6df4970a 100644 --- a/administrator/components/com_media/controllers/file.json.php +++ b/administrator/components/com_media/controllers/file.json.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/controllers/file.php b/administrator/components/com_media/controllers/file.php index 7768ac5596e8b..d942a1d424b99 100644 --- a/administrator/components/com_media/controllers/file.php +++ b/administrator/components/com_media/controllers/file.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/controllers/folder.php b/administrator/components/com_media/controllers/folder.php index 75844dfe0b8a9..6b0da855a18fb 100644 --- a/administrator/components/com_media/controllers/folder.php +++ b/administrator/components/com_media/controllers/folder.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/helpers/media.php b/administrator/components/com_media/helpers/media.php index 97b8c2641c10d..e2b01be7fca1f 100644 --- a/administrator/components/com_media/helpers/media.php +++ b/administrator/components/com_media/helpers/media.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/layouts/toolbar/deletemedia.php b/administrator/components/com_media/layouts/toolbar/deletemedia.php index c8cd23764f196..29d1faf96a7ed 100644 --- a/administrator/components/com_media/layouts/toolbar/deletemedia.php +++ b/administrator/components/com_media/layouts/toolbar/deletemedia.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/layouts/toolbar/newfolder.php b/administrator/components/com_media/layouts/toolbar/newfolder.php index eb6bb5bb9f7b6..eb217cb7ac67d 100644 --- a/administrator/components/com_media/layouts/toolbar/newfolder.php +++ b/administrator/components/com_media/layouts/toolbar/newfolder.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/layouts/toolbar/uploadmedia.php b/administrator/components/com_media/layouts/toolbar/uploadmedia.php index 458aaa6963643..c9ef01c7b79f4 100644 --- a/administrator/components/com_media/layouts/toolbar/uploadmedia.php +++ b/administrator/components/com_media/layouts/toolbar/uploadmedia.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/media.php b/administrator/components/com_media/media.php index 5d50f908ecdae..66810dfafb499 100644 --- a/administrator/components/com_media/media.php +++ b/administrator/components/com_media/media.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/models/list.php b/administrator/components/com_media/models/list.php index a50b97531993d..1d6fd526c3839 100644 --- a/administrator/components/com_media/models/list.php +++ b/administrator/components/com_media/models/list.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/models/manager.php b/administrator/components/com_media/models/manager.php index c1f654389970e..a7c9c397d14ed 100644 --- a/administrator/components/com_media/models/manager.php +++ b/administrator/components/com_media/models/manager.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/views/images/tmpl/default.php b/administrator/components/com_media/views/images/tmpl/default.php index bf9866e34c778..6a70f89b92c87 100644 --- a/administrator/components/com_media/views/images/tmpl/default.php +++ b/administrator/components/com_media/views/images/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/views/images/view.html.php b/administrator/components/com_media/views/images/view.html.php index cb8fd825213a4..43d7939e093e5 100644 --- a/administrator/components/com_media/views/images/view.html.php +++ b/administrator/components/com_media/views/images/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/views/imageslist/tmpl/default.php b/administrator/components/com_media/views/imageslist/tmpl/default.php index 87b35908186ee..417e19ab3eacf 100644 --- a/administrator/components/com_media/views/imageslist/tmpl/default.php +++ b/administrator/components/com_media/views/imageslist/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/views/imageslist/tmpl/default_folder.php b/administrator/components/com_media/views/imageslist/tmpl/default_folder.php index 2c432e3fbe1c0..f01cf7e7dd5d9 100644 --- a/administrator/components/com_media/views/imageslist/tmpl/default_folder.php +++ b/administrator/components/com_media/views/imageslist/tmpl/default_folder.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/views/imageslist/tmpl/default_image.php b/administrator/components/com_media/views/imageslist/tmpl/default_image.php index c181768d1dd98..4bfffe9d6dd29 100644 --- a/administrator/components/com_media/views/imageslist/tmpl/default_image.php +++ b/administrator/components/com_media/views/imageslist/tmpl/default_image.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/views/imageslist/view.html.php b/administrator/components/com_media/views/imageslist/view.html.php index e46e8e14e5941..bdf82b08e8d33 100644 --- a/administrator/components/com_media/views/imageslist/view.html.php +++ b/administrator/components/com_media/views/imageslist/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/views/media/tmpl/default.php b/administrator/components/com_media/views/media/tmpl/default.php index 819f89170d73a..c93131f796f13 100644 --- a/administrator/components/com_media/views/media/tmpl/default.php +++ b/administrator/components/com_media/views/media/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/views/media/tmpl/default.xml b/administrator/components/com_media/views/media/tmpl/default.xml new file mode 100755 index 0000000000000..6aa1cbb202034 --- /dev/null +++ b/administrator/components/com_media/views/media/tmpl/default.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/administrator/components/com_media/views/media/tmpl/default_folders.php b/administrator/components/com_media/views/media/tmpl/default_folders.php index dd302affa4fa8..48d478e9c6399 100644 --- a/administrator/components/com_media/views/media/tmpl/default_folders.php +++ b/administrator/components/com_media/views/media/tmpl/default_folders.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/views/media/tmpl/default_navigation.php b/administrator/components/com_media/views/media/tmpl/default_navigation.php index 52b07f8b80672..2c6434c3b9ca2 100644 --- a/administrator/components/com_media/views/media/tmpl/default_navigation.php +++ b/administrator/components/com_media/views/media/tmpl/default_navigation.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/views/media/view.html.php b/administrator/components/com_media/views/media/view.html.php index d02a54eec7460..290fbb54ed877 100644 --- a/administrator/components/com_media/views/media/view.html.php +++ b/administrator/components/com_media/views/media/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/views/medialist/tmpl/default.php b/administrator/components/com_media/views/medialist/tmpl/default.php index d99218d8c8909..3b47bf1368389 100644 --- a/administrator/components/com_media/views/medialist/tmpl/default.php +++ b/administrator/components/com_media/views/medialist/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/views/medialist/tmpl/details.php b/administrator/components/com_media/views/medialist/tmpl/details.php index f89cb416a9673..450f0fa99b2d7 100644 --- a/administrator/components/com_media/views/medialist/tmpl/details.php +++ b/administrator/components/com_media/views/medialist/tmpl/details.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/views/medialist/tmpl/details_docs.php b/administrator/components/com_media/views/medialist/tmpl/details_docs.php index 056ec39910c93..6fd6b83801b9c 100644 --- a/administrator/components/com_media/views/medialist/tmpl/details_docs.php +++ b/administrator/components/com_media/views/medialist/tmpl/details_docs.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_media/views/medialist/tmpl/details_folders.php b/administrator/components/com_media/views/medialist/tmpl/details_folders.php index 76138ab2d2f6d..b8d74b2b8bab7 100644 --- a/administrator/components/com_media/views/medialist/tmpl/details_folders.php +++ b/administrator/components/com_media/views/medialist/tmpl/details_folders.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_media/views/medialist/tmpl/details_imgs.php b/administrator/components/com_media/views/medialist/tmpl/details_imgs.php index dd6a7a579808a..0125006e823c4 100644 --- a/administrator/components/com_media/views/medialist/tmpl/details_imgs.php +++ b/administrator/components/com_media/views/medialist/tmpl/details_imgs.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/views/medialist/tmpl/details_up.php b/administrator/components/com_media/views/medialist/tmpl/details_up.php index 531d60c6ee685..cc649e41072ff 100644 --- a/administrator/components/com_media/views/medialist/tmpl/details_up.php +++ b/administrator/components/com_media/views/medialist/tmpl/details_up.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/views/medialist/tmpl/details_videos.php b/administrator/components/com_media/views/medialist/tmpl/details_videos.php index adb5519ce4666..92a402647af73 100644 --- a/administrator/components/com_media/views/medialist/tmpl/details_videos.php +++ b/administrator/components/com_media/views/medialist/tmpl/details_videos.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/views/medialist/tmpl/thumbs.php b/administrator/components/com_media/views/medialist/tmpl/thumbs.php index 44ff5c3e49013..46aa8237c5980 100644 --- a/administrator/components/com_media/views/medialist/tmpl/thumbs.php +++ b/administrator/components/com_media/views/medialist/tmpl/thumbs.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/views/medialist/tmpl/thumbs_docs.php b/administrator/components/com_media/views/medialist/tmpl/thumbs_docs.php index d93517a367921..1d81fc7d76a58 100644 --- a/administrator/components/com_media/views/medialist/tmpl/thumbs_docs.php +++ b/administrator/components/com_media/views/medialist/tmpl/thumbs_docs.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/views/medialist/tmpl/thumbs_folders.php b/administrator/components/com_media/views/medialist/tmpl/thumbs_folders.php index 869e69fb014ad..d716c005ae444 100644 --- a/administrator/components/com_media/views/medialist/tmpl/thumbs_folders.php +++ b/administrator/components/com_media/views/medialist/tmpl/thumbs_folders.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/views/medialist/tmpl/thumbs_imgs.php b/administrator/components/com_media/views/medialist/tmpl/thumbs_imgs.php index 149fbf403cf92..1241e98976000 100644 --- a/administrator/components/com_media/views/medialist/tmpl/thumbs_imgs.php +++ b/administrator/components/com_media/views/medialist/tmpl/thumbs_imgs.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/views/medialist/tmpl/thumbs_up.php b/administrator/components/com_media/views/medialist/tmpl/thumbs_up.php index d4a21bad3b61c..862ff075b0a00 100644 --- a/administrator/components/com_media/views/medialist/tmpl/thumbs_up.php +++ b/administrator/components/com_media/views/medialist/tmpl/thumbs_up.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/views/medialist/tmpl/thumbs_videos.php b/administrator/components/com_media/views/medialist/tmpl/thumbs_videos.php index 00006b2d4d925..3e098fda557b0 100644 --- a/administrator/components/com_media/views/medialist/tmpl/thumbs_videos.php +++ b/administrator/components/com_media/views/medialist/tmpl/thumbs_videos.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/views/medialist/view.html.php b/administrator/components/com_media/views/medialist/view.html.php index f11bb826e03e1..7a135f28df8fc 100644 --- a/administrator/components/com_media/views/medialist/view.html.php +++ b/administrator/components/com_media/views/medialist/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_menus/controller.php b/administrator/components/com_menus/controller.php index 2d903fc27d082..509e3f5e258d4 100644 --- a/administrator/components/com_menus/controller.php +++ b/administrator/components/com_menus/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_menus/controllers/item.php b/administrator/components/com_menus/controllers/item.php index 5fd6210a04006..1ba81dfe9a432 100644 --- a/administrator/components/com_menus/controllers/item.php +++ b/administrator/components/com_menus/controllers/item.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -69,6 +69,12 @@ protected function allowEdit($data = array(), $key = 'id') if (!empty($item->menutype)) { + // Protected menutype, do not allow edit + if ($item->menutype == 'main' || $item->menutype == 'menu') + { + return false; + } + $menutypeID = (int) $this->getMenuTypeId($item->menutype); } } @@ -113,10 +119,6 @@ public function add() { $app->setUserState($context . '.type', null); $app->setUserState($context . '.link', null); - - $menuType = $app->getUserStateFromRequest($this->context . '.filter.menutype', 'menutype', 'mainmenu', 'cmd'); - - $this->setRedirect(JRoute::_('index.php?option=com_menus&view=item&menutype=' . $menuType . $this->getRedirectToItemAppend(), false)); } return $result; @@ -204,6 +206,38 @@ public function edit($key = null, $urlVar = null) return $result; } + /** + * Gets the URL arguments to append to an item redirect. + * + * @param integer $recordId The primary key id for the item. + * @param string $urlVar The name of the URL variable for the id. + * + * @return string The arguments to append to the redirect URL. + * + * @since 12.2 + */ + protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id') + { + $append = parent::getRedirectToItemAppend($recordId, $urlVar); + + if ($recordId) + { + $model = $this->getModel(); + $item = $model->getItem($recordId); + $clientId = $item->client_id; + $append = '&client_id=' . $clientId . $append; + } + else + { + $app = JFactory::getApplication(); + $clientId = $app->input->get('client_id', '0', 'int'); + $menuType = $app->input->get('menutype', 'mainmenu', 'cmd'); + $append = '&client_id=' . $clientId . ($menuType ? '&menutype=' . $menuType : '') . $append; + } + + return $append; + } + /** * Method to save a record. * @@ -297,7 +331,7 @@ public function save($key = null, $urlVar = null) $segments = explode(':', $data['link']); $protocol = strtolower($segments[0]); $scheme = array('http', 'https', 'ftp', 'ftps', 'gopher', 'mailto', 'news', 'prospero', 'telnet', 'rlogin', 'tn3270', 'wais', 'url', - 'mid', 'cid', 'nntp', 'tel', 'urn', 'ldap', 'file', 'fax', 'modem', 'git'); + 'mid', 'cid', 'nntp', 'tel', 'urn', 'ldap', 'file', 'fax', 'modem', 'git', 'sms'); if (!in_array($protocol, $scheme)) { @@ -429,7 +463,6 @@ public function save($key = null, $urlVar = null) $app->setUserState('com_menus.edit.item.data', null); $app->setUserState('com_menus.edit.item.type', null); $app->setUserState('com_menus.edit.item.link', null); - $app->setUserState('com_menus.edit.item.menutype', $model->getState('item.menutype')); // Redirect back to the edit screen. $this->setRedirect(JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend(), false)); @@ -532,21 +565,26 @@ public function getParentItem() { $app = JFactory::getApplication(); + $results = array(); $menutype = $this->input->get->get('menutype'); - $model = $this->getModel('Items', '', array()); - $model->getState(); - $model->setState('filter.menutype', $menutype); - $model->setState('list.select', 'a.id, a.title, a.level'); - $model->setState('list.start', 0); - $model->setState('list.limit', 0); - - $results = $model->getItems(); - - // Pad the option text with spaces using depth level as a multiplier. - for ($i = 0, $n = count($results); $i < $n; $i++) + if ($menutype) { - $results[$i]->title = str_repeat('- ', $results[$i]->level) . $results[$i]->title; + $model = $this->getModel('Items', '', array()); + $model->getState(); + $model->setState('filter.menutype', $menutype); + $model->setState('list.select', 'a.id, a.title, a.level'); + $model->setState('list.start', '0'); + $model->setState('list.limit', '0'); + + /** @var MenusModelItems $model */ + $results = $model->getItems(); + + // Pad the option text with spaces using depth level as a multiplier. + for ($i = 0, $n = count($results); $i < $n; $i++) + { + $results[$i]->title = str_repeat(' - ', $results[$i]->level) . $results[$i]->title; + } } // Output a JSON object diff --git a/administrator/components/com_menus/controllers/items.php b/administrator/components/com_menus/controllers/items.php index 6cca36ba32f18..add2426bc7735 100644 --- a/administrator/components/com_menus/controllers/items.php +++ b/administrator/components/com_menus/controllers/items.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_menus/controllers/menu.php b/administrator/components/com_menus/controllers/menu.php index 8ef083144995f..341584a7073f1 100644 --- a/administrator/components/com_menus/controllers/menu.php +++ b/administrator/components/com_menus/controllers/menu.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -52,17 +52,6 @@ public function save($key = null, $urlVar = null) $task = $this->getTask(); $recordId = $this->input->getInt('id'); - // Make sure we are not trying to modify an administrator menu. - if (isset($data['client_id']) && $data['client_id'] == 1) - { - JError::raiseNotice(0, JText::_('COM_MENUS_MENU_TYPE_NOT_ALLOWED')); - - // Redirect back to the edit screen. - $this->setRedirect(JRoute::_('index.php?option=com_menus&view=menu&layout=edit', false)); - - return false; - } - // Prevent using 'menu' or 'main' as menutype as this is reserved for backend menus if (strtolower($data['menutype']) == 'menu' || strtolower($data['menutype']) == 'main') { diff --git a/administrator/components/com_menus/controllers/menus.php b/administrator/components/com_menus/controllers/menus.php index a7743bfeef0b1..427b9a6a920c1 100644 --- a/administrator/components/com_menus/controllers/menus.php +++ b/administrator/components/com_menus/controllers/menus.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_menus/helpers/associations.php b/administrator/components/com_menus/helpers/associations.php new file mode 100644 index 0000000000000..c1244016713a2 --- /dev/null +++ b/administrator/components/com_menus/helpers/associations.php @@ -0,0 +1,166 @@ +getType($typeName); + + $context = $this->extension . '.item'; + + // Get the associations. + $associations = JLanguageAssociations::getAssociations( + $this->extension, + $type['tables']['a'], + $context, + $id, + 'id', + 'alias', + '' + ); + + return $associations; + } + + /** + * Get item information + * + * @param string $typeName The item type + * @param int $id The id of item for which we need the associated items + * + * @return JTable|null + * + * @since __DEPLOY_VERSION__ + */ + public function getItem($typeName, $id) + { + if (empty($id)) + { + return null; + } + + $table = null; + + switch ($typeName) + { + case 'item': + $table = JTable::getInstance('menu'); + break; + } + + if (is_null($table)) + { + return null; + } + + $table->load($id); + + return $table; + } + + /** + * Get information about the type + * + * @param string $typeName The item type + * + * @return array Array of item types + * + * @since __DEPLOY_VERSION__ + */ + public function getType($typeName = '') + { + $fields = $this->getFieldsTemplate(); + $tables = array(); + $joins = array(); + $support = $this->getSupportTemplate(); + $title = ''; + + if (in_array($typeName, $this->itemTypes)) + { + + switch ($typeName) + { + case 'item': + $fields['ordering'] = 'a.lft'; + $fields['level'] = 'a.level'; + $fields['catid'] = ''; + $fields['state'] = 'a.published'; + $fields['created_user_id'] = ''; + $fields['menutype'] = 'a.menutype'; + + $support['state'] = true; + $support['acl'] = true; + $support['checkout'] = true; + + $tables = array( + 'a' => '#__menu' + ); + + $title = 'menu'; + break; + } + } + + return array( + 'fields' => $fields, + 'support' => $support, + 'tables' => $tables, + 'joins' => $joins, + 'title' => $title + ); + } +} diff --git a/administrator/components/com_menus/helpers/html/menus.php b/administrator/components/com_menus/helpers/html/menus.php index a8b82a6fd363b..71522c136461e 100644 --- a/administrator/components/com_menus/helpers/html/menus.php +++ b/administrator/components/com_menus/helpers/html/menus.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_menus/helpers/menus.php b/administrator/components/com_menus/helpers/menus.php index b324004e9b253..c15ca1b041569 100644 --- a/administrator/components/com_menus/helpers/menus.php +++ b/administrator/components/com_menus/helpers/menus.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_menus/layouts/joomla/menu/edit_modules.php b/administrator/components/com_menus/layouts/joomla/menu/edit_modules.php index 92db6100a19eb..256a76125027b 100644 --- a/administrator/components/com_menus/layouts/joomla/menu/edit_modules.php +++ b/administrator/components/com_menus/layouts/joomla/menu/edit_modules.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_menus/layouts/joomla/searchtools/default.php b/administrator/components/com_menus/layouts/joomla/searchtools/default.php new file mode 100644 index 0000000000000..d44a0870e910f --- /dev/null +++ b/administrator/components/com_menus/layouts/joomla/searchtools/default.php @@ -0,0 +1,83 @@ +addStyleDeclaration(" + /* Fixed filter field in search bar */ + .js-stools .js-stools-menutype, + .js-stools .js-stools-client_id { + float: left; + margin-right: 10px; + min-width: 220px; + } + html[dir=rtl] .js-stools .js-stools-menutype, + html[dir=rtl] .js-stools .js-stools-client_id { + float: right; + margin-left: 10px + margin-right: 0; + } + .js-stools .js-stools-container-bar .js-stools-field-filter .chzn-container { + padding: 3px 0; + } + "); + + // Client selector doesn't have to activate the filter bar. + unset($data['view']->activeFilters['client_id']); + + // Menutype filter doesn't have to activate the filter bar + unset($data['view']->activeFilters['menutype']); +} + +// Set some basic options +$customOptions = array( + 'filtersHidden' => isset($data['options']['filtersHidden']) ? $data['options']['filtersHidden'] : empty($data['view']->activeFilters), + 'defaultLimit' => isset($data['options']['defaultLimit']) ? $data['options']['defaultLimit'] : JFactory::getApplication()->get('list_limit', 20), + 'searchFieldSelector' => '#filter_search', + 'orderFieldSelector' => '#list_fullordering', + 'totalResults' => isset($data['options']['totalResults']) ? $data['options']['totalResults'] : -1, + 'noResultsText' => isset($data['options']['noResultsText']) ? $data['options']['noResultsText'] : JText::_('JGLOBAL_NO_MATCHING_RESULTS'), +); + +$data['options'] = array_merge($customOptions, $data['options']); + +$formSelector = !empty($data['options']['formSelector']) ? $data['options']['formSelector'] : '#adminForm'; + +// Load search tools +JHtml::_('searchtools.form', $formSelector, $data['options']); + +$filtersClass = isset($data['view']->activeFilters) && $data['view']->activeFilters ? ' js-stools-container-filters-visible' : ''; +?> +
    +
    +
    + +
    +
    + +
    +
    + +
    + +
    +
    + + + diff --git a/administrator/components/com_menus/layouts/joomla/searchtools/default/bar.php b/administrator/components/com_menus/layouts/joomla/searchtools/default/bar.php new file mode 100644 index 0000000000000..916ea5459df3b --- /dev/null +++ b/administrator/components/com_menus/layouts/joomla/searchtools/default/bar.php @@ -0,0 +1,46 @@ +filterForm->getField('menutype'); + + // Add the client selector before the form filters. + $clientIdField = $data['view']->filterForm->getField('client_id'); + + if ($clientIdField): ?> +
    + input; ?> +
    + + +
    + input; ?> +
    + filterForm->getField('client_id'); + ?> +
    + input; ?> +
    + 'none')); diff --git a/administrator/components/com_menus/menus.php b/administrator/components/com_menus/menus.php index e4453e9202066..1da4ddebce45e 100644 --- a/administrator/components/com_menus/menus.php +++ b/administrator/components/com_menus/menus.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_menus/models/fields/menuordering.php b/administrator/components/com_menus/models/fields/menuordering.php index d78d8e19252e5..241aa7916c8cb 100644 --- a/administrator/components/com_menus/models/fields/menuordering.php +++ b/administrator/components/com_menus/models/fields/menuordering.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_menus/models/fields/menuparent.php b/administrator/components/com_menus/models/fields/menuparent.php index cb665c34e41f6..b59a9cd3993e4 100644 --- a/administrator/components/com_menus/models/fields/menuparent.php +++ b/administrator/components/com_menus/models/fields/menuparent.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -49,7 +49,10 @@ protected function getOptions() } else { + // Skip special menu types $query->where('a.menutype != ' . $db->quote('')); + $query->where('a.menutype != ' . $db->quote('main')); + $query->where('a.menutype != ' . $db->quote('menu')); } // Filter by client id. diff --git a/administrator/components/com_menus/models/fields/menutype.php b/administrator/components/com_menus/models/fields/menutype.php index 25e49d0fde4a1..b6f40a05d4873 100644 --- a/administrator/components/com_menus/models/fields/menutype.php +++ b/administrator/components/com_menus/models/fields/menutype.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -39,14 +39,12 @@ protected function getInput() { $html = array(); $recordId = (int) $this->form->getValue('id'); - $size = ($v = $this->element['size']) ? ' size="' . $v . '"' : ''; - $class = ($v = $this->element['class']) ? ' class="form-control ' . $v . '"' : ' class="form-control"'; - $required = ($v = $this->element['required']) ? ' required="required"' : ''; + $size = (string) ($v = $this->element['size']) ? ' size="' . $v . '"' : ''; + $class = (string) ($v = $this->element['class']) ? ' class="form-control ' . $v . '"' : 'class="form-control"'; + $required = (string) $this->element['required'] ? ' required="required"' : ''; + $clientId = (int) $this->element['clientid'] ?: 0; // Get a reverse lookup of the base link URL to Title - $model = JModelLegacy::getInstance('menutypes', 'menusModel'); - $rlu = $model->getReverseLookup(); - switch ($this->value) { case 'url': @@ -68,10 +66,17 @@ protected function getInput() default: $link = $this->form->getValue('link'); + /** @var MenusModelMenutypes $model */ + $model = JModelLegacy::getInstance('Menutypes', 'MenusModel', array('ignore_request' => true)); + $model->setState('client_id', $clientId); + + $rlu = $model->getReverseLookup(); + // Clean the link back to the option, view and layout $value = JText::_(ArrayHelper::getValue($rlu, MenusHelper::getLinkKey($link))); break; } + // Include jQuery JHtml::_('jquery.framework'); @@ -82,7 +87,7 @@ function jSelectPosition_' . $this->id . '(name) { } '); - $link = JRoute::_('index.php?option=com_menus&view=menutypes&tmpl=component&recordId=' . $recordId); + $link = JRoute::_('index.php?option=com_menus&view=menutypes&tmpl=component&client_id=' . $clientId . '&recordId=' . $recordId); $html[] = ''; $html[] = '' diff --git a/administrator/components/com_menus/models/fields/modal/menu.php b/administrator/components/com_menus/models/fields/modal/menu.php index b61de8867816d..42046a5fe0445 100644 --- a/administrator/components/com_menus/models/fields/modal/menu.php +++ b/administrator/components/com_menus/models/fields/modal/menu.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -38,6 +38,7 @@ protected function getInput() $allowEdit = ((string) $this->element['edit'] == 'true'); $allowClear = ((string) $this->element['clear'] != 'false'); $allowSelect = ((string) $this->element['select'] != 'false'); + $clientId = (int) $this->element['clientid']; // Load language JFactory::getLanguage()->load('com_menus', JPATH_ADMINISTRATOR); @@ -75,8 +76,9 @@ function jSelectMenu_" . $this->id . "(id, title, object) { } // Setup variables for display. - $linkItems = 'index.php?option=com_menus&view=items&layout=modal&tmpl=component&' . JSession::getFormToken() . '=1'; - $linkItem = 'index.php?option=com_menus&view=item&layout=modal&tmpl=component&' . JSession::getFormToken() . '=1'; + $linkSuffix = '&layout=modal&client_id=' . $clientId . '&tmpl=component&' . JSession::getFormToken() . '=1'; + $linkItems = 'index.php?option=com_menus&view=items' . $linkSuffix; + $linkItem = 'index.php?option=com_menus&view=item' . $linkSuffix; $modalTitle = JText::_('COM_MENUS_CHANGE_MENUITEM'); if (isset($this->element['language'])) diff --git a/administrator/components/com_menus/models/forms/filter_items.xml b/administrator/components/com_menus/models/forms/filter_items.xml index 6fb2f181ef607..903f500652d4f 100644 --- a/administrator/components/com_menus/models/forms/filter_items.xml +++ b/administrator/components/com_menus/models/forms/filter_items.xml @@ -1,11 +1,23 @@
    + + + + diff --git a/administrator/components/com_menus/models/forms/filter_menus.xml b/administrator/components/com_menus/models/forms/filter_menus.xml index 76eac7850ffd9..08a41880ae32e 100644 --- a/administrator/components/com_menus/models/forms/filter_menus.xml +++ b/administrator/components/com_menus/models/forms/filter_menus.xml @@ -1,5 +1,15 @@ + + + + JGLOBAL_TITLE_DESC - + @@ -120,7 +121,7 @@ type="list" label="COM_MENUS_ITEM_FIELD_BROWSERNAV_LABEL" description="COM_MENUS_ITEM_FIELD_BROWSERNAV_DESC" - default="Parent" + default="0" filter="int" > @@ -142,6 +143,7 @@ type="templatestyle" label="COM_MENUS_ITEM_FIELD_TEMPLATE_LABEL" description="COM_MENUS_ITEM_FIELD_TEMPLATE_DESC" + client="site" filter="int" > diff --git a/administrator/components/com_menus/models/forms/item_alias.xml b/administrator/components/com_menus/models/forms/item_alias.xml index 042125a713f13..bbc85762e50a9 100644 --- a/administrator/components/com_menus/models/forms/item_alias.xml +++ b/administrator/components/com_menus/models/forms/item_alias.xml @@ -8,6 +8,7 @@ + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + diff --git a/administrator/components/com_menus/models/forms/itemadmin_alias.xml b/administrator/components/com_menus/models/forms/itemadmin_alias.xml new file mode 100644 index 0000000000000..66e4aebe774a2 --- /dev/null +++ b/administrator/components/com_menus/models/forms/itemadmin_alias.xml @@ -0,0 +1,72 @@ + +
    + + +
    + +
    + +
    + + + + + + + + + + + + + + + +
    +     + + diff --git a/administrator/components/com_menus/models/forms/itemadmin_component.xml b/administrator/components/com_menus/models/forms/itemadmin_component.xml new file mode 100644 index 0000000000000..78741817a4869 --- /dev/null +++ b/administrator/components/com_menus/models/forms/itemadmin_component.xml @@ -0,0 +1,43 @@ + +
    + +
    + + + + + + + + + + + + + + + +
    +     +
    diff --git a/administrator/components/com_menus/models/forms/itemadmin_heading.xml b/administrator/components/com_menus/models/forms/itemadmin_heading.xml new file mode 100644 index 0000000000000..a13ca94055c55 --- /dev/null +++ b/administrator/components/com_menus/models/forms/itemadmin_heading.xml @@ -0,0 +1,81 @@ + +
    +
    + + + + +
    + + +
    + + + + + + + + + + + + + + + + + + + + +
    +     + + diff --git a/administrator/components/com_menus/models/forms/itemadmin_separator.xml b/administrator/components/com_menus/models/forms/itemadmin_separator.xml new file mode 100644 index 0000000000000..dc0a4d2e8e4fc --- /dev/null +++ b/administrator/components/com_menus/models/forms/itemadmin_separator.xml @@ -0,0 +1,18 @@ + +
    +
    + + + + +
    + + + diff --git a/administrator/components/com_menus/models/forms/itemadmin_url.xml b/administrator/components/com_menus/models/forms/itemadmin_url.xml new file mode 100644 index 0000000000000..5eba70717831c --- /dev/null +++ b/administrator/components/com_menus/models/forms/itemadmin_url.xml @@ -0,0 +1,61 @@ + +
    + +
    + + + + + + + + + + + + + + + + + + +
    +     + + diff --git a/administrator/components/com_menus/models/forms/menu.xml b/administrator/components/com_menus/models/forms/menu.xml index f89bad80b0384..ab9c9b9cfd177 100644 --- a/administrator/components/com_menus/models/forms/menu.xml +++ b/administrator/components/com_menus/models/forms/menu.xml @@ -7,13 +7,13 @@ type="hidden" default="0" filter="int" - readonly="true"/> - + readonly="true" + /> - + filter="unset" + /> - + required="true" + /> - + required="true" + /> - + maxlength="255" + /> + + + + 'batchAccess', - 'language_id' => 'batchLanguage' + 'language_id' => 'batchLanguage' ); /** @@ -96,9 +96,10 @@ protected function canDelete($record) if (!empty($record->id)) { + // Only delete trashed items if ($record->published != -2) { - return; + return false; } $menuTypeId = 0; @@ -110,6 +111,8 @@ protected function canDelete($record) return $user->authorise('core.delete', 'com_menus.menu.' . (int) $menuTypeId); } + + return false; } /** @@ -143,13 +146,13 @@ protected function canEditState($record) protected function batchCopy($value, $pks, $contexts) { // $value comes as {menutype}.{parent_id} - $parts = explode('.', $value); + $parts = explode('.', $value); $menuType = $parts[0]; $parentId = ArrayHelper::getValue($parts, 1, 0, 'int'); - $table = $this->getTable(); - $db = $this->getDbo(); - $query = $db->getQuery(true); + $table = $this->getTable(); + $db = $this->getDbo(); + $query = $db->getQuery(true); $newIds = array(); // Check that the parent exists @@ -536,8 +539,17 @@ public function getForm($data = array(), $loadData = true) $this->setState('item.type', ArrayHelper::getValue($data, 'type')); } + $clientId = $this->getState('item.client_id'); + // Get the form. - $form = $this->loadForm('com_menus.item', 'item', array('control' => 'jform', 'load_data' => $loadData), true); + if ($clientId == 1) + { + $form = $this->loadForm('com_menus.item.admin', 'itemadmin', array('control' => 'jform', 'load_data' => $loadData), true); + } + else + { + $form = $this->loadForm('com_menus.item', 'item', array('control' => 'jform', 'load_data' => $loadData), true); + } if (empty($form)) { @@ -562,10 +574,11 @@ public function getForm($data = array(), $loadData = true) $form->setFieldAttribute('published', 'filter', 'unset'); } - // Filter available menues + // Filter available menus $action = $this->getState('item.id') > 0 ? 'edit' : 'create'; $form->setFieldAttribute('menutype', 'accesstype', $action); + $form->setFieldAttribute('type', 'clientid', $clientId); return $form; } @@ -653,7 +666,8 @@ public function getItem($pk = null) if (empty($table->id)) { $table->parent_id = $this->getState('item.parent_id'); - $table->menutype = $this->getState('item.menutype'); + $table->menutype = $this->getState('item.menutype'); + $table->client_id = $this->getState('item.client_id'); $table->params = '{}'; } @@ -762,10 +776,8 @@ public function getItem($pk = null) $result->params = array_merge($result->params, $args); } - // Load associated menu items - $assoc = JLanguageAssociations::isEnabled(); - - if ($assoc) + // Load associated menu items, only supported for frontend for now + if ($this->getState('item.client_id') == 0 && JLanguageAssociations::isEnabled()) { if ($pk != null) { @@ -794,6 +806,12 @@ public function getModules() $db = $this->getDbo(); $query = $db->getQuery(true); + // Currently any setting that affects target page for a backend menu is not supported, hence load no modules. + if ($this->getState('item.client_id') == 1) + { + return false; + } + /** * Join on the module-to-menu mapping table. * We are only interested if the module is displayed on ALL or THIS menu item (or the inverse ID number). @@ -808,7 +826,7 @@ public function getModules() $query->select('ag.title AS access_title') ->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access') ->where('a.published >= 0') - ->where('a.client_id = 0') + ->where('a.client_id = ' . (int) $this->getState('item.client_id')) ->order('a.position, a.ordering'); $db->setQuery($query); @@ -830,7 +848,7 @@ public function getModules() /** * Get the list of all view levels * - * @return array An array of all view levels (id, title). + * @return array|bool An array of all view levels (id, title). * * @since 3.4 */ @@ -873,17 +891,17 @@ public function getViewLevels() */ protected function getReorderConditions($table) { - return 'menutype = ' . $this->_db->quote($table->menutype); + return 'menutype = ' . $this->_db->quote($table->get('menutype')); } /** * Returns a Table object, always creating it * - * @param type $type The table type to instantiate. + * @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. + * @return JTable|JTableNested A database object. * * @since 1.6 */ @@ -916,25 +934,48 @@ protected function populateState() $this->setState('item.parent_id', $parentId); - $menuType = $app->getUserState('com_menus.edit.item.menutype'); + $menuType = $app->getUserStateFromRequest('com_menus.items.menutype', 'menutype', '', 'string'); - if ($forcedMenuType = $app->input->get('menutype', '', 'string')) + // If we have a menutype we take client_id from there, unless forced otherwise + if ($menuType) { - $menuType = $forcedMenuType; + $menuTypeObj = $this->getMenuType($menuType); - // Set the menu type on the list view state, so we return to this menu after saving. - $app->setUserState('com_menus.items.menutype', $forcedMenuType); + // An invalid menutype will be handled as clientId = 0 and menuType = '' + $menuType = (string) $menuTypeObj->menutype; + $menuTypeId = (int) $menuTypeObj->client_id; + $clientId = (int) $menuTypeObj->client_id; + } + else + { + $menuTypeId = 0; + $clientId = $app->getUserState('com_menus.items.client_id', 0); } - $this->setState('item.menutype', $menuType); + // Forced client id will override/clear menuType if conflicted + $forcedClientId = $app->input->get('client_id', null, 'string'); - $menuTypeId = 0; + // Current item if not new, we don't allow changing client id at all + if ($pk) + { + $table = $this->getTable(); + $table->load($pk); + $forcedClientId = $table->get('client_id', $forcedClientId); + } - if ($menuType) + if (isset($forcedClientId) && $forcedClientId != $clientId) { - $menuTypeId = $this->getMenuTypeId($menuType); + $clientId = $forcedClientId; + $menuType = ''; + $menuTypeId = 0; } + // Set the menu type and client id on the list view state, so we return to this menu after saving. + $app->setUserState('com_menus.items.menutype', $menuType); + $app->setUserState('com_menus.items.client_id', $clientId); + + $this->setState('item.menutype', $menuType); + $this->setState('item.client_id', $clientId); $this->setState('item.menutypeid', $menuTypeId); if (!($type = $app->getUserState('com_menus.edit.item.type'))) @@ -960,21 +1001,37 @@ protected function populateState() } /** - * Loads the menutype ID by a given menutype string + * Loads the menutype object by a given menutype string * * @param string $menutype The given menutype * - * @return integer + * @return stdClass * - * @since 3.6 + * @since __DEPLOY_VERSION__ */ - protected function getMenuTypeId($menutype) + protected function getMenuType($menutype) { $table = $this->getTable('MenuType', 'JTable'); $table->load(array('menutype' => $menutype)); - return (int) $table->id; + return (object) $table->getProperties(); + } + + /** + * Loads the menutype ID by a given menutype string + * + * @param string $menutype The given menutype + * + * @return integer + * + * @since 3.6 + */ + protected function getMenuTypeId($menutype) + { + $menu = $this->getMenuType($menutype); + + return (int) $menu->id; } /** @@ -991,10 +1048,15 @@ protected function getMenuTypeId($menutype) */ protected function preprocessForm(JForm $form, $data, $group = 'content') { - $link = $this->getState('item.link'); - $type = $this->getState('item.type'); + $link = $this->getState('item.link'); + $type = $this->getState('item.type'); + $clientId = $this->getState('item.client_id'); $formFile = false; + // Load the specific type file + $typeFile = $clientId == 1 ? 'itemadmin_' . $type : 'item_' . $type; + $clientInfo = JApplicationHelper::getClientInfo($clientId); + // Initialise form with component view params if available. if ($type == 'component') { @@ -1012,7 +1074,7 @@ protected function preprocessForm(JForm $form, $data, $group = 'content') { // The option determines the base path to work with. $option = $args['option']; - $base = JPATH_SITE . '/components/' . $option; + $base = $clientInfo->path . '/components/' . $option; } if (isset($args['view'])) @@ -1045,8 +1107,9 @@ protected function preprocessForm(JForm $form, $data, $group = 'content') // template folder is first part of file name -- template:folder if (!$formFile && (strpos($layout, ':') > 0)) { - $temp = explode(':', $layout); - $templatePath = JPath::clean(JPATH_SITE . '/templates/' . $temp[0] . '/html/' . $option . '/' . $view . '/' . $temp[1] . '.xml'); + list($altTmpl, $altLayout) = explode(':', $layout); + + $templatePath = JPath::clean($clientInfo->path . '/templates/' . $altTmpl . '/html/' . $option . '/' . $view . '/' . $altLayout . '.xml'); if (is_file($templatePath)) { @@ -1106,16 +1169,18 @@ protected function preprocessForm(JForm $form, $data, $group = 'content') else { // We don't have a component. Load the form XML to get the help path - $xmlFile = JPath::find(JPATH_ADMINISTRATOR . '/components/com_menus/models/forms', 'item_' . $type . '.xml'); + $xmlFile = JPath::find(JPATH_ADMINISTRATOR . '/components/com_menus/models/forms', $typeFile . '.xml'); - // Attempt to load the xml file. - if ($xmlFile && !$xml = simplexml_load_file($xmlFile)) + if ($xmlFile) { - throw new Exception(JText::_('JERROR_LOADFILE_FAILED')); - } + if (!$xml = simplexml_load_file($xmlFile)) + { + throw new Exception(JText::_('JERROR_LOADFILE_FAILED')); + } - // Get the help data from the XML file if present. - $help = $xml->xpath('/form/help'); + // Get the help data from the XML file if present. + $help = $xml->xpath('/form/help'); + } } if (!empty($help)) @@ -1129,14 +1194,13 @@ protected function preprocessForm(JForm $form, $data, $group = 'content') $this->helpLocal = (($helpLoc == 'true') || ($helpLoc == '1') || ($helpLoc == 'local')) ? true : false; } - // Load the specific type file - if (!$form->loadFile('item_' . $type, false, false)) + if (!$form->loadFile($typeFile, true, false)) { throw new Exception(JText::_('JERROR_LOADFILE_FAILED')); } - // Association menu items - if (JLanguageAssociations::isEnabled()) + // Association menu items, we currently do not support this for admin menu… may be later + if ($clientId == 0 && JLanguageAssociations::isEnabled()) { $languages = JLanguageHelper::getContentLanguages(false, true, null, 'ordering', 'asc'); @@ -1182,7 +1246,7 @@ protected function preprocessForm(JForm $form, $data, $group = 'content') */ public function rebuild() { - // Initialiase variables. + // Initialise variables. $db = $this->getDbo(); $query = $db->getQuery(true); $table = $this->getTable(); @@ -1262,8 +1326,8 @@ public function save($data) $dispatcher = JEventDispatcher::getInstance(); $pk = (!empty($data['id'])) ? $data['id'] : (int) $this->getState('item.id'); $isNew = true; - $table = $this->getTable(); - $context = $this->option . '.' . $this->name; + $table = $this->getTable(); + $context = $this->option . '.' . $this->name; // Include the plugins for the on save events. JPluginHelper::importPlugin($this->events_map['save']); @@ -1310,6 +1374,10 @@ public function save($data) // We have a new item, so it is not a change. else { + $menuType = $this->getMenuType($data['menutype']); + + $data['client_id'] = $menuType->client_id; + $table->setLocation($data['parent_id'], 'last-child'); } @@ -1325,10 +1393,11 @@ public function save($data) if (!$isNew && $data['id'] == 0) { list($title, $alias) = $this->generateNewTitle($table->parent_id, $table->alias, $table->title); - $table->title = $title; - $table->alias = $alias; + + $table->title = $title; + $table->alias = $alias; $table->published = 0; - $table->home = 0; + $table->home = 0; } // Check the data. @@ -1364,10 +1433,8 @@ public function save($data) $this->setState('item.id', $table->id); $this->setState('item.menutype', $table->menutype); - // Load associated menu items - $assoc = JLanguageAssociations::isEnabled(); - - if ($assoc) + // Load associated menu items, for now not supported for admin menu… may be later + if ($table->get('client_id') == 0 && JLanguageAssociations::isEnabled()) { // Adding self to the association $associations = isset($data['associations']) ? $data['associations'] : array(); @@ -1541,6 +1608,12 @@ public function setHome(&$pks, $value = 1) unset($pks[$i]); JError::raiseNotice(403, JText::_('COM_MENUS_ERROR_ALREADY_HOME')); } + elseif ($table->menutype == 'main' || $table->menutype == 'menu') + { + // Prune items that you can't change. + unset($pks[$i]); + JError::raiseWarning(403, JText::_('COM_MENUS_ERROR_MENUTYPE_HOME')); + } else { $table->home = $value; diff --git a/administrator/components/com_menus/models/items.php b/administrator/components/com_menus/models/items.php index f036d251468cf..655c658071713 100644 --- a/administrator/components/com_menus/models/items.php +++ b/administrator/components/com_menus/models/items.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -108,49 +108,58 @@ protected function populateState($ordering = 'a.lft', $direction = 'asc') $level = $this->getUserStateFromRequest($this->context . '.filter.level', 'filter_level'); $this->setState('filter.level', $level); + // Watch changes in client_id and menutype and keep sync whenever needed. + $currentClientId = $app->getUserState($this->context . '.client_id', 0); + $clientId = $app->input->getInt('client_id', $currentClientId); + $currentMenuType = $app->getUserState($this->context . '.menutype', ''); $menuType = $app->input->getString('menutype', $currentMenuType); - // If selected menu type different from current menu type reset pagination to 0 - if ($menuType != $currentMenuType) + // If client_id changed clear menutype and reset pagination + if ($clientId != $currentClientId) { + $menuType = ''; + $app->input->set('limitstart', 0); + $app->input->set('menutype', ''); } - if ($menuType) + // If menutype changed reset pagination. + if ($menuType != $currentMenuType) { - $db = $this->getDbo(); - $query = $db->getQuery(true) - ->select($db->qn(array('id', 'title'))) - ->from($db->qn('#__menu_types')) - ->where($db->qn('menutype') . ' = ' . $db->q($menuType)); - - $menuTypeItem = $db->setQuery($query)->loadObject(); - - // Check if menu type exists. - if (!$menuTypeItem) - { - $this->setError(JText::_('COM_MENUS_ERROR_MENUTYPE_NOT_FOUND')); - } - // Check if menu type was changed and if valid agains ACL - elseif ($user->authorise('core.manage', 'com_menus.menu.' . $menuTypeItem->id)) - { - $app->setUserState($this->context . '.menutype', $menuType); - $this->setState('menutypetitle', !empty($menuTypeItem->title) ? $menuTypeItem->title : ''); - $this->setState('menutypeid', !empty($menuTypeItem->id) ? $menuTypeItem->id : ''); - } - // Nope, not valid - else - { - $this->setError(JText::_('JERROR_ALERTNOAUTHOR')); - } + $app->input->set('limitstart', 0); } - else + + if (!$menuType) { $app->setUserState($this->context . '.menutype', ''); $this->setState('menutypetitle', ''); $this->setState('menutypeid', ''); } + // Special menu types, if selected explicitly, will be allowed as a filter + elseif ($menuType == 'main' || $menuType == 'menu') + { + // Adjust client_id to match the menutype. This is safe as client_id was not changed in this request. + $app->input->set('client_id', 1); + + $app->setUserState($this->context . '.menutype', $menuType); + $this->setState('menutypetitle', ucfirst($menuType)); + $this->setState('menutypeid', -1); + } + // Get the menutype object with appropriate checks. + elseif ($cMenu = $this->getMenu($menuType, true)) + { + // Adjust client_id to match the menutype. This is safe as client_id was not changed in this request. + $app->input->set('client_id', $cMenu->client_id); + + $app->setUserState($this->context . '.menutype', $menuType); + $this->setState('menutypetitle', $cMenu->title); + $this->setState('menutypeid', $cMenu->id); + } + + // Client id filter + $clientId = (int) $this->getUserStateFromRequest($this->context . '.client_id', 'client_id', 0, 'int'); + $this->setState('filter.client_id', $clientId); $this->setState('filter.menutype', $menuType); @@ -193,6 +202,7 @@ protected function getStoreId($id = '') $id .= ':' . $this->getState('filter.search'); $id .= ':' . $this->getState('filter.parent_id'); $id .= ':' . $this->getState('filter.menutype'); + $id .= ':' . $this->getState('filter.client_id'); return parent::getStoreId($id); } @@ -282,7 +292,7 @@ protected function getListQuery() // Exclude the root category. $query->where('a.id > 1') - ->where('a.client_id = 0'); + ->where('a.client_id = ' . (int) $this->getState('filter.client_id')); // Filter on the published state. $published = $this->getState('filter.published'); @@ -293,7 +303,7 @@ protected function getListQuery() } elseif ($published === '') { - $query->where('(a.published IN (0, 1))'); + $query->where('a.published IN (0, 1)'); } // Filter by search in title, alias or id @@ -329,30 +339,31 @@ protected function getListQuery() // Filter the items over the menu id if set. $menuType = $this->getState('filter.menutype'); - // "" means all + // A value "" means all if ($menuType == '') { // Load all menu types we have manage access $query2 = $this->getDbo()->getQuery(true) ->select($this->getDbo()->qn(array('id', 'menutype'))) ->from('#__menu_types') + ->where('client_id = ' . (int) $this->getState('filter.client_id')) ->order('title'); $menuTypes = $this->getDbo()->setQuery($query2)->loadObjectList(); - $types = array(); - - foreach ($menuTypes as $type) + if ($menuTypes) { - if ($user->authorise('core.manage', 'com_menus.menu.' . (int) $type->id)) + $types = array(); + + foreach ($menuTypes as $type) { - $types[] = $query->q($type->menutype); + if ($user->authorise('core.manage', 'com_menus.menu.' . (int) $type->id)) + { + $types[] = $query->q($type->menutype); + } } - } - if (!empty($types)) - { - $query->where('a.menutype IN(' . implode(',', $types) . ')'); + $query->where($types ? 'a.menutype IN(' . implode(',', $types) . ')' : 0); } } // Default behavior => load all items from a specific menu @@ -400,4 +411,108 @@ protected function getListQuery() return $query; } + + /** + * Method to allow derived classes to preprocess the form. + * + * @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.2 + * @throws Exception if there is an error in the form event. + */ + protected function preprocessForm(JForm $form, $data, $group = 'content') + { + $name = $form->getName(); + + if ($name == 'com_menus.items.filter') + { + $clientId = $this->getState('filter.client_id'); + $form->setFieldAttribute('menutype', 'clientid', $clientId); + } + elseif (false !== strpos($name, 'com_menus.items.modal.')) + { + $form->removeField('client_id'); + + $clientId = $this->getState('filter.client_id'); + $form->setFieldAttribute('menutype', 'clientid', $clientId); + } + } + + /** + * Get the client id for a menu + * + * @param string $menuType The menutype identifier for the menu + * @param bool $check Flag whether to perform check against ACL as well as existence + * + * @return int + * + * @since __DEPLOY_VERSION__ + */ + protected function getMenu($menuType, $check = false) + { + $query = $this->_db->getQuery(true); + + $query->select('a.*') + ->from($this->_db->qn('#__menu_types', 'a')) + ->where('menutype = ' . $this->_db->q($menuType)); + + $cMenu = $this->_db->setQuery($query)->loadObject(); + + if ($check) + { + // Check if menu type exists. + if (!$cMenu) + { + $this->setError(JText::_('COM_MENUS_ERROR_MENUTYPE_NOT_FOUND')); + } + // Check if menu type is valid against ACL. + elseif (!JFactory::getUser()->authorise('core.manage', 'com_menus.menu.' . $cMenu->id)) + { + $this->setError(JText::_('JERROR_ALERTNOAUTHOR')); + } + } + + return $cMenu; + } + + /** + * 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() + { + $store = $this->getStoreId(); + + if (!isset($this->cache[$store])) + { + $items = parent::getItems(); + $lang = JFactory::getLanguage(); + + if ($items) + { + foreach ($items as $item) + { + if ($extension = $item->componentname) + { + $lang->load("$extension.sys", JPATH_ADMINISTRATOR, null, false, true) + || $lang->load("$extension.sys", JPATH_ADMINISTRATOR . '/components/' . $extension, null, false, true); + } + + // Translate component name + $item->title = JText::_($item->title); + } + } + + $this->cache[$store] = $items; + } + + return $this->cache[$store]; + } } diff --git a/administrator/components/com_menus/models/menu.php b/administrator/components/com_menus/models/menu.php index eca43d0259b97..20c89465b7694 100644 --- a/administrator/components/com_menus/models/menu.php +++ b/administrator/components/com_menus/models/menu.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_menus/models/menus.php b/administrator/components/com_menus/models/menus.php index f89741ec00d56..6c7f8e6dc566e 100644 --- a/administrator/components/com_menus/models/menus.php +++ b/administrator/components/com_menus/models/menus.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -34,6 +34,7 @@ public function __construct($config = array()) 'id', 'a.id', 'title', 'a.title', 'menutype', 'a.menutype', + 'client_id', 'a.client_id', ); } @@ -138,9 +139,9 @@ public function getItems() // Inject the values back into the array. foreach ($items as $item) { - $item->count_published = isset($countPublished[$item->menutype]) ? $countPublished[$item->menutype] : 0; + $item->count_published = isset($countPublished[$item->menutype]) ? $countPublished[$item->menutype] : 0; $item->count_unpublished = isset($countUnpublished[$item->menutype]) ? $countUnpublished[$item->menutype] : 0; - $item->count_trashed = isset($countTrashed[$item->menutype]) ? $countTrashed[$item->menutype] : 0; + $item->count_trashed = isset($countTrashed[$item->menutype]) ? $countTrashed[$item->menutype] : 0; } // Add the items to the internal cache. @@ -163,10 +164,12 @@ protected function getListQuery() $query = $db->getQuery(true); // Select all fields from the table. - $query->select($this->getState('list.select', 'a.id, a.menutype, a.title, a.description')) + $query->select($this->getState('list.select', 'a.id, a.menutype, a.title, a.description, a.client_id')) ->from($db->quoteName('#__menu_types') . ' AS a') ->where('a.id > 0'); + $query->where('a.client_id = ' . (int) $this->getState('client_id')); + // Filter by search in title or menutype if ($search = trim($this->getState('filter.search'))) { @@ -194,9 +197,12 @@ protected function getListQuery() */ protected function populateState($ordering = 'a.title', $direction = 'asc') { - $search = $this->getUserStateFromRequest($this->context . '.search', 'filter_search'); + $search = $this->getUserStateFromRequest($this->context . '.search', 'filter_search'); $this->setState('filter.search', $search); + $clientId = (int) $this->getUserStateFromRequest($this->context . '.client_id', 'client_id', 0, 'int'); + $this->setState('client_id', $clientId); + // List state information. parent::populateState($ordering, $direction); } @@ -210,13 +216,13 @@ protected function populateState($ordering = 'a.title', $direction = 'asc') */ public function getModMenuId() { - $db = $this->getDbo(); + $db = $this->getDbo(); $query = $db->getQuery(true) ->select('e.extension_id') ->from('#__extensions AS e') ->where('e.type = ' . $db->quote('module')) ->where('e.element = ' . $db->quote('mod_menu')) - ->where('e.client_id = 0'); + ->where('e.client_id = ' . (int) $this->getState('client_id')); $db->setQuery($query); return $db->loadResult(); diff --git a/administrator/components/com_menus/models/menutypes.php b/administrator/components/com_menus/models/menutypes.php index bdf5df647271d..79aab9ed78b6c 100644 --- a/administrator/components/com_menus/models/menutypes.php +++ b/administrator/components/com_menus/models/menutypes.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -25,6 +25,28 @@ class MenusModelMenutypes extends JModelLegacy */ protected $rlu = array(); + /** + * 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. + * + * @return void + * + * @note Calling getState in this method will result in recursion. + * @since 12.2 + */ + protected function populateState() + { + parent::populateState(); + + $app = JFactory::getApplication(); + $clientId = $app->input->get('client_id', 0); + + $this->state->set('client_id', $clientId); + } + /** * Method to get the reverse lookup of the base link URL to Title * @@ -57,7 +79,7 @@ public function getTypeOptions() $list = array(); // Get the list of components. - $db = $this->getDbo(); + $db = $this->getDbo(); $query = $db->getQuery(true) ->select('name, element AS ' . $db->quoteName('option')) ->from('#__extensions') @@ -69,7 +91,9 @@ public function getTypeOptions() foreach ($components as $component) { - if ($options = $this->getTypeOptionsByComponent($component->option)) + $options = $this->getTypeOptionsByComponent($component->option); + + if ($options) { $list[$component->name] = $options; @@ -124,8 +148,8 @@ public function addReverseLookupUrl($option) protected function getTypeOptionsByComponent($component) { $options = array(); - - $mainXML = JPATH_SITE . '/components/' . $component . '/metadata.xml'; + $client = JApplicationHelper::getClientInfo($this->getState('client_id')); + $mainXML = $client->path . '/components/' . $component . '/metadata.xml'; if (is_file($mainXML)) { @@ -137,6 +161,11 @@ protected function getTypeOptionsByComponent($component) $options = $this->getTypeOptionsFromMvc($component); } + if ($client->id == 1 && empty($options)) + { + $options = $this->getTypeOptionsFromManifest($component); + } + return $options; } @@ -146,7 +175,7 @@ protected function getTypeOptionsByComponent($component) * @param string $file File path * @param string $component Component option as in URL * - * @return array + * @return array|bool * * @since 1.6 */ @@ -199,31 +228,29 @@ protected function getTypeOptionsFromXml($file, $component) { return false; } - else + + // Process each child as an option. + foreach ($children as $child) { - // Process each child as an option. - foreach ($children as $child) + if ($child->getName() == 'option') { - if ($child->getName() == 'option') - { - // Create the menu option for the component. - $o = new JObject; - $o->title = (string) $child['name']; - $o->description = (string) $child['msg']; - $o->request = array('option' => $component, (string) $optionsNode['var'] => (string) $child['value']); + // Create the menu option for the component. + $o = new JObject; + $o->title = (string) $child['name']; + $o->description = (string) $child['msg']; + $o->request = array('option' => $component, (string) $optionsNode['var'] => (string) $child['value']); - $options[] = $o; - } - elseif ($child->getName() == 'default') - { - // Create the menu option for the component. - $o = new JObject; - $o->title = (string) $child['name']; - $o->description = (string) $child['msg']; - $o->request = array('option' => $component); + $options[] = $o; + } + elseif ($child->getName() == 'default') + { + // Create the menu option for the component. + $o = new JObject; + $o->title = (string) $child['name']; + $o->description = (string) $child['msg']; + $o->request = array('option' => $component); - $options[] = $o; - } + $options[] = $o; } } @@ -235,18 +262,19 @@ protected function getTypeOptionsFromXml($file, $component) * * @param string $component Component option like in URLs * - * @return array + * @return array|bool * * @since 1.6 */ protected function getTypeOptionsFromMvc($component) { $options = array(); + $client = JApplicationHelper::getClientInfo($this->getState('client_id')); // Get the views for this component. - if (is_dir(JPATH_SITE . '/components/' . $component)) + if (is_dir($client->path . '/components/' . $component)) { - $folders = JFolder::folders(JPATH_SITE . '/components/' . $component, '^view[s]?$', false, true); + $folders = JFolder::folders($client->path . '/components/' . $component, '^view[s]?$', false, true); } $path = ''; @@ -344,6 +372,104 @@ protected function getTypeOptionsFromMvc($component) return $options; } + /** + * Get menu types from Component manifest + * + * @param string $component Component option like in URLs + * + * @return array|bool + * + * @since __DEPLOY_VERSION__ + */ + protected function getTypeOptionsFromManifest($component) + { + // Load the component manifest + $fileName = JPATH_ADMINISTRATOR . '/components/' . $component . '/' . str_replace('com_', '', $component) . '.xml'; + + if (!is_file($fileName)) + { + return false; + } + + if (!($manifest = simplexml_load_file($fileName))) + { + return false; + } + + // Check for a valid XML root tag. + if ($manifest->getName() != 'extension') + { + return false; + } + + $options = array(); + + // Start with the component root menu. + $rootMenu = $manifest->administration->menu; + + // If the menu item doesn't exist or is hidden do nothing. + if (!$rootMenu || in_array((string) $rootMenu['hidden'], array('true', 'hidden'))) + { + return $options; + } + + // Create the root menu option. + $ro = new stdClass; + $ro->title = (string) trim($rootMenu); + $ro->description = ''; + $ro->request = array('option' => $component); + + // Process submenu options. + $submenu = $manifest->administration->submenu; + + if (!$submenu) + { + return $options; + } + + foreach ($submenu->menu as $child) + { + $attributes = $child->attributes(); + + $o = new stdClass; + $o->title = (string) trim($child); + $o->description = ''; + + if ((string) $attributes->link) + { + parse_str((string) $attributes->link, $request); + } + else + { + $request = array(); + + $request['option'] = $component; + $request['act'] = (string) $attributes->act; + $request['task'] = (string) $attributes->task; + $request['controller'] = (string) $attributes->controller; + $request['view'] = (string) $attributes->view; + $request['layout'] = (string) $attributes->layout; + $request['sub'] = (string) $attributes->sub; + } + + $o->request = array_filter($request, 'strlen'); + $options[] = new JObject($o); + + // Do not repeat the default view link (index.php?option=com_abc). + if (count($o->request) == 1) + { + $ro = null; + } + } + + if ($ro) + { + $options[] = new JObject($ro); + } + + return $options; + } + /** * Get the menu types from component layouts * @@ -361,11 +487,12 @@ protected function getTypeOptionsFromLayouts($component, $view) $layoutNames = array(); $lang = JFactory::getLanguage(); $path = ''; + $client = JApplicationHelper::getClientInfo($this->getState('client_id')); // Get the views for this component. - if (is_dir(JPATH_SITE . '/components/' . $component)) + if (is_dir($client->path . '/components/' . $component)) { - $folders = JFolder::folders(JPATH_SITE . '/components/' . $component, '^view[s]?$', false, true); + $folders = JFolder::folders($client->path . '/components/' . $component, '^view[s]?$', false, true); } if (!empty($folders[0])) @@ -395,7 +522,7 @@ protected function getTypeOptionsFromLayouts($component, $view) // Get the template layouts // TODO: This should only search one template -- the current template for this item (default of specified) - $folders = JFolder::folders(JPATH_SITE . '/templates', '', false, true); + $folders = JFolder::folders($client->path . '/templates', '', false, true); // Array to hold association between template file names and templates $templateName = array(); @@ -405,8 +532,8 @@ protected function getTypeOptionsFromLayouts($component, $view) if (is_dir($folder . '/html/' . $component . '/' . $view)) { $template = basename($folder); - $lang->load('tpl_' . $template . '.sys', JPATH_SITE, null, false, true) - || $lang->load('tpl_' . $template . '.sys', JPATH_SITE . '/templates/' . $template, null, false, true); + $lang->load('tpl_' . $template . '.sys', $client->path, null, false, true) + || $lang->load('tpl_' . $template . '.sys', $client->path . '/templates/' . $template, null, false, true); $templateLayouts = JFolder::files($folder . '/html/' . $component . '/' . $view, '.xml$', false, true); diff --git a/administrator/components/com_menus/tables/menu.php b/administrator/components/com_menus/tables/menu.php index 552e73c40ea99..824e1c877300f 100644 --- a/administrator/components/com_menus/tables/menu.php +++ b/administrator/components/com_menus/tables/menu.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_menus/views/item/tmpl/edit.php b/administrator/components/com_menus/views/item/tmpl/edit.php index 8e95b8c22cc0c..2f272b214437c 100644 --- a/administrator/components/com_menus/views/item/tmpl/edit.php +++ b/administrator/components/com_menus/views/item/tmpl/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -86,12 +86,12 @@ // Add the script to the document head. JFactory::getDocument()->addScriptDeclaration($script); // In case of modal -$isModal = $input->get('layout') == 'modal' ? true : false; -$layout = $isModal ? 'modal' : 'edit'; -$tmpl = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=component' : ''; +$isModal = $input->get('layout') == 'modal' ? true : false; +$layout = $isModal ? 'modal' : 'edit'; +$tmpl = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=component' : ''; +$clientId = $this->state->get('item.client_id', 0); ?> - -
    + @@ -129,6 +129,7 @@ // Set main fields. $this->fields = array( 'id', + 'client_id', 'menutype', 'parent_id', 'menuordering', @@ -143,8 +144,8 @@ { $this->fields = array_diff($this->fields, array('home')); } - ?> - + + echo JLayoutHelper::render('joomla.edit.global', $this); ?>
    @@ -156,14 +157,14 @@ echo JLayoutHelper::render('joomla.edit.params', $this); ?> - + state->get('item.client_id') != 1) : ?> item->type !== 'alias' && $this->item->type !== 'url' && $this->item->type !== 'separator' && $this->item->type !== 'heading') : ?> loadTemplate('associations'); ?> - + state->get('item.client_id') != 1) : ?> diff --git a/administrator/components/com_menus/views/item/tmpl/edit.xml b/administrator/components/com_menus/views/item/tmpl/edit.xml new file mode 100755 index 0000000000000..d1408e7e1b3e0 --- /dev/null +++ b/administrator/components/com_menus/views/item/tmpl/edit.xml @@ -0,0 +1,21 @@ + + + + + + + +
    + + + + + +
    +     diff --git a/administrator/components/com_menus/views/item/tmpl/edit_associations.php b/administrator/components/com_menus/views/item/tmpl/edit_associations.php index 2d249134c3e99..ab1f92d2f332c 100644 --- a/administrator/components/com_menus/views/item/tmpl/edit_associations.php +++ b/administrator/components/com_menus/views/item/tmpl/edit_associations.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_menus/views/item/tmpl/edit_modules.php b/administrator/components/com_menus/views/item/tmpl/edit_modules.php index ad0a9933fd0cd..3a658598006fa 100644 --- a/administrator/components/com_menus/views/item/tmpl/edit_modules.php +++ b/administrator/components/com_menus/views/item/tmpl/edit_modules.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_menus/views/item/tmpl/edit_options.php b/administrator/components/com_menus/views/item/tmpl/edit_options.php index b425d2a3e6eaf..d1feebbcd0c58 100644 --- a/administrator/components/com_menus/views/item/tmpl/edit_options.php +++ b/administrator/components/com_menus/views/item/tmpl/edit_options.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_menus/views/item/tmpl/modal.php b/administrator/components/com_menus/views/item/tmpl/modal.php index 6ffaf46755d53..05b20926535e1 100644 --- a/administrator/components/com_menus/views/item/tmpl/modal.php +++ b/administrator/components/com_menus/views/item/tmpl/modal.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_menus/views/item/tmpl/modal_associations.php b/administrator/components/com_menus/views/item/tmpl/modal_associations.php index 2d249134c3e99..ab1f92d2f332c 100644 --- a/administrator/components/com_menus/views/item/tmpl/modal_associations.php +++ b/administrator/components/com_menus/views/item/tmpl/modal_associations.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_menus/views/item/tmpl/modal_options.php b/administrator/components/com_menus/views/item/tmpl/modal_options.php index bb3565346636d..993e76d264124 100644 --- a/administrator/components/com_menus/views/item/tmpl/modal_options.php +++ b/administrator/components/com_menus/views/item/tmpl/modal_options.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_menus/views/item/view.html.php b/administrator/components/com_menus/views/item/view.html.php index 534517260c01c..228ed115cb517 100644 --- a/administrator/components/com_menus/views/item/view.html.php +++ b/administrator/components/com_menus/views/item/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -36,6 +36,11 @@ class MenusViewItem extends JViewLegacy */ protected $state; + /** + * @var JObject + */ + protected $canDo; + /** * Display the view * @@ -49,11 +54,11 @@ public function display($tpl = null) { $user = JFactory::getUser(); + $this->state = $this->get('State'); $this->form = $this->get('Form'); $this->item = $this->get('Item'); $this->modules = $this->get('Modules'); $this->levels = $this->get('ViewLevels'); - $this->state = $this->get('State'); $this->canDo = JHelperContent::getActions('com_menus', 'menu', (int) $this->state->get('item.menutypeid')); // Check if we're allowed to edit this item @@ -68,7 +73,7 @@ public function display($tpl = null) { JError::raiseError(500, implode("\n", $errors)); - return false; + return; } // If we are forcing a language in modal (used for associations). diff --git a/administrator/components/com_menus/views/items/tmpl/default.php b/administrator/components/com_menus/views/items/tmpl/default.php index 7827bfcc02d45..fa302c0cdc548 100644 --- a/administrator/components/com_menus/views/items/tmpl/default.php +++ b/administrator/components/com_menus/views/items/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -30,8 +30,8 @@ JHtml::_('draggablelist.draggable'); } -$assoc = JLanguageAssociations::isEnabled(); -$colSpan = ($assoc) ? 10 : 9; +$assoc = JLanguageAssociations::isEnabled() && $this->state->get('filter.client_id') == 0; +$colSpan = $assoc ? 10 : 9; if ($menuType == '') { @@ -63,9 +63,11 @@ + state->get('filter.client_id') == 0): ?> + @@ -163,7 +165,7 @@ checked_out) : ?> editor, $item->checked_out_time, 'items.', $canCheckin); ?> - + protected) : ?>     escape($item->title); ?> @@ -190,10 +192,11 @@ escape($item->menutype_title); ?> + state->get('filter.client_id') == 0): ?> type == 'component') : ?> language == '*' || $item->home == '0') : ?> - home, $i, 'items.', ($item->language != '*' || !$item->home) && $canChange); ?> + home, $i, 'items.', ($item->language != '*' || !$item->home) && $canChange && !$item->protected); ?> language_image) : ?> @@ -211,6 +214,7 @@ + escape($item->access_level); ?> diff --git a/administrator/components/com_menus/views/items/tmpl/default.xml b/administrator/components/com_menus/views/items/tmpl/default.xml new file mode 100755 index 0000000000000..24144a99341b2 --- /dev/null +++ b/administrator/components/com_menus/views/items/tmpl/default.xml @@ -0,0 +1,21 @@ + + + + + + + +
    + + + + + +
    +     diff --git a/administrator/components/com_menus/views/items/tmpl/default_batch_body.php b/administrator/components/com_menus/views/items/tmpl/default_batch_body.php index 1fd3a70764168..f30b8f0145023 100644 --- a/administrator/components/com_menus/views/items/tmpl/default_batch_body.php +++ b/administrator/components/com_menus/views/items/tmpl/default_batch_body.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_menus/views/items/tmpl/default_batch_footer.php b/administrator/components/com_menus/views/items/tmpl/default_batch_footer.php index a86c3a726aa6a..30f2f908ba5bc 100644 --- a/administrator/components/com_menus/views/items/tmpl/default_batch_footer.php +++ b/administrator/components/com_menus/views/items/tmpl/default_batch_footer.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_menus/views/items/tmpl/modal.php b/administrator/components/com_menus/views/items/tmpl/modal.php index dc0f58986ba3a..c748320e05106 100644 --- a/administrator/components/com_menus/views/items/tmpl/modal.php +++ b/administrator/components/com_menus/views/items/tmpl/modal.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_menus/views/items/view.html.php b/administrator/components/com_menus/views/items/view.html.php index fea889bc8cc24..bace94afeacdd 100644 --- a/administrator/components/com_menus/views/items/view.html.php +++ b/administrator/components/com_menus/views/items/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -47,7 +47,6 @@ class MenusViewItems extends JViewLegacy */ public function display($tpl = null) { - $user = JFactory::getUser(); $lang = JFactory::getLanguage(); $this->items = $this->get('Items'); $this->pagination = $this->get('Pagination'); @@ -207,6 +206,7 @@ public function display($tpl = null) } $item->item_type = $value; + $item->protected = $item->menutype == 'main' || $item->menutype == 'menu'; } // Levels filter. @@ -284,7 +284,9 @@ protected function addToolbar() JToolbarHelper::addNew('item.add'); } - if ($canDo->get('core.edit')) + $m = $this->state->get('filter.menutype'); + + if ($canDo->get('core.edit') && ($m != 'main' && $m != 'menu')) { JToolbarHelper::editList('item.edit'); } @@ -300,7 +302,7 @@ protected function addToolbar() JToolbarHelper::checkin('items.checkin', 'JTOOLBAR_CHECKIN', true); } - if ($canDo->get('core.edit.state')) + if ($canDo->get('core.edit.state') && $this->state->get('filter.client_id') == 0) { JToolbarHelper::makeDefault('items.setDefault', 'COM_MENUS_TOOLBAR_SET_HOME'); } diff --git a/administrator/components/com_menus/views/menu/tmpl/edit.php b/administrator/components/com_menus/views/menu/tmpl/edit.php index 136d3a3fdd681..21a0bca5bc899 100644 --- a/administrator/components/com_menus/views/menu/tmpl/edit.php +++ b/administrator/components/com_menus/views/menu/tmpl/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -29,9 +29,8 @@ "); ?> - + -
    'details')); ?> @@ -52,6 +51,14 @@ form->getInput('description'); ?>
    +
    +
    + form->getLabel('client_id'); ?> +
    +
    + form->getInput('client_id'); ?> +
    +
    canDo->get('core.admin')) : ?> @@ -63,7 +70,5 @@ - - diff --git a/administrator/components/com_menus/views/menu/tmpl/edit.xml b/administrator/components/com_menus/views/menu/tmpl/edit.xml new file mode 100755 index 0000000000000..9765a0da2026c --- /dev/null +++ b/administrator/components/com_menus/views/menu/tmpl/edit.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/administrator/components/com_menus/views/menu/view.html.php b/administrator/components/com_menus/views/menu/view.html.php index d0a6205bda2f9..1799f20cea8ed 100644 --- a/administrator/components/com_menus/views/menu/view.html.php +++ b/administrator/components/com_menus/views/menu/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_menus/views/menus/tmpl/default.php b/administrator/components/com_menus/views/menus/tmpl/default.php index b2339fb008a73..1867571e36a9f 100644 --- a/administrator/components/com_menus/views/menus/tmpl/default.php +++ b/administrator/components/com_menus/views/menus/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_menus/views/menus/tmpl/default.xml b/administrator/components/com_menus/views/menus/tmpl/default.xml new file mode 100755 index 0000000000000..7a64aba93deef --- /dev/null +++ b/administrator/components/com_menus/views/menus/tmpl/default.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/administrator/components/com_menus/views/menus/view.html.php b/administrator/components/com_menus/views/menus/view.html.php index b274b6996f366..d42fa1d917ae6 100644 --- a/administrator/components/com_menus/views/menus/view.html.php +++ b/administrator/components/com_menus/views/menus/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_menus/views/menutypes/tmpl/default.php b/administrator/components/com_menus/views/menutypes/tmpl/default.php index 9bc76c025b5c2..5b20f14a02183 100644 --- a/administrator/components/com_menus/views/menutypes/tmpl/default.php +++ b/administrator/components/com_menus/views/menutypes/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_menus/views/menutypes/view.html.php b/administrator/components/com_menus/views/menutypes/view.html.php index c0707ccb7908d..4a9cf300f83dc 100644 --- a/administrator/components/com_menus/views/menutypes/view.html.php +++ b/administrator/components/com_menus/views/menutypes/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -16,6 +16,11 @@ */ class MenusViewMenutypes extends JViewLegacy { + /** + * @var JObject[] + */ + protected $types; + /** * Display the view * @@ -27,40 +32,12 @@ class MenusViewMenutypes extends JViewLegacy */ public function display($tpl = null) { - $input = JFactory::getApplication()->input; - $this->recordId = $input->getInt('recordId'); - $types = $this->get('TypeOptions'); + $app = JFactory::getApplication(); + $this->recordId = $app->input->getInt('recordId'); - // Adding System Links - $list = array(); - $o = new JObject; - $o->title = 'COM_MENUS_TYPE_EXTERNAL_URL'; - $o->type = 'url'; - $o->description = 'COM_MENUS_TYPE_EXTERNAL_URL_DESC'; - $o->request = null; - $list[] = $o; - - $o = new JObject; - $o->title = 'COM_MENUS_TYPE_ALIAS'; - $o->type = 'alias'; - $o->description = 'COM_MENUS_TYPE_ALIAS_DESC'; - $o->request = null; - $list[] = $o; - - $o = new JObject; - $o->title = 'COM_MENUS_TYPE_SEPARATOR'; - $o->type = 'separator'; - $o->description = 'COM_MENUS_TYPE_SEPARATOR_DESC'; - $o->request = null; - $list[] = $o; + $types = $this->get('TypeOptions'); - $o = new JObject; - $o->title = 'COM_MENUS_TYPE_HEADING'; - $o->type = 'heading'; - $o->description = 'COM_MENUS_TYPE_HEADING_DESC'; - $o->request = null; - $list[] = $o; - $types['COM_MENUS_TYPE_SYSTEM'] = $list; + $this->addCustomTypes($types); $sortedTypes = array(); @@ -108,4 +85,53 @@ protected function addToolbar() $title"; $bar->appendButton('Custom', $dhtml, 'new'); } + + /** + * Method to add system link types to the link types array + * + * @param array &$types The list of link types + * + * @return void + * + * @since __DEPLOY_VERSION__ + */ + protected function addCustomTypes(&$types) + { + if (empty($types)) + { + $types = array(); + } + + // Adding System Links + $list = array(); + $o = new JObject; + $o->title = 'COM_MENUS_TYPE_EXTERNAL_URL'; + $o->type = 'url'; + $o->description = 'COM_MENUS_TYPE_EXTERNAL_URL_DESC'; + $o->request = null; + $list[] = $o; + + $o = new JObject; + $o->title = 'COM_MENUS_TYPE_ALIAS'; + $o->type = 'alias'; + $o->description = 'COM_MENUS_TYPE_ALIAS_DESC'; + $o->request = null; + $list[] = $o; + + $o = new JObject; + $o->title = 'COM_MENUS_TYPE_SEPARATOR'; + $o->type = 'separator'; + $o->description = 'COM_MENUS_TYPE_SEPARATOR_DESC'; + $o->request = null; + $list[] = $o; + + $o = new JObject; + $o->title = 'COM_MENUS_TYPE_HEADING'; + $o->type = 'heading'; + $o->description = 'COM_MENUS_TYPE_HEADING_DESC'; + $o->request = null; + $list[] = $o; + + $types['COM_MENUS_TYPE_SYSTEM'] = $list; + } } diff --git a/administrator/components/com_messages/controller.php b/administrator/components/com_messages/controller.php index b732abc0deb04..db19ba1d68561 100644 --- a/administrator/components/com_messages/controller.php +++ b/administrator/components/com_messages/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_messages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_messages/controllers/config.php b/administrator/components/com_messages/controllers/config.php index 622dd173dca07..8ec3dd8e963a5 100644 --- a/administrator/components/com_messages/controllers/config.php +++ b/administrator/components/com_messages/controllers/config.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_messages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_messages/controllers/message.php b/administrator/components/com_messages/controllers/message.php index 855ce4b5da354..cd1c0d9fc9bab 100644 --- a/administrator/components/com_messages/controllers/message.php +++ b/administrator/components/com_messages/controllers/message.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_messages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_messages/controllers/messages.php b/administrator/components/com_messages/controllers/messages.php index 48db0ffec4798..f835a6993ef38 100644 --- a/administrator/components/com_messages/controllers/messages.php +++ b/administrator/components/com_messages/controllers/messages.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_messages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_messages/helpers/html/messages.php b/administrator/components/com_messages/helpers/html/messages.php index d94d0b7ad0fea..6a0558c4976a4 100644 --- a/administrator/components/com_messages/helpers/html/messages.php +++ b/administrator/components/com_messages/helpers/html/messages.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_messages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_messages/helpers/messages.php b/administrator/components/com_messages/helpers/messages.php index 40f70bc08a4fa..64cf5ee264741 100644 --- a/administrator/components/com_messages/helpers/messages.php +++ b/administrator/components/com_messages/helpers/messages.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_messages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_messages/layouts/toolbar/mysettings.php b/administrator/components/com_messages/layouts/toolbar/mysettings.php index 58fa09e0ddf5c..4c6296656a80e 100644 --- a/administrator/components/com_messages/layouts/toolbar/mysettings.php +++ b/administrator/components/com_messages/layouts/toolbar/mysettings.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_messages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_messages/messages.php b/administrator/components/com_messages/messages.php index d58ad6d569ccc..83b5fa04ffa7c 100644 --- a/administrator/components/com_messages/messages.php +++ b/administrator/components/com_messages/messages.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_messages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_messages/models/config.php b/administrator/components/com_messages/models/config.php index 716dbfaccf0b7..2362e4c7438f6 100644 --- a/administrator/components/com_messages/models/config.php +++ b/administrator/components/com_messages/models/config.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_messages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_messages/models/fields/messagestates.php b/administrator/components/com_messages/models/fields/messagestates.php index 923c30f0836f0..b9502dcb3be97 100644 --- a/administrator/components/com_messages/models/fields/messagestates.php +++ b/administrator/components/com_messages/models/fields/messagestates.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_messages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_messages/models/fields/usermessages.php b/administrator/components/com_messages/models/fields/usermessages.php index bd5805f173d29..e294178b78839 100644 --- a/administrator/components/com_messages/models/fields/usermessages.php +++ b/administrator/components/com_messages/models/fields/usermessages.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_messages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_messages/models/message.php b/administrator/components/com_messages/models/message.php index 6bb43165e2421..0d67b12e5222e 100644 --- a/administrator/components/com_messages/models/message.php +++ b/administrator/components/com_messages/models/message.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_messages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_messages/models/messages.php b/administrator/components/com_messages/models/messages.php index 87f433cbacbc8..4131d98b843b5 100644 --- a/administrator/components/com_messages/models/messages.php +++ b/administrator/components/com_messages/models/messages.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_messages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_messages/tables/message.php b/administrator/components/com_messages/tables/message.php index 387153cee18e8..529c5bb798c55 100644 --- a/administrator/components/com_messages/tables/message.php +++ b/administrator/components/com_messages/tables/message.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_messages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_messages/views/config/tmpl/default.php b/administrator/components/com_messages/views/config/tmpl/default.php index 40da931028e32..0fd408ffaab94 100644 --- a/administrator/components/com_messages/views/config/tmpl/default.php +++ b/administrator/components/com_messages/views/config/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_messages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_messages/views/config/view.html.php b/administrator/components/com_messages/views/config/view.html.php index 78ee13df486ab..07d96561703de 100644 --- a/administrator/components/com_messages/views/config/view.html.php +++ b/administrator/components/com_messages/views/config/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_messages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_messages/views/message/tmpl/default.php b/administrator/components/com_messages/views/message/tmpl/default.php index 42951a28802bc..d7831d707f4e2 100644 --- a/administrator/components/com_messages/views/message/tmpl/default.php +++ b/administrator/components/com_messages/views/message/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_messages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_messages/views/message/tmpl/edit.php b/administrator/components/com_messages/views/message/tmpl/edit.php index 1d4c4c9cdeb87..c2e9bbe5785c3 100644 --- a/administrator/components/com_messages/views/message/tmpl/edit.php +++ b/administrator/components/com_messages/views/message/tmpl/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_messages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_messages/views/message/view.html.php b/administrator/components/com_messages/views/message/view.html.php index 91e6104df3d2a..4ea0db733d227 100644 --- a/administrator/components/com_messages/views/message/view.html.php +++ b/administrator/components/com_messages/views/message/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_messages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_messages/views/messages/tmpl/default.php b/administrator/components/com_messages/views/messages/tmpl/default.php index dc19704698a84..3178687bfee7f 100644 --- a/administrator/components/com_messages/views/messages/tmpl/default.php +++ b/administrator/components/com_messages/views/messages/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_messages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_messages/views/messages/view.html.php b/administrator/components/com_messages/views/messages/view.html.php index 608036df96c7c..29d04bbeaa4e3 100644 --- a/administrator/components/com_messages/views/messages/view.html.php +++ b/administrator/components/com_messages/views/messages/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_messages * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/controller.php b/administrator/components/com_modules/controller.php index ea6d201cc3452..a518482647de6 100644 --- a/administrator/components/com_modules/controller.php +++ b/administrator/components/com_modules/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/controllers/module.php b/administrator/components/com_modules/controllers/module.php index 3cc2e872d4018..eb20853d671e7 100644 --- a/administrator/components/com_modules/controllers/module.php +++ b/administrator/components/com_modules/controllers/module.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/controllers/modules.php b/administrator/components/com_modules/controllers/modules.php index cc2514724a74e..22a9ecb7a3ec8 100644 --- a/administrator/components/com_modules/controllers/modules.php +++ b/administrator/components/com_modules/controllers/modules.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/helpers/html/modules.php b/administrator/components/com_modules/helpers/html/modules.php index fd054b03cf868..ea1cf85233a4b 100644 --- a/administrator/components/com_modules/helpers/html/modules.php +++ b/administrator/components/com_modules/helpers/html/modules.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/helpers/modules.php b/administrator/components/com_modules/helpers/modules.php index c8ae66a175257..26e0c88b2f4b7 100644 --- a/administrator/components/com_modules/helpers/modules.php +++ b/administrator/components/com_modules/helpers/modules.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/helpers/xml.php b/administrator/components/com_modules/helpers/xml.php index 6cb285495e263..faf2397f31d1f 100644 --- a/administrator/components/com_modules/helpers/xml.php +++ b/administrator/components/com_modules/helpers/xml.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/layouts/toolbar/cancelselect.php b/administrator/components/com_modules/layouts/toolbar/cancelselect.php index 89809b86420c6..c9a215be04308 100644 --- a/administrator/components/com_modules/layouts/toolbar/cancelselect.php +++ b/administrator/components/com_modules/layouts/toolbar/cancelselect.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/layouts/toolbar/newmodule.php b/administrator/components/com_modules/layouts/toolbar/newmodule.php index 2976af1e315ed..8832cfb2e7dd0 100644 --- a/administrator/components/com_modules/layouts/toolbar/newmodule.php +++ b/administrator/components/com_modules/layouts/toolbar/newmodule.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/models/fields/modulesmodule.php b/administrator/components/com_modules/models/fields/modulesmodule.php index 42ff163450c72..2decdff94a308 100644 --- a/administrator/components/com_modules/models/fields/modulesmodule.php +++ b/administrator/components/com_modules/models/fields/modulesmodule.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/models/fields/modulesposition.php b/administrator/components/com_modules/models/fields/modulesposition.php index d035859f8b810..0273e30919576 100644 --- a/administrator/components/com_modules/models/fields/modulesposition.php +++ b/administrator/components/com_modules/models/fields/modulesposition.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/models/forms/module.xml b/administrator/components/com_modules/models/forms/module.xml index 9590fe7c4c746..d86b6acf8275e 100644 --- a/administrator/components/com_modules/models/forms/module.xml +++ b/administrator/components/com_modules/models/forms/module.xml @@ -54,19 +54,25 @@     - - diff --git a/administrator/components/com_modules/models/module.php b/administrator/components/com_modules/models/module.php index 39a19fabeb607..e78fa37f1a45f 100644 --- a/administrator/components/com_modules/models/module.php +++ b/administrator/components/com_modules/models/module.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -426,8 +426,8 @@ public function duplicate(&$pks) ->from($db->quoteName('#__modules_menu')) ->where($db->quoteName('moduleid') . ' = ' . (int) $pk); - $this->_db->setQuery($query); - $rows = $this->_db->loadColumn(); + $db->setQuery($query); + $rows = $db->loadColumn(); foreach ($rows as $menuid) { @@ -448,11 +448,11 @@ public function duplicate(&$pks) ->columns($db->quoteName(array('moduleid', 'menuid'))) ->values($tuples); - $this->_db->setQuery($query); + $db->setQuery($query); try { - $this->_db->execute(); + $db->execute(); } catch (RuntimeException $e) { @@ -686,8 +686,7 @@ public function getItem($pk = null) } else { - $app = JFactory::getApplication(); - $app->redirect(JRoute::_('index.php?option=com_modules&view=modules', false)); + JFactory::getApplication()->redirect(JRoute::_('index.php?option=com_modules&view=modules', false)); return false; } @@ -1016,18 +1015,16 @@ public function save($data) // Get the sign of the number. $sign = $assignment < 0 ? -1 : 1; - // Preprocess the assigned array. - $tuples = array(); + $query->clear() + ->insert($db->quoteName('#__modules_menu')) + ->columns($db->quoteName(array('moduleid', 'menuid'))); foreach ($data['assigned'] as &$pk) { - $tuples[] = '(' . (int) $table->id . ',' . (int) $pk * $sign . ')'; + $query->values((int) $table->id . ',' . (int) $pk * $sign); } - $this->_db->setQuery( - 'INSERT INTO #__modules_menu (moduleid, menuid) VALUES ' . - implode(',', $tuples) - ); + $db->setQuery($query); try { @@ -1046,7 +1043,7 @@ public function save($data) $dispatcher->trigger($this->event_after_save, array($context, &$table, $isNew)); // Compute the extension id of this module in case the controller wants it. - $query = $db->getQuery(true) + $query->clear() ->select('extension_id') ->from('#__extensions AS e') ->join('LEFT', '#__modules AS m ON e.element = m.module') diff --git a/administrator/components/com_modules/models/modules.php b/administrator/components/com_modules/models/modules.php index 32d88c5ae2ffe..10f9de6d0f3fb 100644 --- a/administrator/components/com_modules/models/modules.php +++ b/administrator/components/com_modules/models/modules.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/models/positions.php b/administrator/components/com_modules/models/positions.php index 59d92fffbfef4..4b763e5267500 100644 --- a/administrator/components/com_modules/models/positions.php +++ b/administrator/components/com_modules/models/positions.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/models/select.php b/administrator/components/com_modules/models/select.php index 6389c41e4b39f..277f7dc32b88a 100644 --- a/administrator/components/com_modules/models/select.php +++ b/administrator/components/com_modules/models/select.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/modules.php b/administrator/components/com_modules/modules.php index 5a0cd0caeb553..405bd2f9adf79 100644 --- a/administrator/components/com_modules/modules.php +++ b/administrator/components/com_modules/modules.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/views/module/tmpl/edit.php b/administrator/components/com_modules/views/module/tmpl/edit.php index b2792eb58826f..c54c05432fa04 100644 --- a/administrator/components/com_modules/views/module/tmpl/edit.php +++ b/administrator/components/com_modules/views/module/tmpl/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/views/module/tmpl/edit_assignment.php b/administrator/components/com_modules/views/module/tmpl/edit_assignment.php index fc6ac5a67e15f..5e2bd1a7549a5 100644 --- a/administrator/components/com_modules/views/module/tmpl/edit_assignment.php +++ b/administrator/components/com_modules/views/module/tmpl/edit_assignment.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/views/module/tmpl/edit_options.php b/administrator/components/com_modules/views/module/tmpl/edit_options.php index 84fae8f597216..d03e2a003dd43 100644 --- a/administrator/components/com_modules/views/module/tmpl/edit_options.php +++ b/administrator/components/com_modules/views/module/tmpl/edit_options.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/views/module/tmpl/edit_positions.php b/administrator/components/com_modules/views/module/tmpl/edit_positions.php index 834da24d7bbef..4f103fb3b839d 100644 --- a/administrator/components/com_modules/views/module/tmpl/edit_positions.php +++ b/administrator/components/com_modules/views/module/tmpl/edit_positions.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/views/module/tmpl/modal.php b/administrator/components/com_modules/views/module/tmpl/modal.php index 2c38f757c2719..875d3b0620207 100644 --- a/administrator/components/com_modules/views/module/tmpl/modal.php +++ b/administrator/components/com_modules/views/module/tmpl/modal.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/views/module/view.html.php b/administrator/components/com_modules/views/module/view.html.php index b3021cd369c47..ad4ca5871fe4c 100644 --- a/administrator/components/com_modules/views/module/view.html.php +++ b/administrator/components/com_modules/views/module/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/views/module/view.json.php b/administrator/components/com_modules/views/module/view.json.php index 30e48e9d29686..1d066b8ffe7af 100644 --- a/administrator/components/com_modules/views/module/view.json.php +++ b/administrator/components/com_modules/views/module/view.json.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/views/modules/tmpl/default.php b/administrator/components/com_modules/views/modules/tmpl/default.php index 64016719812b1..c34b11ec23d8b 100644 --- a/administrator/components/com_modules/views/modules/tmpl/default.php +++ b/administrator/components/com_modules/views/modules/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/views/modules/tmpl/default.xml b/administrator/components/com_modules/views/modules/tmpl/default.xml new file mode 100755 index 0000000000000..4d323670bbf5b --- /dev/null +++ b/administrator/components/com_modules/views/modules/tmpl/default.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/administrator/components/com_modules/views/modules/tmpl/default_batch_body.php b/administrator/components/com_modules/views/modules/tmpl/default_batch_body.php index 4b71e703f4c12..7e0c9d9c3f6f8 100644 --- a/administrator/components/com_modules/views/modules/tmpl/default_batch_body.php +++ b/administrator/components/com_modules/views/modules/tmpl/default_batch_body.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/views/modules/tmpl/default_batch_footer.php b/administrator/components/com_modules/views/modules/tmpl/default_batch_footer.php index 80a1fd9c94312..7d2f0e06261e8 100644 --- a/administrator/components/com_modules/views/modules/tmpl/default_batch_footer.php +++ b/administrator/components/com_modules/views/modules/tmpl/default_batch_footer.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_modules/views/modules/tmpl/modal.php b/administrator/components/com_modules/views/modules/tmpl/modal.php index dbd5214a81c5d..f16dbc478162f 100644 --- a/administrator/components/com_modules/views/modules/tmpl/modal.php +++ b/administrator/components/com_modules/views/modules/tmpl/modal.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/views/modules/view.html.php b/administrator/components/com_modules/views/modules/view.html.php index ad374ec0cc1c1..9c37cae7f5d3e 100644 --- a/administrator/components/com_modules/views/modules/view.html.php +++ b/administrator/components/com_modules/views/modules/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/views/positions/tmpl/modal.php b/administrator/components/com_modules/views/positions/tmpl/modal.php index f2d7f0432daed..35dc93f0283dd 100644 --- a/administrator/components/com_modules/views/positions/tmpl/modal.php +++ b/administrator/components/com_modules/views/positions/tmpl/modal.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/views/positions/view.html.php b/administrator/components/com_modules/views/positions/view.html.php index 29b5c847bba56..0983d34902b5c 100644 --- a/administrator/components/com_modules/views/positions/view.html.php +++ b/administrator/components/com_modules/views/positions/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/views/preview/tmpl/default.php b/administrator/components/com_modules/views/preview/tmpl/default.php index e1c3d70912ee4..cd78e23d17355 100644 --- a/administrator/components/com_modules/views/preview/tmpl/default.php +++ b/administrator/components/com_modules/views/preview/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/views/preview/view.html.php b/administrator/components/com_modules/views/preview/view.html.php index 63e482b15452d..661c3b3ee5d64 100644 --- a/administrator/components/com_modules/views/preview/view.html.php +++ b/administrator/components/com_modules/views/preview/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/views/select/tmpl/default.php b/administrator/components/com_modules/views/select/tmpl/default.php index 621df8c9d06e0..a963a98967533 100644 --- a/administrator/components/com_modules/views/select/tmpl/default.php +++ b/administrator/components/com_modules/views/select/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/views/select/view.html.php b/administrator/components/com_modules/views/select/view.html.php index 6c83c96718e99..4e61bbb6e30fc 100644 --- a/administrator/components/com_modules/views/select/view.html.php +++ b/administrator/components/com_modules/views/select/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_newsfeeds/controller.php b/administrator/components/com_newsfeeds/controller.php index 2f4f415f40f2e..70e1cd0b82711 100644 --- a/administrator/components/com_newsfeeds/controller.php +++ b/administrator/components/com_newsfeeds/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_newsfeeds/controllers/newsfeed.php b/administrator/components/com_newsfeeds/controllers/newsfeed.php index 6059c50ffbb01..d7d6b52172875 100644 --- a/administrator/components/com_newsfeeds/controllers/newsfeed.php +++ b/administrator/components/com_newsfeeds/controllers/newsfeed.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_newsfeeds/controllers/newsfeeds.php b/administrator/components/com_newsfeeds/controllers/newsfeeds.php index 45a6c27464b29..dd1b15dee7391 100644 --- a/administrator/components/com_newsfeeds/controllers/newsfeeds.php +++ b/administrator/components/com_newsfeeds/controllers/newsfeeds.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_newsfeeds/helpers/associations.php b/administrator/components/com_newsfeeds/helpers/associations.php new file mode 100644 index 0000000000000..76d7a7740ffee --- /dev/null +++ b/administrator/components/com_newsfeeds/helpers/associations.php @@ -0,0 +1,192 @@ +getType($typeName); + + $context = $this->extension . '.item'; + $catidField = 'catid'; + + if ($typeName === 'category') + { + $context = 'com_categories.item'; + $catidField = ''; + } + + // Get the associations. + $associations = JLanguageAssociations::getAssociations( + $this->extension, + $type['tables']['a'], + $context, + $id, + 'id', + 'alias', + $catidField + ); + + return $associations; + } + + /** + * Get item information + * + * @param string $typeName The item type + * @param int $id The id of item for which we need the associated items + * + * @return JTable|null + * + * @since __DEPLOY_VERSION__ + */ + public function getItem($typeName, $id) + { + if (empty($id)) + { + return null; + } + + $table = null; + + switch ($typeName) + { + case 'contact': + $table = JTable::getInstance('Newsfeed', 'NewsfeedsTable'); + break; + + case 'category': + $table = JTable::getInstance('Category'); + break; + } + + if (empty($table)) + { + return null; + } + + $table->load($id); + + return $table; + } + + /** + * Get information about the type + * + * @param string $typeName The item type + * + * @return array Array of item types + * + * @since __DEPLOY_VERSION__ + */ + public function getType($typeName = '') + { + $fields = $this->getFieldsTemplate(); + $tables = array(); + $joins = array(); + $support = $this->getSupportTemplate(); + $title = ''; + + if (in_array($typeName, $this->itemTypes)) + { + + switch ($typeName) + { + case 'newsfeed': + $fields['title'] = 'a.name'; + $fields['state'] = 'a.published'; + + $support['state'] = true; + $support['acl'] = true; + $support['checkout'] = true; + + $tables = array( + 'a' => '#__newsfeeds' + ); + $title = 'newsfeed'; + break; + + case 'category': + $fields['created_user_id'] = 'a.created_user_id'; + $fields['ordering'] = 'a.lft'; + $fields['level'] = 'a.level'; + $fields['catid'] = ''; + $fields['state'] = 'a.published'; + + $support['state'] = true; + $support['acl'] = true; + $support['checkout'] = true; + + $tables = array( + 'a' => '#__categories' + ); + + $title = 'category'; + break; + } + } + + return array( + 'fields' => $fields, + 'support' => $support, + 'tables' => $tables, + 'joins' => $joins, + 'title' => $title + ); + } +} diff --git a/administrator/components/com_newsfeeds/helpers/html/newsfeed.php b/administrator/components/com_newsfeeds/helpers/html/newsfeed.php index 1bb46e62d5991..57178abf09c89 100644 --- a/administrator/components/com_newsfeeds/helpers/html/newsfeed.php +++ b/administrator/components/com_newsfeeds/helpers/html/newsfeed.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_newsfeeds/helpers/newsfeeds.php b/administrator/components/com_newsfeeds/helpers/newsfeeds.php index f9489b9ee4c34..b3ed33cd18ca7 100644 --- a/administrator/components/com_newsfeeds/helpers/newsfeeds.php +++ b/administrator/components/com_newsfeeds/helpers/newsfeeds.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_newsfeeds/models/fields/modal/newsfeed.php b/administrator/components/com_newsfeeds/models/fields/modal/newsfeed.php index 807e96b046188..a1f695a416ae3 100644 --- a/administrator/components/com_newsfeeds/models/fields/modal/newsfeed.php +++ b/administrator/components/com_newsfeeds/models/fields/modal/newsfeed.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_newsfeeds/models/fields/newsfeeds.php b/administrator/components/com_newsfeeds/models/fields/newsfeeds.php index 53f65997dfedb..7771de98be9bb 100644 --- a/administrator/components/com_newsfeeds/models/fields/newsfeeds.php +++ b/administrator/components/com_newsfeeds/models/fields/newsfeeds.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_newsfeeds/models/forms/newsfeed.xml b/administrator/components/com_newsfeeds/models/forms/newsfeed.xml index 7eedbd0f5b642..99a79bd20b0b1 100644 --- a/administrator/components/com_newsfeeds/models/forms/newsfeed.xml +++ b/administrator/components/com_newsfeeds/models/forms/newsfeed.xml @@ -137,8 +137,9 @@ type="calendar" label="JGLOBAL_FIELD_CREATED_LABEL" description="JGLOBAL_FIELD_CREATED_DESC" + translateformat="true" + showtime="true" size="22" - format="%Y-%m-%d %H:%M:%S" filter="user_utc" /> @@ -163,9 +164,10 @@ label="JGLOBAL_FIELD_Modified_Label" description="COM_NEWSFEEDS_FIELD_MODIFIED_DESC" class="readonly" + translateformat="true" + showtime="true" size="22" readonly="true" - format="%Y-%m-%d %H:%M:%S" filter="user_utc" /> @@ -215,8 +217,9 @@ type="calendar" label="JGLOBAL_FIELD_PUBLISH_UP_LABEL" description="JGLOBAL_FIELD_PUBLISH_UP_DESC" + translateformat="true" + showtime="true" size="22" - format="%Y-%m-%d %H:%M:%S" filter="user_utc" /> @@ -225,8 +228,9 @@ type="calendar" label="JGLOBAL_FIELD_PUBLISH_DOWN_LABEL" description="JGLOBAL_FIELD_PUBLISH_DOWN_DESC" + translateformat="true" + showtime="true" size="22" - format="%Y-%m-%d %H:%M:%S" filter="user_utc" /> diff --git a/administrator/components/com_newsfeeds/models/newsfeed.php b/administrator/components/com_newsfeeds/models/newsfeed.php index ab0c9fec96a4e..b4b04543a9743 100644 --- a/administrator/components/com_newsfeeds/models/newsfeed.php +++ b/administrator/components/com_newsfeeds/models/newsfeed.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_newsfeeds/models/newsfeeds.php b/administrator/components/com_newsfeeds/models/newsfeeds.php index b93423fb7771f..161b87625d3d6 100644 --- a/administrator/components/com_newsfeeds/models/newsfeeds.php +++ b/administrator/components/com_newsfeeds/models/newsfeeds.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_newsfeeds/newsfeeds.php b/administrator/components/com_newsfeeds/newsfeeds.php index d98f6e2a740eb..aa0a608a1f17a 100644 --- a/administrator/components/com_newsfeeds/newsfeeds.php +++ b/administrator/components/com_newsfeeds/newsfeeds.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_newsfeeds/tables/newsfeed.php b/administrator/components/com_newsfeeds/tables/newsfeed.php index 02023248d00a4..49188b94f4dfe 100644 --- a/administrator/components/com_newsfeeds/tables/newsfeed.php +++ b/administrator/components/com_newsfeeds/tables/newsfeed.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit.php b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit.php index 7f62494c55712..354871cbb846a 100644 --- a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit.php +++ b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_associations.php b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_associations.php index 0a8f9093adf80..38de9c2f4c70d 100644 --- a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_associations.php +++ b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_associations.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_display.php b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_display.php index 0d11b1a2d5670..e4a190d512cb5 100644 --- a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_display.php +++ b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_display.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_metadata.php b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_metadata.php index 8bf99cf812734..446c938e51468 100644 --- a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_metadata.php +++ b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_metadata.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_params.php b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_params.php index d032df5127ce0..d9785b0fd2dc0 100644 --- a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_params.php +++ b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_params.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal.php b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal.php index 17e45912cf45a..9a5fd3ddb898a 100644 --- a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal.php +++ b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_associations.php b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_associations.php index 0a8f9093adf80..38de9c2f4c70d 100644 --- a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_associations.php +++ b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_associations.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_display.php b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_display.php index 0d11b1a2d5670..e4a190d512cb5 100644 --- a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_display.php +++ b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_display.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_metadata.php b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_metadata.php index 8bf99cf812734..446c938e51468 100644 --- a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_metadata.php +++ b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_metadata.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_params.php b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_params.php index c8c8c86d87a66..66665ade073a5 100644 --- a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_params.php +++ b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_params.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_newsfeeds/views/newsfeed/view.html.php b/administrator/components/com_newsfeeds/views/newsfeed/view.html.php index 6211d2019f2ca..de0e5a245d4e9 100644 --- a/administrator/components/com_newsfeeds/views/newsfeed/view.html.php +++ b/administrator/components/com_newsfeeds/views/newsfeed/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default.php b/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default.php index 559dad21f4df8..ab7b6267fe7a8 100644 --- a/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default.php +++ b/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default_batch_body.php b/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default_batch_body.php index 9b852d933e092..9107251fec5d2 100644 --- a/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default_batch_body.php +++ b/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default_batch_body.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default_batch_footer.php b/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default_batch_footer.php index eb3971f00f3b5..269ead7667c98 100644 --- a/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default_batch_footer.php +++ b/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default_batch_footer.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/modal.php b/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/modal.php index a63758fe4d7b0..2542481546348 100644 --- a/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/modal.php +++ b/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/modal.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_newsfeeds/views/newsfeeds/view.html.php b/administrator/components/com_newsfeeds/views/newsfeeds/view.html.php index b0ae720d2b11c..72462f8a5f78b 100644 --- a/administrator/components/com_newsfeeds/views/newsfeeds/view.html.php +++ b/administrator/components/com_newsfeeds/views/newsfeeds/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_plugins/controller.php b/administrator/components/com_plugins/controller.php index 55966d9696072..11ca5736b5844 100644 --- a/administrator/components/com_plugins/controller.php +++ b/administrator/components/com_plugins/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_plugins * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_plugins/controllers/plugin.php b/administrator/components/com_plugins/controllers/plugin.php index a0d7bd45df865..690880d1fff97 100644 --- a/administrator/components/com_plugins/controllers/plugin.php +++ b/administrator/components/com_plugins/controllers/plugin.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_plugins * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_plugins/controllers/plugins.php b/administrator/components/com_plugins/controllers/plugins.php index a10bc9be3493a..d30db20d7912f 100644 --- a/administrator/components/com_plugins/controllers/plugins.php +++ b/administrator/components/com_plugins/controllers/plugins.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_plugins * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_plugins/helpers/plugins.php b/administrator/components/com_plugins/helpers/plugins.php index 362350ecbd5eb..9b030151288d2 100644 --- a/administrator/components/com_plugins/helpers/plugins.php +++ b/administrator/components/com_plugins/helpers/plugins.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_plugins * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_plugins/models/fields/pluginordering.php b/administrator/components/com_plugins/models/fields/pluginordering.php index 59dd4b9e74e5b..361be0fbb8c5b 100644 --- a/administrator/components/com_plugins/models/fields/pluginordering.php +++ b/administrator/components/com_plugins/models/fields/pluginordering.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_plugins * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_plugins/models/fields/plugintype.php b/administrator/components/com_plugins/models/fields/plugintype.php index ca185623c7070..34de3a17cde20 100644 --- a/administrator/components/com_plugins/models/fields/plugintype.php +++ b/administrator/components/com_plugins/models/fields/plugintype.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_plugins * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_plugins/models/plugin.php b/administrator/components/com_plugins/models/plugin.php index 906df1a340435..691a536afc90d 100644 --- a/administrator/components/com_plugins/models/plugin.php +++ b/administrator/components/com_plugins/models/plugin.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_plugins * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_plugins/models/plugins.php b/administrator/components/com_plugins/models/plugins.php index 9326a7cc30547..3e2634eadee37 100644 --- a/administrator/components/com_plugins/models/plugins.php +++ b/administrator/components/com_plugins/models/plugins.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_plugins * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_plugins/plugins.php b/administrator/components/com_plugins/plugins.php index 5c77e033cdc04..d46badb9143da 100644 --- a/administrator/components/com_plugins/plugins.php +++ b/administrator/components/com_plugins/plugins.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_plugins * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_plugins/views/plugin/tmpl/edit.php b/administrator/components/com_plugins/views/plugin/tmpl/edit.php index a8d749440322a..5fdc24fb9554a 100644 --- a/administrator/components/com_plugins/views/plugin/tmpl/edit.php +++ b/administrator/components/com_plugins/views/plugin/tmpl/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_plugins * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_plugins/views/plugin/tmpl/edit_options.php b/administrator/components/com_plugins/views/plugin/tmpl/edit_options.php index 5606f5475d074..aac7c0bb73304 100644 --- a/administrator/components/com_plugins/views/plugin/tmpl/edit_options.php +++ b/administrator/components/com_plugins/views/plugin/tmpl/edit_options.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_plugins * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_plugins/views/plugin/view.html.php b/administrator/components/com_plugins/views/plugin/view.html.php index 2044393f01732..5d315ed30935f 100644 --- a/administrator/components/com_plugins/views/plugin/view.html.php +++ b/administrator/components/com_plugins/views/plugin/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_plugins * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_plugins/views/plugins/tmpl/default.php b/administrator/components/com_plugins/views/plugins/tmpl/default.php index 87c84dc092424..7c3f253486521 100644 --- a/administrator/components/com_plugins/views/plugins/tmpl/default.php +++ b/administrator/components/com_plugins/views/plugins/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_plugins * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_plugins/views/plugins/tmpl/default.xml b/administrator/components/com_plugins/views/plugins/tmpl/default.xml new file mode 100755 index 0000000000000..9d181a9f8de8f --- /dev/null +++ b/administrator/components/com_plugins/views/plugins/tmpl/default.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/administrator/components/com_plugins/views/plugins/view.html.php b/administrator/components/com_plugins/views/plugins/view.html.php index c05dd7915f0d8..b973141856afc 100644 --- a/administrator/components/com_plugins/views/plugins/view.html.php +++ b/administrator/components/com_plugins/views/plugins/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_plugins * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_postinstall/controllers/message.php b/administrator/components/com_postinstall/controllers/message.php index d67213010b44c..b1b8c732ed317 100644 --- a/administrator/components/com_postinstall/controllers/message.php +++ b/administrator/components/com_postinstall/controllers/message.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_postinstall * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_postinstall/models/messages.php b/administrator/components/com_postinstall/models/messages.php index dd8e0e5c0fc28..9a9667bf7f889 100644 --- a/administrator/components/com_postinstall/models/messages.php +++ b/administrator/components/com_postinstall/models/messages.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_postinstall * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_postinstall/postinstall.php b/administrator/components/com_postinstall/postinstall.php index 1745aa617b165..d8fee19491017 100644 --- a/administrator/components/com_postinstall/postinstall.php +++ b/administrator/components/com_postinstall/postinstall.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_postinstall * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_postinstall/toolbar.php b/administrator/components/com_postinstall/toolbar.php index ff45d6f436526..4b8753a8381ea 100644 --- a/administrator/components/com_postinstall/toolbar.php +++ b/administrator/components/com_postinstall/toolbar.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_postinstall * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_postinstall/views/messages/tmpl/default.php b/administrator/components/com_postinstall/views/messages/tmpl/default.php index 846ff2718d969..b67b378e97191 100644 --- a/administrator/components/com_postinstall/views/messages/tmpl/default.php +++ b/administrator/components/com_postinstall/views/messages/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_postinstall * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_postinstall/views/messages/tmpl/default.xml b/administrator/components/com_postinstall/views/messages/tmpl/default.xml new file mode 100755 index 0000000000000..f4b7d57442f9d --- /dev/null +++ b/administrator/components/com_postinstall/views/messages/tmpl/default.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/administrator/components/com_postinstall/views/messages/view.html.php b/administrator/components/com_postinstall/views/messages/view.html.php index e004cf1917459..7cfffa8c46edc 100644 --- a/administrator/components/com_postinstall/views/messages/view.html.php +++ b/administrator/components/com_postinstall/views/messages/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_postinstall * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_redirect/controller.php b/administrator/components/com_redirect/controller.php index 4cef71f97c069..05c2219dfde5d 100644 --- a/administrator/components/com_redirect/controller.php +++ b/administrator/components/com_redirect/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_redirect * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_redirect/controllers/link.php b/administrator/components/com_redirect/controllers/link.php index ec3d43bd091cd..491e5d0dfd2ed 100644 --- a/administrator/components/com_redirect/controllers/link.php +++ b/administrator/components/com_redirect/controllers/link.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_redirect * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_redirect/controllers/links.php b/administrator/components/com_redirect/controllers/links.php index 0cd78816e755c..806c3d8bd6836 100644 --- a/administrator/components/com_redirect/controllers/links.php +++ b/administrator/components/com_redirect/controllers/links.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_redirect * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_redirect/helpers/html/redirect.php b/administrator/components/com_redirect/helpers/html/redirect.php index 41f497a38ab4e..8e71901c67677 100644 --- a/administrator/components/com_redirect/helpers/html/redirect.php +++ b/administrator/components/com_redirect/helpers/html/redirect.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_redirect * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_redirect/helpers/redirect.php b/administrator/components/com_redirect/helpers/redirect.php index 624f14aa36433..0b6d7717cb4ec 100644 --- a/administrator/components/com_redirect/helpers/redirect.php +++ b/administrator/components/com_redirect/helpers/redirect.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_redirect * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_redirect/layouts/toolbar/batch.php b/administrator/components/com_redirect/layouts/toolbar/batch.php index 150c8a92e100d..97dc3ed307fcf 100644 --- a/administrator/components/com_redirect/layouts/toolbar/batch.php +++ b/administrator/components/com_redirect/layouts/toolbar/batch.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_redirect/models/fields/redirect.php b/administrator/components/com_redirect/models/fields/redirect.php index 47a2296046e68..dacfb755e7a56 100644 --- a/administrator/components/com_redirect/models/fields/redirect.php +++ b/administrator/components/com_redirect/models/fields/redirect.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_redirect * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_redirect/models/link.php b/administrator/components/com_redirect/models/link.php index 3bc6b52131d36..571fe3d39d770 100644 --- a/administrator/components/com_redirect/models/link.php +++ b/administrator/components/com_redirect/models/link.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_redirect * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_redirect/models/links.php b/administrator/components/com_redirect/models/links.php index 8cc8203f72dd3..69cd7126852b0 100644 --- a/administrator/components/com_redirect/models/links.php +++ b/administrator/components/com_redirect/models/links.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_redirect * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_redirect/redirect.php b/administrator/components/com_redirect/redirect.php index ebe62f846009c..da376b562f0d2 100644 --- a/administrator/components/com_redirect/redirect.php +++ b/administrator/components/com_redirect/redirect.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_redirect * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_redirect/tables/link.php b/administrator/components/com_redirect/tables/link.php index 4c6d0b9a279f5..0f684de30b852 100644 --- a/administrator/components/com_redirect/tables/link.php +++ b/administrator/components/com_redirect/tables/link.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_redirect * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_redirect/views/link/tmpl/edit.php b/administrator/components/com_redirect/views/link/tmpl/edit.php index 5231d4bf7ff5a..6bd7960362253 100644 --- a/administrator/components/com_redirect/views/link/tmpl/edit.php +++ b/administrator/components/com_redirect/views/link/tmpl/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_redirect * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_redirect/views/link/view.html.php b/administrator/components/com_redirect/views/link/view.html.php index 369336e397998..3988a17108bd4 100644 --- a/administrator/components/com_redirect/views/link/view.html.php +++ b/administrator/components/com_redirect/views/link/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_redirect * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_redirect/views/links/tmpl/default.php b/administrator/components/com_redirect/views/links/tmpl/default.php old mode 100755 new mode 100644 index 08c6fc4be370b..6f9fac661dfb7 --- a/administrator/components/com_redirect/views/links/tmpl/default.php +++ b/administrator/components/com_redirect/views/links/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_redirect * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_redirect/views/links/tmpl/default_addform.php b/administrator/components/com_redirect/views/links/tmpl/default_addform.php index 669d034423674..e094016666c0b 100644 --- a/administrator/components/com_redirect/views/links/tmpl/default_addform.php +++ b/administrator/components/com_redirect/views/links/tmpl/default_addform.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_redirect * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_redirect/views/links/tmpl/default_batch_body.php b/administrator/components/com_redirect/views/links/tmpl/default_batch_body.php index 6fbacd5dbb32e..378e02fdf9115 100644 --- a/administrator/components/com_redirect/views/links/tmpl/default_batch_body.php +++ b/administrator/components/com_redirect/views/links/tmpl/default_batch_body.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_redirect * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_redirect/views/links/tmpl/default_batch_footer.php b/administrator/components/com_redirect/views/links/tmpl/default_batch_footer.php index b1ef538eefa1c..7d60e4445b736 100644 --- a/administrator/components/com_redirect/views/links/tmpl/default_batch_footer.php +++ b/administrator/components/com_redirect/views/links/tmpl/default_batch_footer.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_redirect * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_redirect/views/links/view.html.php b/administrator/components/com_redirect/views/links/view.html.php index a815511fe6b72..ec758c8a3a1bb 100644 --- a/administrator/components/com_redirect/views/links/view.html.php +++ b/administrator/components/com_redirect/views/links/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_redirect * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_search/controller.php b/administrator/components/com_search/controller.php index 5aa407396e0f9..41796dd39cbb7 100644 --- a/administrator/components/com_search/controller.php +++ b/administrator/components/com_search/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_search * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_search/controllers/searches.php b/administrator/components/com_search/controllers/searches.php index 4176362548372..bd590dfb3ada7 100644 --- a/administrator/components/com_search/controllers/searches.php +++ b/administrator/components/com_search/controllers/searches.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_search * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_search/helpers/search.php b/administrator/components/com_search/helpers/search.php index d83a616872de8..39fc22d66c3a8 100644 --- a/administrator/components/com_search/helpers/search.php +++ b/administrator/components/com_search/helpers/search.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_search * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_search/helpers/site.php b/administrator/components/com_search/helpers/site.php index 91a5c8d7fead2..ee651450edf6e 100644 --- a/administrator/components/com_search/helpers/site.php +++ b/administrator/components/com_search/helpers/site.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_search * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_search/models/searches.php b/administrator/components/com_search/models/searches.php index 43b0de054e15a..1ed48ec25f3ae 100644 --- a/administrator/components/com_search/models/searches.php +++ b/administrator/components/com_search/models/searches.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_search * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_search/search.php b/administrator/components/com_search/search.php index 98b57a9c128c4..9bdbd0c930af5 100644 --- a/administrator/components/com_search/search.php +++ b/administrator/components/com_search/search.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_search * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_search/views/searches/tmpl/default.php b/administrator/components/com_search/views/searches/tmpl/default.php index e68a764153601..33e725b9b692b 100644 --- a/administrator/components/com_search/views/searches/tmpl/default.php +++ b/administrator/components/com_search/views/searches/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_search * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_search/views/searches/view.html.php b/administrator/components/com_search/views/searches/view.html.php index 91a0f7bacd915..0b9ead3d914db 100644 --- a/administrator/components/com_search/views/searches/view.html.php +++ b/administrator/components/com_search/views/searches/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_search * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_tags/controller.php b/administrator/components/com_tags/controller.php index 173caf51abce5..caf2668ce4d94 100644 --- a/administrator/components/com_tags/controller.php +++ b/administrator/components/com_tags/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_tags/controllers/tag.php b/administrator/components/com_tags/controllers/tag.php index 4cab1ec40e002..1f1d0818ed4b6 100644 --- a/administrator/components/com_tags/controllers/tag.php +++ b/administrator/components/com_tags/controllers/tag.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_tags/controllers/tags.php b/administrator/components/com_tags/controllers/tags.php index c2458a458609b..cd8bff2848096 100644 --- a/administrator/components/com_tags/controllers/tags.php +++ b/administrator/components/com_tags/controllers/tags.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_tags/helpers/tags.php b/administrator/components/com_tags/helpers/tags.php index 23ac2cb2de165..8e1b0902a41dd 100644 --- a/administrator/components/com_tags/helpers/tags.php +++ b/administrator/components/com_tags/helpers/tags.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_tags/models/forms/tag.xml b/administrator/components/com_tags/models/forms/tag.xml index 5936a99afa55d..781c0c1916e53 100644 --- a/administrator/components/com_tags/models/forms/tag.xml +++ b/administrator/components/com_tags/models/forms/tag.xml @@ -172,9 +172,10 @@ type="calendar" class="readonly" label="JGLOBAL_CREATED_DATE" - format="%Y-%m-%d %H:%M:%S" - filter="user_utc" description="COM_TAGS_FIELD_CREATED_DATE_DESC" + translateformat="true" + showtime="true" + filter="user_utc" readonly="true" /> @@ -192,9 +193,10 @@ type="calendar" class="readonly" label="JGLOBAL_FIELD_MODIFIED_LABEL" - format="%Y-%m-%d %H:%M:%S" - filter="user_utc" description="COM_TAGS_FIELD_MODIFIED_DESC" + translateformat="true" + showtime="true" + filter="user_utc" readonly="true" /> diff --git a/administrator/components/com_tags/models/tag.php b/administrator/components/com_tags/models/tag.php index d95f7d7c1988f..a152b6c1faee1 100644 --- a/administrator/components/com_tags/models/tag.php +++ b/administrator/components/com_tags/models/tag.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_tags/models/tags.php b/administrator/components/com_tags/models/tags.php index 52cccbfc2c997..3b9adeb144cbe 100644 --- a/administrator/components/com_tags/models/tags.php +++ b/administrator/components/com_tags/models/tags.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_tags/tables/tag.php b/administrator/components/com_tags/tables/tag.php index 4f69243b23fb8..d0ca966d2bd08 100644 --- a/administrator/components/com_tags/tables/tag.php +++ b/administrator/components/com_tags/tables/tag.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_tags/tags.php b/administrator/components/com_tags/tags.php index e2867634b723e..56823e1d6a4c6 100644 --- a/administrator/components/com_tags/tags.php +++ b/administrator/components/com_tags/tags.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_tags/views/tag/tmpl/edit.php b/administrator/components/com_tags/views/tag/tmpl/edit.php index 7613386ab1869..dedddc193c0d5 100644 --- a/administrator/components/com_tags/views/tag/tmpl/edit.php +++ b/administrator/components/com_tags/views/tag/tmpl/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_tags/views/tag/tmpl/edit_metadata.php b/administrator/components/com_tags/views/tag/tmpl/edit_metadata.php index ebbe22c6bed16..42f305b88ee48 100644 --- a/administrator/components/com_tags/views/tag/tmpl/edit_metadata.php +++ b/administrator/components/com_tags/views/tag/tmpl/edit_metadata.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_tags/views/tag/tmpl/edit_options.php b/administrator/components/com_tags/views/tag/tmpl/edit_options.php index 6094dd708f29a..85b595a38e411 100644 --- a/administrator/components/com_tags/views/tag/tmpl/edit_options.php +++ b/administrator/components/com_tags/views/tag/tmpl/edit_options.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_tags/views/tag/view.html.php b/administrator/components/com_tags/views/tag/view.html.php index 1797b173e7777..8d35ad5429331 100644 --- a/administrator/components/com_tags/views/tag/view.html.php +++ b/administrator/components/com_tags/views/tag/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_tags/views/tags/tmpl/default.php b/administrator/components/com_tags/views/tags/tmpl/default.php index 65352625ac7da..e9137db6ac8ae 100644 --- a/administrator/components/com_tags/views/tags/tmpl/default.php +++ b/administrator/components/com_tags/views/tags/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_tags/views/tags/tmpl/default_batch_body.php b/administrator/components/com_tags/views/tags/tmpl/default_batch_body.php index 380db93a89ffd..71b8145e38fc1 100644 --- a/administrator/components/com_tags/views/tags/tmpl/default_batch_body.php +++ b/administrator/components/com_tags/views/tags/tmpl/default_batch_body.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_tags/views/tags/tmpl/default_batch_footer.php b/administrator/components/com_tags/views/tags/tmpl/default_batch_footer.php index 3c4be48b88fa8..e96802cb8375d 100644 --- a/administrator/components/com_tags/views/tags/tmpl/default_batch_footer.php +++ b/administrator/components/com_tags/views/tags/tmpl/default_batch_footer.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_tags/views/tags/view.html.php b/administrator/components/com_tags/views/tags/view.html.php index f230249185fce..83ebb8edbe2c5 100644 --- a/administrator/components/com_tags/views/tags/view.html.php +++ b/administrator/components/com_tags/views/tags/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/controller.php b/administrator/components/com_templates/controller.php index 3b9e1d565cefb..541fac59cfb35 100644 --- a/administrator/components/com_templates/controller.php +++ b/administrator/components/com_templates/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/controllers/style.php b/administrator/components/com_templates/controllers/style.php index 7ea1fae814891..155b89fcd06df 100644 --- a/administrator/components/com_templates/controllers/style.php +++ b/administrator/components/com_templates/controllers/style.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/controllers/styles.php b/administrator/components/com_templates/controllers/styles.php index 819cfe35f3522..93e3c9ca57319 100644 --- a/administrator/components/com_templates/controllers/styles.php +++ b/administrator/components/com_templates/controllers/styles.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/controllers/template.php b/administrator/components/com_templates/controllers/template.php index 52a42d5b5c903..376459b6ac9d9 100644 --- a/administrator/components/com_templates/controllers/template.php +++ b/administrator/components/com_templates/controllers/template.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/helpers/html/templates.php b/administrator/components/com_templates/helpers/html/templates.php index 62a6d51cb7950..fcbf00a9d2bba 100644 --- a/administrator/components/com_templates/helpers/html/templates.php +++ b/administrator/components/com_templates/helpers/html/templates.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/helpers/template.php b/administrator/components/com_templates/helpers/template.php index e73322d5a6c64..c24d832be1a0c 100644 --- a/administrator/components/com_templates/helpers/template.php +++ b/administrator/components/com_templates/helpers/template.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/helpers/templates.php b/administrator/components/com_templates/helpers/templates.php index 498a655c10faa..b9a9a4263fcf6 100644 --- a/administrator/components/com_templates/helpers/templates.php +++ b/administrator/components/com_templates/helpers/templates.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/models/fields/templatelocation.php b/administrator/components/com_templates/models/fields/templatelocation.php index 1278ac9085a8f..17258f4fcc0f3 100644 --- a/administrator/components/com_templates/models/fields/templatelocation.php +++ b/administrator/components/com_templates/models/fields/templatelocation.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/models/fields/templatename.php b/administrator/components/com_templates/models/fields/templatename.php index 7ae7626cb77e9..39874bf1bb611 100644 --- a/administrator/components/com_templates/models/fields/templatename.php +++ b/administrator/components/com_templates/models/fields/templatename.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/models/style.php b/administrator/components/com_templates/models/style.php index dbc2398a16c7f..53c5dfbde956b 100644 --- a/administrator/components/com_templates/models/style.php +++ b/administrator/components/com_templates/models/style.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/models/styles.php b/administrator/components/com_templates/models/styles.php index f37e7b9ef5a83..b5b9599aa18cb 100644 --- a/administrator/components/com_templates/models/styles.php +++ b/administrator/components/com_templates/models/styles.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/models/template.php b/administrator/components/com_templates/models/template.php index edaacbdc55369..0e26390d36049 100644 --- a/administrator/components/com_templates/models/template.php +++ b/administrator/components/com_templates/models/template.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/models/templates.php b/administrator/components/com_templates/models/templates.php index 2818dbf3ee6b7..e145fc15f364c 100644 --- a/administrator/components/com_templates/models/templates.php +++ b/administrator/components/com_templates/models/templates.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/tables/style.php b/administrator/components/com_templates/tables/style.php index af34bcd7b3ab9..a065b1d975a52 100644 --- a/administrator/components/com_templates/tables/style.php +++ b/administrator/components/com_templates/tables/style.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/templates.php b/administrator/components/com_templates/templates.php index 24fcef4e62a45..51f9d1becdb44 100644 --- a/administrator/components/com_templates/templates.php +++ b/administrator/components/com_templates/templates.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/views/style/tmpl/edit.php b/administrator/components/com_templates/views/style/tmpl/edit.php index 4a9c0f91dfd9f..a5af7ef776840 100644 --- a/administrator/components/com_templates/views/style/tmpl/edit.php +++ b/administrator/components/com_templates/views/style/tmpl/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/views/style/tmpl/edit_assignment.php b/administrator/components/com_templates/views/style/tmpl/edit_assignment.php index 6b345c67c7503..2270c62f56aff 100644 --- a/administrator/components/com_templates/views/style/tmpl/edit_assignment.php +++ b/administrator/components/com_templates/views/style/tmpl/edit_assignment.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/views/style/tmpl/edit_options.php b/administrator/components/com_templates/views/style/tmpl/edit_options.php index dd7ce642887db..1578a8235b0d7 100644 --- a/administrator/components/com_templates/views/style/tmpl/edit_options.php +++ b/administrator/components/com_templates/views/style/tmpl/edit_options.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/views/style/view.html.php b/administrator/components/com_templates/views/style/view.html.php index 099d9d8cdeb72..ff469a56e9419 100644 --- a/administrator/components/com_templates/views/style/view.html.php +++ b/administrator/components/com_templates/views/style/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/views/style/view.json.php b/administrator/components/com_templates/views/style/view.json.php index 7712d6ae6f0d9..93ac78a224be5 100644 --- a/administrator/components/com_templates/views/style/view.json.php +++ b/administrator/components/com_templates/views/style/view.json.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/views/styles/tmpl/default.php b/administrator/components/com_templates/views/styles/tmpl/default.php index 848119aa79fe2..1a9049225d1de 100644 --- a/administrator/components/com_templates/views/styles/tmpl/default.php +++ b/administrator/components/com_templates/views/styles/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/views/styles/tmpl/default.xml b/administrator/components/com_templates/views/styles/tmpl/default.xml new file mode 100755 index 0000000000000..95ef7adba738f --- /dev/null +++ b/administrator/components/com_templates/views/styles/tmpl/default.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/administrator/components/com_templates/views/styles/view.html.php b/administrator/components/com_templates/views/styles/view.html.php index bf0864e5387fb..407cbb2d2b568 100644 --- a/administrator/components/com_templates/views/styles/view.html.php +++ b/administrator/components/com_templates/views/styles/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/views/template/tmpl/default.php b/administrator/components/com_templates/views/template/tmpl/default.php index 5275cfda23806..e8241c6169c35 100644 --- a/administrator/components/com_templates/views/template/tmpl/default.php +++ b/administrator/components/com_templates/views/template/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/views/template/tmpl/default_description.php b/administrator/components/com_templates/views/template/tmpl/default_description.php index 292730fd92d67..75ba7713ed662 100644 --- a/administrator/components/com_templates/views/template/tmpl/default_description.php +++ b/administrator/components/com_templates/views/template/tmpl/default_description.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/views/template/tmpl/default_folders.php b/administrator/components/com_templates/views/template/tmpl/default_folders.php index 7ea4aab785997..68fa95add087d 100644 --- a/administrator/components/com_templates/views/template/tmpl/default_folders.php +++ b/administrator/components/com_templates/views/template/tmpl/default_folders.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/views/template/tmpl/default_modal_copy_body.php b/administrator/components/com_templates/views/template/tmpl/default_modal_copy_body.php index 82dc26a232124..7c4d880f4ac89 100644 --- a/administrator/components/com_templates/views/template/tmpl/default_modal_copy_body.php +++ b/administrator/components/com_templates/views/template/tmpl/default_modal_copy_body.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/views/template/tmpl/default_modal_copy_footer.php b/administrator/components/com_templates/views/template/tmpl/default_modal_copy_footer.php index 678990ef34c8e..5560c96856b39 100644 --- a/administrator/components/com_templates/views/template/tmpl/default_modal_copy_footer.php +++ b/administrator/components/com_templates/views/template/tmpl/default_modal_copy_footer.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/views/template/tmpl/default_modal_delete_body.php b/administrator/components/com_templates/views/template/tmpl/default_modal_delete_body.php index 2038b13d24c00..2470f4004fe94 100644 --- a/administrator/components/com_templates/views/template/tmpl/default_modal_delete_body.php +++ b/administrator/components/com_templates/views/template/tmpl/default_modal_delete_body.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/views/template/tmpl/default_modal_delete_footer.php b/administrator/components/com_templates/views/template/tmpl/default_modal_delete_footer.php index 3d1a3f507ffe2..e982342844940 100644 --- a/administrator/components/com_templates/views/template/tmpl/default_modal_delete_footer.php +++ b/administrator/components/com_templates/views/template/tmpl/default_modal_delete_footer.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/views/template/tmpl/default_modal_file_body.php b/administrator/components/com_templates/views/template/tmpl/default_modal_file_body.php index 2c41f669d5120..453eecde39541 100644 --- a/administrator/components/com_templates/views/template/tmpl/default_modal_file_body.php +++ b/administrator/components/com_templates/views/template/tmpl/default_modal_file_body.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/views/template/tmpl/default_modal_file_footer.php b/administrator/components/com_templates/views/template/tmpl/default_modal_file_footer.php index 40a4b04e5a73a..59070c3f07510 100644 --- a/administrator/components/com_templates/views/template/tmpl/default_modal_file_footer.php +++ b/administrator/components/com_templates/views/template/tmpl/default_modal_file_footer.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/views/template/tmpl/default_modal_folder_body.php b/administrator/components/com_templates/views/template/tmpl/default_modal_folder_body.php index 58c126d38ef76..a41682272666d 100644 --- a/administrator/components/com_templates/views/template/tmpl/default_modal_folder_body.php +++ b/administrator/components/com_templates/views/template/tmpl/default_modal_folder_body.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/views/template/tmpl/default_modal_folder_footer.php b/administrator/components/com_templates/views/template/tmpl/default_modal_folder_footer.php index 49a78b069b7ab..815d98c15695a 100644 --- a/administrator/components/com_templates/views/template/tmpl/default_modal_folder_footer.php +++ b/administrator/components/com_templates/views/template/tmpl/default_modal_folder_footer.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/views/template/tmpl/default_modal_rename_body.php b/administrator/components/com_templates/views/template/tmpl/default_modal_rename_body.php index 3a5080044d2c1..2d682aaed8188 100644 --- a/administrator/components/com_templates/views/template/tmpl/default_modal_rename_body.php +++ b/administrator/components/com_templates/views/template/tmpl/default_modal_rename_body.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/views/template/tmpl/default_modal_rename_footer.php b/administrator/components/com_templates/views/template/tmpl/default_modal_rename_footer.php index 7c090e0da2afb..656e441ff7a2d 100644 --- a/administrator/components/com_templates/views/template/tmpl/default_modal_rename_footer.php +++ b/administrator/components/com_templates/views/template/tmpl/default_modal_rename_footer.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/views/template/tmpl/default_modal_resize_body.php b/administrator/components/com_templates/views/template/tmpl/default_modal_resize_body.php index 4d54b6d54d71e..91fbe84d9a5cc 100644 --- a/administrator/components/com_templates/views/template/tmpl/default_modal_resize_body.php +++ b/administrator/components/com_templates/views/template/tmpl/default_modal_resize_body.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/views/template/tmpl/default_modal_resize_footer.php b/administrator/components/com_templates/views/template/tmpl/default_modal_resize_footer.php index aae62c4c64c21..b6d1a1f7d843f 100644 --- a/administrator/components/com_templates/views/template/tmpl/default_modal_resize_footer.php +++ b/administrator/components/com_templates/views/template/tmpl/default_modal_resize_footer.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/views/template/tmpl/default_tree.php b/administrator/components/com_templates/views/template/tmpl/default_tree.php index d3ca9b87b9009..28675c64265ba 100644 --- a/administrator/components/com_templates/views/template/tmpl/default_tree.php +++ b/administrator/components/com_templates/views/template/tmpl/default_tree.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/views/template/tmpl/readonly.php b/administrator/components/com_templates/views/template/tmpl/readonly.php index 1aaeb1bc90d32..f86532c5c0ffa 100644 --- a/administrator/components/com_templates/views/template/tmpl/readonly.php +++ b/administrator/components/com_templates/views/template/tmpl/readonly.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/views/template/view.html.php b/administrator/components/com_templates/views/template/view.html.php index 107ab437d006a..49989d34b4140 100644 --- a/administrator/components/com_templates/views/template/view.html.php +++ b/administrator/components/com_templates/views/template/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * -* @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. +* @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/views/templates/tmpl/default.php b/administrator/components/com_templates/views/templates/tmpl/default.php index af89b0fcbf0ad..eb7c48bf70ba6 100644 --- a/administrator/components/com_templates/views/templates/tmpl/default.php +++ b/administrator/components/com_templates/views/templates/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/views/templates/tmpl/default.xml b/administrator/components/com_templates/views/templates/tmpl/default.xml new file mode 100755 index 0000000000000..b867cf716c364 --- /dev/null +++ b/administrator/components/com_templates/views/templates/tmpl/default.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/administrator/components/com_templates/views/templates/view.html.php b/administrator/components/com_templates/views/templates/view.html.php index 039e692cec752..0fda10545980e 100644 --- a/administrator/components/com_templates/views/templates/view.html.php +++ b/administrator/components/com_templates/views/templates/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/controller.php b/administrator/components/com_users/controller.php index 040221e6a7610..fdad519cc2dbc 100644 --- a/administrator/components/com_users/controller.php +++ b/administrator/components/com_users/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/controllers/group.php b/administrator/components/com_users/controllers/group.php index dcaf8905405bd..257322dbe9918 100644 --- a/administrator/components/com_users/controllers/group.php +++ b/administrator/components/com_users/controllers/group.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/controllers/groups.php b/administrator/components/com_users/controllers/groups.php index f1b9357f9b5cf..a5b499c684ae6 100644 --- a/administrator/components/com_users/controllers/groups.php +++ b/administrator/components/com_users/controllers/groups.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/controllers/level.php b/administrator/components/com_users/controllers/level.php index cead58f845f6e..cd0308d90c4ca 100644 --- a/administrator/components/com_users/controllers/level.php +++ b/administrator/components/com_users/controllers/level.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/controllers/levels.php b/administrator/components/com_users/controllers/levels.php index 8fcfd54a2931f..81f2237bac3bd 100644 --- a/administrator/components/com_users/controllers/levels.php +++ b/administrator/components/com_users/controllers/levels.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/controllers/mail.php b/administrator/components/com_users/controllers/mail.php index 8c21b6bd87925..75d591d363460 100644 --- a/administrator/components/com_users/controllers/mail.php +++ b/administrator/components/com_users/controllers/mail.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/controllers/note.php b/administrator/components/com_users/controllers/note.php index ab094cb146dd8..2e720a204415a 100644 --- a/administrator/components/com_users/controllers/note.php +++ b/administrator/components/com_users/controllers/note.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/controllers/notes.php b/administrator/components/com_users/controllers/notes.php index 1cfaf91713de4..20d1d860fb39a 100644 --- a/administrator/components/com_users/controllers/notes.php +++ b/administrator/components/com_users/controllers/notes.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/controllers/profile.json.php b/administrator/components/com_users/controllers/profile.json.php index eed7aba5eaddf..51f6208a35b68 100644 --- a/administrator/components/com_users/controllers/profile.json.php +++ b/administrator/components/com_users/controllers/profile.json.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/controllers/user.php b/administrator/components/com_users/controllers/user.php index b5d634a8c6357..184448f76b25e 100644 --- a/administrator/components/com_users/controllers/user.php +++ b/administrator/components/com_users/controllers/user.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/controllers/users.php b/administrator/components/com_users/controllers/users.php index 998b3653744b5..d74f90afbc4f8 100644 --- a/administrator/components/com_users/controllers/users.php +++ b/administrator/components/com_users/controllers/users.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/helpers/debug.php b/administrator/components/com_users/helpers/debug.php index 18dd519d80ff6..e7cb88fe285c6 100644 --- a/administrator/components/com_users/helpers/debug.php +++ b/administrator/components/com_users/helpers/debug.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/helpers/html/users.php b/administrator/components/com_users/helpers/html/users.php index a0c08bf09aa1d..ed37fe5df2c9a 100644 --- a/administrator/components/com_users/helpers/html/users.php +++ b/administrator/components/com_users/helpers/html/users.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/helpers/users.php b/administrator/components/com_users/helpers/users.php index 017fce20739fd..19ad21c8e41b9 100644 --- a/administrator/components/com_users/helpers/users.php +++ b/administrator/components/com_users/helpers/users.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/models/debuggroup.php b/administrator/components/com_users/models/debuggroup.php index dd085870950eb..8f7e72a197821 100644 --- a/administrator/components/com_users/models/debuggroup.php +++ b/administrator/components/com_users/models/debuggroup.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/models/debuguser.php b/administrator/components/com_users/models/debuguser.php index 2b41aee566091..11fb3edb2321e 100644 --- a/administrator/components/com_users/models/debuguser.php +++ b/administrator/components/com_users/models/debuguser.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/models/fields/components.php b/administrator/components/com_users/models/fields/components.php index 80372bc387b57..87cc122d893ac 100644 --- a/administrator/components/com_users/models/fields/components.php +++ b/administrator/components/com_users/models/fields/components.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/models/fields/groupparent.php b/administrator/components/com_users/models/fields/groupparent.php index 8574e3301e340..0b64334e8af1e 100644 --- a/administrator/components/com_users/models/fields/groupparent.php +++ b/administrator/components/com_users/models/fields/groupparent.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/models/fields/levels.php b/administrator/components/com_users/models/fields/levels.php index a3b9a9bf10eb1..373a04c98f116 100644 --- a/administrator/components/com_users/models/fields/levels.php +++ b/administrator/components/com_users/models/fields/levels.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/models/forms/note.xml b/administrator/components/com_users/models/forms/note.xml index 86331346ce2e4..d4a3e1495f2b0 100644 --- a/administrator/components/com_users/models/forms/note.xml +++ b/administrator/components/com_users/models/forms/note.xml @@ -74,7 +74,7 @@ label="COM_USERS_FIELD_REVIEW_TIME_LABEL" description="COM_USERS_FIELD_REVIEW_TIME_DESC" default="NOW" - format="%Y-%m-%d" + translateformat="true" /> - - - - - + + + + - + /> diff --git a/administrator/components/com_users/models/forms/user.xml b/administrator/components/com_users/models/forms/user.xml index 40640d4701294..450f5f7e8c100 100644 --- a/administrator/components/com_users/models/forms/user.xml +++ b/administrator/components/com_users/models/forms/user.xml @@ -53,7 +53,8 @@ label="COM_USERS_USER_FIELD_REGISTERDATE_LABEL" description="COM_USERS_USER_FIELD_REGISTERDATE_DESC" readonly="true" - format="%Y-%m-%d %H:%M:%S" + translateformat="true" + showtime="true" size="22" filter="user_utc" /> @@ -65,7 +66,8 @@ label="COM_USERS_USER_FIELD_LASTVISIT_LABEL" description="COM_USERS_USER_FIELD_LASTVISIT_DESC" readonly="true" - format="%Y-%m-%d %H:%M:%S" + translateformat="true" + showtime="true" size="22" filter="user_utc" /> @@ -77,7 +79,8 @@ label="COM_USERS_USER_FIELD_LASTRESET_LABEL" description="COM_USERS_USER_FIELD_LASTRESET_DESC" readonly="true" - format="%Y-%m-%d %H:%M:%S" + translateformat="true" + showtime="true" size="22" filter="user_utc" /> diff --git a/administrator/components/com_users/models/group.php b/administrator/components/com_users/models/group.php index 00b38b108deef..3e6940090f9ec 100644 --- a/administrator/components/com_users/models/group.php +++ b/administrator/components/com_users/models/group.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/models/groups.php b/administrator/components/com_users/models/groups.php index 52e293cd73040..10a056b73cae0 100644 --- a/administrator/components/com_users/models/groups.php +++ b/administrator/components/com_users/models/groups.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/models/level.php b/administrator/components/com_users/models/level.php index 7d56eadc06882..e7961c088d0fa 100644 --- a/administrator/components/com_users/models/level.php +++ b/administrator/components/com_users/models/level.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/models/levels.php b/administrator/components/com_users/models/levels.php index 9aa2368986744..bdc8ad0a13067 100644 --- a/administrator/components/com_users/models/levels.php +++ b/administrator/components/com_users/models/levels.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/models/mail.php b/administrator/components/com_users/models/mail.php index 2e389ba7be335..952b092283c51 100644 --- a/administrator/components/com_users/models/mail.php +++ b/administrator/components/com_users/models/mail.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/models/note.php b/administrator/components/com_users/models/note.php index 4499cf44e26b5..5a3a06cb43d21 100644 --- a/administrator/components/com_users/models/note.php +++ b/administrator/components/com_users/models/note.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/models/notes.php b/administrator/components/com_users/models/notes.php index df8cb9f39feb5..3baacd2d5339d 100644 --- a/administrator/components/com_users/models/notes.php +++ b/administrator/components/com_users/models/notes.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/models/user.php b/administrator/components/com_users/models/user.php index 551675b0bb89a..792352fcd1260 100644 --- a/administrator/components/com_users/models/user.php +++ b/administrator/components/com_users/models/user.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/models/users.php b/administrator/components/com_users/models/users.php index b8ae260e1bacf..0c49455a362ad 100644 --- a/administrator/components/com_users/models/users.php +++ b/administrator/components/com_users/models/users.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/tables/note.php b/administrator/components/com_users/tables/note.php index b926236fd0d8c..eab11724eaaed 100644 --- a/administrator/components/com_users/tables/note.php +++ b/administrator/components/com_users/tables/note.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/users.php b/administrator/components/com_users/users.php index 4c3ca532f0425..738350140843e 100644 --- a/administrator/components/com_users/users.php +++ b/administrator/components/com_users/users.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/views/debuggroup/tmpl/default.php b/administrator/components/com_users/views/debuggroup/tmpl/default.php index 70b8b45cc1c49..285f57c7b934d 100644 --- a/administrator/components/com_users/views/debuggroup/tmpl/default.php +++ b/administrator/components/com_users/views/debuggroup/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/views/debuggroup/view.html.php b/administrator/components/com_users/views/debuggroup/view.html.php index cc13b8f0a5b0d..048ffcd067175 100644 --- a/administrator/components/com_users/views/debuggroup/view.html.php +++ b/administrator/components/com_users/views/debuggroup/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/views/debuguser/tmpl/default.php b/administrator/components/com_users/views/debuguser/tmpl/default.php index 911c2f10aadf0..ad953bcd2236d 100644 --- a/administrator/components/com_users/views/debuguser/tmpl/default.php +++ b/administrator/components/com_users/views/debuguser/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/views/debuguser/view.html.php b/administrator/components/com_users/views/debuguser/view.html.php index 5395dc1b3ba30..3a47bb9f461aa 100644 --- a/administrator/components/com_users/views/debuguser/view.html.php +++ b/administrator/components/com_users/views/debuguser/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/views/group/tmpl/edit.php b/administrator/components/com_users/views/group/tmpl/edit.php index e58a914241c7b..647c1f3cd6ac3 100644 --- a/administrator/components/com_users/views/group/tmpl/edit.php +++ b/administrator/components/com_users/views/group/tmpl/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/views/group/tmpl/edit.xml b/administrator/components/com_users/views/group/tmpl/edit.xml new file mode 100755 index 0000000000000..bcc58adfd9996 --- /dev/null +++ b/administrator/components/com_users/views/group/tmpl/edit.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/administrator/components/com_users/views/group/view.html.php b/administrator/components/com_users/views/group/view.html.php index bc8a56ef60009..c7d5974438b64 100644 --- a/administrator/components/com_users/views/group/view.html.php +++ b/administrator/components/com_users/views/group/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/views/groups/tmpl/default.php b/administrator/components/com_users/views/groups/tmpl/default.php index ea44800d6fe75..826a048bdcac3 100644 --- a/administrator/components/com_users/views/groups/tmpl/default.php +++ b/administrator/components/com_users/views/groups/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/views/groups/tmpl/default.xml b/administrator/components/com_users/views/groups/tmpl/default.xml new file mode 100755 index 0000000000000..b5cccb8105263 --- /dev/null +++ b/administrator/components/com_users/views/groups/tmpl/default.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/administrator/components/com_users/views/groups/view.html.php b/administrator/components/com_users/views/groups/view.html.php index cbd43e6950dee..b9b75ca362df3 100644 --- a/administrator/components/com_users/views/groups/view.html.php +++ b/administrator/components/com_users/views/groups/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/views/level/tmpl/edit.php b/administrator/components/com_users/views/level/tmpl/edit.php index 641eb2192b386..885b81c4d8235 100644 --- a/administrator/components/com_users/views/level/tmpl/edit.php +++ b/administrator/components/com_users/views/level/tmpl/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/views/level/tmpl/edit.xml b/administrator/components/com_users/views/level/tmpl/edit.xml new file mode 100755 index 0000000000000..fc078486434e0 --- /dev/null +++ b/administrator/components/com_users/views/level/tmpl/edit.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/administrator/components/com_users/views/level/view.html.php b/administrator/components/com_users/views/level/view.html.php index 09e1135c76fcd..c49b96d43b789 100644 --- a/administrator/components/com_users/views/level/view.html.php +++ b/administrator/components/com_users/views/level/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/views/levels/tmpl/default.php b/administrator/components/com_users/views/levels/tmpl/default.php index 47992d45a0d9b..6d984d8ac799a 100644 --- a/administrator/components/com_users/views/levels/tmpl/default.php +++ b/administrator/components/com_users/views/levels/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/views/levels/tmpl/default.xml b/administrator/components/com_users/views/levels/tmpl/default.xml new file mode 100755 index 0000000000000..77c9428152f90 --- /dev/null +++ b/administrator/components/com_users/views/levels/tmpl/default.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/administrator/components/com_users/views/levels/view.html.php b/administrator/components/com_users/views/levels/view.html.php index 289f47976c6c0..2f0efc392a59c 100644 --- a/administrator/components/com_users/views/levels/view.html.php +++ b/administrator/components/com_users/views/levels/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/views/mail/tmpl/default.php b/administrator/components/com_users/views/mail/tmpl/default.php index 2c3801ddcb3fb..e66fb4c675061 100644 --- a/administrator/components/com_users/views/mail/tmpl/default.php +++ b/administrator/components/com_users/views/mail/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/views/mail/tmpl/default.xml b/administrator/components/com_users/views/mail/tmpl/default.xml new file mode 100755 index 0000000000000..075e0da043481 --- /dev/null +++ b/administrator/components/com_users/views/mail/tmpl/default.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/administrator/components/com_users/views/mail/view.html.php b/administrator/components/com_users/views/mail/view.html.php index b672cda1e52fe..de51ddc44392a 100644 --- a/administrator/components/com_users/views/mail/view.html.php +++ b/administrator/components/com_users/views/mail/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/views/note/tmpl/edit.php b/administrator/components/com_users/views/note/tmpl/edit.php index a58fa729726a2..fc7901e05924b 100644 --- a/administrator/components/com_users/views/note/tmpl/edit.php +++ b/administrator/components/com_users/views/note/tmpl/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/views/note/tmpl/edit.xml b/administrator/components/com_users/views/note/tmpl/edit.xml new file mode 100755 index 0000000000000..7a6a20b60eadb --- /dev/null +++ b/administrator/components/com_users/views/note/tmpl/edit.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/administrator/components/com_users/views/note/view.html.php b/administrator/components/com_users/views/note/view.html.php index eeab8ee61747e..e58ae2f1038e2 100644 --- a/administrator/components/com_users/views/note/view.html.php +++ b/administrator/components/com_users/views/note/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/views/notes/tmpl/default.php b/administrator/components/com_users/views/notes/tmpl/default.php index 271d5e915fe64..194b6c1cb54d0 100644 --- a/administrator/components/com_users/views/notes/tmpl/default.php +++ b/administrator/components/com_users/views/notes/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/views/notes/tmpl/default.xml b/administrator/components/com_users/views/notes/tmpl/default.xml new file mode 100755 index 0000000000000..a1a88fbd51920 --- /dev/null +++ b/administrator/components/com_users/views/notes/tmpl/default.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/administrator/components/com_users/views/notes/tmpl/modal.php b/administrator/components/com_users/views/notes/tmpl/modal.php index edcfed284288f..05ef39b9e2aa7 100644 --- a/administrator/components/com_users/views/notes/tmpl/modal.php +++ b/administrator/components/com_users/views/notes/tmpl/modal.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/views/notes/view.html.php b/administrator/components/com_users/views/notes/view.html.php index f6c74d6055c43..227a0d776ed67 100644 --- a/administrator/components/com_users/views/notes/view.html.php +++ b/administrator/components/com_users/views/notes/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_users/views/user/tmpl/edit.php b/administrator/components/com_users/views/user/tmpl/edit.php index fc13544520a95..dfbef60ec7dbb 100644 --- a/administrator/components/com_users/views/user/tmpl/edit.php +++ b/administrator/components/com_users/views/user/tmpl/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/views/user/tmpl/edit.xml b/administrator/components/com_users/views/user/tmpl/edit.xml new file mode 100755 index 0000000000000..045a8e9a3c21b --- /dev/null +++ b/administrator/components/com_users/views/user/tmpl/edit.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/administrator/components/com_users/views/user/tmpl/edit_groups.php b/administrator/components/com_users/views/user/tmpl/edit_groups.php index 57e4394cadf3d..a7dcd5a550f7d 100644 --- a/administrator/components/com_users/views/user/tmpl/edit_groups.php +++ b/administrator/components/com_users/views/user/tmpl/edit_groups.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/views/user/view.html.php b/administrator/components/com_users/views/user/view.html.php index 717bcbaf35151..4bf553735960b 100644 --- a/administrator/components/com_users/views/user/view.html.php +++ b/administrator/components/com_users/views/user/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/views/users/tmpl/default.php b/administrator/components/com_users/views/users/tmpl/default.php index e651b34e5a66d..eda673348805b 100644 --- a/administrator/components/com_users/views/users/tmpl/default.php +++ b/administrator/components/com_users/views/users/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/views/users/tmpl/default.xml b/administrator/components/com_users/views/users/tmpl/default.xml new file mode 100755 index 0000000000000..28b9faff51653 --- /dev/null +++ b/administrator/components/com_users/views/users/tmpl/default.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/administrator/components/com_users/views/users/tmpl/default_batch_body.php b/administrator/components/com_users/views/users/tmpl/default_batch_body.php index bd386c24d3c43..1dba33629206b 100644 --- a/administrator/components/com_users/views/users/tmpl/default_batch_body.php +++ b/administrator/components/com_users/views/users/tmpl/default_batch_body.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_users/views/users/tmpl/default_batch_footer.php b/administrator/components/com_users/views/users/tmpl/default_batch_footer.php index cf7ca46d31204..a94767014867e 100644 --- a/administrator/components/com_users/views/users/tmpl/default_batch_footer.php +++ b/administrator/components/com_users/views/users/tmpl/default_batch_footer.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_users/views/users/tmpl/modal.php b/administrator/components/com_users/views/users/tmpl/modal.php index e0b95afeecdf5..63fb89a071535 100644 --- a/administrator/components/com_users/views/users/tmpl/modal.php +++ b/administrator/components/com_users/views/users/tmpl/modal.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/views/users/view.html.php b/administrator/components/com_users/views/users/view.html.php index 16b598668d098..f2d92778ef03a 100644 --- a/administrator/components/com_users/views/users/view.html.php +++ b/administrator/components/com_users/views/users/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/includes/defines.php b/administrator/includes/defines.php index 501deaf3918c9..7eae321c31247 100644 --- a/administrator/includes/defines.php +++ b/administrator/includes/defines.php @@ -2,7 +2,7 @@ /** * @package Joomla.Administrator * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/includes/framework.php b/administrator/includes/framework.php index 29be6ccf7db4e..ff540851f1dd7 100644 --- a/administrator/includes/framework.php +++ b/administrator/includes/framework.php @@ -2,7 +2,7 @@ /** * @package Joomla.Administrator * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/includes/helper.php b/administrator/includes/helper.php index 99f5ae798a082..6cffde3da2288 100644 --- a/administrator/includes/helper.php +++ b/administrator/includes/helper.php @@ -2,7 +2,7 @@ /** * @package Joomla.Administrator * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/includes/subtoolbar.php b/administrator/includes/subtoolbar.php index 4a446b280dbd1..93a115a471cb5 100644 --- a/administrator/includes/subtoolbar.php +++ b/administrator/includes/subtoolbar.php @@ -2,7 +2,7 @@ /** * @package Joomla.Administrator * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/includes/toolbar.php b/administrator/includes/toolbar.php index 4bfed4c1de4de..0d52a1a2ecd14 100644 --- a/administrator/includes/toolbar.php +++ b/administrator/includes/toolbar.php @@ -2,7 +2,7 @@ /** * @package Joomla.Administrator * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/index.php b/administrator/index.php index 0bf6627140c69..a48b437d1e57c 100644 --- a/administrator/index.php +++ b/administrator/index.php @@ -2,7 +2,7 @@ /** * @package Joomla.Administrator * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/language/en-GB/en-GB.com_admin.ini b/administrator/language/en-GB/en-GB.com_admin.ini index d3e0399a2b8a4..c6d49857390f2 100644 --- a/administrator/language/en-GB/en-GB.com_admin.ini +++ b/administrator/language/en-GB/en-GB.com_admin.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_admin.sys.ini b/administrator/language/en-GB/en-GB.com_admin.sys.ini index 58f4801c4530b..f05285fdce0b3 100644 --- a/administrator/language/en-GB/en-GB.com_admin.sys.ini +++ b/administrator/language/en-GB/en-GB.com_admin.sys.ini @@ -1,7 +1,12 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 COM_ADMIN="Administrator - System Information" COM_ADMIN_XML_DESCRIPTION="Administration system information component." + +COM_ADMIN_HELP_VIEW_DEFAULT_DESC="Get help regarding various pages in your Joomla administrator interface." +COM_ADMIN_HELP_VIEW_DEFAULT_TITLE="Joomla! Help" +COM_ADMIN_SYSINFO_VIEW_DEFAULT_DESC="View detailed information about your Joomla site and server configuration settings." +COM_ADMIN_SYSINFO_VIEW_DEFAULT_TITLE="System Information" diff --git a/administrator/language/en-GB/en-GB.com_ajax.ini b/administrator/language/en-GB/en-GB.com_ajax.ini index 59fe55dbff085..e3cdde4f9e971 100644 --- a/administrator/language/en-GB/en-GB.com_ajax.ini +++ b/administrator/language/en-GB/en-GB.com_ajax.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_ajax.sys.ini b/administrator/language/en-GB/en-GB.com_ajax.sys.ini index d973c5af6c0f0..2172e80befcca 100644 --- a/administrator/language/en-GB/en-GB.com_ajax.sys.ini +++ b/administrator/language/en-GB/en-GB.com_ajax.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_associations.ini b/administrator/language/en-GB/en-GB.com_associations.ini new file mode 100644 index 0000000000000..56fa4ff02c1c8 --- /dev/null +++ b/administrator/language/en-GB/en-GB.com_associations.ini @@ -0,0 +1,50 @@ +; Joomla! Project +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php +; Note : All ini files need to be saved as UTF-8 + +COM_ASSOCIATIONS="Multilingual Associations" +COM_ASSOCIATIONS_ADD_NEW_ASSOCIATION="Add new association" +COM_ASSOCIATIONS_ASSOCIATED_ITEM="Target" +COM_ASSOCIATIONS_CHANGE_TARGET="Change Target" +COM_ASSOCIATIONS_COMPONENT_NOT_SUPPORTED="The extension %s does not support multilingual associations." +COM_ASSOCIATIONS_COMPONENT_SELECTOR_DESC="Select a component from this list" +COM_ASSOCIATIONS_COMPONENT_SELECTOR_LABEL="Select component" +COM_ASSOCIATIONS_CONFIGURATION="Multilingual Associations: Options" +COM_ASSOCIATIONS_COPY_REFERENCE="Copy Reference to Target" +COM_ASSOCIATIONS_DELETE_ORPHANS="Delete Orphans" +COM_ASSOCIATIONS_DELETE_ORPHANS_FAILED="Failed to delete orphans." +COM_ASSOCIATIONS_DELETE_ORPHANS_NONE="There were no orphans to delete." +COM_ASSOCIATIONS_DELETE_ORPHANS_SUCCESS="All orphans have been deleted." +COM_ASSOCIATIONS_EDIT_ASSOCIATION="Edit association" +COM_ASSOCIATIONS_EDIT_HIDE_REFERENCE="Hide Reference" +COM_ASSOCIATIONS_EDIT_SHOW_REFERENCE="Show Reference" +COM_ASSOCIATIONS_ERROR_NO_ASSOC="The Multilingual Associations component can't be used if the site is not set as multilingual and/or Items Associations is not enabled in the Language Filter plugin." +COM_ASSOCIATIONS_FILTER_MENUTYPE_DESC="Select a Menu" +COM_ASSOCIATIONS_FILTER_MENUTYPE_LABEL="Menu" +COM_ASSOCIATIONS_FILTER_SEARCH_DESC="Search an item by its title" +COM_ASSOCIATIONS_FILTER_SEARCH_LABEL="Search item" +COM_ASSOCIATIONS_FILTER_SELECT_ITEM_TYPE="- Select Item Type -" +COM_ASSOCIATIONS_HEADING_ASSOCIATION="Associations" +COM_ASSOCIATIONS_HEADING_MENUTYPE="Menu" +COM_ASSOCIATIONS_HEADING_MENUTYPE_ASC="Menu ascending" +COM_ASSOCIATIONS_HEADING_MENUTYPE_DESC="Menu descending" +COM_ASSOCIATIONS_ITEMS="Items" +COM_ASSOCIATIONS_NO_ASSOCIATION="There is no association for this language" +COM_ASSOCIATIONS_NOTICE_NO_SELECTORS="Please select an Item Type and a reference language to view the associations." +COM_ASSOCIATIONS_PURGE="Delete All Associations" +COM_ASSOCIATIONS_PURGE_CONFIRM_PROMPT="Are you sure you want to delete all associations? Confirming will permanently delete them!" +COM_ASSOCIATIONS_PURGE_FAILED="Failed to delete all associations." +COM_ASSOCIATIONS_PURGE_NONE="There were no associations to delete." +COM_ASSOCIATIONS_PURGE_SUCCESS="All associations have been deleted." +COM_ASSOCIATIONS_REFERENCE_ITEM="Reference" +COM_ASSOCIATIONS_SAVE_REFERENCE="Save Reference" +COM_ASSOCIATIONS_SAVE_TARGET="Save Target" +COM_ASSOCIATIONS_SELECT_MENU="- Select Menu -" +COM_ASSOCIATIONS_SELECT_TARGET="Select Target" +COM_ASSOCIATIONS_SELECT_TARGET_LANGUAGE="- Select Target Language -" +COM_ASSOCIATIONS_TITLE="Associations" +COM_ASSOCIATIONS_TITLE_EDIT="Multilingual Associations: Edit Associations (%1s > %2s)" +COM_ASSOCIATIONS_TITLE_LIST="Multilingual Associations (%1s > %2s)" +COM_ASSOCIATIONS_TITLE_LIST_SELECT="Multilingual Associations: Select Item Type and Language" +COM_ASSOCIATIONS_XML_DESCRIPTION="Improved multilingual content management component" diff --git a/administrator/language/en-GB/en-GB.com_associations.sys.ini b/administrator/language/en-GB/en-GB.com_associations.sys.ini new file mode 100644 index 0000000000000..e9846cdcd5aa3 --- /dev/null +++ b/administrator/language/en-GB/en-GB.com_associations.sys.ini @@ -0,0 +1,7 @@ +; Joomla! Project +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php +; Note : All ini files need to be saved as UTF-8 + +COM_ASSOCIATIONS="Multilingual Associations" +COM_ASSOCIATIONS_XML_DESCRIPTION="Improved multilingual content management component" \ No newline at end of file diff --git a/administrator/language/en-GB/en-GB.com_banners.ini b/administrator/language/en-GB/en-GB.com_banners.ini index 52ea14c0b2bc9..50f4012916f20 100644 --- a/administrator/language/en-GB/en-GB.com_banners.ini +++ b/administrator/language/en-GB/en-GB.com_banners.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_banners.sys.ini b/administrator/language/en-GB/en-GB.com_banners.sys.ini index 9a93c924f2376..e28d645abb936 100644 --- a/administrator/language/en-GB/en-GB.com_banners.sys.ini +++ b/administrator/language/en-GB/en-GB.com_banners.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_cache.ini b/administrator/language/en-GB/en-GB.com_cache.ini index 97b5fe930a9f2..475cedde2cd90 100644 --- a/administrator/language/en-GB/en-GB.com_cache.ini +++ b/administrator/language/en-GB/en-GB.com_cache.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_cache.sys.ini b/administrator/language/en-GB/en-GB.com_cache.sys.ini index 0495a3e803857..ed51a4f33c0a2 100644 --- a/administrator/language/en-GB/en-GB.com_cache.sys.ini +++ b/administrator/language/en-GB/en-GB.com_cache.sys.ini @@ -1,7 +1,12 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 COM_CACHE="Cache" COM_CACHE_XML_DESCRIPTION="Component for cache management." + +COM_CACHE_CACHE_VIEW_DEFAULT_DESC="" +COM_CACHE_CACHE_VIEW_DEFAULT_TITLE="Clear Cache" +COM_CACHE_PURGE_VIEW_DEFAULT_DESC="" +COM_CACHE_PURGE_VIEW_DEFAULT_TITLE="Clear Expired Cache" diff --git a/administrator/language/en-GB/en-GB.com_categories.ini b/administrator/language/en-GB/en-GB.com_categories.ini index 2d9d3ece8f95a..0156d74248903 100644 --- a/administrator/language/en-GB/en-GB.com_categories.ini +++ b/administrator/language/en-GB/en-GB.com_categories.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_categories.sys.ini b/administrator/language/en-GB/en-GB.com_categories.sys.ini index 28120666e5e58..9247455f43c0b 100644 --- a/administrator/language/en-GB/en-GB.com_categories.sys.ini +++ b/administrator/language/en-GB/en-GB.com_categories.sys.ini @@ -1,7 +1,14 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 COM_CATEGORIES="Categories" COM_CATEGORIES_XML_DESCRIPTION="This component manages categories." + +COM_CATEGORIES_CATEGORIES_VIEW_DEFAULT_DESC="Shows a List of All categories in the selected component." +COM_CATEGORIES_CATEGORIES_VIEW_DEFAULT_TITLE="List All Categories" +COM_CATEGORIES_CATEGORY_VIEW_EDIT_DESC="Create a new Category in the selected component." +COM_CATEGORIES_CATEGORY_VIEW_EDIT_TITLE="Create New Category" +COM_CATEGORIES_CHOOSE_COMPONENT_DESC="Select a component to which this category should be linked." +COM_CATEGORIES_CHOOSE_COMPONENT_LABEL="Choose a Component" diff --git a/administrator/language/en-GB/en-GB.com_checkin.ini b/administrator/language/en-GB/en-GB.com_checkin.ini index 0713ee6b0f5b3..15ed6839b8e93 100644 --- a/administrator/language/en-GB/en-GB.com_checkin.ini +++ b/administrator/language/en-GB/en-GB.com_checkin.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_checkin.sys.ini b/administrator/language/en-GB/en-GB.com_checkin.sys.ini index 63639344c091d..c1b1dd9c1b2ed 100644 --- a/administrator/language/en-GB/en-GB.com_checkin.sys.ini +++ b/administrator/language/en-GB/en-GB.com_checkin.sys.ini @@ -1,7 +1,10 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 COM_CHECKIN="Check-in" COM_CHECKIN_XML_DESCRIPTION="Check-in Component" + +COM_CHECKIN_CHECKIN_VIEW_DEFAULT_DESC="Shows a list of checked out items from all components/tables." +COM_CHECKIN_CHECKIN_VIEW_DEFAULT_TITLE="Global Check-in" diff --git a/administrator/language/en-GB/en-GB.com_config.ini b/administrator/language/en-GB/en-GB.com_config.ini index d0eb65e67bb07..be6d458264335 100644 --- a/administrator/language/en-GB/en-GB.com_config.ini +++ b/administrator/language/en-GB/en-GB.com_config.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_config.sys.ini b/administrator/language/en-GB/en-GB.com_config.sys.ini index c4d6fe01affbe..3fe6c96073ecb 100644 --- a/administrator/language/en-GB/en-GB.com_config.sys.ini +++ b/administrator/language/en-GB/en-GB.com_config.sys.ini @@ -1,11 +1,14 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 COM_CONFIG="Configuration Manager" COM_CONFIG_XML_DESCRIPTION="Configuration Manager" + +COM_CONFIG_COMPONENT_VIEW_DEFAULT_DESC="Dislay the configuration options for the selected component." +COM_CONFIG_COMPONENT_VIEW_DEFAULT_TITLE="Component Configuration Options" COM_CONFIG_CONFIG_VIEW_DEFAULT_DESC="Displays basic site configuration options." -COM_CONFIG_CONFIG_VIEW_DEFAULT_TITLE="Display Site Configuration Options" +COM_CONFIG_CONFIG_VIEW_DEFAULT_TITLE="Site Configuration Options" COM_CONFIG_TEMPLATES_VIEW_DEFAULT_DESC="Displays template parameter options if the template allows this." COM_CONFIG_TEMPLATES_VIEW_DEFAULT_TITLE="Display Template Options" diff --git a/administrator/language/en-GB/en-GB.com_contact.ini b/administrator/language/en-GB/en-GB.com_contact.ini index e58d9bdb19fd9..e04687039a12d 100644 --- a/administrator/language/en-GB/en-GB.com_contact.ini +++ b/administrator/language/en-GB/en-GB.com_contact.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 @@ -20,6 +20,7 @@ COM_CONTACT_CONTACT_DETAILS="Details" COM_CONTACT_CONTACT_DISPLAY_DETAILS="Display options for the individual contact page." COM_CONTACT_CONTACT_SETTINGS_LABEL="Contact Options" COM_CONTACT_CONTACT_VIEW_DEFAULT_DESC="This links to the contact information for one contact." +COM_CONTACT_CONTACTS="Contact" COM_CONTACT_DETAILS="Contact Information" COM_CONTACT_EDIT_CONTACT="Edit Contact" COM_CONTACT_EDIT_DETAILS="Edit contact information displayed on an individual page." diff --git a/administrator/language/en-GB/en-GB.com_contact.sys.ini b/administrator/language/en-GB/en-GB.com_contact.sys.ini index b7cc5e980d5f4..48138527e1023 100644 --- a/administrator/language/en-GB/en-GB.com_contact.sys.ini +++ b/administrator/language/en-GB/en-GB.com_contact.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_content.ini b/administrator/language/en-GB/en-GB.com_content.ini index 3f8d238ef33b1..e7702ba4f1cdf 100644 --- a/administrator/language/en-GB/en-GB.com_content.ini +++ b/administrator/language/en-GB/en-GB.com_content.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_content.sys.ini b/administrator/language/en-GB/en-GB.com_content.sys.ini index 79592a4bb86ea..de2003b689593 100644 --- a/administrator/language/en-GB/en-GB.com_content.sys.ini +++ b/administrator/language/en-GB/en-GB.com_content.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 @@ -7,11 +7,15 @@ COM_CONTENT="Articles" COM_CONTENT_ARCHIVE_VIEW_DEFAULT_DESC="Display all archived articles." COM_CONTENT_ARCHIVE_VIEW_DEFAULT_OPTION="Default" COM_CONTENT_ARCHIVE_VIEW_DEFAULT_TITLE="Archived Articles" +COM_CONTENT_ARTICLES="Articles" +COM_CONTENT_ARTICLES_VIEW_DEFAULT_DESC="Shows a list of all the articles." +COM_CONTENT_ARTICLES_VIEW_DEFAULT_TITLE="List All Articles" COM_CONTENT_ARTICLE_MANAGER="Articles" COM_CONTENT_ARTICLE_VIEW_DEFAULT_DESC="Display a single article." COM_CONTENT_ARTICLE_VIEW_DEFAULT_OPTION="Default" COM_CONTENT_ARTICLE_VIEW_DEFAULT_TITLE="Single Article" -COM_CONTENT_ARTICLES="Articles" +COM_CONTENT_ARTICLE_VIEW_EDIT_DESC="Shows a form to create a New Article." +COM_CONTENT_ARTICLE_VIEW_EDIT_TITLE="Create an Article" COM_CONTENT_CATEGORIES="Categories" COM_CONTENT_CATEGORIES_VIEW_DEFAULT_DESC="Shows a list of all the article categories within a category." COM_CONTENT_CATEGORIES_VIEW_DEFAULT_OPTION="Default" diff --git a/administrator/language/en-GB/en-GB.com_contenthistory.ini b/administrator/language/en-GB/en-GB.com_contenthistory.ini index cc22054e60568..5cac0266d9fa7 100644 --- a/administrator/language/en-GB/en-GB.com_contenthistory.ini +++ b/administrator/language/en-GB/en-GB.com_contenthistory.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_contenthistory.sys.ini b/administrator/language/en-GB/en-GB.com_contenthistory.sys.ini index 689c103f51408..aac744a0e5a0f 100644 --- a/administrator/language/en-GB/en-GB.com_contenthistory.sys.ini +++ b/administrator/language/en-GB/en-GB.com_contenthistory.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_cpanel.ini b/administrator/language/en-GB/en-GB.com_cpanel.ini index 863fcd5a4f6e3..d7a072822c17d 100644 --- a/administrator/language/en-GB/en-GB.com_cpanel.ini +++ b/administrator/language/en-GB/en-GB.com_cpanel.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_cpanel.sys.ini b/administrator/language/en-GB/en-GB.com_cpanel.sys.ini index cec82acfc980b..2a535faf4d8b5 100644 --- a/administrator/language/en-GB/en-GB.com_cpanel.sys.ini +++ b/administrator/language/en-GB/en-GB.com_cpanel.sys.ini @@ -1,7 +1,10 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 COM_CPANEL="Control Panel" COM_CPANEL_XML_DESCRIPTION="Control Panel component." + +COM_CPANEL_CPANEL_VIEW_DEFAULT_TITLE="Control Panel" +COM_CPANEL_CPANEL_VIEW_DEFAULT_TITLE_DESC="Shows the Joomla! Administration Dashboard page." diff --git a/administrator/language/en-GB/en-GB.com_fields.ini b/administrator/language/en-GB/en-GB.com_fields.ini index bed98c2f8cef1..e5d71354808cc 100644 --- a/administrator/language/en-GB/en-GB.com_fields.ini +++ b/administrator/language/en-GB/en-GB.com_fields.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 @@ -10,7 +10,7 @@ COM_FIELDS_FIELD_CLASS_DESC="The class attributes of the field in the edit form. COM_FIELDS_FIELD_CLASS_LABEL="Edit Class" COM_FIELDS_FIELD_DEFAULT_VALUE_DESC="The default value of the field." COM_FIELDS_FIELD_DEFAULT_VALUE_LABEL="Default Value" -COM_FIELDS_FIELD_DESCRIPTION_DESC="The description of the field." +COM_FIELDS_FIELD_DESCRIPTION_DESC="A description of the field that will be displayed in the label tooltip." COM_FIELDS_FIELD_DISABLED_DESC="Is the field disabled in the edit form." COM_FIELDS_FIELD_DISABLED_LABEL="Disabled" COM_FIELDS_FIELD_DISPLAY_AFTER_DISPLAY="After Display" diff --git a/administrator/language/en-GB/en-GB.com_fields.sys.ini b/administrator/language/en-GB/en-GB.com_fields.sys.ini index 078f1cf37c1d3..57e0833577164 100644 --- a/administrator/language/en-GB/en-GB.com_fields.sys.ini +++ b/administrator/language/en-GB/en-GB.com_fields.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_finder.ini b/administrator/language/en-GB/en-GB.com_finder.ini index 0cf3b17551509..a5205b427ff09 100644 --- a/administrator/language/en-GB/en-GB.com_finder.ini +++ b/administrator/language/en-GB/en-GB.com_finder.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_finder.sys.ini b/administrator/language/en-GB/en-GB.com_finder.sys.ini index cdf24135e6361..353169c77b3de 100644 --- a/administrator/language/en-GB/en-GB.com_finder.sys.ini +++ b/administrator/language/en-GB/en-GB.com_finder.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_installer.ini b/administrator/language/en-GB/en-GB.com_installer.ini index 94080001da183..557aa1de0d80d 100644 --- a/administrator/language/en-GB/en-GB.com_installer.ini +++ b/administrator/language/en-GB/en-GB.com_installer.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_installer.sys.ini b/administrator/language/en-GB/en-GB.com_installer.sys.ini index 88df901bd28c8..f2c2f57250fdf 100644 --- a/administrator/language/en-GB/en-GB.com_installer.sys.ini +++ b/administrator/language/en-GB/en-GB.com_installer.sys.ini @@ -1,7 +1,24 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 COM_INSTALLER="Installer" COM_INSTALLER_XML_DESCRIPTION="Installer component for adding, removing and upgrading extensions." + +COM_INSTALLER_DATABASE_VIEW_DEFAULT_DESC="Check and fix any database issues with your website." +COM_INSTALLER_DATABASE_VIEW_DEFAULT_TITLE="Check Database" +COM_INSTALLER_DISCOVER_VIEW_DEFAULT_DESC="Discover extensions that have not gone through the normal installation process." +COM_INSTALLER_DISCOVER_VIEW_DEFAULT_TITLE="Discover Extensions" +COM_INSTALLER_INSTALL_VIEW_DEFAULT_DESC="Install extensions into your Joomla! installation." +COM_INSTALLER_INSTALL_VIEW_DEFAULT_TITLE="Install Extensions" +COM_INSTALLER_LANGUAGES_VIEW_DEFAULT_DESC="Install Language packs into your Joomla! website." +COM_INSTALLER_LANGUAGES_VIEW_DEFAULT_TITLE="Install Languages" +COM_INSTALLER_MANAGE_VIEW_DEFAULT_DESC="Manage extension that are already installed on your Joomla! website." +COM_INSTALLER_MANAGE_VIEW_DEFAULT_TITLE="Manage Extensions" +COM_INSTALLER_UPDATESITES_VIEW_DEFAULT_DESC="Manage "_QQ_"Update Sites"_QQ_" for various installed extensions." +COM_INSTALLER_UPDATESITES_VIEW_DEFAULT_TITLE="Update Sites" +COM_INSTALLER_UPDATE_VIEW_DEFAULT_DESC="Find and Install updates for the installed extensions." +COM_INSTALLER_UPDATE_VIEW_DEFAULT_TITLE="Update Extensions" +COM_INSTALLER_WARNINGS_VIEW_DEFAULT_DESC="Displays warnings related to your installed extensions." +COM_INSTALLER_WARNINGS_VIEW_DEFAULT_TITLE="Warnings" diff --git a/administrator/language/en-GB/en-GB.com_joomlaupdate.ini b/administrator/language/en-GB/en-GB.com_joomlaupdate.ini index ded8bf033633d..c39e73649778a 100644 --- a/administrator/language/en-GB/en-GB.com_joomlaupdate.ini +++ b/administrator/language/en-GB/en-GB.com_joomlaupdate.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_joomlaupdate.sys.ini b/administrator/language/en-GB/en-GB.com_joomlaupdate.sys.ini index 88a8cc7761d4b..e69a2e27fbbcd 100644 --- a/administrator/language/en-GB/en-GB.com_joomlaupdate.sys.ini +++ b/administrator/language/en-GB/en-GB.com_joomlaupdate.sys.ini @@ -1,7 +1,10 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 COM_JOOMLAUPDATE="Joomla! Update" COM_JOOMLAUPDATE_XML_DESCRIPTION="One-click update to the latest Joomla release." + +COM_JOOMLAUPDATE_DEFAULT_VIEW_DEFAULT_DESC="Check for Joomla! updates and update your website with latest available release." +COM_JOOMLAUPDATE_DEFAULT_VIEW_DEFAULT_TITLE="View Joomla! Updates" diff --git a/administrator/language/en-GB/en-GB.com_languages.ini b/administrator/language/en-GB/en-GB.com_languages.ini index d58d7470a9af7..58e8b0c39c63f 100644 --- a/administrator/language/en-GB/en-GB.com_languages.ini +++ b/administrator/language/en-GB/en-GB.com_languages.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_languages.sys.ini b/administrator/language/en-GB/en-GB.com_languages.sys.ini index d2de03873a303..5646707ee7a9a 100644 --- a/administrator/language/en-GB/en-GB.com_languages.sys.ini +++ b/administrator/language/en-GB/en-GB.com_languages.sys.ini @@ -1,7 +1,14 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 COM_LANGUAGES="Languages" COM_LANGUAGES_XML_DESCRIPTION="Component for language management." + +COM_LANGUAGES_INSTALLED_VIEW_DEFAULT_DESC="Displays language packs installed into your Joomla! website." +COM_LANGUAGES_INSTALLED_VIEW_DEFAULT_TITLE="Installed Languages" +COM_LANGUAGES_LANGUAGES_VIEW_DEFAULT_DESC="Create or manage content languages for your Joomla! website." +COM_LANGUAGES_LANGUAGES_VIEW_DEFAULT_TITLE="Content Languages" +COM_LANGUAGES_OVERRIDE_VIEW_DEFAULT_DESC="Here you assign custom text for a language key that you want to used instead of language pack default text." +COM_LANGUAGES_OVERRIDE_VIEW_DEFAULT_TITLE="Language Overrides" diff --git a/administrator/language/en-GB/en-GB.com_login.ini b/administrator/language/en-GB/en-GB.com_login.ini index c47ae98cf7195..58f56d861d650 100644 --- a/administrator/language/en-GB/en-GB.com_login.ini +++ b/administrator/language/en-GB/en-GB.com_login.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_login.sys.ini b/administrator/language/en-GB/en-GB.com_login.sys.ini index a4597fb975aa1..0a829a56ab5d3 100644 --- a/administrator/language/en-GB/en-GB.com_login.sys.ini +++ b/administrator/language/en-GB/en-GB.com_login.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_mailto.sys.ini b/administrator/language/en-GB/en-GB.com_mailto.sys.ini index f13d379443235..9c7ba34b6fd86 100644 --- a/administrator/language/en-GB/en-GB.com_mailto.sys.ini +++ b/administrator/language/en-GB/en-GB.com_mailto.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_media.ini b/administrator/language/en-GB/en-GB.com_media.ini index c2f4fd4f5ec4d..1e2ea9e2ed6a5 100644 --- a/administrator/language/en-GB/en-GB.com_media.ini +++ b/administrator/language/en-GB/en-GB.com_media.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_media.sys.ini b/administrator/language/en-GB/en-GB.com_media.sys.ini index a8ad452f3b3ab..da606784f52a2 100644 --- a/administrator/language/en-GB/en-GB.com_media.sys.ini +++ b/administrator/language/en-GB/en-GB.com_media.sys.ini @@ -1,7 +1,10 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 COM_MEDIA="Media" COM_MEDIA_XML_DESCRIPTION="Component for managing site media." + +COM_MEDIA_MEDIA_VIEW_DEFAULT_DESC="Upload or manage images and other media files on you Joomla! website." +COM_MEDIA_MEDIA_VIEW_DEFAULT_TITLE="Media Manager" diff --git a/administrator/language/en-GB/en-GB.com_menus.ini b/administrator/language/en-GB/en-GB.com_menus.ini index fd62d4f5a8373..b52590b2b69f4 100644 --- a/administrator/language/en-GB/en-GB.com_menus.ini +++ b/administrator/language/en-GB/en-GB.com_menus.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 @@ -18,7 +18,8 @@ COM_MENUS_EDIT_MENUITEM="Edit Menu Item" COM_MENUS_EDIT_MODULE_SETTINGS="Edit module settings" COM_MENUS_ERROR_ALL_LANGUAGE_ASSOCIATED="A menu item set to All languages can't be associated. Associations have not been set." COM_MENUS_ERROR_ALREADY_HOME="Menu item already set to home." -COM_MENUS_ERROR_MENUTYPE="Please change the Menu type. The terms 'menu' and 'main' are reserved for Backend usage." +COM_MENUS_ERROR_MENUTYPE="Please change the Menu type. The terms 'menu' and 'main' are reserved for internal usage." +COM_MENUS_ERROR_MENUTYPE_HOME="The terms 'menu' and 'main' are reserved for internal usage." COM_MENUS_ERROR_MENUTYPE_NOT_FOUND="The Menu type doesn't exist." COM_MENUS_ERROR_ONE_HOME="Only one menu item can be a home link for each language." COM_MENUS_EXTENSION_PUBLISHED_DISABLED="Component disabled and menu item published." @@ -80,6 +81,10 @@ COM_MENUS_ITEM_FIELD_ASSIGNED_LABEL=" Menu" COM_MENUS_ITEM_FIELD_ASSOCIATION_NO_VALUE="- No association -" COM_MENUS_ITEM_FIELD_BROWSERNAV_DESC="Target browser window when the menu item is selected." COM_MENUS_ITEM_FIELD_BROWSERNAV_LABEL="Target Window" +COM_MENUS_ITEM_FIELD_CLIENT_ID_DESC="Choose the client application menu" +COM_MENUS_ITEM_FIELD_CLIENT_ID_LABEL="Client" +COM_MENUS_ITEM_FIELD_COMPONENTS_CONTAINER_DESC="Choose whether this should be a container for the components menu created during installation of new components.

    To hide any or all of those menu items from this container you can just unpublish them under the menu type: Main (protected)." +COM_MENUS_ITEM_FIELD_COMPONENTS_CONTAINER_LABEL="Component Menu Container" COM_MENUS_ITEM_FIELD_HIDE_UNASSIGNED="Hide Unassigned Modules" COM_MENUS_ITEM_FIELD_HIDE_UNASSIGNED_DESC="Show or hide modules unassigned to this menu item." COM_MENUS_ITEM_FIELD_HIDE_UNASSIGNED_LABEL="Unassigned Modules" @@ -133,9 +138,12 @@ COM_MENUS_ITEMS_SET_HOME_0="No menu item set to home." COM_MENUS_ITEMS_SET_HOME_1="1 menu item successfully set to home." COM_MENUS_ITEMS_SET_HOME_MORE="%d menu items successfully set to home." COM_MENUS_ITEMS_UNSET_HOME="1 menu item successfully unset to home." +COM_MENUS_LABEL_HIDDEN="Hidden" COM_MENUS_LAYOUT_FEATURED_OPTIONS="Layout" COM_MENUS_LAYOUT_MENUTYPE_OPTIONS_LABEL="Menu Type" COM_MENUS_LINKTYPE_OPTIONS_LABEL="Link Type" +COM_MENUS_MENU_CLIENT_ID_LABEL="Client" +COM_MENUS_MENU_CLIENT_ID_DESC="Choose the client for which this menutype will be used." COM_MENUS_MENU_CONFIRM_DELETE="Are you sure you want to delete these menus? Confirming will delete the selected menu types, all their menu items and the associated menu modules." COM_MENUS_MENU_DESCRIPTION_DESC="A description about the purpose of the menu." COM_MENUS_MENU_DETAILS="Menu Details" @@ -145,13 +153,13 @@ COM_MENUS_MENU_MENUTYPE_LABEL="Menu Type" COM_MENUS_MENU_SAVE_SUCCESS="Menu successfully saved" COM_MENUS_MENU_SEARCH_FILTER="Search in Title or Menu type" COM_MENUS_MENU_SPRINTF="Menu: %s" +COM_MENUS_MENUS="Menu items" +COM_MENUS_MENU_TYPE_PROTECTED_MENU_LABEL="Menu (Protected)" +COM_MENUS_MENU_TYPE_PROTECTED_MAIN_LABEL="Main (Protected)" COM_MENUS_TYPE_SYSTEM="System Links" COM_MENUS_MENU_TITLE_DESC="The title of the menu to display in the Administrator Menubar and lists." -COM_MENUS_MENU_TYPE_NOT_ALLOWED="This is a reserved menutype." COM_MENUS_MENUS_FILTER_SEARCH_DESC="Search in title and menu type." COM_MENUS_MENUS_FILTER_SEARCH_LABEL="Search Menus" -COM_MENUS_PAGE_OPTIONS_LABEL="Page Display" -COM_MENUS_LABEL_HIDDEN="Hidden" ; in the following string ; %1$s is for module title, %2$s is for access-title, %3$s is for position COM_MENUS_MODULE_ACCESS_POSITION="%1$s (%2$s in %3$s)" @@ -176,6 +184,7 @@ COM_MENUS_NEW_MENUITEM="New Menu Item" COM_MENUS_NO_ITEM_SELECTED="No menu items selected." COM_MENUS_NO_MENUS_SELECTED="No menu selected." COM_MENUS_OPTION_SELECT_LEVEL="- Select Max Levels -" +COM_MENUS_PAGE_OPTIONS_LABEL="Page Display" COM_MENUS_REQUEST_FIELDSET_LABEL="Required Settings" COM_MENUS_SAVE_SUCCESS="Menu item successfully saved." COM_MENUS_SELECT_A_MENUITEM="Select a Menu Item" @@ -198,6 +207,7 @@ COM_MENUS_TYPE_HEADING="Menu Heading" COM_MENUS_TYPE_HEADING_DESC="A heading for use within menus, useful when separating menus with a separator." COM_MENUS_TYPE_SEPARATOR="Text Separator" COM_MENUS_TYPE_SEPARATOR_DESC="A text separator." +COM_MENUS_TYPE_SYSTEM="System Links" COM_MENUS_TYPE_UNEXISTING="Component '%s' does not exist." COM_MENUS_TYPE_UNKNOWN="Unknown" COM_MENUS_VIEW_EDIT_ITEM_TITLE="Menus: Edit Item" diff --git a/administrator/language/en-GB/en-GB.com_menus.sys.ini b/administrator/language/en-GB/en-GB.com_menus.sys.ini index 30e294c8e7fba..14a6169a1cc18 100644 --- a/administrator/language/en-GB/en-GB.com_menus.sys.ini +++ b/administrator/language/en-GB/en-GB.com_menus.sys.ini @@ -1,8 +1,18 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 COM_MENUS="Menus" COM_MENUS_XML_DESCRIPTION="Component for creating menus." +COM_MENUS_ITEMS_CHOOSE_MENU_DESC="Choose a Menutype for the target page.

    Not to be confused with the Menu under which this menu item will be assigned." +COM_MENUS_ITEMS_CHOOSE_MENU_LABEL="Choose a Menutype" +COM_MENUS_ITEMS_VIEW_DEFAULT_DESC="Shows a list of menu items" +COM_MENUS_ITEMS_VIEW_DEFAULT_TITLE="Menu Items" +COM_MENUS_ITEM_VIEW_EDIT_DESC="Shows a form to create a new menu item" +COM_MENUS_ITEM_VIEW_EDIT_TITLE="New Menu Item" +COM_MENUS_MENUS_VIEW_DEFAULT_DESC="Shows a list of Menu Types" +COM_MENUS_MENUS_VIEW_DEFAULT_TITLE="Menus" +COM_MENUS_MENU_VIEW_EDIT_DESC="Shows a form to create a new menu" +COM_MENUS_MENU_VIEW_EDIT_TITLE="New Menu" diff --git a/administrator/language/en-GB/en-GB.com_messages.ini b/administrator/language/en-GB/en-GB.com_messages.ini index 83a367ad7538e..23294c04f7c4c 100644 --- a/administrator/language/en-GB/en-GB.com_messages.ini +++ b/administrator/language/en-GB/en-GB.com_messages.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_messages.sys.ini b/administrator/language/en-GB/en-GB.com_messages.sys.ini index 00c98d70f914c..d1b6bb9413b85 100644 --- a/administrator/language/en-GB/en-GB.com_messages.sys.ini +++ b/administrator/language/en-GB/en-GB.com_messages.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_modules.ini b/administrator/language/en-GB/en-GB.com_modules.ini index f76d2eefe0a3d..bd0ed7aab1bec 100644 --- a/administrator/language/en-GB/en-GB.com_modules.ini +++ b/administrator/language/en-GB/en-GB.com_modules.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_modules.sys.ini b/administrator/language/en-GB/en-GB.com_modules.sys.ini index 5d8ca27a4317d..ef7198f949260 100644 --- a/administrator/language/en-GB/en-GB.com_modules.sys.ini +++ b/administrator/language/en-GB/en-GB.com_modules.sys.ini @@ -1,10 +1,12 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 COM_MODULES="Modules" COM_MODULES_GENERAL="General" +COM_MODULES_MODULES_VIEW_DEFAULT_DESC="Shows a list of modules to manage" +COM_MODULES_MODULES_VIEW_DEFAULT_TITLE="Module Manager" COM_MODULES_REDIRECT_EDIT_DESC="Select if module editing should be opened in the site or administration interface." COM_MODULES_REDIRECT_EDIT_LABEL="Edit Module" COM_MODULES_XML_DESCRIPTION="Component for module management on the Backend." diff --git a/administrator/language/en-GB/en-GB.com_newsfeeds.ini b/administrator/language/en-GB/en-GB.com_newsfeeds.ini index adcc0aad9b756..aaabd65bd8bdb 100644 --- a/administrator/language/en-GB/en-GB.com_newsfeeds.ini +++ b/administrator/language/en-GB/en-GB.com_newsfeeds.ini @@ -1,4 +1,4 @@ -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; Joomla! Project ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 @@ -115,6 +115,7 @@ COM_NEWSFEEDS_N_ITEMS_TRASHED_1="News feed successfully trashed." COM_NEWSFEEDS_N_ITEMS_UNPUBLISHED="%d news feeds successfully unpublished." COM_NEWSFEEDS_N_ITEMS_UNPUBLISHED_1="News feed successfully unpublished." COM_NEWSFEEDS_NEW_NEWSFEED="New News Feed" +COM_NEWSFEEDS_NEWSFEEDS="Newsfeeds" COM_NEWSFEEDS_NO_ITEM_SELECTED="No news feeds selected." COM_NEWSFEEDS_NONE="None" COM_NEWSFEEDS_NUM_ARTICLES_HEADING="# Articles" diff --git a/administrator/language/en-GB/en-GB.com_newsfeeds.sys.ini b/administrator/language/en-GB/en-GB.com_newsfeeds.sys.ini index c14d1f3fe58b2..b3f507b4f214b 100644 --- a/administrator/language/en-GB/en-GB.com_newsfeeds.sys.ini +++ b/administrator/language/en-GB/en-GB.com_newsfeeds.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_plugins.ini b/administrator/language/en-GB/en-GB.com_plugins.ini index cd521451c0df7..03abef8a40df4 100644 --- a/administrator/language/en-GB/en-GB.com_plugins.ini +++ b/administrator/language/en-GB/en-GB.com_plugins.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_plugins.sys.ini b/administrator/language/en-GB/en-GB.com_plugins.sys.ini index f4683c26c955e..33ab25e666c95 100644 --- a/administrator/language/en-GB/en-GB.com_plugins.sys.ini +++ b/administrator/language/en-GB/en-GB.com_plugins.sys.ini @@ -1,7 +1,10 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 COM_PLUGINS="Plugins" COM_PLUGINS_XML_DESCRIPTION="This component manages Joomla plugins." + +COM_PLUGINS_PLUGINS_VIEW_DEFAULT_DESC="Shows a list of plugins to manage" +COM_PLUGINS_PLUGINS_VIEW_DEFAULT_TITLE="Plugin Manager" diff --git a/administrator/language/en-GB/en-GB.com_postinstall.ini b/administrator/language/en-GB/en-GB.com_postinstall.ini index 256f33b8fc9f0..a09dd4627c12b 100644 --- a/administrator/language/en-GB/en-GB.com_postinstall.ini +++ b/administrator/language/en-GB/en-GB.com_postinstall.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_postinstall.sys.ini b/administrator/language/en-GB/en-GB.com_postinstall.sys.ini index d1c5a76bad357..f501b45a672ee 100644 --- a/administrator/language/en-GB/en-GB.com_postinstall.sys.ini +++ b/administrator/language/en-GB/en-GB.com_postinstall.sys.ini @@ -1,7 +1,10 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 COM_POSTINSTALL="Post-installation Messages" -COM_POSTINSTALL_XML_DESCRIPTION="Displays post-installation and post-upgrade messages for Joomla! and its extensions." \ No newline at end of file +COM_POSTINSTALL_XML_DESCRIPTION="Displays post-installation and post-upgrade messages for Joomla! and its extensions." + +COM_POSTINSTALL_MESSAGES_VIEW_DEFAULT_DESC="Displays post-installation and post-upgrade messages for Joomla! and its extensions." +COM_POSTINSTALL_MESSAGES_VIEW_DEFAULT_TITLE="Post-Installation Messages" diff --git a/administrator/language/en-GB/en-GB.com_redirect.ini b/administrator/language/en-GB/en-GB.com_redirect.ini index 51b0eabb06130..43197caae2906 100644 --- a/administrator/language/en-GB/en-GB.com_redirect.ini +++ b/administrator/language/en-GB/en-GB.com_redirect.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_redirect.sys.ini b/administrator/language/en-GB/en-GB.com_redirect.sys.ini index 40222a087f868..c807a9bb11a44 100644 --- a/administrator/language/en-GB/en-GB.com_redirect.sys.ini +++ b/administrator/language/en-GB/en-GB.com_redirect.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_search.ini b/administrator/language/en-GB/en-GB.com_search.ini index c5e5a4288a95d..cbfab20756877 100644 --- a/administrator/language/en-GB/en-GB.com_search.ini +++ b/administrator/language/en-GB/en-GB.com_search.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_search.sys.ini b/administrator/language/en-GB/en-GB.com_search.sys.ini index c991dc443a3b5..5ab97bb1df933 100644 --- a/administrator/language/en-GB/en-GB.com_search.sys.ini +++ b/administrator/language/en-GB/en-GB.com_search.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_tags.ini b/administrator/language/en-GB/en-GB.com_tags.ini index 20d264ab81f7e..71a223efb9e59 100644 --- a/administrator/language/en-GB/en-GB.com_tags.ini +++ b/administrator/language/en-GB/en-GB.com_tags.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_tags.sys.ini b/administrator/language/en-GB/en-GB.com_tags.sys.ini index ce5545ab88bc6..beb9f88678b47 100644 --- a/administrator/language/en-GB/en-GB.com_tags.sys.ini +++ b/administrator/language/en-GB/en-GB.com_tags.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_templates.ini b/administrator/language/en-GB/en-GB.com_templates.ini index c93edfa3a2f50..a88f37c705981 100644 --- a/administrator/language/en-GB/en-GB.com_templates.ini +++ b/administrator/language/en-GB/en-GB.com_templates.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_templates.sys.ini b/administrator/language/en-GB/en-GB.com_templates.sys.ini index 6462afa6c27d8..35f7d8e34dc98 100644 --- a/administrator/language/en-GB/en-GB.com_templates.sys.ini +++ b/administrator/language/en-GB/en-GB.com_templates.sys.ini @@ -1,7 +1,12 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 COM_TEMPLATES="Templates" COM_TEMPLATES_XML_DESCRIPTION="This component manages templates." + +COM_TEMPLATES_STYLE_VIEW_DEFAULT_DESC="Shows a List of Template styles" +COM_TEMPLATES_STYLE_VIEW_DEFAULT_TITLE="Template Styles" +COM_TEMPLATES_TEMPLATES_VIEW_DEFAULT_DESC="Shows a List of Installed Templates" +COM_TEMPLATES_TEMPLATES_VIEW_DEFAULT_TITLE="Templates" diff --git a/administrator/language/en-GB/en-GB.com_users.ini b/administrator/language/en-GB/en-GB.com_users.ini index 8ba9cc5c5f7bd..383ce2e11d794 100644 --- a/administrator/language/en-GB/en-GB.com_users.ini +++ b/administrator/language/en-GB/en-GB.com_users.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_users.sys.ini b/administrator/language/en-GB/en-GB.com_users.sys.ini index 8e5a8e9f21e8e..7797cece1a16a 100644 --- a/administrator/language/en-GB/en-GB.com_users.sys.ini +++ b/administrator/language/en-GB/en-GB.com_users.sys.ini @@ -1,11 +1,33 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 -COM_USERS_CONTENT_TYPE_USER="User" -COM_USERS_CONTENT_TYPE_NOTE="User Notes" +COM_USERS="Users" +COM_USERS_XML_DESCRIPTION="Component for managing users." + COM_USERS_CONTENT_TYPE_CATEGORY="User Notes Category" +COM_USERS_CONTENT_TYPE_NOTE="User Notes" +COM_USERS_CONTENT_TYPE_USER="User" +COM_USERS_GROUPS_VIEW_DEFAULT_DESC="Shows a List of User Groups" +COM_USERS_GROUPS_VIEW_DEFAULT_TITLE="User Groups" +COM_USERS_GROUP_VIEW_EDIT_DESC="Shows a form to create a new User Group" +COM_USERS_GROUP_VIEW_EDIT_TITLE="Create User Group" +COM_USERS_LEVELS_VIEW_DEFAULT_DESC="Shows a List of Access Levels" +COM_USERS_LEVELS_VIEW_DEFAULT_TITLE="Access Levels" +COM_USERS_LEVEL_VIEW_EDIT_DESC="Shows a form to create a new Access Level" +COM_USERS_LEVEL_VIEW_EDIT_TITLE="Create Access Level" +COM_USERS_MAIL_VIEW_DEFAULT_DESC="Shows a form to send mass email to multiple users." +COM_USERS_MAIL_VIEW_DEFAULT_TITLE="Mass Mail Users" +COM_USERS_NOTES_VIEW_DEFAULT_DESC="Shows a List of User Notes" +COM_USERS_NOTES_VIEW_DEFAULT_TITLE="User Notes" +COM_USERS_NOTE_VIEW_EDIT_DESC="Shows a form to create a new User Note" +COM_USERS_NOTE_VIEW_EDIT_TITLE="Create User Note" +COM_USERS_TAGS_CATEGORY="User Note Category" +COM_USERS_USERS_VIEW_DEFAULT_DESC="Shows a List of Users" +COM_USERS_USERS_VIEW_DEFAULT_TITLE="Users" +COM_USERS_USER_VIEW_EDIT_DESC="Shows a form to create a new User Account" +COM_USERS_USER_VIEW_EDIT_TITLE="Create User" COM_USER_LOGIN_VIEW_DEFAULT_DESC="Displays a login form." COM_USER_LOGIN_VIEW_DEFAULT_OPTION="Login Form" COM_USER_LOGIN_VIEW_DEFAULT_TITLE="Login Form" @@ -27,6 +49,3 @@ COM_USER_REMIND_VIEW_DEFAULT_TITLE="Username Reminder Request" COM_USER_RESET_VIEW_DEFAULT_DESC="Displays a request to reset password." COM_USER_RESET_VIEW_DEFAULT_OPTION="Default" COM_USER_RESET_VIEW_DEFAULT_TITLE="Password Reset" -COM_USERS="Users" -COM_USERS_TAGS_CATEGORY="User Note Category" -COM_USERS_XML_DESCRIPTION="Component for managing users." diff --git a/administrator/language/en-GB/en-GB.com_weblinks.ini b/administrator/language/en-GB/en-GB.com_weblinks.ini index 19ad7c97d17d7..f067acf75e845 100644 --- a/administrator/language/en-GB/en-GB.com_weblinks.ini +++ b/administrator/language/en-GB/en-GB.com_weblinks.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_weblinks.sys.ini b/administrator/language/en-GB/en-GB.com_weblinks.sys.ini index 98acc5c526e34..144f9baf8bfbe 100644 --- a/administrator/language/en-GB/en-GB.com_weblinks.sys.ini +++ b/administrator/language/en-GB/en-GB.com_weblinks.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_wrapper.ini b/administrator/language/en-GB/en-GB.com_wrapper.ini index 034c0e8358a68..351d769937194 100644 --- a/administrator/language/en-GB/en-GB.com_wrapper.ini +++ b/administrator/language/en-GB/en-GB.com_wrapper.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_wrapper.sys.ini b/administrator/language/en-GB/en-GB.com_wrapper.sys.ini index c3b3b69cbcd72..9f4ac24f94e05 100644 --- a/administrator/language/en-GB/en-GB.com_wrapper.sys.ini +++ b/administrator/language/en-GB/en-GB.com_wrapper.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.ini b/administrator/language/en-GB/en-GB.ini index 6c140e12db152..f364bf833b584 100644 --- a/administrator/language/en-GB/en-GB.ini +++ b/administrator/language/en-GB/en-GB.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 @@ -310,6 +310,8 @@ JGLOBAL_CENTER="Center" JGLOBAL_CHECK_ALL="Check All" JGLOBAL_CHOOSE_CATEGORY_DESC="Choose a category from the list." JGLOBAL_CHOOSE_CATEGORY_LABEL="Choose a Category" +JGLOBAL_CHOOSE_COMPONENT_DESC="Choose a component from the list." +JGLOBAL_CHOOSE_COMPONENT_LABEL="Choose a component" JGLOBAL_CLICK_TO_SORT_THIS_COLUMN="Select to sort by this column" JGLOBAL_CLICK_TO_TOGGLE_STATE="Select icon to toggle state." JGLOBAL_CONFIRM_DELETE="Are you sure you want to delete? Confirming will permanently delete the selected item(s)!" diff --git a/administrator/language/en-GB/en-GB.lib_joomla.ini b/administrator/language/en-GB/en-GB.lib_joomla.ini index a4242348619b3..25163a0cbffbc 100644 --- a/administrator/language/en-GB/en-GB.lib_joomla.ini +++ b/administrator/language/en-GB/en-GB.lib_joomla.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.localise.php b/administrator/language/en-GB/en-GB.localise.php index 44a7c8cc52c78..6d4e391d3db5f 100644 --- a/administrator/language/en-GB/en-GB.localise.php +++ b/administrator/language/en-GB/en-GB.localise.php @@ -2,7 +2,7 @@ /** * @package Joomla.Language * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/language/en-GB/en-GB.mod_custom.ini b/administrator/language/en-GB/en-GB.mod_custom.ini index 092987a9b247c..afd77e07817e9 100644 --- a/administrator/language/en-GB/en-GB.mod_custom.ini +++ b/administrator/language/en-GB/en-GB.mod_custom.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_custom.sys.ini b/administrator/language/en-GB/en-GB.mod_custom.sys.ini index 8166663b9352a..ee3efa1b329de 100644 --- a/administrator/language/en-GB/en-GB.mod_custom.sys.ini +++ b/administrator/language/en-GB/en-GB.mod_custom.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_feed.ini b/administrator/language/en-GB/en-GB.mod_feed.ini index 98899527b72e6..984242f08612e 100644 --- a/administrator/language/en-GB/en-GB.mod_feed.ini +++ b/administrator/language/en-GB/en-GB.mod_feed.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_feed.sys.ini b/administrator/language/en-GB/en-GB.mod_feed.sys.ini index 8787cca723610..dddf6358f619a 100644 --- a/administrator/language/en-GB/en-GB.mod_feed.sys.ini +++ b/administrator/language/en-GB/en-GB.mod_feed.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_latest.ini b/administrator/language/en-GB/en-GB.mod_latest.ini index a4d5b3dafbd2d..8eeeff253e9d3 100644 --- a/administrator/language/en-GB/en-GB.mod_latest.ini +++ b/administrator/language/en-GB/en-GB.mod_latest.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_latest.sys.ini b/administrator/language/en-GB/en-GB.mod_latest.sys.ini index 5cecb842d6298..b25c2b679fadf 100644 --- a/administrator/language/en-GB/en-GB.mod_latest.sys.ini +++ b/administrator/language/en-GB/en-GB.mod_latest.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_logged.ini b/administrator/language/en-GB/en-GB.mod_logged.ini index c6728e8600c69..a646a205e6677 100644 --- a/administrator/language/en-GB/en-GB.mod_logged.ini +++ b/administrator/language/en-GB/en-GB.mod_logged.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_logged.sys.ini b/administrator/language/en-GB/en-GB.mod_logged.sys.ini index bd0ccfc5b79bb..44e01c2bd89af 100644 --- a/administrator/language/en-GB/en-GB.mod_logged.sys.ini +++ b/administrator/language/en-GB/en-GB.mod_logged.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_login.ini b/administrator/language/en-GB/en-GB.mod_login.ini index 693ac62c2a5c1..55970ea4066ea 100644 --- a/administrator/language/en-GB/en-GB.mod_login.ini +++ b/administrator/language/en-GB/en-GB.mod_login.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_login.sys.ini b/administrator/language/en-GB/en-GB.mod_login.sys.ini index 73fce55e704ac..b0fca65fcbc02 100644 --- a/administrator/language/en-GB/en-GB.mod_login.sys.ini +++ b/administrator/language/en-GB/en-GB.mod_login.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_menu.ini b/administrator/language/en-GB/en-GB.mod_menu.ini index 3daab0d814d09..6831ef691cdc9 100644 --- a/administrator/language/en-GB/en-GB.mod_menu.ini +++ b/administrator/language/en-GB/en-GB.mod_menu.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 @@ -36,8 +36,13 @@ MOD_MENU_EXTENSIONS_LANGUAGE_MANAGER="Language(s)" MOD_MENU_EXTENSIONS_MODULE_MANAGER="Modules" MOD_MENU_EXTENSIONS_PLUGIN_MANAGER="Plugins" MOD_MENU_EXTENSIONS_TEMPLATE_MANAGER="Templates" +MOD_MENU_FIELD_CHECK_DESC="Whether to perform the checks for the selected administrator menu for presence of important menu items." +MOD_MENU_FIELD_CHECK_LABEL="Check Menu" MOD_MENU_FIELD_FORUMURL_DESC="Enter the URL to a forum other than the default." MOD_MENU_FIELD_FORUMURL_LABEL="Custom Support Forum" +MOD_MENU_FIELD_MENUTYPE_LABEL="Menu to Show" +MOD_MENU_FIELD_MENUTYPE_DESC="Choose which menu should be rendered with this instance of module." +MOD_MENU_FIELD_MENUTYPE_OPTION_PREDEFINED="Use System Preset" MOD_MENU_FIELD_SHOWHELP="Help Menu" MOD_MENU_FIELD_SHOWHELP_DESC="Show or hide the Help menu which includes links to various joomla.org sites useful to users." MOD_MENU_FIELD_SHOWNEW="Add New Shortcuts" @@ -85,10 +90,15 @@ MOD_MENU_MENU_MANAGER_NEW_MENU_ITEM="Add New Menu Item" MOD_MENU_NEW_PRIVATE_MESSAGE="New Private Message" MOD_MENU_PURGE_EXPIRED_CACHE="Clear Expired Cache" MOD_MENU_READ_PRIVATE_MESSAGES="Read Private Messages" +MOD_MENU_RECOVERY_MENU_ROOT="Menu Recovery" MOD_MENU_SETTINGS="Settings" MOD_MENU_MAINTENANCE="Maintenance" MOD_MENU_SYSTEM_INFORMATION="System Information" MOD_MENU_SYSTEM="System" MOD_MENU_TOOLS="Tools" MOD_MENU_USER_PROFILE="My Profile" +MOD_MENU_WARNING_IMPORTANT_ITEMS_INACCESSIBLE="The active administrator menu does not contain links to Module Manager and Menu Manager. Click to     turn on the menu recovery mode." +MOD_MENU_WARNING_IMPORTANT_ITEMS_INACCESSIBLE_MENUS="The active administrator menu does not contain link to Menu Manager. Click to turn on the menu recovery mode." +MOD_MENU_WARNING_IMPORTANT_ITEMS_INACCESSIBLE_MODULES="The active administrator menu does not contain link to Module Manager. Click to turn on the menu recovery mode." +MOD_MENU_WARNING_IMPORTANT_ITEMS_INACCESSIBLE_RECOVERY="You are currently in menu recovery mode. Click to turn off menu recovery mode." MOD_MENU_XML_DESCRIPTION="This module shows the main administrator navigation module." diff --git a/administrator/language/en-GB/en-GB.mod_menu.sys.ini b/administrator/language/en-GB/en-GB.mod_menu.sys.ini index 43d0782e51663..6c085a99a205d 100644 --- a/administrator/language/en-GB/en-GB.mod_menu.sys.ini +++ b/administrator/language/en-GB/en-GB.mod_menu.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_multilangstatus.ini b/administrator/language/en-GB/en-GB.mod_multilangstatus.ini index c31fd3d36ef9f..4953322b57617 100644 --- a/administrator/language/en-GB/en-GB.mod_multilangstatus.ini +++ b/administrator/language/en-GB/en-GB.mod_multilangstatus.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_multilangstatus.sys.ini b/administrator/language/en-GB/en-GB.mod_multilangstatus.sys.ini index 51f5487d6d5da..fbb220c6cae84 100644 --- a/administrator/language/en-GB/en-GB.mod_multilangstatus.sys.ini +++ b/administrator/language/en-GB/en-GB.mod_multilangstatus.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_popular.ini b/administrator/language/en-GB/en-GB.mod_popular.ini index 0f283c78270d9..b9fa222cbc114 100644 --- a/administrator/language/en-GB/en-GB.mod_popular.ini +++ b/administrator/language/en-GB/en-GB.mod_popular.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_popular.sys.ini b/administrator/language/en-GB/en-GB.mod_popular.sys.ini index ecfc06fe5b150..d8e9f9f614081 100644 --- a/administrator/language/en-GB/en-GB.mod_popular.sys.ini +++ b/administrator/language/en-GB/en-GB.mod_popular.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_quickicon.ini b/administrator/language/en-GB/en-GB.mod_quickicon.ini index 37d8bfc0e5a47..cb59fc0e46b5e 100644 --- a/administrator/language/en-GB/en-GB.mod_quickicon.ini +++ b/administrator/language/en-GB/en-GB.mod_quickicon.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_quickicon.sys.ini b/administrator/language/en-GB/en-GB.mod_quickicon.sys.ini index fd6002fe69dec..672ffd77de0b9 100644 --- a/administrator/language/en-GB/en-GB.mod_quickicon.sys.ini +++ b/administrator/language/en-GB/en-GB.mod_quickicon.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_stats_admin.ini b/administrator/language/en-GB/en-GB.mod_stats_admin.ini index de03ceb3f9f29..e52e44aa51930 100644 --- a/administrator/language/en-GB/en-GB.mod_stats_admin.ini +++ b/administrator/language/en-GB/en-GB.mod_stats_admin.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_stats_admin.sys.ini b/administrator/language/en-GB/en-GB.mod_stats_admin.sys.ini index e81b28be5ade9..21ce560b2d7da 100644 --- a/administrator/language/en-GB/en-GB.mod_stats_admin.sys.ini +++ b/administrator/language/en-GB/en-GB.mod_stats_admin.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_status.ini b/administrator/language/en-GB/en-GB.mod_status.ini index 869259fdd98b6..9defca089b3b2 100644 --- a/administrator/language/en-GB/en-GB.mod_status.ini +++ b/administrator/language/en-GB/en-GB.mod_status.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_status.sys.ini b/administrator/language/en-GB/en-GB.mod_status.sys.ini index 7a661e2b00397..564bdea0b9358 100644 --- a/administrator/language/en-GB/en-GB.mod_status.sys.ini +++ b/administrator/language/en-GB/en-GB.mod_status.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_submenu.ini b/administrator/language/en-GB/en-GB.mod_submenu.ini index 2ee193e214db5..ae82cd66889ef 100644 --- a/administrator/language/en-GB/en-GB.mod_submenu.ini +++ b/administrator/language/en-GB/en-GB.mod_submenu.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_submenu.sys.ini b/administrator/language/en-GB/en-GB.mod_submenu.sys.ini index 961481dd8511e..333b28524101f 100644 --- a/administrator/language/en-GB/en-GB.mod_submenu.sys.ini +++ b/administrator/language/en-GB/en-GB.mod_submenu.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_title.ini b/administrator/language/en-GB/en-GB.mod_title.ini index caf8a00486783..5229445d2bdf9 100644 --- a/administrator/language/en-GB/en-GB.mod_title.ini +++ b/administrator/language/en-GB/en-GB.mod_title.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_title.sys.ini b/administrator/language/en-GB/en-GB.mod_title.sys.ini index 8ea4165f7d735..31cee92ecee46 100644 --- a/administrator/language/en-GB/en-GB.mod_title.sys.ini +++ b/administrator/language/en-GB/en-GB.mod_title.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_toolbar.ini b/administrator/language/en-GB/en-GB.mod_toolbar.ini index d1bd5bcffd382..d73b63a7ea7ad 100644 --- a/administrator/language/en-GB/en-GB.mod_toolbar.ini +++ b/administrator/language/en-GB/en-GB.mod_toolbar.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_toolbar.sys.ini b/administrator/language/en-GB/en-GB.mod_toolbar.sys.ini index 7d62ef327641b..cf7f271077467 100644 --- a/administrator/language/en-GB/en-GB.mod_toolbar.sys.ini +++ b/administrator/language/en-GB/en-GB.mod_toolbar.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_version.ini b/administrator/language/en-GB/en-GB.mod_version.ini index 55395839363de..47f49543ac151 100644 --- a/administrator/language/en-GB/en-GB.mod_version.ini +++ b/administrator/language/en-GB/en-GB.mod_version.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_version.sys.ini b/administrator/language/en-GB/en-GB.mod_version.sys.ini index 305ddeb31daf4..6906ac2884ceb 100644 --- a/administrator/language/en-GB/en-GB.mod_version.sys.ini +++ b/administrator/language/en-GB/en-GB.mod_version.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_authentication_cookie.ini b/administrator/language/en-GB/en-GB.plg_authentication_cookie.ini index bb05042d9012c..1fa585d632e23 100644 --- a/administrator/language/en-GB/en-GB.plg_authentication_cookie.ini +++ b/administrator/language/en-GB/en-GB.plg_authentication_cookie.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_authentication_cookie.sys.ini b/administrator/language/en-GB/en-GB.plg_authentication_cookie.sys.ini index a1f7042d89702..9f2aa5e46d87c 100644 --- a/administrator/language/en-GB/en-GB.plg_authentication_cookie.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_authentication_cookie.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_authentication_gmail.ini b/administrator/language/en-GB/en-GB.plg_authentication_gmail.ini index 7d864b8f447f1..c33efda38b88c 100644 --- a/administrator/language/en-GB/en-GB.plg_authentication_gmail.ini +++ b/administrator/language/en-GB/en-GB.plg_authentication_gmail.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_authentication_gmail.sys.ini b/administrator/language/en-GB/en-GB.plg_authentication_gmail.sys.ini index 58d3e0e3d589a..85c1e017f53d8 100644 --- a/administrator/language/en-GB/en-GB.plg_authentication_gmail.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_authentication_gmail.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_authentication_joomla.ini b/administrator/language/en-GB/en-GB.plg_authentication_joomla.ini index 3a2e490beb011..21bd93f40e21e 100644 --- a/administrator/language/en-GB/en-GB.plg_authentication_joomla.ini +++ b/administrator/language/en-GB/en-GB.plg_authentication_joomla.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_authentication_joomla.sys.ini b/administrator/language/en-GB/en-GB.plg_authentication_joomla.sys.ini index 16b95834b491f..9a35f25a34b1c 100644 --- a/administrator/language/en-GB/en-GB.plg_authentication_joomla.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_authentication_joomla.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_authentication_ldap.ini b/administrator/language/en-GB/en-GB.plg_authentication_ldap.ini index 8fa3f5551110a..c35b816344497 100644 --- a/administrator/language/en-GB/en-GB.plg_authentication_ldap.ini +++ b/administrator/language/en-GB/en-GB.plg_authentication_ldap.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_authentication_ldap.sys.ini b/administrator/language/en-GB/en-GB.plg_authentication_ldap.sys.ini index 92121fd20e554..6ab26fa237624 100644 --- a/administrator/language/en-GB/en-GB.plg_authentication_ldap.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_authentication_ldap.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.ini b/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.ini index bc45dc0ec3997..2a8b491feb488 100644 --- a/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.ini +++ b/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.sys.ini b/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.sys.ini index 6d60c263adbb7..e4931f171f52f 100644 --- a/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_content_contact.ini b/administrator/language/en-GB/en-GB.plg_content_contact.ini index 3d96970f9d2fb..79e6236e05033 100644 --- a/administrator/language/en-GB/en-GB.plg_content_contact.ini +++ b/administrator/language/en-GB/en-GB.plg_content_contact.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_content_contact.sys.ini b/administrator/language/en-GB/en-GB.plg_content_contact.sys.ini index 3d96970f9d2fb..79e6236e05033 100644 --- a/administrator/language/en-GB/en-GB.plg_content_contact.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_content_contact.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_content_emailcloak.ini b/administrator/language/en-GB/en-GB.plg_content_emailcloak.ini index eb04a609749d5..d8a5044824eec 100644 --- a/administrator/language/en-GB/en-GB.plg_content_emailcloak.ini +++ b/administrator/language/en-GB/en-GB.plg_content_emailcloak.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_content_emailcloak.sys.ini b/administrator/language/en-GB/en-GB.plg_content_emailcloak.sys.ini index cf58172990f4f..b1368183b9d94 100644 --- a/administrator/language/en-GB/en-GB.plg_content_emailcloak.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_content_emailcloak.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_content_finder.ini b/administrator/language/en-GB/en-GB.plg_content_finder.ini index a6475578f20b7..b3e0372a0cdf4 100644 --- a/administrator/language/en-GB/en-GB.plg_content_finder.ini +++ b/administrator/language/en-GB/en-GB.plg_content_finder.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_content_finder.sys.ini b/administrator/language/en-GB/en-GB.plg_content_finder.sys.ini index 21aa225155bf3..cc434de99cb93 100644 --- a/administrator/language/en-GB/en-GB.plg_content_finder.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_content_finder.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_content_joomla.ini b/administrator/language/en-GB/en-GB.plg_content_joomla.ini index 3596d10b5d932..ce4353f1da4e0 100644 --- a/administrator/language/en-GB/en-GB.plg_content_joomla.ini +++ b/administrator/language/en-GB/en-GB.plg_content_joomla.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_content_joomla.sys.ini b/administrator/language/en-GB/en-GB.plg_content_joomla.sys.ini index 1dd3c64c3b302..1b382f4d0cf06 100644 --- a/administrator/language/en-GB/en-GB.plg_content_joomla.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_content_joomla.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_content_loadmodule.ini b/administrator/language/en-GB/en-GB.plg_content_loadmodule.ini index 4434914d98052..f90a2df7de55f 100644 --- a/administrator/language/en-GB/en-GB.plg_content_loadmodule.ini +++ b/administrator/language/en-GB/en-GB.plg_content_loadmodule.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_content_loadmodule.sys.ini b/administrator/language/en-GB/en-GB.plg_content_loadmodule.sys.ini index 3e1c44ac3f11b..64e9572727113 100644 --- a/administrator/language/en-GB/en-GB.plg_content_loadmodule.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_content_loadmodule.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_content_pagebreak.ini b/administrator/language/en-GB/en-GB.plg_content_pagebreak.ini index e2ac4d842d970..1e340bd11a5b5 100644 --- a/administrator/language/en-GB/en-GB.plg_content_pagebreak.ini +++ b/administrator/language/en-GB/en-GB.plg_content_pagebreak.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_content_pagebreak.sys.ini b/administrator/language/en-GB/en-GB.plg_content_pagebreak.sys.ini index 9cc24afd1d916..285e91ff2aaeb 100644 --- a/administrator/language/en-GB/en-GB.plg_content_pagebreak.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_content_pagebreak.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_content_pagenavigation.ini b/administrator/language/en-GB/en-GB.plg_content_pagenavigation.ini index e180b973c9ff8..08e83978e7522 100644 --- a/administrator/language/en-GB/en-GB.plg_content_pagenavigation.ini +++ b/administrator/language/en-GB/en-GB.plg_content_pagenavigation.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_content_pagenavigation.sys.ini b/administrator/language/en-GB/en-GB.plg_content_pagenavigation.sys.ini index e54543ee50d9d..51eac8645ce82 100644 --- a/administrator/language/en-GB/en-GB.plg_content_pagenavigation.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_content_pagenavigation.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_content_vote.ini b/administrator/language/en-GB/en-GB.plg_content_vote.ini index 542ea9bcc5011..a0bcb0fe115e0 100644 --- a/administrator/language/en-GB/en-GB.plg_content_vote.ini +++ b/administrator/language/en-GB/en-GB.plg_content_vote.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_content_vote.sys.ini b/administrator/language/en-GB/en-GB.plg_content_vote.sys.ini index 5060efb9da537..eef7fb44a68df 100644 --- a/administrator/language/en-GB/en-GB.plg_content_vote.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_content_vote.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_article.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_article.ini index dbe3585a9a104..a5505ec1d51e3 100644 --- a/administrator/language/en-GB/en-GB.plg_editors-xtd_article.ini +++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_article.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_article.sys.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_article.sys.ini index 90bbffe0704c9..c80dfed98c264 100644 --- a/administrator/language/en-GB/en-GB.plg_editors-xtd_article.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_article.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_contact.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_contact.ini index cf3172dff486e..d5b5906d75a14 100644 --- a/administrator/language/en-GB/en-GB.plg_editors-xtd_contact.ini +++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_contact.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_contact.sys.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_contact.sys.ini index 66b51d8cd8c6f..da77bbd12bcb3 100644 --- a/administrator/language/en-GB/en-GB.plg_editors-xtd_contact.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_contact.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_image.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_image.ini index b4c4198f19e22..2c67d65f797f1 100644 --- a/administrator/language/en-GB/en-GB.plg_editors-xtd_image.ini +++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_image.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_image.sys.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_image.sys.ini index 4777ee32e093a..18ef3247335d3 100644 --- a/administrator/language/en-GB/en-GB.plg_editors-xtd_image.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_image.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_menu.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_menu.ini index 6b7b401d46179..8f5f9336fd6ff 100644 --- a/administrator/language/en-GB/en-GB.plg_editors-xtd_menu.ini +++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_menu.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_menu.sys.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_menu.sys.ini index 145342aba1837..d7ea901021977 100644 --- a/administrator/language/en-GB/en-GB.plg_editors-xtd_menu.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_menu.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_module.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_module.ini index 8f9d66473f29d..9e11420241e65 100644 --- a/administrator/language/en-GB/en-GB.plg_editors-xtd_module.ini +++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_module.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_module.sys.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_module.sys.ini index b07aa1fdf66ab..4d51d7bec8f1d 100644 --- a/administrator/language/en-GB/en-GB.plg_editors-xtd_module.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_module.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.ini index ba1c4ffbe669f..35b69c408c59d 100644 --- a/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.ini +++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.sys.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.sys.ini index 2bb2ffe81f88d..86fd51d7251bf 100644 --- a/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.ini index b8bb8d328db4c..a0427fcc3484e 100644 --- a/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.ini +++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.sys.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.sys.ini index 67969346759dc..45375bcf811b5 100644 --- a/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_editors_codemirror.ini b/administrator/language/en-GB/en-GB.plg_editors_codemirror.ini index 2ac4f0327bb12..d57e7f2c1b97e 100644 --- a/administrator/language/en-GB/en-GB.plg_editors_codemirror.ini +++ b/administrator/language/en-GB/en-GB.plg_editors_codemirror.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_editors_codemirror.sys.ini b/administrator/language/en-GB/en-GB.plg_editors_codemirror.sys.ini index 4629ae2e329bd..fe50cdd245dd9 100644 --- a/administrator/language/en-GB/en-GB.plg_editors_codemirror.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_editors_codemirror.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_editors_none.ini b/administrator/language/en-GB/en-GB.plg_editors_none.ini index 5766732d0a494..62fb92f713f09 100644 --- a/administrator/language/en-GB/en-GB.plg_editors_none.ini +++ b/administrator/language/en-GB/en-GB.plg_editors_none.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_editors_none.sys.ini b/administrator/language/en-GB/en-GB.plg_editors_none.sys.ini index 5766732d0a494..62fb92f713f09 100644 --- a/administrator/language/en-GB/en-GB.plg_editors_none.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_editors_none.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini b/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini index c911948459a80..74dc944823f59 100644 --- a/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini +++ b/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_editors_tinymce.sys.ini b/administrator/language/en-GB/en-GB.plg_editors_tinymce.sys.ini index fd44e2375b66a..e7e822fd728dd 100644 --- a/administrator/language/en-GB/en-GB.plg_editors_tinymce.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_editors_tinymce.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_extension_joomla.ini b/administrator/language/en-GB/en-GB.plg_extension_joomla.ini index 67a9b036a4ff1..d91a0341bb745 100644 --- a/administrator/language/en-GB/en-GB.plg_extension_joomla.ini +++ b/administrator/language/en-GB/en-GB.plg_extension_joomla.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_extension_joomla.sys.ini b/administrator/language/en-GB/en-GB.plg_extension_joomla.sys.ini index 6b2f601ce3d28..41cf169241626 100644 --- a/administrator/language/en-GB/en-GB.plg_extension_joomla.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_extension_joomla.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_fields_calendar.ini b/administrator/language/en-GB/en-GB.plg_fields_calendar.ini index 680b81f5b51af..20ced836d6335 100644 --- a/administrator/language/en-GB/en-GB.plg_fields_calendar.ini +++ b/administrator/language/en-GB/en-GB.plg_fields_calendar.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_fields_calendar.sys.ini b/administrator/language/en-GB/en-GB.plg_fields_calendar.sys.ini index 39a852201a152..7ad2fd5e559df 100644 --- a/administrator/language/en-GB/en-GB.plg_fields_calendar.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_fields_calendar.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_fields_checkboxes.ini b/administrator/language/en-GB/en-GB.plg_fields_checkboxes.ini index 25348591e22ae..ba9b4157fd78c 100644 --- a/administrator/language/en-GB/en-GB.plg_fields_checkboxes.ini +++ b/administrator/language/en-GB/en-GB.plg_fields_checkboxes.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_fields_checkboxes.sys.ini b/administrator/language/en-GB/en-GB.plg_fields_checkboxes.sys.ini index 7ee52fb2a7358..ecd6bac89b25e 100644 --- a/administrator/language/en-GB/en-GB.plg_fields_checkboxes.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_fields_checkboxes.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_fields_color.ini b/administrator/language/en-GB/en-GB.plg_fields_color.ini index fdc18743a4eb0..66934f3668f9f 100644 --- a/administrator/language/en-GB/en-GB.plg_fields_color.ini +++ b/administrator/language/en-GB/en-GB.plg_fields_color.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_fields_color.sys.ini b/administrator/language/en-GB/en-GB.plg_fields_color.sys.ini index a6856eccc2131..d422326350dc5 100644 --- a/administrator/language/en-GB/en-GB.plg_fields_color.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_fields_color.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_fields_editor.ini b/administrator/language/en-GB/en-GB.plg_fields_editor.ini index 5b115bcecb54b..ce7534da448e0 100644 --- a/administrator/language/en-GB/en-GB.plg_fields_editor.ini +++ b/administrator/language/en-GB/en-GB.plg_fields_editor.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_fields_editor.sys.ini b/administrator/language/en-GB/en-GB.plg_fields_editor.sys.ini index b4d6979693f53..078ba93ef25f4 100644 --- a/administrator/language/en-GB/en-GB.plg_fields_editor.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_fields_editor.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_fields_gallery.ini b/administrator/language/en-GB/en-GB.plg_fields_gallery.ini index 5c055a8224aa2..1a9871cc6eb4b 100644 --- a/administrator/language/en-GB/en-GB.plg_fields_gallery.ini +++ b/administrator/language/en-GB/en-GB.plg_fields_gallery.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_fields_gallery.sys.ini b/administrator/language/en-GB/en-GB.plg_fields_gallery.sys.ini index e9a9b6ccd1837..231dea1e8039c 100644 --- a/administrator/language/en-GB/en-GB.plg_fields_gallery.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_fields_gallery.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_fields_image.ini b/administrator/language/en-GB/en-GB.plg_fields_image.ini index b13423b1534bc..45d26c47227d3 100644 --- a/administrator/language/en-GB/en-GB.plg_fields_image.ini +++ b/administrator/language/en-GB/en-GB.plg_fields_image.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_fields_image.sys.ini b/administrator/language/en-GB/en-GB.plg_fields_image.sys.ini index 95c50c2cf5a32..b1676c6957bcc 100644 --- a/administrator/language/en-GB/en-GB.plg_fields_image.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_fields_image.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_fields_imagelist.ini b/administrator/language/en-GB/en-GB.plg_fields_imagelist.ini index 98e99a09d561c..928ac5834af8b 100644 --- a/administrator/language/en-GB/en-GB.plg_fields_imagelist.ini +++ b/administrator/language/en-GB/en-GB.plg_fields_imagelist.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_fields_imagelist.sys.ini b/administrator/language/en-GB/en-GB.plg_fields_imagelist.sys.ini index 72f20b9a37dd1..ce80b34b5b9c3 100644 --- a/administrator/language/en-GB/en-GB.plg_fields_imagelist.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_fields_imagelist.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_fields_integer.ini b/administrator/language/en-GB/en-GB.plg_fields_integer.ini index ed5b72a76ff25..098e87073ddbc 100644 --- a/administrator/language/en-GB/en-GB.plg_fields_integer.ini +++ b/administrator/language/en-GB/en-GB.plg_fields_integer.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_fields_integer.sys.ini b/administrator/language/en-GB/en-GB.plg_fields_integer.sys.ini index 9b526889e7aaf..aac41b4732371 100644 --- a/administrator/language/en-GB/en-GB.plg_fields_integer.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_fields_integer.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_fields_list.ini b/administrator/language/en-GB/en-GB.plg_fields_list.ini index 9fcb51c4259f3..83d9a257af24f 100644 --- a/administrator/language/en-GB/en-GB.plg_fields_list.ini +++ b/administrator/language/en-GB/en-GB.plg_fields_list.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_fields_list.sys.ini b/administrator/language/en-GB/en-GB.plg_fields_list.sys.ini index 4eeb1539434c4..5ef840f6158b0 100644 --- a/administrator/language/en-GB/en-GB.plg_fields_list.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_fields_list.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_fields_media.ini b/administrator/language/en-GB/en-GB.plg_fields_media.ini index 5c68eaaccd062..b3aa4de311949 100644 --- a/administrator/language/en-GB/en-GB.plg_fields_media.ini +++ b/administrator/language/en-GB/en-GB.plg_fields_media.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_fields_media.sys.ini b/administrator/language/en-GB/en-GB.plg_fields_media.sys.ini index 8e5611d17817a..47c28f787af10 100644 --- a/administrator/language/en-GB/en-GB.plg_fields_media.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_fields_media.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_fields_radio.ini b/administrator/language/en-GB/en-GB.plg_fields_radio.ini index 9b850be9a496c..846aca3d01fbc 100644 --- a/administrator/language/en-GB/en-GB.plg_fields_radio.ini +++ b/administrator/language/en-GB/en-GB.plg_fields_radio.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_fields_radio.sys.ini b/administrator/language/en-GB/en-GB.plg_fields_radio.sys.ini index 1c10fac539718..feae2c5907b31 100644 --- a/administrator/language/en-GB/en-GB.plg_fields_radio.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_fields_radio.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_fields_sql.ini b/administrator/language/en-GB/en-GB.plg_fields_sql.ini index 3ec87be9dddd6..d1d38dd4b21a0 100644 --- a/administrator/language/en-GB/en-GB.plg_fields_sql.ini +++ b/administrator/language/en-GB/en-GB.plg_fields_sql.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_fields_sql.sys.ini b/administrator/language/en-GB/en-GB.plg_fields_sql.sys.ini index 5bf8f31ee9eb1..cfaada19abc8d 100644 --- a/administrator/language/en-GB/en-GB.plg_fields_sql.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_fields_sql.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_fields_text.ini b/administrator/language/en-GB/en-GB.plg_fields_text.ini index 0e9f6d12891bb..c8234a3c6a8c8 100644 --- a/administrator/language/en-GB/en-GB.plg_fields_text.ini +++ b/administrator/language/en-GB/en-GB.plg_fields_text.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_fields_text.sys.ini b/administrator/language/en-GB/en-GB.plg_fields_text.sys.ini index fae2f7ae44f39..b5d597f9639e7 100644 --- a/administrator/language/en-GB/en-GB.plg_fields_text.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_fields_text.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_fields_textarea.ini b/administrator/language/en-GB/en-GB.plg_fields_textarea.ini index 89b377f43f050..aa09950d3aa08 100644 --- a/administrator/language/en-GB/en-GB.plg_fields_textarea.ini +++ b/administrator/language/en-GB/en-GB.plg_fields_textarea.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_fields_textarea.sys.ini b/administrator/language/en-GB/en-GB.plg_fields_textarea.sys.ini index ac42e033325e1..c74355fa55de6 100644 --- a/administrator/language/en-GB/en-GB.plg_fields_textarea.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_fields_textarea.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_fields_url.ini b/administrator/language/en-GB/en-GB.plg_fields_url.ini index 38d148a2904ed..bb44d1fd802fc 100644 --- a/administrator/language/en-GB/en-GB.plg_fields_url.ini +++ b/administrator/language/en-GB/en-GB.plg_fields_url.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_fields_url.sys.ini b/administrator/language/en-GB/en-GB.plg_fields_url.sys.ini index c815c509202d1..1187eae3bffb8 100644 --- a/administrator/language/en-GB/en-GB.plg_fields_url.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_fields_url.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_fields_user.ini b/administrator/language/en-GB/en-GB.plg_fields_user.ini index c5cc3e4c142ed..3bfc1ca2d6e0b 100644 --- a/administrator/language/en-GB/en-GB.plg_fields_user.ini +++ b/administrator/language/en-GB/en-GB.plg_fields_user.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_fields_user.sys.ini b/administrator/language/en-GB/en-GB.plg_fields_user.sys.ini index d70054b04a3e0..8b4b00147d708 100644 --- a/administrator/language/en-GB/en-GB.plg_fields_user.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_fields_user.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_fields_usergrouplist.ini b/administrator/language/en-GB/en-GB.plg_fields_usergrouplist.ini index 3064064ee38a1..c8f5dcf5e9166 100644 --- a/administrator/language/en-GB/en-GB.plg_fields_usergrouplist.ini +++ b/administrator/language/en-GB/en-GB.plg_fields_usergrouplist.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_fields_usergrouplist.sys.ini b/administrator/language/en-GB/en-GB.plg_fields_usergrouplist.sys.ini index ade2f0ac13380..19bb89399df23 100644 --- a/administrator/language/en-GB/en-GB.plg_fields_usergrouplist.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_fields_usergrouplist.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_finder_categories.ini b/administrator/language/en-GB/en-GB.plg_finder_categories.ini index 805b9897c4708..6ebb32d48a246 100644 --- a/administrator/language/en-GB/en-GB.plg_finder_categories.ini +++ b/administrator/language/en-GB/en-GB.plg_finder_categories.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_finder_categories.sys.ini b/administrator/language/en-GB/en-GB.plg_finder_categories.sys.ini index f01fcaffe8ef4..2935b9b850b3b 100644 --- a/administrator/language/en-GB/en-GB.plg_finder_categories.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_finder_categories.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_finder_contacts.ini b/administrator/language/en-GB/en-GB.plg_finder_contacts.ini index c1e03236a3110..f93d65cdcda4c 100644 --- a/administrator/language/en-GB/en-GB.plg_finder_contacts.ini +++ b/administrator/language/en-GB/en-GB.plg_finder_contacts.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_finder_contacts.sys.ini b/administrator/language/en-GB/en-GB.plg_finder_contacts.sys.ini index 06ebc1789af2b..7c67b3fe88535 100644 --- a/administrator/language/en-GB/en-GB.plg_finder_contacts.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_finder_contacts.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_finder_content.ini b/administrator/language/en-GB/en-GB.plg_finder_content.ini index bcc9246590bf1..561b1c9c12229 100644 --- a/administrator/language/en-GB/en-GB.plg_finder_content.ini +++ b/administrator/language/en-GB/en-GB.plg_finder_content.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_finder_content.sys.ini b/administrator/language/en-GB/en-GB.plg_finder_content.sys.ini index eed9e0ddbf63d..0e024e8b047fd 100644 --- a/administrator/language/en-GB/en-GB.plg_finder_content.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_finder_content.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.ini b/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.ini index 9c97a5441efd5..83df2bf435b8f 100644 --- a/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.ini +++ b/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.sys.ini b/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.sys.ini index 7bbab94cf9370..b2302ffdfe757 100644 --- a/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_finder_tags.ini b/administrator/language/en-GB/en-GB.plg_finder_tags.ini index 6dbc9700fb59b..b5aced4a042b8 100644 --- a/administrator/language/en-GB/en-GB.plg_finder_tags.ini +++ b/administrator/language/en-GB/en-GB.plg_finder_tags.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_finder_tags.sys.ini b/administrator/language/en-GB/en-GB.plg_finder_tags.sys.ini index 9dee49f76f22a..62c060d0aea8b 100644 --- a/administrator/language/en-GB/en-GB.plg_finder_tags.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_finder_tags.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_finder_weblinks.ini b/administrator/language/en-GB/en-GB.plg_finder_weblinks.ini index f445e0c5ea16a..af84926f3fd6f 100644 --- a/administrator/language/en-GB/en-GB.plg_finder_weblinks.ini +++ b/administrator/language/en-GB/en-GB.plg_finder_weblinks.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_finder_weblinks.sys.ini b/administrator/language/en-GB/en-GB.plg_finder_weblinks.sys.ini index dfbd68a29a2fa..a76e55a257410 100644 --- a/administrator/language/en-GB/en-GB.plg_finder_weblinks.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_finder_weblinks.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_installer_folderinstaller.ini b/administrator/language/en-GB/en-GB.plg_installer_folderinstaller.ini index 33717a14ca278..977578ca94398 100644 --- a/administrator/language/en-GB/en-GB.plg_installer_folderinstaller.ini +++ b/administrator/language/en-GB/en-GB.plg_installer_folderinstaller.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_installer_folderinstaller.sys.ini b/administrator/language/en-GB/en-GB.plg_installer_folderinstaller.sys.ini index c6469ca6aa73f..1aac83c42b4a6 100644 --- a/administrator/language/en-GB/en-GB.plg_installer_folderinstaller.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_installer_folderinstaller.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_installer_packageinstaller.ini b/administrator/language/en-GB/en-GB.plg_installer_packageinstaller.ini index 221bae256bbe7..889642fbcd881 100644 --- a/administrator/language/en-GB/en-GB.plg_installer_packageinstaller.ini +++ b/administrator/language/en-GB/en-GB.plg_installer_packageinstaller.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_installer_packageinstaller.sys.ini b/administrator/language/en-GB/en-GB.plg_installer_packageinstaller.sys.ini index 590d917568759..7db2b5deb0c0c 100644 --- a/administrator/language/en-GB/en-GB.plg_installer_packageinstaller.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_installer_packageinstaller.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_installer_urlinstaller.ini b/administrator/language/en-GB/en-GB.plg_installer_urlinstaller.ini index 00f4e63edd301..f223801a08bc6 100644 --- a/administrator/language/en-GB/en-GB.plg_installer_urlinstaller.ini +++ b/administrator/language/en-GB/en-GB.plg_installer_urlinstaller.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_installer_urlinstaller.sys.ini b/administrator/language/en-GB/en-GB.plg_installer_urlinstaller.sys.ini index 908f3648f0f2e..437431566f1c8 100644 --- a/administrator/language/en-GB/en-GB.plg_installer_urlinstaller.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_installer_urlinstaller.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_installer_webinstaller.ini b/administrator/language/en-GB/en-GB.plg_installer_webinstaller.ini index 97e91f7d91f53..c5540ce69068b 100644 --- a/administrator/language/en-GB/en-GB.plg_installer_webinstaller.ini +++ b/administrator/language/en-GB/en-GB.plg_installer_webinstaller.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_installer_webinstaller.sys.ini b/administrator/language/en-GB/en-GB.plg_installer_webinstaller.sys.ini index 5697c4a235496..b0813d174396a 100644 --- a/administrator/language/en-GB/en-GB.plg_installer_webinstaller.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_installer_webinstaller.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.ini b/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.ini index 102b296db2baf..18440b769d994 100644 --- a/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.ini +++ b/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.sys.ini b/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.sys.ini index cebf3833c08e4..dc48ae4ec9fb9 100644 --- a/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.ini b/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.ini index 1cd2639ee18c5..9cb972c4bb7bb 100644 --- a/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.ini +++ b/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.sys.ini b/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.sys.ini index 3eb05e0150991..97663f5e2e489 100644 --- a/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_quickicon_phpversioncheck.ini b/administrator/language/en-GB/en-GB.plg_quickicon_phpversioncheck.ini index a344d77c319b5..ed7bcc4b8bd14 100644 --- a/administrator/language/en-GB/en-GB.plg_quickicon_phpversioncheck.ini +++ b/administrator/language/en-GB/en-GB.plg_quickicon_phpversioncheck.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_quickicon_phpversioncheck.sys.ini b/administrator/language/en-GB/en-GB.plg_quickicon_phpversioncheck.sys.ini index bae32945de9e0..f637dbc8c0b93 100644 --- a/administrator/language/en-GB/en-GB.plg_quickicon_phpversioncheck.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_quickicon_phpversioncheck.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_search_categories.ini b/administrator/language/en-GB/en-GB.plg_search_categories.ini index 4376401fdcaba..942b89ab96c28 100644 --- a/administrator/language/en-GB/en-GB.plg_search_categories.ini +++ b/administrator/language/en-GB/en-GB.plg_search_categories.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_search_categories.sys.ini b/administrator/language/en-GB/en-GB.plg_search_categories.sys.ini index 4d0dfad9eae50..d0e50867e8c1a 100644 --- a/administrator/language/en-GB/en-GB.plg_search_categories.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_search_categories.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_search_contacts.ini b/administrator/language/en-GB/en-GB.plg_search_contacts.ini index b85882596963a..70951c25f00ef 100644 --- a/administrator/language/en-GB/en-GB.plg_search_contacts.ini +++ b/administrator/language/en-GB/en-GB.plg_search_contacts.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_search_contacts.sys.ini b/administrator/language/en-GB/en-GB.plg_search_contacts.sys.ini index 989b5c7b3c6bf..843668bbfae14 100644 --- a/administrator/language/en-GB/en-GB.plg_search_contacts.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_search_contacts.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_search_content.ini b/administrator/language/en-GB/en-GB.plg_search_content.ini index 6b0070441d20b..8ecc7cf022875 100644 --- a/administrator/language/en-GB/en-GB.plg_search_content.ini +++ b/administrator/language/en-GB/en-GB.plg_search_content.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_search_content.sys.ini b/administrator/language/en-GB/en-GB.plg_search_content.sys.ini index 0f153a94532fc..6a8a0ff045359 100644 --- a/administrator/language/en-GB/en-GB.plg_search_content.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_search_content.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_search_newsfeeds.ini b/administrator/language/en-GB/en-GB.plg_search_newsfeeds.ini index 1b9728d1550aa..b3f9df7eb85f6 100644 --- a/administrator/language/en-GB/en-GB.plg_search_newsfeeds.ini +++ b/administrator/language/en-GB/en-GB.plg_search_newsfeeds.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_search_newsfeeds.sys.ini b/administrator/language/en-GB/en-GB.plg_search_newsfeeds.sys.ini index 23e8a65454285..b3221e776ee80 100644 --- a/administrator/language/en-GB/en-GB.plg_search_newsfeeds.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_search_newsfeeds.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_search_tags.ini b/administrator/language/en-GB/en-GB.plg_search_tags.ini index c50ebe79fede2..b8913d436b6a2 100644 --- a/administrator/language/en-GB/en-GB.plg_search_tags.ini +++ b/administrator/language/en-GB/en-GB.plg_search_tags.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_search_tags.sys.ini b/administrator/language/en-GB/en-GB.plg_search_tags.sys.ini index e5330361af847..d4a45ee2f27de 100644 --- a/administrator/language/en-GB/en-GB.plg_search_tags.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_search_tags.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_search_weblinks.ini b/administrator/language/en-GB/en-GB.plg_search_weblinks.ini index 14a5623f365b8..a54c03ddbca65 100644 --- a/administrator/language/en-GB/en-GB.plg_search_weblinks.ini +++ b/administrator/language/en-GB/en-GB.plg_search_weblinks.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_search_weblinks.sys.ini b/administrator/language/en-GB/en-GB.plg_search_weblinks.sys.ini index cab92523fcdc7..d72d66a87fb12 100644 --- a/administrator/language/en-GB/en-GB.plg_search_weblinks.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_search_weblinks.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_cache.ini b/administrator/language/en-GB/en-GB.plg_system_cache.ini index 99f7b83c24035..a4da15646431f 100644 --- a/administrator/language/en-GB/en-GB.plg_system_cache.ini +++ b/administrator/language/en-GB/en-GB.plg_system_cache.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_cache.sys.ini b/administrator/language/en-GB/en-GB.plg_system_cache.sys.ini index 8d1f74cf91407..58195c0faec10 100644 --- a/administrator/language/en-GB/en-GB.plg_system_cache.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_system_cache.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_debug.ini b/administrator/language/en-GB/en-GB.plg_system_debug.ini index d7cbd165eb224..c30c68cbfb626 100644 --- a/administrator/language/en-GB/en-GB.plg_system_debug.ini +++ b/administrator/language/en-GB/en-GB.plg_system_debug.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_debug.sys.ini b/administrator/language/en-GB/en-GB.plg_system_debug.sys.ini index 3ba552850b155..f6a4ae1918fcb 100644 --- a/administrator/language/en-GB/en-GB.plg_system_debug.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_system_debug.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_fields.ini b/administrator/language/en-GB/en-GB.plg_system_fields.ini index 892771f41cbe4..dc450d72b7aea 100644 --- a/administrator/language/en-GB/en-GB.plg_system_fields.ini +++ b/administrator/language/en-GB/en-GB.plg_system_fields.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_fields.sys.ini b/administrator/language/en-GB/en-GB.plg_system_fields.sys.ini index 12dca887f3148..09a046e9fc6f5 100644 --- a/administrator/language/en-GB/en-GB.plg_system_fields.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_system_fields.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_highlight.ini b/administrator/language/en-GB/en-GB.plg_system_highlight.ini index 86deaab3a0181..1f804bd6bc941 100644 --- a/administrator/language/en-GB/en-GB.plg_system_highlight.ini +++ b/administrator/language/en-GB/en-GB.plg_system_highlight.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_highlight.sys.ini b/administrator/language/en-GB/en-GB.plg_system_highlight.sys.ini index 7cf4a28988edd..58c7567408e10 100644 --- a/administrator/language/en-GB/en-GB.plg_system_highlight.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_system_highlight.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_languagecode.ini b/administrator/language/en-GB/en-GB.plg_system_languagecode.ini index c8c871eb220d4..ac7ae3960d619 100644 --- a/administrator/language/en-GB/en-GB.plg_system_languagecode.ini +++ b/administrator/language/en-GB/en-GB.plg_system_languagecode.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_languagecode.sys.ini b/administrator/language/en-GB/en-GB.plg_system_languagecode.sys.ini index f3ebf2f38f3b2..45fd95cfbb59d 100644 --- a/administrator/language/en-GB/en-GB.plg_system_languagecode.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_system_languagecode.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_languagefilter.ini b/administrator/language/en-GB/en-GB.plg_system_languagefilter.ini index d6e765e41adfb..12d2876c84172 100644 --- a/administrator/language/en-GB/en-GB.plg_system_languagefilter.ini +++ b/administrator/language/en-GB/en-GB.plg_system_languagefilter.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_languagefilter.sys.ini b/administrator/language/en-GB/en-GB.plg_system_languagefilter.sys.ini index 9e454201cc6ce..22dd3adef1f0f 100644 --- a/administrator/language/en-GB/en-GB.plg_system_languagefilter.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_system_languagefilter.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_log.ini b/administrator/language/en-GB/en-GB.plg_system_log.ini index b357ab136530b..d8ea63ecb3085 100644 --- a/administrator/language/en-GB/en-GB.plg_system_log.ini +++ b/administrator/language/en-GB/en-GB.plg_system_log.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_log.sys.ini b/administrator/language/en-GB/en-GB.plg_system_log.sys.ini index e348a831d1fe8..fd68d95e1c462 100644 --- a/administrator/language/en-GB/en-GB.plg_system_log.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_system_log.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_logout.ini b/administrator/language/en-GB/en-GB.plg_system_logout.ini index 132d8fcb5a5ba..5564a61b0e537 100644 --- a/administrator/language/en-GB/en-GB.plg_system_logout.ini +++ b/administrator/language/en-GB/en-GB.plg_system_logout.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_logout.sys.ini b/administrator/language/en-GB/en-GB.plg_system_logout.sys.ini index b41e59ff830e3..c5a631187a393 100644 --- a/administrator/language/en-GB/en-GB.plg_system_logout.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_system_logout.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_p3p.ini b/administrator/language/en-GB/en-GB.plg_system_p3p.ini index 78a37b57bd595..c6b5faab9f95f 100644 --- a/administrator/language/en-GB/en-GB.plg_system_p3p.ini +++ b/administrator/language/en-GB/en-GB.plg_system_p3p.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_p3p.sys.ini b/administrator/language/en-GB/en-GB.plg_system_p3p.sys.ini index 5644ddc38d4cb..f441d449f6dd4 100644 --- a/administrator/language/en-GB/en-GB.plg_system_p3p.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_system_p3p.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_redirect.ini b/administrator/language/en-GB/en-GB.plg_system_redirect.ini index 7421298a4c857..802e08817e2b3 100644 --- a/administrator/language/en-GB/en-GB.plg_system_redirect.ini +++ b/administrator/language/en-GB/en-GB.plg_system_redirect.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_redirect.sys.ini b/administrator/language/en-GB/en-GB.plg_system_redirect.sys.ini index 6e3c27b1e95e7..2dc776c7dc526 100644 --- a/administrator/language/en-GB/en-GB.plg_system_redirect.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_system_redirect.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_remember.ini b/administrator/language/en-GB/en-GB.plg_system_remember.ini index 3f78112bbff30..e5d1e657fa84f 100644 --- a/administrator/language/en-GB/en-GB.plg_system_remember.ini +++ b/administrator/language/en-GB/en-GB.plg_system_remember.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_remember.sys.ini b/administrator/language/en-GB/en-GB.plg_system_remember.sys.ini index 0c7fc5f364c44..2860b4cd97916 100644 --- a/administrator/language/en-GB/en-GB.plg_system_remember.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_system_remember.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_sef.ini b/administrator/language/en-GB/en-GB.plg_system_sef.ini index 2af8f4f1f81ea..abc25af12f131 100644 --- a/administrator/language/en-GB/en-GB.plg_system_sef.ini +++ b/administrator/language/en-GB/en-GB.plg_system_sef.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_sef.sys.ini b/administrator/language/en-GB/en-GB.plg_system_sef.sys.ini index a8b3fba37aeb0..0a48f8776a81d 100644 --- a/administrator/language/en-GB/en-GB.plg_system_sef.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_system_sef.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_stats.ini b/administrator/language/en-GB/en-GB.plg_system_stats.ini index adada6fc72b23..049a392638202 100644 --- a/administrator/language/en-GB/en-GB.plg_system_stats.ini +++ b/administrator/language/en-GB/en-GB.plg_system_stats.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_stats.sys.ini b/administrator/language/en-GB/en-GB.plg_system_stats.sys.ini index 55bcc9d9f416e..a012736f66a89 100644 --- a/administrator/language/en-GB/en-GB.plg_system_stats.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_system_stats.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_updatenotification.ini b/administrator/language/en-GB/en-GB.plg_system_updatenotification.ini index 94227ed393176..76cf16ca1926f 100644 --- a/administrator/language/en-GB/en-GB.plg_system_updatenotification.ini +++ b/administrator/language/en-GB/en-GB.plg_system_updatenotification.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_updatenotification.sys.ini b/administrator/language/en-GB/en-GB.plg_system_updatenotification.sys.ini index a454155a3f728..c9a1abd29e9aa 100644 --- a/administrator/language/en-GB/en-GB.plg_system_updatenotification.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_system_updatenotification.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.ini b/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.ini index a7de836e7894b..c2ed55603b590 100644 --- a/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.ini +++ b/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.sys.ini b/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.sys.ini index a2fc37701117d..d6ad3b82ce6b6 100644 --- a/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.ini b/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.ini index 016336818ae07..97c75421ec619 100644 --- a/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.ini +++ b/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.sys.ini b/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.sys.ini index e79f48bd5af1b..4ebf4b98e082d 100644 --- a/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_user_contactcreator.ini b/administrator/language/en-GB/en-GB.plg_user_contactcreator.ini index a162c17564277..5373eebd1abed 100644 --- a/administrator/language/en-GB/en-GB.plg_user_contactcreator.ini +++ b/administrator/language/en-GB/en-GB.plg_user_contactcreator.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_user_contactcreator.sys.ini b/administrator/language/en-GB/en-GB.plg_user_contactcreator.sys.ini index 72dc34b5a64d4..5bc6728bb5e82 100644 --- a/administrator/language/en-GB/en-GB.plg_user_contactcreator.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_user_contactcreator.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_user_joomla.ini b/administrator/language/en-GB/en-GB.plg_user_joomla.ini index 2cb22aeac7ebf..e564339e23d6d 100644 --- a/administrator/language/en-GB/en-GB.plg_user_joomla.ini +++ b/administrator/language/en-GB/en-GB.plg_user_joomla.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_user_joomla.sys.ini b/administrator/language/en-GB/en-GB.plg_user_joomla.sys.ini index 72234e44c8365..7c6927c3149f2 100644 --- a/administrator/language/en-GB/en-GB.plg_user_joomla.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_user_joomla.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_user_profile.ini b/administrator/language/en-GB/en-GB.plg_user_profile.ini index e3f4ff3b90222..395a4dd1ba512 100644 --- a/administrator/language/en-GB/en-GB.plg_user_profile.ini +++ b/administrator/language/en-GB/en-GB.plg_user_profile.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_user_profile.sys.ini b/administrator/language/en-GB/en-GB.plg_user_profile.sys.ini index e2f06ecc0a115..b03896dee9897 100644 --- a/administrator/language/en-GB/en-GB.plg_user_profile.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_user_profile.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.xml b/administrator/language/en-GB/en-GB.xml index 4aad734618a23..b7bc598c38d56 100644 --- a/administrator/language/en-GB/en-GB.xml +++ b/administrator/language/en-GB/en-GB.xml @@ -6,7 +6,7 @@ Joomla! Project admin@joomla.org www.joomla.org - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml index f77fe8d0c4eb0..eac13998edb14 100644 --- a/administrator/language/en-GB/install.xml +++ b/administrator/language/en-GB/install.xml @@ -7,7 +7,7 @@ Joomla! Project admin@joomla.org www.joomla.org - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt en-GB administrator language @@ -15,6 +15,8 @@ en-GB.com_admin.sys.ini en-GB.com_ajax.ini en-GB.com_ajax.sys.ini + en-GB.com_associations.ini + en-GB.com_associations.sys.ini en-GB.com_banners.ini en-GB.com_banners.sys.ini en-GB.com_cache.ini diff --git a/administrator/manifests/libraries/joomla.xml b/administrator/manifests/libraries/joomla.xml index a104b07487cbc..5b90980c49f09 100644 --- a/administrator/manifests/libraries/joomla.xml +++ b/administrator/manifests/libraries/joomla.xml @@ -5,7 +5,7 @@ 13.1 LIB_JOOMLA_XML_DESCRIPTION 2008 - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt Joomla! Project admin@joomla.org diff --git a/administrator/manifests/packages/pkg_en-GB.xml b/administrator/manifests/packages/pkg_en-GB.xml index 7c18c99563538..afcff3fbaca13 100644 --- a/administrator/manifests/packages/pkg_en-GB.xml +++ b/administrator/manifests/packages/pkg_en-GB.xml @@ -7,7 +7,7 @@ Joomla! Project admin@joomla.org www.joomla.org - Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL https://github.com/joomla/joomla-cms Joomla! Project diff --git a/administrator/modules/mod_custom/mod_custom.php b/administrator/modules/mod_custom/mod_custom.php index e06eeaacb489e..5b6182c62830a 100644 --- a/administrator/modules/mod_custom/mod_custom.php +++ b/administrator/modules/mod_custom/mod_custom.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_custom * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_custom/mod_custom.xml b/administrator/modules/mod_custom/mod_custom.xml index 6ec919d83ddd5..71628e6e47a21 100644 --- a/administrator/modules/mod_custom/mod_custom.xml +++ b/administrator/modules/mod_custom/mod_custom.xml @@ -3,7 +3,7 @@ mod_custom Joomla! Project July 2004 - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org diff --git a/administrator/modules/mod_custom/tmpl/default.php b/administrator/modules/mod_custom/tmpl/default.php index be68031860a19..3a114d3e96e9d 100644 --- a/administrator/modules/mod_custom/tmpl/default.php +++ b/administrator/modules/mod_custom/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_custom * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_feed/helper.php b/administrator/modules/mod_feed/helper.php index 481f855cf5886..06beb58b3a03a 100644 --- a/administrator/modules/mod_feed/helper.php +++ b/administrator/modules/mod_feed/helper.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_feed * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_feed/mod_feed.php b/administrator/modules/mod_feed/mod_feed.php index d2e1755a65f4e..61268f0d444c0 100644 --- a/administrator/modules/mod_feed/mod_feed.php +++ b/administrator/modules/mod_feed/mod_feed.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_feed * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_feed/mod_feed.xml b/administrator/modules/mod_feed/mod_feed.xml index 00eb7ae8f274b..7cdd6e32e02bd 100644 --- a/administrator/modules/mod_feed/mod_feed.xml +++ b/administrator/modules/mod_feed/mod_feed.xml @@ -3,7 +3,7 @@ mod_feed Joomla! Project July 2005 - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org diff --git a/administrator/modules/mod_feed/tmpl/default.php b/administrator/modules/mod_feed/tmpl/default.php index 8cb87558db60c..a861e0ad9f362 100644 --- a/administrator/modules/mod_feed/tmpl/default.php +++ b/administrator/modules/mod_feed/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_feed * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_latest/helper.php b/administrator/modules/mod_latest/helper.php index c0e25ac26e046..63c607ba44b9f 100644 --- a/administrator/modules/mod_latest/helper.php +++ b/administrator/modules/mod_latest/helper.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_latest * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_latest/mod_latest.php b/administrator/modules/mod_latest/mod_latest.php index e6dab1c4d911a..7bb17edfb6ebb 100644 --- a/administrator/modules/mod_latest/mod_latest.php +++ b/administrator/modules/mod_latest/mod_latest.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_latest * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_latest/mod_latest.xml b/administrator/modules/mod_latest/mod_latest.xml index 254c447f56203..8b97018fed9df 100644 --- a/administrator/modules/mod_latest/mod_latest.xml +++ b/administrator/modules/mod_latest/mod_latest.xml @@ -3,7 +3,7 @@ mod_latest Joomla! Project July 2004 - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org diff --git a/administrator/modules/mod_latest/tmpl/default.php b/administrator/modules/mod_latest/tmpl/default.php index f6ee92e354297..d841bebaefd87 100644 --- a/administrator/modules/mod_latest/tmpl/default.php +++ b/administrator/modules/mod_latest/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_latest * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_logged/helper.php b/administrator/modules/mod_logged/helper.php index df9386b562a8a..80a4fb1714b30 100644 --- a/administrator/modules/mod_logged/helper.php +++ b/administrator/modules/mod_logged/helper.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_logged * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_logged/mod_logged.php b/administrator/modules/mod_logged/mod_logged.php index 983d0d726ee4e..691f804140a64 100644 --- a/administrator/modules/mod_logged/mod_logged.php +++ b/administrator/modules/mod_logged/mod_logged.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_logged * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_logged/mod_logged.xml b/administrator/modules/mod_logged/mod_logged.xml index 57c9bce2d2505..419973c34051d 100644 --- a/administrator/modules/mod_logged/mod_logged.xml +++ b/administrator/modules/mod_logged/mod_logged.xml @@ -3,7 +3,7 @@ mod_logged Joomla! Project January 2005 - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org diff --git a/administrator/modules/mod_logged/tmpl/default.php b/administrator/modules/mod_logged/tmpl/default.php index 1b3505af7304a..1900eccc2af74 100644 --- a/administrator/modules/mod_logged/tmpl/default.php +++ b/administrator/modules/mod_logged/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_logged * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_login/helper.php b/administrator/modules/mod_login/helper.php index cd7c3d0bfa8d1..03cfd391d3179 100644 --- a/administrator/modules/mod_login/helper.php +++ b/administrator/modules/mod_login/helper.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_login * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_login/mod_login.php b/administrator/modules/mod_login/mod_login.php index a972336b4ff38..c48860246b61c 100644 --- a/administrator/modules/mod_login/mod_login.php +++ b/administrator/modules/mod_login/mod_login.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_login * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_login/mod_login.xml b/administrator/modules/mod_login/mod_login.xml index 97dfac281e66b..3796994ed6bf6 100644 --- a/administrator/modules/mod_login/mod_login.xml +++ b/administrator/modules/mod_login/mod_login.xml @@ -3,7 +3,7 @@ mod_login Joomla! Project March 2005 - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org diff --git a/administrator/modules/mod_login/tmpl/default.php b/administrator/modules/mod_login/tmpl/default.php index 328dbf141231a..c25681d91e670 100644 --- a/administrator/modules/mod_login/tmpl/default.php +++ b/administrator/modules/mod_login/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_login * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_menu/helper.php b/administrator/modules/mod_menu/helper.php index 4e56333f0582a..c602b013d5187 100644 --- a/administrator/modules/mod_menu/helper.php +++ b/administrator/modules/mod_menu/helper.php @@ -3,12 +3,13 @@ * @package Joomla.Administrator * @subpackage mod_menu * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; +use Joomla\Registry\Registry; use Joomla\Utilities\ArrayHelper; /** @@ -60,13 +61,14 @@ public static function getMenus() /** * Get a list of the authorised, non-special components to display in the components menu. * - * @param boolean $authCheck An optional switch to turn off the auth check (to support custom layouts 'grey out' behaviour). + * @param boolean $authCheck An optional switch to turn off the auth check (to support custom layouts 'grey out' behaviour). + * @param boolean $enabledOnly Whether to load only enabled/published menu items. * * @return array A nest array of component objects and submenus * * @since 1.6 */ - public static function getComponents($authCheck = true) + public static function getComponents($authCheck = true, $enabledOnly = false) { $lang = JFactory::getLanguage(); $user = JFactory::getUser(); @@ -75,15 +77,21 @@ public static function getComponents($authCheck = true) $result = array(); // Prepare the query. - $query->select('m.id, m.title, m.alias, m.link, m.parent_id, m.img, e.element') - ->from('#__menu AS m'); - - // Filter on the enabled states. - $query->join('LEFT', '#__extensions AS e ON m.component_id = e.extension_id') + $query->select('m.id, m.title, m.alias, m.link, m.parent_id, m.img, e.element, m.menutype') + ->from('#__menu AS m') + ->where('(m.menutype = \'menu\' OR m.menutype = \'main\')') ->where('m.client_id = 1') - ->where('e.enabled = 1') ->where('m.id > 1'); + if ($enabledOnly) + { + $query->where('m.published = 1'); + } + + // Filter on the enabled states. + $query->join('INNER', '#__extensions AS e ON m.component_id = e.extension_id') + ->where('e.enabled = 1'); + // Order by lft. $query->order('m.lft'); @@ -130,27 +138,233 @@ public static function getComponents($authCheck = true) // Load the core file then // Load extension-local file. $lang->load($component->element . '.sys', JPATH_BASE, null, false, true) - || $lang->load($component->element . '.sys', JPATH_ADMINISTRATOR . '/components/' . $component->element, null, false, true); + || $lang->load($component->element . '.sys', JPATH_ADMINISTRATOR . '/components/' . $component->element, null, false, true); } $component->text = $lang->hasKey($component->title) ? JText::_($component->title) : $component->alias; } } - else + // Sub-menu level. + // Add the submenu link if it is defined. + elseif (isset($result[$component->parent_id]) && isset($result[$component->parent_id]->submenu) && !empty($component->link)) + { + $component->text = $lang->hasKey($component->title) ? JText::_($component->title) : $component->alias; + + $result[$component->parent_id]->submenu[] = &$component; + } + } + + return ArrayHelper::sortObjects($result, 'text', 1, false, true); + } + + /** + * Load the menu items from database for the given menutype + * + * @param string $menutype The selected menu type + * @param boolean $authCheck An optional switch to turn off the auth check (to support custom layouts 'grey out' behaviour). + * + * @return array + * + * @since __DEPLOY_VERSION__ + */ + public static function getMenuItems($menutype, $authCheck = true) + { + $db = JFactory::getDbo(); + $query = $db->getQuery(true); + + // Prepare the query. + $query->select('m.*') + ->from('#__menu AS m') + ->where('m.menutype = ' . $db->q($menutype)) + ->where('m.client_id = 1') + ->where('m.published = 1') + ->where('m.id > 1'); + + // Filter on the enabled states. + $query->select('e.element') + ->join('LEFT', '#__extensions AS e ON m.component_id = e.extension_id') + ->where('(e.enabled = 1 OR e.enabled IS NULL)'); + + // Order by lft. + $query->order('m.lft'); + + $db->setQuery($query); + + // Component list + try + { + $menuItems = $db->loadObjectList(); + + foreach ($menuItems as &$menuitem) + { + $menuitem->params = new Registry($menuitem->params); + } + } + catch (RuntimeException $e) + { + $menuItems = array(); + JFactory::getApplication()->enqueueMessage(JText::_('JERROR_AN_ERROR_HAS_OCCURRED'), 'error'); + } + + // Parse the list of extensions. + $result = self::parseItems($menuItems, $authCheck); + + return $result; + } + + /** + * Parse the list of extensions. + * + * @param array $menuItems List of loaded components + * @param bool $authCheck An optional switch to turn off the auth check (to support custom layouts 'grey out' behaviour). + * + * @return array + * + * @since __DEPLOY_VERSION__ + */ + protected static function parseItems($menuItems, $authCheck = true) + { + $result = array(); + $user = JFactory::getUser(); + $lang = JFactory::getLanguage(); + $levels = $user->getAuthorisedViewLevels(); + + // Process each item + foreach ($menuItems as $i => &$menuitem) + { + /* + * Exclude item with menu item option set to exclude from menu modules + * Exclude item if the component is not authorised + * Exclude item if menu item set access level is not met + */ + if (($menuitem->params->get('menu_show', 1) == 0) + || ($menuitem->element && $authCheck && !$user->authorise('core.manage', $menuitem->element)) + || ($menuitem->access && !in_array($menuitem->access, $levels))) + { + continue; + } + + // Evaluate link url + switch ($menuitem->type) + { + case 'url': + case 'component': + $menuitem->link = trim($menuitem->link); + break; + case 'separator': + case 'heading': + $menuitem->link = '#'; + break; + case 'alias': + $aliasTo = $menuitem->params->get('aliasoptions'); + $menuitem->link = static::getLink($aliasTo); + break; + default: + } + + if ($menuitem->link == '') + { + continue; + } + + // Translate Menu item label, if needed + if (!empty($menuitem->element)) + { + $lang->load($menuitem->element . '.sys', JPATH_BASE, null, false, true) + || $lang->load($menuitem->element . '.sys', JPATH_ADMINISTRATOR . '/components/' . $menuitem->element, null, false, true); + } + + $menuitem->text = $lang->hasKey($menuitem->title) ? JText::_($menuitem->title) : $menuitem->title; + $menuitem->submenu = array(); + + $result[$menuitem->parent_id][$menuitem->id] = $menuitem; + } + + // Do an early exit if there are no top level menu items. + if (!isset($result[1])) + { + return array(); + } + + // Put the items under respective parent menu items. + foreach ($result as $parentId => &$mItems) + { + foreach ($mItems as &$mItem) { - // Sub-menu level. - if (isset($result[$component->parent_id])) + if (isset($result[$mItem->id])) { - // Add the submenu link if it is defined. - if (isset($result[$component->parent_id]->submenu) && !empty($component->link)) - { - $component->text = $lang->hasKey($component->title) ? JText::_($component->title) : $component->alias; - $result[$component->parent_id]->submenu[] = &$component; - } + static::cleanup($result[$mItem->id]); + + $mItem->submenu = &$result[$mItem->id]; } } } - return ArrayHelper::sortObjects($result, 'text', 1, false, true); + // Return only top level items + return $result[1]; + } + + /** + * Method to get a link to the aliased menu item + * + * @param int $menuId The record id of the referencing menu item + * + * @return string + * + * @since __DEPLOY_VERSION__ + */ + protected static function getLink($menuId) + { + $table = JTable::getInstance('Menu'); + $table->load($menuId); + + // Look for an alias-to-alias + if ($table->type == 'alias') + { + $params = new Registry($table->params); + $aliasTo = $params->get('aliasoptions'); + + return static::getLink($aliasTo); + } + + return $table->link; + } + + /** + * Method to cleanup the menu items for repeated, leading or trailing separators in a given menu level + * + * @param array &$items The list of menu items in the selected level + * + * @return void + * + * @since __DEPLOY_VERSION__ + */ + protected static function cleanup(&$items) + { + $b = true; + + foreach ($items as $k => &$item) + { + if ($item->type == 'separator') + { + if ($b) + { + $item = false; + } + + $b = true; + } + else + { + $b = false; + } + } + + if ($b) + { + $item = false; + } + + $items = array_filter($items); } } diff --git a/administrator/modules/mod_menu/menu.php b/administrator/modules/mod_menu/menu.php index 88f9eb929615a..8fd174c8aa08d 100644 --- a/administrator/modules/mod_menu/menu.php +++ b/administrator/modules/mod_menu/menu.php @@ -3,18 +3,21 @@ * @package Joomla.Administrator * @subpackage mod_menu * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; +use Joomla\Registry\Registry; +use Joomla\Utilities\ArrayHelper; + /** * Tree based class to render the admin menu * * @since 1.5 */ -class JAdminCssMenu extends JObject +class JAdminCssMenu { /** * CSS string to add to document head @@ -49,8 +52,8 @@ class JAdminCssMenu extends JObject */ public function __construct() { - $this->_root = new JMenuNode('ROOT'); - $this->_current = & $this->_root; + $this->_root = new JMenuNode('ROOT'); + $this->_current = &$this->_root; } /** @@ -84,10 +87,17 @@ public function getParent() /** * Method to get the parent * + * @param bool $clear Whether to clear the existing menu items or just reset the pointer to root element + * * @return void */ - public function reset() + public function reset($clear = false) { + if ($clear) + { + $this->_root = new JMenuNode('ROOT'); + } + $this->_current = &$this->_root; } @@ -284,6 +294,144 @@ public function getIconClass($identifier) return $html; } + + /** + * Populate the menu items in the menu object for disabled state + * + * @param Registry $params Menu configuration parameters + * @param bool $enabled Whether the menu should be enabled or disabled + * + * @return void + * + * @since __DEPLOY_VERSION__ + */ + public function load($params, $enabled) + { + $menutype = $params->get('menutype', '*'); + + $this->reset(true); + + if ($menutype == '*') + { + require_once __DIR__ . '/preset/' . ($enabled ? 'enabled.php' : 'disabled.php'); + } + else + { + $items = ModMenuHelper::getMenuItems($menutype); + $app = JFactory::getApplication(); + $me = JFactory::getUser(); + + $authMenus = $me->authorise('core.manage', 'com_menus'); + $authModules = $me->authorise('core.manage', 'com_modules'); + + if ($enabled && $params->get('check') && ($authMenus || $authModules)) + { + $elements = ArrayHelper::getColumn($items, 'element'); + + $rMenu = $authMenus && !in_array('com_menus', $elements); + $rModule = $authModules && !in_array('com_modules', $elements); + + if ($rMenu || $rModule) + { + $recovery = $app->getUserStateFromRequest('mod_menu.recovery', 'recover_menu', 0, 'int'); + + if ($recovery) + { + $app->enqueueMessage(JText::_('MOD_MENU_WARNING_IMPORTANT_ITEMS_INACCESSIBLE_RECOVERY'), 'info'); + + $params->set('recovery', true); + + // In recovery mode, load the preset inside a special root node. + $this->addChild(new JMenuNode(JText::_('MOD_MENU_RECOVERY_MENU_ROOT'), '#'), true); + + require_once __DIR__ . '/preset/enabled.php'; + + $this->getParent(); + } + elseif ($rMenu && $rModule) + { + $app->enqueueMessage(JText::_('MOD_MENU_WARNING_IMPORTANT_ITEMS_INACCESSIBLE'), 'warning'); + } + else + { + $app->enqueueMessage(JText::_('MOD_MENU_WARNING_IMPORTANT_ITEMS_INACCESSIBLE_' . ($rMenu ? 'MENUS' : 'MODULES')), 'warning'); + } + } + } + + // Menu items for dynamic db driven setup to load here + $this->loadItems($items, $enabled); + } + } + + /** + * Load the menu items from an array + * + * @param array $items Menu items loaded from database + * @param bool $enabled Whether the menu should be enabled or disabled + * + * @return void + * + * @since __DEPLOY_VERSION__ + */ + protected function loadItems($items, $enabled = true) + { + foreach ($items as $item) + { + if ($item->type == 'separator') + { + $this->addSeparator(); + + continue; + } + + $container = $item->params->get('components_container'); + $components = $container ? ModMenuHelper::getComponents(true, true) : array(); + + if ($item->type == 'heading' && !count($components) && !count($item->submenu)) + { + // Exclude if it is a heading type menu item, and has no children. + } + elseif (!$enabled) + { + $this->addChild(new JMenuNode($item->text, $item->link, 'disabled')); + } + else + { + $this->addChild(new JMenuNode($item->text, $item->link, $item->parent_id == 1 ? null : 'class:'), true); + + $this->loadItems($item->submenu); + + // Add a separator between dynamic menu items and components menu items + if (count($item->submenu) && count($components)) + { + $this->addSeparator(); + } + + // Adding component submenu the old way, this assumes 2-level menu only + foreach ($components as &$component) + { + if (empty($component->submenu)) + { + $this->addChild(new JMenuNode($component->text, $component->link, $component->img)); + } + else + { + $this->addChild(new JMenuNode($component->text, $component->link, $component->img), true); + + foreach ($component->submenu as $sub) + { + $this->addChild(new JMenuNode($sub->text, $sub->link, $sub->img)); + } + + $this->getParent(); + } + } + + $this->getParent(); + } + } + } } /** @@ -292,7 +440,7 @@ public function getIconClass($identifier) * @see JAdminCssMenu * @since 1.5 */ -class JMenuNode extends JObject +class JMenuNode { /** * Node Title @@ -415,15 +563,15 @@ public function setParent(JMenuNode &$parent = null) if (!is_null($this->_parent)) { - unset($this->_parent->children[$hash]); + unset($this->_parent->_children[$hash]); } if (!is_null($parent)) { - $parent->_children[$hash] = & $this; + $parent->_children[$hash] = &$this; } - $this->_parent = & $parent; + $this->_parent = &$parent; } /** diff --git a/administrator/modules/mod_menu/mod_menu.php b/administrator/modules/mod_menu/mod_menu.php index 5f2e811c19006..a625f99b0b11e 100644 --- a/administrator/modules/mod_menu/mod_menu.php +++ b/administrator/modules/mod_menu/mod_menu.php @@ -3,21 +3,26 @@ * @package Joomla.Administrator * @subpackage mod_menu * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; +use Joomla\Registry\Registry; + // Include the module helper classes. JLoader::register('ModMenuHelper', __DIR__ . '/helper.php'); JLoader::register('JAdminCssMenu', __DIR__ . '/menu.php'); +/** @var Registry $params */ $lang = JFactory::getLanguage(); $user = JFactory::getUser(); $input = JFactory::getApplication()->input; -$menu = new JAdminCssMenu; -$enabled = $input->getBool('hidemainmenu') ? false : true; +$enabled = !$input->getBool('hidemainmenu'); + +$menu = new JAdminCssMenu; +$menu->load($params, $enabled); // Render the module layout require JModuleHelper::getLayoutPath('mod_menu', $params->get('layout', 'default')); diff --git a/administrator/modules/mod_menu/mod_menu.xml b/administrator/modules/mod_menu/mod_menu.xml index 12e3fc0c69eb7..62b0f8bcda668 100644 --- a/administrator/modules/mod_menu/mod_menu.xml +++ b/administrator/modules/mod_menu/mod_menu.xml @@ -3,7 +3,7 @@ mod_menu Joomla! Project March 2006 - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org @@ -11,6 +11,7 @@ MOD_MENU_XML_DESCRIPTION mod_menu.php + preset tmpl helper.php menu.php @@ -23,6 +24,26 @@
    + + + + + + + addChild(new JMenuNode(JText::_('MOD_MENU_SYSTEM'), null, 'class:cog fa-fw')); +$this->addChild(new JMenuNode(JText::_('MOD_MENU_SYSTEM'), null, 'class:cog fa-fw')); /** * Users Submenu */ if ($user->authorise('core.manage', 'com_users')) { - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_COM_USERS'), null, 'class:users fa-fw')); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_COM_USERS'), null, 'class:users fa-fw')); } /** @@ -29,7 +32,7 @@ */ if ($user->authorise('core.manage', 'com_menus')) { - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_MENUS'), null, 'class:list fa-fw')); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_MENUS'), null, 'class:list fa-fw')); } /** @@ -37,7 +40,7 @@ */ if ($user->authorise('core.manage', 'com_media')) { - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_MEDIA_MANAGER'), null, 'class:file-picture-o fa-fw')); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_MEDIA_MANAGER'), null, 'class:file-picture-o fa-fw')); } /** @@ -45,7 +48,7 @@ */ if ($user->authorise('core.manage', 'com_content')) { - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_COM_CONTENT'), null, 'class:file-text-o fa-fw')); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_COM_CONTENT'), null, 'class:file-text-o fa-fw')); } /** @@ -58,7 +61,7 @@ // Check if there are any components, otherwise, don't display the components menu item if ($components) { - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_COMPONENTS'), null, 'class:cube fa-fw')); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_COMPONENTS'), null, 'class:cube fa-fw')); } /** @@ -72,7 +75,7 @@ if ($im || $mm || $pm || $tm || $lm) { - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_EXTENSIONS_EXTENSIONS'), null, 'class:cubes fa-fw')); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_EXTENSIONS_EXTENSIONS'), null, 'class:cubes fa-fw')); } /** @@ -80,10 +83,10 @@ */ if ($params->get('showhelp', 1)) { - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_HELP'), null, 'class:info-circle fa-fw')); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_HELP'), null, 'class:info-circle fa-fw')); } /* * User Submenu */ -$menu->addChild(new JMenuNode($user->username, null, 'class:user fa-fw')); \ No newline at end of file +$this->addChild(new JMenuNode($user->username, null, 'class:user fa-fw')); \ No newline at end of file diff --git a/administrator/modules/mod_menu/tmpl/default_enabled.php b/administrator/modules/mod_menu/preset/enabled.php similarity index 61% rename from administrator/modules/mod_menu/tmpl/default_enabled.php rename to administrator/modules/mod_menu/preset/enabled.php index 28463f558caf7..f023e04ae8410 100644 --- a/administrator/modules/mod_menu/tmpl/default_enabled.php +++ b/administrator/modules/mod_menu/preset/enabled.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_menu * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -11,41 +11,44 @@ use Joomla\Utilities\ArrayHelper; -/* @var $menu JAdminCSSMenu */ +/* @var $this JAdminCSSMenu */ +/* @var $params Joomla\Registry\Registry */ +$recovery = (boolean) $params->get('recovery', 0); $shownew = (boolean) $params->get('shownew', 1); $showhelp = (boolean) $params->get('showhelp', 1); $user = JFactory::getUser(); $lang = JFactory::getLanguage(); +$rootClass = $recovery ? 'class:' : null; /** * Site Submenu */ -$menu->addChild(new JMenuNode(JText::_('MOD_MENU_SYSTEM'), '#', 'class:cog fa-fw'), true); -$menu->addChild(new JMenuNode(JText::_('MOD_MENU_CONTROL_PANEL'), 'index.php')); +$this->addChild(new JMenuNode(JText::_('MOD_MENU_SYSTEM'), '#', 'class:cog fa-fw'), true); +$this->addChild(new JMenuNode(JText::_('MOD_MENU_CONTROL_PANEL'), 'index.php')); if ($user->authorise('core.admin')) { - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_CONFIGURATION'), 'index.php?option=com_config')); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_CONFIGURATION'), 'index.php?option=com_config')); } if ($user->authorise('core.manage', 'com_checkin')) { - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_GLOBAL_CHECKIN'), 'index.php?option=com_checkin')); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_GLOBAL_CHECKIN'), 'index.php?option=com_checkin')); } if ($user->authorise('core.manage', 'com_cache')) { - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_CLEAR_CACHE'), 'index.php?option=com_cache')); - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_PURGE_EXPIRED_CACHE'), 'index.php?option=com_cache&view=purge')); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_CLEAR_CACHE'), 'index.php?option=com_cache')); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_PURGE_EXPIRED_CACHE'), 'index.php?option=com_cache&view=purge')); } if ($user->authorise('core.admin')) { - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_SYSTEM_INFORMATION'), 'index.php?option=com_admin&view=sysinfo')); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_SYSTEM_INFORMATION'), 'index.php?option=com_admin&view=sysinfo')); } -$menu->getParent(); +$this->getParent(); /** * Users Submenu @@ -55,39 +58,39 @@ $createUser = $shownew && $user->authorise('core.create', 'com_users'); $createGrp = $user->authorise('core.admin', 'com_users'); - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_COM_USERS_USERS'), '#', 'class:users fa-fw'), true); - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_COM_USERS_USER_MANAGER'), 'index.php?option=com_users&view=users'), $createUser); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_COM_USERS_USERS'), '#', 'class:users fa-fw'), true); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_COM_USERS_USER_MANAGER'), 'index.php?option=com_users&view=users'), $createUser); if ($createUser) { - $menu->getParent(); + $this->getParent(); } if ($createGrp) { - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_COM_USERS_GROUPS'), 'index.php?option=com_users&view=groups'), $createUser); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_COM_USERS_GROUPS'), 'index.php?option=com_users&view=groups'), $createUser); if ($createUser) { - $menu->getParent(); + $this->getParent(); } - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_COM_USERS_LEVELS'), 'index.php?option=com_users&view=levels'), $createUser); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_COM_USERS_LEVELS'), 'index.php?option=com_users&view=levels'), $createUser); if ($createUser) { - $menu->getParent(); + $this->getParent(); } } - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_COM_USERS_NOTES'), 'index.php?option=com_users&view=notes'), $createUser); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_COM_USERS_NOTES'), 'index.php?option=com_users&view=notes'), $createUser); if ($createUser) { - $menu->getParent(); + $this->getParent(); } - $menu->addChild( + $this->addChild( new JMenuNode( JText::_('MOD_MENU_COM_USERS_NOTE_CATEGORIES'), 'index.php?option=com_categories&view=categories&extension=com_users'), $createUser @@ -95,21 +98,21 @@ if ($createUser) { - $menu->getParent(); + $this->getParent(); } if (JComponentHelper::isEnabled('com_fields') && JComponentHelper::getParams('com_users')->get('custom_fields_enable', '1')) { - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_FIELDS'), 'index.php?option=com_fields&context=com_users.user')); - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_FIELDS_GROUP'), 'index.php?option=com_fields&view=groups&context=com_users.user')); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_FIELDS'), 'index.php?option=com_fields&context=com_users.user')); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_FIELDS_GROUP'), 'index.php?option=com_fields&view=groups&context=com_users.user')); } if (JFactory::getApplication()->get('massmailoff') != 1) { - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_MASS_MAIL_USERS'), 'index.php?option=com_users&view=mail')); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_MASS_MAIL_USERS'), 'index.php?option=com_users&view=mail')); } - $menu->getParent(); + $this->getParent(); } /** @@ -119,19 +122,19 @@ { $createMenu = $shownew && $user->authorise('core.create', 'com_menus'); - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_MENUS'), '#', 'class:list fa-fw'), true); - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_MENU_MANAGER'), 'index.php?option=com_menus&view=menus'), $createMenu); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_MENUS'), '#', 'class:list fa-fw'), true); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_MENU_MANAGER'), 'index.php?option=com_menus&view=menus'), $createMenu); if ($createMenu) { - $menu->getParent(); + $this->getParent(); } // Menu Types $menuTypes = ModMenuHelper::getMenus(); $menuTypes = JArrayHelper::sortObjects($menuTypes, 'title', 1, false); - foreach ($menuTypes as $menuType) + foreach ($menuTypes as $mti => $menuType) { if (!$user->authorise('core.manage', 'com_menus.menu.' . (int) $menuType->id)) { @@ -156,24 +159,30 @@ } elseif ($menuType->image && JHtml::_('image', 'mod_languages/' . $menuType->image . '.gif', null, null, true, true)) { - $titleicon = ' ' . JHtml::_('image', 'mod_languages/' . $menuType->image . '.gif', $alt, array('title' => $menuType->title_native), true) . ''; + $titleicon = ' ' . + JHtml::_('image', 'mod_languages/' . $menuType->image . '.gif', $alt, array('title' => $menuType->title_native), true) . ''; } else { $titleicon = ' ' . $menuType->sef . ''; } - $menu->addChild( + if (isset($menuTypes[$mti - 1]) && $menuTypes[$mti - 1]->client_id != $menuType->client_id) + { + $this->addSeparator(); + } + + $this->addChild( new JMenuNode( $menuType->title, 'index.php?option=com_menus&view=items&menutype=' . $menuType->menutype, null, null, null, $titleicon ), $user->authorise('core.create', 'com_menus.menu.' . (int) $menuType->id) ); - $menu->getParent(); + $this->getParent(); } - $menu->getParent(); + $this->getParent(); } /** @@ -181,8 +190,8 @@ */ if ($user->authorise('core.manage', 'com_media')) { - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_MEDIA_MANAGER'), 'index.php?option=com_media', 'class:file-picture-o fa-fw'), true); - $menu->getParent(); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_MEDIA_MANAGER'), 'index.php?option=com_media', 'class:file-picture-o fa-fw'), true); + $this->getParent(); } /** @@ -190,34 +199,34 @@ */ if ($user->authorise('core.manage', 'com_content')) { - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_COM_CONTENT'), '#', 'class:file-text-o fa-fw'), true); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_COM_CONTENT'), '#', 'class:file-text-o fa-fw'), true); $createContent = $shownew && $user->authorise('core.create', 'com_content'); - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_COM_CONTENT_ARTICLE_MANAGER'), 'index.php?option=com_content'), $createContent); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_COM_CONTENT_ARTICLE_MANAGER'), 'index.php?option=com_content'), $createContent); if ($createContent) { - $menu->getParent(); + $this->getParent(); } - $menu->addChild( + $this->addChild( new JMenuNode(JText::_('MOD_MENU_COM_CONTENT_CATEGORY_MANAGER'), 'index.php?option=com_categories&extension=com_content'), $createContent ); if ($createContent) { - $menu->getParent(); + $this->getParent(); } if (JComponentHelper::isEnabled('com_fields') && JComponentHelper::getParams('com_content')->get('custom_fields_enable', '1')) { - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_FIELDS'), 'index.php?option=com_fields&context=com_content.article')); - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_FIELDS_GROUP'), 'index.php?option=com_fields&view=groups&context=com_content.article')); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_FIELDS'), 'index.php?option=com_fields&context=com_content.article')); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_FIELDS_GROUP'), 'index.php?option=com_fields&view=groups&context=com_content.article')); } - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_COM_CONTENT_FEATURED'), 'index.php?option=com_content&view=featured')); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_COM_CONTENT_FEATURED'), 'index.php?option=com_content&view=featured')); - $menu->getParent(); + $this->getParent(); } /** @@ -230,29 +239,29 @@ // Check if there are any components, otherwise, don't render the menu if ($components) { - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_COMPONENTS'), '#', 'class:cube fa-fw'), true); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_COMPONENTS'), '#', 'class:cube fa-fw'), true); foreach ($components as &$component) { if (!empty($component->submenu)) { // This component has a db driven submenu. - $menu->addChild(new JMenuNode($component->text, $component->link), true); + $this->addChild(new JMenuNode($component->text, $component->link), true); foreach ($component->submenu as $sub) { - $menu->addChild(new JMenuNode($sub->text, $sub->link)); + $this->addChild(new JMenuNode($sub->text, $sub->link)); } - $menu->getParent(); + $this->getParent(); } else { - $menu->addChild(new JMenuNode($component->text, $component->link)); + $this->addChild(new JMenuNode($component->text, $component->link)); } } - $menu->getParent(); + $this->getParent(); } /** @@ -266,52 +275,52 @@ if ($im || $mm || $pm || $tm || $lm) { - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_EXTENSIONS_EXTENSIONS'), '#', 'class:cubes fa-fw'), true); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_EXTENSIONS_EXTENSIONS'), '#', 'class:cubes fa-fw'), true); if ($im) { - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_EXTENSIONS_EXTENSION_MANAGER'), '#'), $im); - - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_INSTALLER_SUBMENU_INSTALL'), 'index.php?option=com_installer')); - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_INSTALLER_SUBMENU_UPDATE'), 'index.php?option=com_installer&view=update')); - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_INSTALLER_SUBMENU_MANAGE'), 'index.php?option=com_installer&view=manage')); - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_INSTALLER_SUBMENU_DISCOVER'), 'index.php?option=com_installer&view=discover')); - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_INSTALLER_SUBMENU_DATABASE'), 'index.php?option=com_installer&view=database')); - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_INSTALLER_SUBMENU_WARNINGS'), 'index.php?option=com_installer&view=warnings')); - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_INSTALLER_SUBMENU_LANGUAGES'), 'index.php?option=com_installer&view=languages')); - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_INSTALLER_SUBMENU_UPDATESITES'), 'index.php?option=com_installer&view=updatesites')); - $menu->getParent(); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_EXTENSIONS_EXTENSION_MANAGER'), '#'), $im); + + $this->addChild(new JMenuNode(JText::_('MOD_MENU_INSTALLER_SUBMENU_INSTALL'), 'index.php?option=com_installer')); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_INSTALLER_SUBMENU_UPDATE'), 'index.php?option=com_installer&view=update')); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_INSTALLER_SUBMENU_MANAGE'), 'index.php?option=com_installer&view=manage')); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_INSTALLER_SUBMENU_DISCOVER'), 'index.php?option=com_installer&view=discover')); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_INSTALLER_SUBMENU_DATABASE'), 'index.php?option=com_installer&view=database')); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_INSTALLER_SUBMENU_WARNINGS'), 'index.php?option=com_installer&view=warnings')); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_INSTALLER_SUBMENU_LANGUAGES'), 'index.php?option=com_installer&view=languages')); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_INSTALLER_SUBMENU_UPDATESITES'), 'index.php?option=com_installer&view=updatesites')); + $this->getParent(); } if ($mm) { - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_EXTENSIONS_MODULE_MANAGER'), 'index.php?option=com_modules')); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_EXTENSIONS_MODULE_MANAGER'), 'index.php?option=com_modules')); } if ($pm) { - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_EXTENSIONS_PLUGIN_MANAGER'), 'index.php?option=com_plugins')); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_EXTENSIONS_PLUGIN_MANAGER'), 'index.php?option=com_plugins')); } if ($tm) { - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_EXTENSIONS_TEMPLATE_MANAGER'), 'index.php?option=com_templates'), $tm); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_EXTENSIONS_TEMPLATE_MANAGER'), 'index.php?option=com_templates'), $tm); - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_COM_TEMPLATES_SUBMENU_STYLES'), 'index.php?option=com_templates&view=styles')); - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_COM_TEMPLATES_SUBMENU_TEMPLATES'), 'index.php?option=com_templates&view=templates')); - $menu->getParent(); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_COM_TEMPLATES_SUBMENU_STYLES'), 'index.php?option=com_templates&view=styles')); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_COM_TEMPLATES_SUBMENU_TEMPLATES'), 'index.php?option=com_templates&view=templates')); + $this->getParent(); } if ($lm) { - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_EXTENSIONS_LANGUAGE_MANAGER'), '#'), $lm); - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_COM_LANGUAGES_SUBMENU_INSTALLED'), 'index.php?option=com_languages&view=installed')); - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_COM_LANGUAGES_SUBMENU_CONTENT'), 'index.php?option=com_languages&view=languages')); - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_COM_LANGUAGES_SUBMENU_OVERRIDES'), 'index.php?option=com_languages&view=overrides')); - $menu->getParent(); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_EXTENSIONS_LANGUAGE_MANAGER'), '#'), $lm); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_COM_LANGUAGES_SUBMENU_INSTALLED'), 'index.php?option=com_languages&view=installed')); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_COM_LANGUAGES_SUBMENU_CONTENT'), 'index.php?option=com_languages&view=languages')); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_COM_LANGUAGES_SUBMENU_OVERRIDES'), 'index.php?option=com_languages&view=overrides')); + $this->getParent(); } - $menu->getParent(); + $this->getParent(); } /** @@ -319,13 +328,13 @@ */ if ($showhelp == 1) { - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_HELP'), '#', 'class:info-circle fa-fw'), true); - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_JOOMLA'), 'index.php?option=com_admin&view=help')); - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_SUPPORT_OFFICIAL_FORUM'), 'https://forum.joomla.org', null, false, '_blank')); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_HELP'), '#', 'class:info-circle fa-fw'), true); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_JOOMLA'), 'index.php?option=com_admin&view=help')); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_SUPPORT_OFFICIAL_FORUM'), 'https://forum.joomla.org', null, false, '_blank')); if ($forum_url = $params->get('forum_url')) { - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_SUPPORT_CUSTOM_FORUM'), $forum_url, null, false, '_blank')); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_SUPPORT_CUSTOM_FORUM'), $forum_url, null, false, '_blank')); } $debug = $lang->setDebug(false); @@ -334,18 +343,18 @@ { $forum_url = 'https://forum.joomla.org/viewforum.php?f=' . (int) JText::_('MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM_VALUE'); $lang->setDebug($debug); - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM'), $forum_url, null, false, '_blank')); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM'), $forum_url, null, false, '_blank')); } $lang->setDebug($debug); - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_DOCUMENTATION'), 'https://docs.joomla.org', null, false, '_blank')); - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_EXTENSIONS'), 'https://extensions.joomla.org', null, false, '_blank')); - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_TRANSLATIONS'), 'https://community.joomla.org/translations.html', null, false, '_blank')); - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_RESOURCES'), 'http://resources.joomla.org', null, false, '_blank')); - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_COMMUNITY'), 'https://community.joomla.org', null, false, '_blank')); - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_SECURITY'), 'https://developer.joomla.org/security-centre.html', null, false, '_blank')); - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_DEVELOPER'), 'https://developer.joomla.org', null, false, '_blank')); - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_XCHANGE'), 'https://joomla.stackexchange.com', null, false, '_blank')); - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_SHOP'), 'https://community.joomla.org/the-joomla-shop.html', null, false, '_blank')); - $menu->getParent(); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_DOCUMENTATION'), 'https://docs.joomla.org', null, false, '_blank')); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_EXTENSIONS'), 'https://extensions.joomla.org', null, false, '_blank')); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_TRANSLATIONS'), 'https://community.joomla.org/translations.html', null, false, '_blank')); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_RESOURCES'), 'http://resources.joomla.org', null, false, '_blank')); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_COMMUNITY'), 'https://community.joomla.org', null, false, '_blank')); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_SECURITY'), 'https://developer.joomla.org/security-centre.html', null, false, '_blank')); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_DEVELOPER'), 'https://developer.joomla.org', null, false, '_blank')); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_XCHANGE'), 'https://joomla.stackexchange.com', null, false, '_blank')); + $this->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_SHOP'), 'https://community.joomla.org/the-joomla-shop.html', null, false, '_blank')); + $this->getParent(); } diff --git a/administrator/modules/mod_menu/tmpl/default.php b/administrator/modules/mod_menu/tmpl/default.php index 7fe3f3651b3ca..368a3788f149f 100644 --- a/administrator/modules/mod_menu/tmpl/default.php +++ b/administrator/modules/mod_menu/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_menu * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -11,6 +11,4 @@ $direction = JFactory::getDocument()->direction == 'rtl' ? 'float-right' : ''; -require JModuleHelper::getLayoutPath('mod_menu', $enabled ? 'default_enabled' : 'default_disabled'); - $menu->renderMenu('menu', $enabled ? 'nav ' . $direction : 'nav disabled ' . $direction); diff --git a/administrator/modules/mod_multilangstatus/language/en-GB/en-GB.mod_multilangstatus.ini b/administrator/modules/mod_multilangstatus/language/en-GB/en-GB.mod_multilangstatus.ini index 9094dff5819bd..e3d994d75f03f 100644 --- a/administrator/modules/mod_multilangstatus/language/en-GB/en-GB.mod_multilangstatus.ini +++ b/administrator/modules/mod_multilangstatus/language/en-GB/en-GB.mod_multilangstatus.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/modules/mod_multilangstatus/language/en-GB/en-GB.mod_multilangstatus.sys.ini b/administrator/modules/mod_multilangstatus/language/en-GB/en-GB.mod_multilangstatus.sys.ini index 9094dff5819bd..e3d994d75f03f 100644 --- a/administrator/modules/mod_multilangstatus/language/en-GB/en-GB.mod_multilangstatus.sys.ini +++ b/administrator/modules/mod_multilangstatus/language/en-GB/en-GB.mod_multilangstatus.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/modules/mod_multilangstatus/mod_multilangstatus.php b/administrator/modules/mod_multilangstatus/mod_multilangstatus.php index 74eaa1cfafaec..4a1eb242e2d19 100644 --- a/administrator/modules/mod_multilangstatus/mod_multilangstatus.php +++ b/administrator/modules/mod_multilangstatus/mod_multilangstatus.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_multilangstatus * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_multilangstatus/mod_multilangstatus.xml b/administrator/modules/mod_multilangstatus/mod_multilangstatus.xml index 3258571e75fe5..20942743c3df8 100644 --- a/administrator/modules/mod_multilangstatus/mod_multilangstatus.xml +++ b/administrator/modules/mod_multilangstatus/mod_multilangstatus.xml @@ -3,7 +3,7 @@ mod_multilangstatus Joomla! Project September 2011 - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org diff --git a/administrator/modules/mod_multilangstatus/tmpl/default.php b/administrator/modules/mod_multilangstatus/tmpl/default.php index e94dbb81b7efd..e444bd34ca0f5 100644 --- a/administrator/modules/mod_multilangstatus/tmpl/default.php +++ b/administrator/modules/mod_multilangstatus/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_multilangstatus * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_popular/helper.php b/administrator/modules/mod_popular/helper.php index 1eac75a1f3202..456dd40858ba1 100644 --- a/administrator/modules/mod_popular/helper.php +++ b/administrator/modules/mod_popular/helper.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_popular * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_popular/mod_popular.php b/administrator/modules/mod_popular/mod_popular.php index 24462df1d0883..51a6f78751cc2 100644 --- a/administrator/modules/mod_popular/mod_popular.php +++ b/administrator/modules/mod_popular/mod_popular.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_popular * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_popular/mod_popular.xml b/administrator/modules/mod_popular/mod_popular.xml index 2c05041a45a88..bbc53713e2545 100644 --- a/administrator/modules/mod_popular/mod_popular.xml +++ b/administrator/modules/mod_popular/mod_popular.xml @@ -3,7 +3,7 @@ mod_popular Joomla! Project July 2004 - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org diff --git a/administrator/modules/mod_popular/tmpl/default.php b/administrator/modules/mod_popular/tmpl/default.php index 42ae143bb2ba5..0c948c13edf25 100644 --- a/administrator/modules/mod_popular/tmpl/default.php +++ b/administrator/modules/mod_popular/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_popular * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_quickicon/helper.php b/administrator/modules/mod_quickicon/helper.php index d7aae3a4a84fc..da5da237560d7 100644 --- a/administrator/modules/mod_quickicon/helper.php +++ b/administrator/modules/mod_quickicon/helper.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_quickicon * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_quickicon/mod_quickicon.php b/administrator/modules/mod_quickicon/mod_quickicon.php index 52cbe3838842d..49b04a99f4b85 100644 --- a/administrator/modules/mod_quickicon/mod_quickicon.php +++ b/administrator/modules/mod_quickicon/mod_quickicon.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_quickicon * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_quickicon/mod_quickicon.xml b/administrator/modules/mod_quickicon/mod_quickicon.xml index 5839c5a25ccd4..49be718645977 100644 --- a/administrator/modules/mod_quickicon/mod_quickicon.xml +++ b/administrator/modules/mod_quickicon/mod_quickicon.xml @@ -3,7 +3,7 @@ mod_quickicon Joomla! Project Nov 2005 - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org diff --git a/administrator/modules/mod_quickicon/tmpl/default.php b/administrator/modules/mod_quickicon/tmpl/default.php index 9c0b5b9bae65a..763e815d89302 100644 --- a/administrator/modules/mod_quickicon/tmpl/default.php +++ b/administrator/modules/mod_quickicon/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_quickicon * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_stats_admin/helper.php b/administrator/modules/mod_stats_admin/helper.php index bbe34155af483..ff2f2c8a1a85e 100644 --- a/administrator/modules/mod_stats_admin/helper.php +++ b/administrator/modules/mod_stats_admin/helper.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_stats_admin * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_stats_admin/language/en-GB.mod_stats_admin.ini b/administrator/modules/mod_stats_admin/language/en-GB.mod_stats_admin.ini index 225523aa3fde3..2bb5ea30e65f5 100644 --- a/administrator/modules/mod_stats_admin/language/en-GB.mod_stats_admin.ini +++ b/administrator/modules/mod_stats_admin/language/en-GB.mod_stats_admin.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/modules/mod_stats_admin/language/en-GB.mod_stats_admin.sys.ini b/administrator/modules/mod_stats_admin/language/en-GB.mod_stats_admin.sys.ini index 62d6a701bdf31..efbf693736e43 100644 --- a/administrator/modules/mod_stats_admin/language/en-GB.mod_stats_admin.sys.ini +++ b/administrator/modules/mod_stats_admin/language/en-GB.mod_stats_admin.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/modules/mod_stats_admin/mod_stats_admin.php b/administrator/modules/mod_stats_admin/mod_stats_admin.php index d66d624e410f6..a3949b3eb85d6 100644 --- a/administrator/modules/mod_stats_admin/mod_stats_admin.php +++ b/administrator/modules/mod_stats_admin/mod_stats_admin.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_stats_admin * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_stats_admin/mod_stats_admin.xml b/administrator/modules/mod_stats_admin/mod_stats_admin.xml index 7432358e38080..822a6c0721d2e 100644 --- a/administrator/modules/mod_stats_admin/mod_stats_admin.xml +++ b/administrator/modules/mod_stats_admin/mod_stats_admin.xml @@ -3,7 +3,7 @@ mod_stats_admin Joomla! Project July 2004 - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org diff --git a/administrator/modules/mod_stats_admin/tmpl/default.php b/administrator/modules/mod_stats_admin/tmpl/default.php index 4621bde71bd89..f452a375a5451 100644 --- a/administrator/modules/mod_stats_admin/tmpl/default.php +++ b/administrator/modules/mod_stats_admin/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_stats_admin * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_status/mod_status.php b/administrator/modules/mod_status/mod_status.php index b987704b67701..fa6b3c6e1caa8 100644 --- a/administrator/modules/mod_status/mod_status.php +++ b/administrator/modules/mod_status/mod_status.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_status * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_status/tmpl/default.php b/administrator/modules/mod_status/tmpl/default.php index 5efbceeda4e71..65c025b2b6de4 100644 --- a/administrator/modules/mod_status/tmpl/default.php +++ b/administrator/modules/mod_status/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_status * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_submenu/mod_submenu.php b/administrator/modules/mod_submenu/mod_submenu.php index 81ddb0e38a8ed..85b09a0cab9fd 100644 --- a/administrator/modules/mod_submenu/mod_submenu.php +++ b/administrator/modules/mod_submenu/mod_submenu.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_submenu * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_submenu/mod_submenu.xml b/administrator/modules/mod_submenu/mod_submenu.xml index 5f4a88eb52d4c..7a3101d90d24e 100644 --- a/administrator/modules/mod_submenu/mod_submenu.xml +++ b/administrator/modules/mod_submenu/mod_submenu.xml @@ -3,7 +3,7 @@ mod_submenu Joomla! Project Feb 2006 - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org diff --git a/administrator/modules/mod_submenu/tmpl/default.php b/administrator/modules/mod_submenu/tmpl/default.php index 22dd0fd90c16c..96d80ef09ac36 100644 --- a/administrator/modules/mod_submenu/tmpl/default.php +++ b/administrator/modules/mod_submenu/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_submenu * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_title/mod_title.php b/administrator/modules/mod_title/mod_title.php index fab995a76619e..a0e5f6fd1b8a8 100644 --- a/administrator/modules/mod_title/mod_title.php +++ b/administrator/modules/mod_title/mod_title.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_title * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_title/mod_title.xml b/administrator/modules/mod_title/mod_title.xml index d0013a6f244db..9fd8dbcecfb75 100644 --- a/administrator/modules/mod_title/mod_title.xml +++ b/administrator/modules/mod_title/mod_title.xml @@ -3,7 +3,7 @@ mod_title Joomla! Project Nov 2005 - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org diff --git a/administrator/modules/mod_title/tmpl/default.php b/administrator/modules/mod_title/tmpl/default.php index 7ba118750d863..fc92e301cf2a4 100644 --- a/administrator/modules/mod_title/tmpl/default.php +++ b/administrator/modules/mod_title/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_title * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_toolbar/mod_toolbar.php b/administrator/modules/mod_toolbar/mod_toolbar.php index 2f60f29cf9449..7b733895f57ad 100644 --- a/administrator/modules/mod_toolbar/mod_toolbar.php +++ b/administrator/modules/mod_toolbar/mod_toolbar.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_toolbar * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_toolbar/mod_toolbar.xml b/administrator/modules/mod_toolbar/mod_toolbar.xml index ed7ce50fbbc51..4ca3c0c545a93 100644 --- a/administrator/modules/mod_toolbar/mod_toolbar.xml +++ b/administrator/modules/mod_toolbar/mod_toolbar.xml @@ -3,7 +3,7 @@ mod_toolbar Joomla! Project Nov 2005 - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org diff --git a/administrator/modules/mod_toolbar/tmpl/default.php b/administrator/modules/mod_toolbar/tmpl/default.php index 0510c7f62cf2f..f25093042acc7 100644 --- a/administrator/modules/mod_toolbar/tmpl/default.php +++ b/administrator/modules/mod_toolbar/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_toolbar * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_version/helper.php b/administrator/modules/mod_version/helper.php index 5e8f2268cf219..9f673c7430379 100644 --- a/administrator/modules/mod_version/helper.php +++ b/administrator/modules/mod_version/helper.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_version * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_version/language/en-GB/en-GB.mod_version.ini b/administrator/modules/mod_version/language/en-GB/en-GB.mod_version.ini index a46201776b2ac..51c512093986e 100644 --- a/administrator/modules/mod_version/language/en-GB/en-GB.mod_version.ini +++ b/administrator/modules/mod_version/language/en-GB/en-GB.mod_version.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/modules/mod_version/language/en-GB/en-GB.mod_version.sys.ini b/administrator/modules/mod_version/language/en-GB/en-GB.mod_version.sys.ini index 305ddeb31daf4..6906ac2884ceb 100644 --- a/administrator/modules/mod_version/language/en-GB/en-GB.mod_version.sys.ini +++ b/administrator/modules/mod_version/language/en-GB/en-GB.mod_version.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/modules/mod_version/mod_version.php b/administrator/modules/mod_version/mod_version.php index d2848caa4ec84..d19366754c51a 100644 --- a/administrator/modules/mod_version/mod_version.php +++ b/administrator/modules/mod_version/mod_version.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_version * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_version/mod_version.xml b/administrator/modules/mod_version/mod_version.xml index f1da4a8437293..8870415efe697 100644 --- a/administrator/modules/mod_version/mod_version.xml +++ b/administrator/modules/mod_version/mod_version.xml @@ -3,7 +3,7 @@ mod_version Joomla! Project January 2012 - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org diff --git a/administrator/modules/mod_version/tmpl/default.php b/administrator/modules/mod_version/tmpl/default.php index f854a8fb161cc..65e6f2d5c9367 100644 --- a/administrator/modules/mod_version/tmpl/default.php +++ b/administrator/modules/mod_version/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_version * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/atum/component.php b/administrator/templates/atum/component.php index 002e68f11be8c..88d8b940282f0 100644 --- a/administrator/templates/atum/component.php +++ b/administrator/templates/atum/component.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Templates.Atum * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/atum/cpanel.php b/administrator/templates/atum/cpanel.php index 1f484ed5d83b2..8ef891384b2f8 100644 --- a/administrator/templates/atum/cpanel.php +++ b/administrator/templates/atum/cpanel.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Templates.Atum * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/atum/html/mod_version/default.php b/administrator/templates/atum/html/mod_version/default.php index df17ae5914340..52d6936b204cf 100644 --- a/administrator/templates/atum/html/mod_version/default.php +++ b/administrator/templates/atum/html/mod_version/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_version * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/atum/html/pagination.php b/administrator/templates/atum/html/pagination.php index cdcd3835b96e0..55273cac99e36 100644 --- a/administrator/templates/atum/html/pagination.php +++ b/administrator/templates/atum/html/pagination.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.Atum * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/system/component.php b/administrator/templates/system/component.php index 6a0f54da1869e..e9d47e8af5835 100644 --- a/administrator/templates/system/component.php +++ b/administrator/templates/system/component.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.system * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/system/css/error.css b/administrator/templates/system/css/error.css index 3c8dd0b29e8a9..716f6759de8f5 100644 --- a/administrator/templates/system/css/error.css +++ b/administrator/templates/system/css/error.css @@ -1,5 +1,5 @@ /** - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/system/css/system.css b/administrator/templates/system/css/system.css index 950c2607fdbb0..f78adbd402167 100644 --- a/administrator/templates/system/css/system.css +++ b/administrator/templates/system/css/system.css @@ -1,5 +1,5 @@ /** - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/system/error.php b/administrator/templates/system/error.php index ce69e6ad8d70f..93d4e7e8c9b6a 100644 --- a/administrator/templates/system/error.php +++ b/administrator/templates/system/error.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.system * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/system/html/modules.php b/administrator/templates/system/html/modules.php index b5780488d0881..a08106bdf60d2 100644 --- a/administrator/templates/system/html/modules.php +++ b/administrator/templates/system/html/modules.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.system * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/system/index.php b/administrator/templates/system/index.php index 256219c306b86..a761256732f02 100644 --- a/administrator/templates/system/index.php +++ b/administrator/templates/system/index.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.system * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/bin/keychain.php b/bin/keychain.php index 7c609ea793bca..95884737b25f0 100644 --- a/bin/keychain.php +++ b/bin/keychain.php @@ -3,7 +3,7 @@ /** * @package Joomla.Platform * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE * */ diff --git a/build/build.php b/build/build.php index 985831381d278..f79c66d476930 100644 --- a/build/build.php +++ b/build/build.php @@ -17,7 +17,7 @@ * 4. Check the archives in the tmp directory. * * @package Joomla.Build - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/build/bump.php b/build/bump.php index a243d705e894a..4c7d87ddc2805 100644 --- a/build/bump.php +++ b/build/bump.php @@ -17,7 +17,7 @@ * - /usr/bin/php /path/to/joomla-cms/build/bump.php -v 3.7.0 * * @package Joomla.Build - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/build/helpTOC.php b/build/helpTOC.php index fec7f797776ce..baf64ba0b9ff1 100644 --- a/build/helpTOC.php +++ b/build/helpTOC.php @@ -2,7 +2,7 @@ /** * @package Joomla.Build * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/cli/deletefiles.php b/cli/deletefiles.php index 0a3e74f3c76ff..30a29f2d6ecf4 100644 --- a/cli/deletefiles.php +++ b/cli/deletefiles.php @@ -2,7 +2,7 @@ /** * @package Joomla.Cli * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/cli/finder_indexer.php b/cli/finder_indexer.php index 01854b2edf197..3106c201f04ca 100644 --- a/cli/finder_indexer.php +++ b/cli/finder_indexer.php @@ -2,7 +2,7 @@ /** * @package Joomla.Cli * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/cli/garbagecron.php b/cli/garbagecron.php index c3490880f2fd4..bac7553bddf45 100644 --- a/cli/garbagecron.php +++ b/cli/garbagecron.php @@ -2,7 +2,7 @@ /** * @package Joomla.Cli * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/cli/update_cron.php b/cli/update_cron.php index 3ee6a7c7e4287..e0e418c032daf 100644 --- a/cli/update_cron.php +++ b/cli/update_cron.php @@ -2,7 +2,7 @@ /** * @package Joomla.Cli * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_ajax/ajax.php b/components/com_ajax/ajax.php index 16abe7a36fdb4..6e1849eda960d 100644 --- a/components/com_ajax/ajax.php +++ b/components/com_ajax/ajax.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_ajax * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_banners/banners.php b/components/com_banners/banners.php index 2ae2cd62d5a21..7ce0b0bf38bb4 100644 --- a/components/com_banners/banners.php +++ b/components/com_banners/banners.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_banners/controller.php b/components/com_banners/controller.php index 0073f6245aa8e..dec498b621e2a 100644 --- a/components/com_banners/controller.php +++ b/components/com_banners/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_banners/helpers/banner.php b/components/com_banners/helpers/banner.php index 3bd8ad8e0e97c..babe0e0238c6f 100644 --- a/components/com_banners/helpers/banner.php +++ b/components/com_banners/helpers/banner.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_banners/helpers/category.php b/components/com_banners/helpers/category.php index 606201578ef99..6f555da0c19f8 100644 --- a/components/com_banners/helpers/category.php +++ b/components/com_banners/helpers/category.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_banners/models/banner.php b/components/com_banners/models/banner.php index 1ebbc75f0a6ae..b9c0080dc844e 100644 --- a/components/com_banners/models/banner.php +++ b/components/com_banners/models/banner.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_banners/models/banners.php b/components/com_banners/models/banners.php index 0d266917211bf..d2bad4cb42332 100644 --- a/components/com_banners/models/banners.php +++ b/components/com_banners/models/banners.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_banners/router.php b/components/com_banners/router.php index 1092e09448284..69c37fe997c03 100644 --- a/components/com_banners/router.php +++ b/components/com_banners/router.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/config.php b/components/com_config/config.php index a48f4e9fa3310..3d9a04ecafd16 100644 --- a/components/com_config/config.php +++ b/components/com_config/config.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/controller/cancel.php b/components/com_config/controller/cancel.php index 211b5449ef675..729335ace897d 100644 --- a/components/com_config/controller/cancel.php +++ b/components/com_config/controller/cancel.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/controller/canceladmin.php b/components/com_config/controller/canceladmin.php index b5fdb0848dcc2..826bbcf082fa4 100644 --- a/components/com_config/controller/canceladmin.php +++ b/components/com_config/controller/canceladmin.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/controller/cmsbase.php b/components/com_config/controller/cmsbase.php index 177f3c8d5007d..84c346b509cdc 100644 --- a/components/com_config/controller/cmsbase.php +++ b/components/com_config/controller/cmsbase.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/controller/config/display.php b/components/com_config/controller/config/display.php index 125621161e10f..445d24983beda 100644 --- a/components/com_config/controller/config/display.php +++ b/components/com_config/controller/config/display.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/controller/config/save.php b/components/com_config/controller/config/save.php index 47689a6b4446c..8afe723b7e952 100644 --- a/components/com_config/controller/config/save.php +++ b/components/com_config/controller/config/save.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/controller/display.php b/components/com_config/controller/display.php index e1d4d2fec0a2d..e3df7fc526935 100644 --- a/components/com_config/controller/display.php +++ b/components/com_config/controller/display.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/controller/helper.php b/components/com_config/controller/helper.php index 9c10b07e7856d..77376872dfd2e 100644 --- a/components/com_config/controller/helper.php +++ b/components/com_config/controller/helper.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/controller/modules/cancel.php b/components/com_config/controller/modules/cancel.php index 4bf7520ab386a..3e8cd5f2b71de 100644 --- a/components/com_config/controller/modules/cancel.php +++ b/components/com_config/controller/modules/cancel.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/controller/modules/display.php b/components/com_config/controller/modules/display.php index 3152897fd8929..e618f18e806c2 100644 --- a/components/com_config/controller/modules/display.php +++ b/components/com_config/controller/modules/display.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/controller/modules/save.php b/components/com_config/controller/modules/save.php index 763937da7ee60..0127dc7fbf467 100644 --- a/components/com_config/controller/modules/save.php +++ b/components/com_config/controller/modules/save.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/controller/templates/display.php b/components/com_config/controller/templates/display.php index 2ee48e452acf4..29dc55776b8e8 100644 --- a/components/com_config/controller/templates/display.php +++ b/components/com_config/controller/templates/display.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/controller/templates/save.php b/components/com_config/controller/templates/save.php index ee7e02dcc35b3..6334a3b136b6c 100644 --- a/components/com_config/controller/templates/save.php +++ b/components/com_config/controller/templates/save.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/model/cms.php b/components/com_config/model/cms.php index 29aa70375adf7..176668114a4b1 100644 --- a/components/com_config/model/cms.php +++ b/components/com_config/model/cms.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/model/config.php b/components/com_config/model/config.php index 2be2b1e187508..958dc6e57e82e 100644 --- a/components/com_config/model/config.php +++ b/components/com_config/model/config.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/model/form.php b/components/com_config/model/form.php index 18f0f41c7c82f..9112ac8afa756 100644 --- a/components/com_config/model/form.php +++ b/components/com_config/model/form.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/model/form/modules.xml b/components/com_config/model/form/modules.xml index ea79dc0255cd9..a2dacf6ccd74f 100644 --- a/components/com_config/model/form/modules.xml +++ b/components/com_config/model/form/modules.xml @@ -52,21 +52,27 @@ - - diff --git a/components/com_config/model/modules.php b/components/com_config/model/modules.php index ec397003a2522..0957f8fd24403 100644 --- a/components/com_config/model/modules.php +++ b/components/com_config/model/modules.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/model/templates.php b/components/com_config/model/templates.php index 6aba25fa71f2c..40d5f37a9389f 100644 --- a/components/com_config/model/templates.php +++ b/components/com_config/model/templates.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/view/cms/html.php b/components/com_config/view/cms/html.php index df348eebda6ca..f84ff3262f92d 100644 --- a/components/com_config/view/cms/html.php +++ b/components/com_config/view/cms/html.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/view/cms/json.php b/components/com_config/view/cms/json.php index d5687bccda73f..975c06500c43e 100644 --- a/components/com_config/view/cms/json.php +++ b/components/com_config/view/cms/json.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/view/config/html.php b/components/com_config/view/config/html.php index d97c72b461d74..551d210edc7c3 100644 --- a/components/com_config/view/config/html.php +++ b/components/com_config/view/config/html.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/view/config/tmpl/default.php b/components/com_config/view/config/tmpl/default.php index e6c6f18654d78..3bf54178a29ef 100644 --- a/components/com_config/view/config/tmpl/default.php +++ b/components/com_config/view/config/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/view/config/tmpl/default_metadata.php b/components/com_config/view/config/tmpl/default_metadata.php index 2851f41f7cc19..1441e9974d319 100644 --- a/components/com_config/view/config/tmpl/default_metadata.php +++ b/components/com_config/view/config/tmpl/default_metadata.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/view/config/tmpl/default_seo.php b/components/com_config/view/config/tmpl/default_seo.php index f403336e4a3db..6327c0284d5e9 100644 --- a/components/com_config/view/config/tmpl/default_seo.php +++ b/components/com_config/view/config/tmpl/default_seo.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/view/config/tmpl/default_site.php b/components/com_config/view/config/tmpl/default_site.php index b555395ac289d..6dfad93559df6 100644 --- a/components/com_config/view/config/tmpl/default_site.php +++ b/components/com_config/view/config/tmpl/default_site.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/view/modules/html.php b/components/com_config/view/modules/html.php index 3a558dc3037ae..fe63a64356b02 100644 --- a/components/com_config/view/modules/html.php +++ b/components/com_config/view/modules/html.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/view/modules/tmpl/default.php b/components/com_config/view/modules/tmpl/default.php index c51a854755fa4..751cc8feb3c02 100644 --- a/components/com_config/view/modules/tmpl/default.php +++ b/components/com_config/view/modules/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/view/modules/tmpl/default_options.php b/components/com_config/view/modules/tmpl/default_options.php index 41ed53b7a2688..cf6690acc2885 100644 --- a/components/com_config/view/modules/tmpl/default_options.php +++ b/components/com_config/view/modules/tmpl/default_options.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/view/modules/tmpl/default_positions.php b/components/com_config/view/modules/tmpl/default_positions.php index 30082b134327d..c64981dbca822 100644 --- a/components/com_config/view/modules/tmpl/default_positions.php +++ b/components/com_config/view/modules/tmpl/default_positions.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/view/templates/html.php b/components/com_config/view/templates/html.php index 43716cee7f5ae..6a11a81a0452d 100644 --- a/components/com_config/view/templates/html.php +++ b/components/com_config/view/templates/html.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/view/templates/tmpl/default.php b/components/com_config/view/templates/tmpl/default.php index 7e33a39405c44..5f0ad668000e6 100644 --- a/components/com_config/view/templates/tmpl/default.php +++ b/components/com_config/view/templates/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/view/templates/tmpl/default_options.php b/components/com_config/view/templates/tmpl/default_options.php index 1411ba3d3a0ac..468c53d2c2389 100644 --- a/components/com_config/view/templates/tmpl/default_options.php +++ b/components/com_config/view/templates/tmpl/default_options.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/contact.php b/components/com_contact/contact.php index fd6a908af80bf..78a53a7e4d788 100644 --- a/components/com_contact/contact.php +++ b/components/com_contact/contact.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/controller.php b/components/com_contact/controller.php index ab7cc99865fb4..1842180ba89ad 100644 --- a/components/com_contact/controller.php +++ b/components/com_contact/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/controllers/contact.php b/components/com_contact/controllers/contact.php index 9dfba0bee2546..da19fec5818e2 100644 --- a/components/com_contact/controllers/contact.php +++ b/components/com_contact/controllers/contact.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/helpers/association.php b/components/com_contact/helpers/association.php index a3b8ad9338a39..54fe0b33c7e75 100644 --- a/components/com_contact/helpers/association.php +++ b/components/com_contact/helpers/association.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/helpers/category.php b/components/com_contact/helpers/category.php index 3001a68ccf136..8d94de2c22fef 100644 --- a/components/com_contact/helpers/category.php +++ b/components/com_contact/helpers/category.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/helpers/legacyrouter.php b/components/com_contact/helpers/legacyrouter.php index 69a367941d6e0..2e718984e9406 100644 --- a/components/com_contact/helpers/legacyrouter.php +++ b/components/com_contact/helpers/legacyrouter.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/helpers/route.php b/components/com_contact/helpers/route.php index c78ec6e5df4a4..a544f75c3cc2d 100644 --- a/components/com_contact/helpers/route.php +++ b/components/com_contact/helpers/route.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/layouts/field/render.php b/components/com_contact/layouts/field/render.php index 7d1cd2772a6b6..6f34fe532dcbf 100644 --- a/components/com_contact/layouts/field/render.php +++ b/components/com_contact/layouts/field/render.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/components/com_contact/layouts/fields/render.php b/components/com_contact/layouts/fields/render.php index 747e0564ca001..7ca5c6076634a 100644 --- a/components/com_contact/layouts/fields/render.php +++ b/components/com_contact/layouts/fields/render.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/components/com_contact/layouts/joomla/form/renderfield.php b/components/com_contact/layouts/joomla/form/renderfield.php index 8c6097e21a2dd..c8961db2eeb6f 100644 --- a/components/com_contact/layouts/joomla/form/renderfield.php +++ b/components/com_contact/layouts/joomla/form/renderfield.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/models/categories.php b/components/com_contact/models/categories.php index 9dbdcc1ab0e12..b8ce15c35d598 100644 --- a/components/com_contact/models/categories.php +++ b/components/com_contact/models/categories.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/models/category.php b/components/com_contact/models/category.php index 590e956d47c3d..313e92c9b0559 100644 --- a/components/com_contact/models/category.php +++ b/components/com_contact/models/category.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/models/contact.php b/components/com_contact/models/contact.php index b69a087522e9d..8f7d44d726d8e 100644 --- a/components/com_contact/models/contact.php +++ b/components/com_contact/models/contact.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/models/featured.php b/components/com_contact/models/featured.php index 2a981d31043b3..eca64c618f811 100644 --- a/components/com_contact/models/featured.php +++ b/components/com_contact/models/featured.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/models/rules/contactemail.php b/components/com_contact/models/rules/contactemail.php index 9c3f9a3658604..13a66a0288cd7 100644 --- a/components/com_contact/models/rules/contactemail.php +++ b/components/com_contact/models/rules/contactemail.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/models/rules/contactemailmessage.php b/components/com_contact/models/rules/contactemailmessage.php index f7c619b99aeec..73ff31a1e7eef 100644 --- a/components/com_contact/models/rules/contactemailmessage.php +++ b/components/com_contact/models/rules/contactemailmessage.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/models/rules/contactemailsubject.php b/components/com_contact/models/rules/contactemailsubject.php index cf1349d62cf51..8f465bca622bf 100644 --- a/components/com_contact/models/rules/contactemailsubject.php +++ b/components/com_contact/models/rules/contactemailsubject.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/router.php b/components/com_contact/router.php index 597569cd0a201..5b971ea00b066 100644 --- a/components/com_contact/router.php +++ b/components/com_contact/router.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/views/categories/tmpl/default.php b/components/com_contact/views/categories/tmpl/default.php index 971c9b5784205..8b1f767ae1f2a 100644 --- a/components/com_contact/views/categories/tmpl/default.php +++ b/components/com_contact/views/categories/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/views/categories/tmpl/default_items.php b/components/com_contact/views/categories/tmpl/default_items.php index 42f8f4c4497a8..c9d763d207491 100644 --- a/components/com_contact/views/categories/tmpl/default_items.php +++ b/components/com_contact/views/categories/tmpl/default_items.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/views/categories/view.html.php b/components/com_contact/views/categories/view.html.php index 90d227c9149e2..a14c5b615ef8e 100644 --- a/components/com_contact/views/categories/view.html.php +++ b/components/com_contact/views/categories/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/views/category/tmpl/default.php b/components/com_contact/views/category/tmpl/default.php index 1aea668741e07..bd5a9324d86f9 100644 --- a/components/com_contact/views/category/tmpl/default.php +++ b/components/com_contact/views/category/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/views/category/tmpl/default_children.php b/components/com_contact/views/category/tmpl/default_children.php index 55be0ce90bf99..77538a3ba8e58 100644 --- a/components/com_contact/views/category/tmpl/default_children.php +++ b/components/com_contact/views/category/tmpl/default_children.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/views/category/tmpl/default_items.php b/components/com_contact/views/category/tmpl/default_items.php index 75c41d6a317a2..3b14dee0ba5fc 100644 --- a/components/com_contact/views/category/tmpl/default_items.php +++ b/components/com_contact/views/category/tmpl/default_items.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/views/category/view.feed.php b/components/com_contact/views/category/view.feed.php index 0d0a53b88bdb4..f12a96b289768 100644 --- a/components/com_contact/views/category/view.feed.php +++ b/components/com_contact/views/category/view.feed.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/views/category/view.html.php b/components/com_contact/views/category/view.html.php index 003c91148207b..790420c359d27 100644 --- a/components/com_contact/views/category/view.html.php +++ b/components/com_contact/views/category/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/views/contact/tmpl/default.php b/components/com_contact/views/contact/tmpl/default.php index 55e090ac4e6ab..1d6536d4932cd 100644 --- a/components/com_contact/views/contact/tmpl/default.php +++ b/components/com_contact/views/contact/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/views/contact/tmpl/default_address.php b/components/com_contact/views/contact/tmpl/default_address.php index 230255b7b6814..9020932eb3b64 100644 --- a/components/com_contact/views/contact/tmpl/default_address.php +++ b/components/com_contact/views/contact/tmpl/default_address.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/views/contact/tmpl/default_articles.php b/components/com_contact/views/contact/tmpl/default_articles.php index d7195ff5485d0..25a0ea6d848ed 100644 --- a/components/com_contact/views/contact/tmpl/default_articles.php +++ b/components/com_contact/views/contact/tmpl/default_articles.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/views/contact/tmpl/default_form.php b/components/com_contact/views/contact/tmpl/default_form.php index 1d325c6989d64..691db960d2135 100644 --- a/components/com_contact/views/contact/tmpl/default_form.php +++ b/components/com_contact/views/contact/tmpl/default_form.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/views/contact/tmpl/default_links.php b/components/com_contact/views/contact/tmpl/default_links.php index c3f4c44daa815..e38530ed09204 100644 --- a/components/com_contact/views/contact/tmpl/default_links.php +++ b/components/com_contact/views/contact/tmpl/default_links.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/views/contact/tmpl/default_profile.php b/components/com_contact/views/contact/tmpl/default_profile.php index 03c59558edb05..d8d87c19d8d3b 100644 --- a/components/com_contact/views/contact/tmpl/default_profile.php +++ b/components/com_contact/views/contact/tmpl/default_profile.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/views/contact/tmpl/default_user_custom_fields.php b/components/com_contact/views/contact/tmpl/default_user_custom_fields.php index 5314627925f69..b6d150ef277ec 100644 --- a/components/com_contact/views/contact/tmpl/default_user_custom_fields.php +++ b/components/com_contact/views/contact/tmpl/default_user_custom_fields.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/views/contact/view.html.php b/components/com_contact/views/contact/view.html.php index 5189b34f53604..2e705f073c2b3 100644 --- a/components/com_contact/views/contact/view.html.php +++ b/components/com_contact/views/contact/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/views/contact/view.vcf.php b/components/com_contact/views/contact/view.vcf.php index 835512a0ab3a1..8c0f36875a40c 100644 --- a/components/com_contact/views/contact/view.vcf.php +++ b/components/com_contact/views/contact/view.vcf.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/views/featured/tmpl/default.php b/components/com_contact/views/featured/tmpl/default.php index 4a2deeeb081f9..335c6703d4b7b 100644 --- a/components/com_contact/views/featured/tmpl/default.php +++ b/components/com_contact/views/featured/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/views/featured/tmpl/default_items.php b/components/com_contact/views/featured/tmpl/default_items.php index 04654ae96441b..b948c479bbfc0 100644 --- a/components/com_contact/views/featured/tmpl/default_items.php +++ b/components/com_contact/views/featured/tmpl/default_items.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/views/featured/view.html.php b/components/com_contact/views/featured/view.html.php index bebd2616f9fbb..8d8859d60e83a 100644 --- a/components/com_contact/views/featured/view.html.php +++ b/components/com_contact/views/featured/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_content/content.php b/components/com_content/content.php index 850b1ba40fd98..8774af3c63c18 100644 --- a/components/com_content/content.php +++ b/components/com_content/content.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_content/controller.php b/components/com_content/controller.php index 4963dcf66f2fc..161b1427d03b4 100644 --- a/components/com_content/controller.php +++ b/components/com_content/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_content/controllers/article.php b/components/com_content/controllers/article.php index aad63eae8d044..ec77b718b455b 100644 --- a/components/com_content/controllers/article.php +++ b/components/com_content/controllers/article.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_content/helpers/association.php b/components/com_content/helpers/association.php index 9a6a34e8b7d40..c5b536c3b936e 100644 --- a/components/com_content/helpers/association.php +++ b/components/com_content/helpers/association.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_content/helpers/category.php b/components/com_content/helpers/category.php index b63ce4d335292..24983bf982031 100644 --- a/components/com_content/helpers/category.php +++ b/components/com_content/helpers/category.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_content/helpers/icon.php b/components/com_content/helpers/icon.php index 4751f60ad9628..7739a03f671ba 100644 --- a/components/com_content/helpers/icon.php +++ b/components/com_content/helpers/icon.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_content/helpers/legacyrouter.php b/components/com_content/helpers/legacyrouter.php index 74d61d44aa1ff..b5f4f05c608cf 100644 --- a/components/com_content/helpers/legacyrouter.php +++ b/components/com_content/helpers/legacyrouter.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_content/helpers/query.php b/components/com_content/helpers/query.php index 03de25d175e51..af24f0a8bc598 100644 --- a/components/com_content/helpers/query.php +++ b/components/com_content/helpers/query.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_content/helpers/route.php b/components/com_content/helpers/route.php index 8bcf7d671e952..a8d7011a2c707 100644 --- a/components/com_content/helpers/route.php +++ b/components/com_content/helpers/route.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_content/layouts/field/prepare/modal_article.php b/components/com_content/layouts/field/prepare/modal_article.php index f8e22cfea0a56..66dec6c48a1c9 100644 --- a/components/com_content/layouts/field/prepare/modal_article.php +++ b/components/com_content/layouts/field/prepare/modal_article.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_content/models/archive.php b/components/com_content/models/archive.php index 78c00a52e81b2..5de3b822de9e7 100644 --- a/components/com_content/models/archive.php +++ b/components/com_content/models/archive.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_content/models/article.php b/components/com_content/models/article.php index 165e38c187d7d..8634baeb924b4 100644 --- a/components/com_content/models/article.php +++ b/components/com_content/models/article.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_content/models/articles.php b/components/com_content/models/articles.php index b415ba10608ce..1934e8b433a99 100644 --- a/components/com_content/models/articles.php +++ b/components/com_content/models/articles.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_content/models/categories.php b/components/com_content/models/categories.php index ba35b9cc72966..878caf857df7c 100644 --- a/components/com_content/models/categories.php +++ b/components/com_content/models/categories.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_content/models/category.php b/components/com_content/models/category.php index f8e6166526395..8e92249006576 100644 --- a/components/com_content/models/category.php +++ b/components/com_content/models/category.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_content/models/featured.php b/components/com_content/models/featured.php index e8381e887bdaf..0f97b910d9076 100644 --- a/components/com_content/models/featured.php +++ b/components/com_content/models/featured.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_content/models/form.php b/components/com_content/models/form.php index 8477d820c3172..aa5b749237b84 100644 --- a/components/com_content/models/form.php +++ b/components/com_content/models/form.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_content/models/forms/article.xml b/components/com_content/models/forms/article.xml index 4f90c4cdda275..fe3f8afa3167f 100644 --- a/components/com_content/models/forms/article.xml +++ b/components/com_content/models/forms/article.xml @@ -106,6 +106,7 @@ id="created" name="created" type="calendar" + translateformat="true" filter="unset" /> + filter="user_utc" + /> + filter="user_utc" + /> array(1, 0)); + + if ($item = self::_findItem($needles)) + { + $link .= '&Itemid=' . $item; + } + } + } + + return $link; + } + + /** + * Tries to load the router for the tags view. + * + * @return string URL link to pass to JRoute + * + * @since 3.7 + */ + public static function getTagsRoute() + { + $needles = array( + 'tags' => array(0) + ); + + $link = 'index.php?option=com_tags&view=tags'; + + if ($item = self::_findItem($needles)) + { + $link .= '&Itemid=' . $item; } return $link; @@ -153,6 +185,10 @@ protected static function _findItem($needles = null) } } } + elseif ($view == 'tags') + { + self::$lookup[$lang]['tags'][] = $item->id; + } } } } diff --git a/components/com_tags/models/tag.php b/components/com_tags/models/tag.php index 89b72c702b812..d809164230030 100644 --- a/components/com_tags/models/tag.php +++ b/components/com_tags/models/tag.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_tags/models/tags.php b/components/com_tags/models/tags.php index e10c7953d8c57..96878327e7d0f 100644 --- a/components/com_tags/models/tags.php +++ b/components/com_tags/models/tags.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_tags/router.php b/components/com_tags/router.php index 995c0f4d579f8..72a979930fa3a 100644 --- a/components/com_tags/router.php +++ b/components/com_tags/router.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -103,6 +103,13 @@ public function build(&$query) for ($i = 0; $i < $total; $i++) { $segments[$i] = str_replace(':', '-', $segments[$i]); + $position = strpos($segments[$i], '-'); + + if ($position) + { + // Remove id from segment + $segments[$i] = substr($segments[$i], $position + 1); + } } return $segments; @@ -137,19 +144,47 @@ public function parse(&$segments) if (!isset($item)) { $vars['view'] = $segments[0]; - $vars['id'] = $segments[$count - 1]; + $vars['id'] = $this->fixSegment($segments[$count - 1]); return $vars; } - // From the tags view, we can only jump to a tag. - $id = (isset($item->query['id']) && $item->query['id'] > 1) ? $item->query['id'] : 'root'; - - $vars['id'] = $segments[0]; + $vars['id'] = $this->fixSegment($segments[0]); $vars['view'] = 'tag'; return $vars; } + + /** + * Try to add missing id to segment + * + * @param string $segment One piece of segment of the URL to parse + * + * @return string The segment with founded id + * + * @since 3.7 + */ + protected function fixSegment($segment) + { + $db = JFactory::getDbo(); + + // Try to find tag id + $alias = str_replace(':', '-', $segment); + + $query = $db->getQuery(true) + ->select('id') + ->from($db->quoteName('#__tags')) + ->where($db->quoteName('alias') . " = " . $db->quote($alias)); + + $id = $db->setQuery($query)->loadResult(); + + if ($id) + { + $segment = "$id:$alias"; + } + + return $segment; + } } /** diff --git a/components/com_tags/tags.php b/components/com_tags/tags.php index 55d66b036a738..01babcd96c214 100644 --- a/components/com_tags/tags.php +++ b/components/com_tags/tags.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_tags/views/tag/tmpl/default.php b/components/com_tags/views/tag/tmpl/default.php index 3bdf7b5172e32..f88ee6944e536 100644 --- a/components/com_tags/views/tag/tmpl/default.php +++ b/components/com_tags/views/tag/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_tags/views/tag/tmpl/default_items.php b/components/com_tags/views/tag/tmpl/default_items.php index 536d68ed26677..5c0046f199b1e 100644 --- a/components/com_tags/views/tag/tmpl/default_items.php +++ b/components/com_tags/views/tag/tmpl/default_items.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_tags/views/tag/tmpl/list.php b/components/com_tags/views/tag/tmpl/list.php index 5075e342885ab..987ca1798a613 100644 --- a/components/com_tags/views/tag/tmpl/list.php +++ b/components/com_tags/views/tag/tmpl/list.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_tags/views/tag/tmpl/list_items.php b/components/com_tags/views/tag/tmpl/list_items.php index 937cf78276e15..b706d10f1bde6 100644 --- a/components/com_tags/views/tag/tmpl/list_items.php +++ b/components/com_tags/views/tag/tmpl/list_items.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_tags/views/tag/view.feed.php b/components/com_tags/views/tag/view.feed.php index e3199b329cc02..5efb11e060fc1 100644 --- a/components/com_tags/views/tag/view.feed.php +++ b/components/com_tags/views/tag/view.feed.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_tags/views/tag/view.html.php b/components/com_tags/views/tag/view.html.php index 73b2db3dad425..573b5d1cba47c 100644 --- a/components/com_tags/views/tag/view.html.php +++ b/components/com_tags/views/tag/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_tags/views/tags/tmpl/default.php b/components/com_tags/views/tags/tmpl/default.php index 2ae1b36c8b852..d93f37a860534 100644 --- a/components/com_tags/views/tags/tmpl/default.php +++ b/components/com_tags/views/tags/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_tags/views/tags/tmpl/default_items.php b/components/com_tags/views/tags/tmpl/default_items.php index 157d0bda8967e..e95ea53ee355b 100644 --- a/components/com_tags/views/tags/tmpl/default_items.php +++ b/components/com_tags/views/tags/tmpl/default_items.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_tags/views/tags/view.feed.php b/components/com_tags/views/tags/view.feed.php index 2242b4a115913..1fee1b255790d 100644 --- a/components/com_tags/views/tags/view.feed.php +++ b/components/com_tags/views/tags/view.feed.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_tags/views/tags/view.html.php b/components/com_tags/views/tags/view.html.php index 8a01ee638f2be..ab5ef6b1f9550 100644 --- a/components/com_tags/views/tags/view.html.php +++ b/components/com_tags/views/tags/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/controller.php b/components/com_users/controller.php index 5797e86c2b28c..7ffb315c3d8c3 100644 --- a/components/com_users/controller.php +++ b/components/com_users/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/controllers/profile.json.php b/components/com_users/controllers/profile.json.php index 380fe3287f1b8..ea8441263c516 100644 --- a/components/com_users/controllers/profile.json.php +++ b/components/com_users/controllers/profile.json.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/controllers/profile.php b/components/com_users/controllers/profile.php index a0a0ea09eae60..e38834833ce68 100644 --- a/components/com_users/controllers/profile.php +++ b/components/com_users/controllers/profile.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/controllers/profile_base_json.php b/components/com_users/controllers/profile_base_json.php index d0498a3b1a406..c99e6e0cea2c5 100644 --- a/components/com_users/controllers/profile_base_json.php +++ b/components/com_users/controllers/profile_base_json.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/controllers/registration.php b/components/com_users/controllers/registration.php index 92eaccb3a1118..aef63d868dc62 100644 --- a/components/com_users/controllers/registration.php +++ b/components/com_users/controllers/registration.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/controllers/remind.php b/components/com_users/controllers/remind.php index 32c71fe8c7cba..71cc321cae28d 100644 --- a/components/com_users/controllers/remind.php +++ b/components/com_users/controllers/remind.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/controllers/reset.php b/components/com_users/controllers/reset.php index 68ea60f3ef11e..10f023585c545 100644 --- a/components/com_users/controllers/reset.php +++ b/components/com_users/controllers/reset.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/controllers/user.php b/components/com_users/controllers/user.php index b0f5c6de4e81f..f4e9d88321f8b 100644 --- a/components/com_users/controllers/user.php +++ b/components/com_users/controllers/user.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/helpers/html/users.php b/components/com_users/helpers/html/users.php index fe7e1333c03ec..26d002a3e0876 100644 --- a/components/com_users/helpers/html/users.php +++ b/components/com_users/helpers/html/users.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/helpers/legacyrouter.php b/components/com_users/helpers/legacyrouter.php index 9a8ab96c782bc..e21a2433e3b20 100644 --- a/components/com_users/helpers/legacyrouter.php +++ b/components/com_users/helpers/legacyrouter.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/helpers/route.php b/components/com_users/helpers/route.php index 5a9fa797f0ab1..646370a3c182d 100644 --- a/components/com_users/helpers/route.php +++ b/components/com_users/helpers/route.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/models/login.php b/components/com_users/models/login.php index f541ac7249564..f1755f0223ca7 100644 --- a/components/com_users/models/login.php +++ b/components/com_users/models/login.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/models/profile.php b/components/com_users/models/profile.php index 1861a129827be..dd2d89ab37424 100644 --- a/components/com_users/models/profile.php +++ b/components/com_users/models/profile.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/models/registration.php b/components/com_users/models/registration.php index 5cc42a68e530d..4543eed534e1e 100644 --- a/components/com_users/models/registration.php +++ b/components/com_users/models/registration.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -134,7 +134,8 @@ public function activate($token) $query->clear() ->select($db->quoteName(array('name', 'email', 'sendEmail', 'id'))) ->from($db->quoteName('#__users')) - ->where($db->quoteName('sendEmail') . ' = ' . 1); + ->where($db->quoteName('sendEmail') . ' = 1') + ->where($db->quoteName('block') . ' = 0'); $db->setQuery($query); @@ -582,7 +583,8 @@ public function register($temp) $query->clear() ->select($db->quoteName(array('name', 'email', 'sendEmail'))) ->from($db->quoteName('#__users')) - ->where($db->quoteName('sendEmail') . ' = ' . 1); + ->where($db->quoteName('sendEmail') . ' = 1') + ->where($db->quoteName('block') . ' = 0'); $db->setQuery($query); diff --git a/components/com_users/models/remind.php b/components/com_users/models/remind.php index fd96b0944d797..56b717815dfc3 100644 --- a/components/com_users/models/remind.php +++ b/components/com_users/models/remind.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/models/reset.php b/components/com_users/models/reset.php index 08138bc1b4c7e..5bac0c362132f 100644 --- a/components/com_users/models/reset.php +++ b/components/com_users/models/reset.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/models/rules/loginuniquefield.php b/components/com_users/models/rules/loginuniquefield.php index 850cce29b6fdb..ca09768674215 100644 --- a/components/com_users/models/rules/loginuniquefield.php +++ b/components/com_users/models/rules/loginuniquefield.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/components/com_users/models/rules/logoutuniquefield.php b/components/com_users/models/rules/logoutuniquefield.php index 4be8fa388a4d4..4296460733d20 100644 --- a/components/com_users/models/rules/logoutuniquefield.php +++ b/components/com_users/models/rules/logoutuniquefield.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/components/com_users/router.php b/components/com_users/router.php index 84d5d1c6740c1..8460b25239584 100644 --- a/components/com_users/router.php +++ b/components/com_users/router.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/users.php b/components/com_users/users.php index 2138d06f84b0c..7560a498d982b 100644 --- a/components/com_users/users.php +++ b/components/com_users/users.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/views/login/tmpl/default.php b/components/com_users/views/login/tmpl/default.php index 31e3f84792145..75cecb37f2e26 100644 --- a/components/com_users/views/login/tmpl/default.php +++ b/components/com_users/views/login/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/views/login/tmpl/default_login.php b/components/com_users/views/login/tmpl/default_login.php index 39a4db1df5fd9..faec8edbd5dac 100644 --- a/components/com_users/views/login/tmpl/default_login.php +++ b/components/com_users/views/login/tmpl/default_login.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/views/login/tmpl/default_logout.php b/components/com_users/views/login/tmpl/default_logout.php index 4fcb2bc7b60c0..f4796aec4c139 100644 --- a/components/com_users/views/login/tmpl/default_logout.php +++ b/components/com_users/views/login/tmpl/default_logout.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/views/login/view.html.php b/components/com_users/views/login/view.html.php index 753e89e9ab565..5be7f9c8a2023 100644 --- a/components/com_users/views/login/view.html.php +++ b/components/com_users/views/login/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/views/profile/tmpl/default.php b/components/com_users/views/profile/tmpl/default.php index 37e906b68dbe1..e3f8726409d5c 100644 --- a/components/com_users/views/profile/tmpl/default.php +++ b/components/com_users/views/profile/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/views/profile/tmpl/default_core.php b/components/com_users/views/profile/tmpl/default_core.php index 299ac0c25c19d..70db95e5e0967 100644 --- a/components/com_users/views/profile/tmpl/default_core.php +++ b/components/com_users/views/profile/tmpl/default_core.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/views/profile/tmpl/default_custom.php b/components/com_users/views/profile/tmpl/default_custom.php index 8876039cd5ec0..a250088da7f11 100644 --- a/components/com_users/views/profile/tmpl/default_custom.php +++ b/components/com_users/views/profile/tmpl/default_custom.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -45,7 +45,7 @@
    title; ?>
    fieldname, $customFields)) : ?> - fieldname]->value; ?> + fieldname]->value ?: JText::_('COM_USERS_PROFILE_VALUE_NOT_FOUND'); ?> id)) : ?> id, $field->value); ?> fieldname)) : ?> diff --git a/components/com_users/views/profile/tmpl/default_params.php b/components/com_users/views/profile/tmpl/default_params.php index 88e34520bbd52..8237f061d1fdf 100644 --- a/components/com_users/views/profile/tmpl/default_params.php +++ b/components/com_users/views/profile/tmpl/default_params.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/views/profile/tmpl/edit.php b/components/com_users/views/profile/tmpl/edit.php index 94662e6b12687..13a21c831c52b 100644 --- a/components/com_users/views/profile/tmpl/edit.php +++ b/components/com_users/views/profile/tmpl/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/views/profile/view.html.php b/components/com_users/views/profile/view.html.php index 8b4e76512e053..e6230addbf5f6 100644 --- a/components/com_users/views/profile/view.html.php +++ b/components/com_users/views/profile/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/views/registration/tmpl/complete.php b/components/com_users/views/registration/tmpl/complete.php index d6229e02e910f..80f004d3ff4e5 100644 --- a/components/com_users/views/registration/tmpl/complete.php +++ b/components/com_users/views/registration/tmpl/complete.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/views/registration/tmpl/default.php b/components/com_users/views/registration/tmpl/default.php index 54d3a497b922e..9d88d241ce91d 100644 --- a/components/com_users/views/registration/tmpl/default.php +++ b/components/com_users/views/registration/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/views/registration/view.html.php b/components/com_users/views/registration/view.html.php index 03a6e3a0e2c27..99fe3cf576c7d 100644 --- a/components/com_users/views/registration/view.html.php +++ b/components/com_users/views/registration/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/views/remind/tmpl/default.php b/components/com_users/views/remind/tmpl/default.php index f47fde00cf3d0..77ad8fbc53467 100644 --- a/components/com_users/views/remind/tmpl/default.php +++ b/components/com_users/views/remind/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/views/remind/view.html.php b/components/com_users/views/remind/view.html.php index 7a253b1148848..1c15c6978054f 100644 --- a/components/com_users/views/remind/view.html.php +++ b/components/com_users/views/remind/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/views/reset/tmpl/complete.php b/components/com_users/views/reset/tmpl/complete.php index f12fa191c53f5..a49bde30bf1aa 100644 --- a/components/com_users/views/reset/tmpl/complete.php +++ b/components/com_users/views/reset/tmpl/complete.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/views/reset/tmpl/confirm.php b/components/com_users/views/reset/tmpl/confirm.php index f712626c60892..faa54f975b44f 100644 --- a/components/com_users/views/reset/tmpl/confirm.php +++ b/components/com_users/views/reset/tmpl/confirm.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/views/reset/tmpl/default.php b/components/com_users/views/reset/tmpl/default.php index 649aa4af1e73e..4a0ebdd7cdd62 100644 --- a/components/com_users/views/reset/tmpl/default.php +++ b/components/com_users/views/reset/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/views/reset/view.html.php b/components/com_users/views/reset/view.html.php index 84874760cb611..0eebcae045aa2 100644 --- a/components/com_users/views/reset/view.html.php +++ b/components/com_users/views/reset/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_wrapper/controller.php b/components/com_wrapper/controller.php index 31838b8f617b4..50833e82aee19 100644 --- a/components/com_wrapper/controller.php +++ b/components/com_wrapper/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_wrapper * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_wrapper/router.php b/components/com_wrapper/router.php index 4d5f3a89cd727..82ff3386bc74b 100644 --- a/components/com_wrapper/router.php +++ b/components/com_wrapper/router.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_wrapper * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_wrapper/views/wrapper/tmpl/default.php b/components/com_wrapper/views/wrapper/tmpl/default.php index 9ddd514062ac2..1b5b2a3ee06f5 100644 --- a/components/com_wrapper/views/wrapper/tmpl/default.php +++ b/components/com_wrapper/views/wrapper/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_wrapper * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_wrapper/views/wrapper/view.html.php b/components/com_wrapper/views/wrapper/view.html.php index 84b7cac7001a3..148db1cf42510 100644 --- a/components/com_wrapper/views/wrapper/view.html.php +++ b/components/com_wrapper/views/wrapper/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_wrapper * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_wrapper/wrapper.php b/components/com_wrapper/wrapper.php index af70cbd884416..741c8a8fb5c4c 100644 --- a/components/com_wrapper/wrapper.php +++ b/components/com_wrapper/wrapper.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_wrapper * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/composer.lock b/composer.lock index b780110f1cd27..7b82ca6812ef8 100644 --- a/composer.lock +++ b/composer.lock @@ -725,16 +725,16 @@ }, { "name": "phpmailer/phpmailer", - "version": "v5.2.21", + "version": "v5.2.22", "source": { "type": "git", "url": "https://github.com/PHPMailer/PHPMailer.git", - "reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e" + "reference": "b18cb98131bd83103ccb26a888fdfe3177b8a663" }, "dist": { "type": "zip", - "url": "https://github.com/gitapi/repos/PHPMailer/PHPMailer/zipball/1d51856b76c06fc687fcd9180efa7a0bed0d761e", - "reference": "1d51856b76c06fc687fcd9180efa7a0bed0d761e", + "url": "https://github.com/gitapi/repos/PHPMailer/PHPMailer/zipball/b18cb98131bd83103ccb26a888fdfe3177b8a663", + "reference": "b18cb98131bd83103ccb26a888fdfe3177b8a663", "shasum": "" }, "require": { @@ -781,7 +781,7 @@ } ], "description": "PHPMailer is a full-featured email creation and transfer class for PHP", - "time": "2016-12-28T15:35:48+00:00" + "time": "2017-01-09T09:33:47+00:00" }, { "name": "psr/log", diff --git a/htaccess.txt b/htaccess.txt index c9aaf3667c68a..0e98773e93bec 100644 --- a/htaccess.txt +++ b/htaccess.txt @@ -1,6 +1,6 @@ ## # @package Joomla -# @copyright Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +# @copyright Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. # @license GNU General Public License version 2 or later; see LICENSE.txt ## diff --git a/includes/defines.php b/includes/defines.php index 6f39e107b8c7f..31f23bd47cc05 100644 --- a/includes/defines.php +++ b/includes/defines.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/includes/framework.php b/includes/framework.php index 9859d0ac4e2c0..e1b868628dc5d 100644 --- a/includes/framework.php +++ b/includes/framework.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/index.php b/index.php index 9fa61daa8f46c..fd812d433c6d8 100644 --- a/index.php +++ b/index.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/COPYRIGHT b/installation/COPYRIGHT index 3002516083348..078efda880b2c 100644 --- a/installation/COPYRIGHT +++ b/installation/COPYRIGHT @@ -2,7 +2,7 @@ /** * @package Joomla.Installation * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/CREDITS b/installation/CREDITS index 08baed9163eab..480f177e3d304 100644 --- a/installation/CREDITS +++ b/installation/CREDITS @@ -2,7 +2,7 @@ /** * @package Joomla.Installation * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/INSTALL b/installation/INSTALL index 82bbb0198d724..c66a837f0672b 100644 --- a/installation/INSTALL +++ b/installation/INSTALL @@ -2,7 +2,7 @@ /** * @package Joomla.Installation * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/LICENSES b/installation/LICENSES index 0bb0eaedddd60..9284f6100bab8 100644 --- a/installation/LICENSES +++ b/installation/LICENSES @@ -2,7 +2,7 @@ /** * @package Joomla.Installation * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/application/bootstrap.php b/installation/application/bootstrap.php index c5af7284f69d6..4e4b96603b562 100644 --- a/installation/application/bootstrap.php +++ b/installation/application/bootstrap.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage Application * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/application/defines.php b/installation/application/defines.php index b5189699d73fd..34ac0615763c8 100644 --- a/installation/application/defines.php +++ b/installation/application/defines.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage Application * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/application/framework.php b/installation/application/framework.php index 382485fb584fa..75c62ec71b558 100644 --- a/installation/application/framework.php +++ b/installation/application/framework.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage Application * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/application/router.php b/installation/application/router.php index de9082993d4d9..95a1f4bd4d639 100644 --- a/installation/application/router.php +++ b/installation/application/router.php @@ -2,7 +2,7 @@ /** * @package Joomla.Installation * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/application/web.php b/installation/application/web.php index 6f42404f9791c..d940254085abb 100644 --- a/installation/application/web.php +++ b/installation/application/web.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage Application * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/configuration.php-dist b/installation/configuration.php-dist index 4355b8222465b..3c3bbf42ffddb 100644 --- a/installation/configuration.php-dist +++ b/installation/configuration.php-dist @@ -2,7 +2,7 @@ /** * @package Joomla.Installation * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt * * ------------------------------------------------------------------------- diff --git a/installation/controller/database.php b/installation/controller/database.php index abe03e89536c7..549dcba799afb 100644 --- a/installation/controller/database.php +++ b/installation/controller/database.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage Controller * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/controller/default.php b/installation/controller/default.php index 84fa84350f37a..603a972329e8a 100644 --- a/installation/controller/default.php +++ b/installation/controller/default.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage Controller * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/controller/detectftproot.php b/installation/controller/detectftproot.php index 099e5e3b3e0e0..e80f47379ed83 100644 --- a/installation/controller/detectftproot.php +++ b/installation/controller/detectftproot.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage Controller * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/controller/ftp.php b/installation/controller/ftp.php index 313a1f4cbd393..48580dbb10519 100644 --- a/installation/controller/ftp.php +++ b/installation/controller/ftp.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage Controller * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/controller/install/config.php b/installation/controller/install/config.php index 7ac5b358ae802..6a48a0888e161 100644 --- a/installation/controller/install/config.php +++ b/installation/controller/install/config.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage Controller * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/controller/install/database.php b/installation/controller/install/database.php index d122b0c019375..ed0a5dc68f161 100644 --- a/installation/controller/install/database.php +++ b/installation/controller/install/database.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage Controller * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/controller/install/database_backup.php b/installation/controller/install/database_backup.php index c7b0f7fbdba28..7ea24a3958111 100644 --- a/installation/controller/install/database_backup.php +++ b/installation/controller/install/database_backup.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage Controller * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/controller/install/database_remove.php b/installation/controller/install/database_remove.php index 105e272d998dd..3330224c4fe9d 100644 --- a/installation/controller/install/database_remove.php +++ b/installation/controller/install/database_remove.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage Controller * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/controller/install/email.php b/installation/controller/install/email.php index 6c5c8eeac71e0..196b5c22077fc 100644 --- a/installation/controller/install/email.php +++ b/installation/controller/install/email.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage Controller * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/controller/install/languages.php b/installation/controller/install/languages.php index 60c9222da5c7d..2bdc11a96541b 100644 --- a/installation/controller/install/languages.php +++ b/installation/controller/install/languages.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage Controller * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/controller/install/sample.php b/installation/controller/install/sample.php index 7e029c8b60dbc..8b9d64cda7e2d 100644 --- a/installation/controller/install/sample.php +++ b/installation/controller/install/sample.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage Controller * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/controller/preinstall.php b/installation/controller/preinstall.php index c81cfa244f688..b0550cc199cfb 100644 --- a/installation/controller/preinstall.php +++ b/installation/controller/preinstall.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage Controller * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/controller/removefolder.php b/installation/controller/removefolder.php index 3df81fcf9a0c8..9cc1d74e1a033 100644 --- a/installation/controller/removefolder.php +++ b/installation/controller/removefolder.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage Controller * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/controller/setdefaultlanguage.php b/installation/controller/setdefaultlanguage.php index f2bf9dbd7cde1..d7f5b5bef6528 100644 --- a/installation/controller/setdefaultlanguage.php +++ b/installation/controller/setdefaultlanguage.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage Controller * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/controller/setlanguage.php b/installation/controller/setlanguage.php index e927b23cb73a3..279dc6b48bf2d 100644 --- a/installation/controller/setlanguage.php +++ b/installation/controller/setlanguage.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage Controller * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/controller/site.php b/installation/controller/site.php index 794dd8ba79290..b99822a563577 100644 --- a/installation/controller/site.php +++ b/installation/controller/site.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage Controller * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/controller/summary.php b/installation/controller/summary.php index e391445bcf383..debd9f27d67ec 100644 --- a/installation/controller/summary.php +++ b/installation/controller/summary.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage Controller * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/controller/verifyftpsettings.php b/installation/controller/verifyftpsettings.php index 6c81f6b05ef9e..5520567c31ed8 100644 --- a/installation/controller/verifyftpsettings.php +++ b/installation/controller/verifyftpsettings.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage Controller * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/form/field/language.php b/installation/form/field/language.php index a46a8d8e9b38d..ecd735662f1d1 100644 --- a/installation/form/field/language.php +++ b/installation/form/field/language.php @@ -2,7 +2,7 @@ /** * @package Joomla.Installation * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/form/field/prefix.php b/installation/form/field/prefix.php index fffa7eb59832f..4410326d68481 100644 --- a/installation/form/field/prefix.php +++ b/installation/form/field/prefix.php @@ -2,7 +2,7 @@ /** * @package Joomla.Installation * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/form/field/sample.php b/installation/form/field/sample.php index 1911aec964b14..d61dde3558b4e 100644 --- a/installation/form/field/sample.php +++ b/installation/form/field/sample.php @@ -2,7 +2,7 @@ /** * @package Joomla.Installation * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/form/rule/prefix.php b/installation/form/rule/prefix.php index 2fc3143236acd..bad33f3c0a297 100644 --- a/installation/form/rule/prefix.php +++ b/installation/form/rule/prefix.php @@ -2,7 +2,7 @@ /** * @package Joomla.Installation * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/helper/database.php b/installation/helper/database.php index 4ea540787386d..2aba4697b7cb6 100644 --- a/installation/helper/database.php +++ b/installation/helper/database.php @@ -2,7 +2,7 @@ /** * @package Joomla.Installation * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/html/helper.php b/installation/html/helper.php index 202e84d723564..749817c7611ba 100644 --- a/installation/html/helper.php +++ b/installation/html/helper.php @@ -2,7 +2,7 @@ /** * @package Joomla.Installation * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/index.php b/installation/index.php index 054f53401a154..1c4dc34441eef 100644 --- a/installation/index.php +++ b/installation/index.php @@ -2,7 +2,7 @@ /** * @package Joomla.Installation * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/language/af-ZA/af-ZA.ini b/installation/language/af-ZA/af-ZA.ini index 852cee0d41bd1..fd41319b489a2 100644 --- a/installation/language/af-ZA/af-ZA.ini +++ b/installation/language/af-ZA/af-ZA.ini @@ -1,6 +1,6 @@ ; $Id: af-ZA.ini 1939 2015-07-04 14:16:48Z gerrit_hoekstra $ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php ; Let op: Alle ini lêërs moet as UTF-8 gestoor word diff --git a/installation/language/af-ZA/af-ZA.xml b/installation/language/af-ZA/af-ZA.xml index ab9f3e5a843b9..00a11f55f6bc2 100644 --- a/installation/language/af-ZA/af-ZA.xml +++ b/installation/language/af-ZA/af-ZA.xml @@ -4,7 +4,7 @@ 3.6.0 2016.05.11 Joomla4Africa Project - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL af-ZA.ini diff --git a/installation/language/ar-AA/ar-AA.ini b/installation/language/ar-AA/ar-AA.ini index 83560c86c6252..554a32319a6bb 100644 --- a/installation/language/ar-AA/ar-AA.ini +++ b/installation/language/ar-AA/ar-AA.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 - No BOM diff --git a/installation/language/ar-AA/ar-AA.xml b/installation/language/ar-AA/ar-AA.xml index 5f39beb943ab9..7b8f12ca71557 100644 --- a/installation/language/ar-AA/ar-AA.xml +++ b/installation/language/ar-AA/ar-AA.xml @@ -6,7 +6,7 @@ 3.6.3 August 2016 Joomla! Arabic Unitag Translation team - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt ar-AA.ini diff --git a/installation/language/be-BY/be-BY.ini b/installation/language/be-BY/be-BY.ini index 6718b123615e0..e0dfa373094a3 100644 --- a/installation/language/be-BY/be-BY.ini +++ b/installation/language/be-BY/be-BY.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/be-BY/be-BY.xml b/installation/language/be-BY/be-BY.xml index f873fc02580fb..fa2c2b2778900 100644 --- a/installation/language/be-BY/be-BY.xml +++ b/installation/language/be-BY/be-BY.xml @@ -6,7 +6,7 @@ 3.4.4 August 2015 Dennis Hermatski - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt be-BY.ini diff --git a/installation/language/bg-BG/bg-BG.ini b/installation/language/bg-BG/bg-BG.ini index c6d98c61d53b4..28a2e7b34108b 100644 --- a/installation/language/bg-BG/bg-BG.ini +++ b/installation/language/bg-BG/bg-BG.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/bg-BG/bg-BG.xml b/installation/language/bg-BG/bg-BG.xml index 5cf8b07784b6e..f89198db9da51 100644 --- a/installation/language/bg-BG/bg-BG.xml +++ b/installation/language/bg-BG/bg-BG.xml @@ -6,7 +6,7 @@ 3.6.1 July 2016 Yuriy Boev - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt bg-BG.ini diff --git a/installation/language/bs-BA/bs-BA.ini b/installation/language/bs-BA/bs-BA.ini index e0a7f44d83a3d..e63e29d6c7545 100644 --- a/installation/language/bs-BA/bs-BA.ini +++ b/installation/language/bs-BA/bs-BA.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/bs-BA/bs-BA.xml b/installation/language/bs-BA/bs-BA.xml index 26193a5a1e5cf..d0c8b67be42f4 100644 --- a/installation/language/bs-BA/bs-BA.xml +++ b/installation/language/bs-BA/bs-BA.xml @@ -6,7 +6,7 @@ 3.6.3 October 2016 Bosnian Translation Team - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt bs-BA.ini diff --git a/installation/language/ca-ES/ca-ES.ini b/installation/language/ca-ES/ca-ES.ini index 566dc923c25b4..f265e9d20185a 100644 --- a/installation/language/ca-ES/ca-ES.ini +++ b/installation/language/ca-ES/ca-ES.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/ca-ES/ca-ES.xml b/installation/language/ca-ES/ca-ES.xml index f17e48be5da97..70391ee08580e 100644 --- a/installation/language/ca-ES/ca-ES.xml +++ b/installation/language/ca-ES/ca-ES.xml @@ -6,7 +6,7 @@ 3.6.1 July 2016 Catalan Translation Team - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt ca-ES.ini diff --git a/installation/language/ckb-IQ/ckb-IQ.ini b/installation/language/ckb-IQ/ckb-IQ.ini index 2795b81cc0062..1e2b7182089cd 100644 --- a/installation/language/ckb-IQ/ckb-IQ.ini +++ b/installation/language/ckb-IQ/ckb-IQ.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/ckb-IQ/ckb-IQ.xml b/installation/language/ckb-IQ/ckb-IQ.xml index f389bc0b75589..1b9b71ff8f650 100644 --- a/installation/language/ckb-IQ/ckb-IQ.xml +++ b/installation/language/ckb-IQ/ckb-IQ.xml @@ -6,7 +6,7 @@ 3.2.0 January 2011 Kurdish Soranî Translation team - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt ckb-IQ.ini diff --git a/installation/language/cs-CZ/cs-CZ.ini b/installation/language/cs-CZ/cs-CZ.ini index f0b3e07f7e4c0..7451ffaefe225 100644 --- a/installation/language/cs-CZ/cs-CZ.ini +++ b/installation/language/cs-CZ/cs-CZ.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/cs-CZ/cs-CZ.xml b/installation/language/cs-CZ/cs-CZ.xml index 6d685c9dc19ea..f94d730aa4fc7 100644 --- a/installation/language/cs-CZ/cs-CZ.xml +++ b/installation/language/cs-CZ/cs-CZ.xml @@ -6,7 +6,7 @@ 3.6.3 August 2016 Czech Translation Team - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt cs-CZ.ini diff --git a/installation/language/cy-GB/cy-GB.ini b/installation/language/cy-GB/cy-GB.ini index a318994e1245c..1a8f6e63622e8 100644 --- a/installation/language/cy-GB/cy-GB.ini +++ b/installation/language/cy-GB/cy-GB.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/cy-GB/cy-GB.xml b/installation/language/cy-GB/cy-GB.xml index c4466dd83465f..0de4be23bfa12 100644 --- a/installation/language/cy-GB/cy-GB.xml +++ b/installation/language/cy-GB/cy-GB.xml @@ -4,7 +4,7 @@ 3.3.0.1 2014-05-07 Joomla! Project - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt Welsh (United Kingdom) diff --git a/installation/language/da-DK/da-DK.ini b/installation/language/da-DK/da-DK.ini index 53a89be18fcc3..8bdff722967bc 100644 --- a/installation/language/da-DK/da-DK.ini +++ b/installation/language/da-DK/da-DK.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/da-DK/da-DK.xml b/installation/language/da-DK/da-DK.xml index 6847ca357361a..10d692662a3cd 100644 --- a/installation/language/da-DK/da-DK.xml +++ b/installation/language/da-DK/da-DK.xml @@ -6,7 +6,7 @@ 3.6.3 September 2016 Danish Translation project - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt da-DK.ini diff --git a/installation/language/de-DE/de-DE.ini b/installation/language/de-DE/de-DE.ini index d89fa9288e0e2..5af520cb95b4f 100644 --- a/installation/language/de-DE/de-DE.ini +++ b/installation/language/de-DE/de-DE.ini @@ -1,5 +1,5 @@ ; Author J!German (Joomla! German Translation Team) -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/de-DE/de-DE.xml b/installation/language/de-DE/de-DE.xml index 9ee070230c22c..0e44d496cc24a 100644 --- a/installation/language/de-DE/de-DE.xml +++ b/installation/language/de-DE/de-DE.xml @@ -4,7 +4,7 @@ 3.6.3 September 2016 J!German - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt de-DE.ini diff --git a/installation/language/dz-BT/dz-BT.ini b/installation/language/dz-BT/dz-BT.ini index d472d803ea495..342dd1a6fee04 100644 --- a/installation/language/dz-BT/dz-BT.ini +++ b/installation/language/dz-BT/dz-BT.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/dz-BT/dz-BT.xml b/installation/language/dz-BT/dz-BT.xml index 694e13cdfc959..763310dfcbd1c 100644 --- a/installation/language/dz-BT/dz-BT.xml +++ b/installation/language/dz-BT/dz-BT.xml @@ -6,7 +6,7 @@ 3.6.2 August 2016 Dzongkha Translation Team - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/installation/language/el-GR/el-GR.ini b/installation/language/el-GR/el-GR.ini index 57635ae19a0b1..d962d7864a196 100644 --- a/installation/language/el-GR/el-GR.ini +++ b/installation/language/el-GR/el-GR.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/en-AU/en-AU.ini b/installation/language/en-AU/en-AU.ini index 7c719ace75a7c..2e9ca1dcfb2ec 100644 --- a/installation/language/en-AU/en-AU.ini +++ b/installation/language/en-AU/en-AU.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/en-AU/en-AU.xml b/installation/language/en-AU/en-AU.xml index 0ea35ef7fcc26..d3498b4835ff7 100644 --- a/installation/language/en-AU/en-AU.xml +++ b/installation/language/en-AU/en-AU.xml @@ -6,7 +6,7 @@ 3.6.3 October 2016 Joomla! Project - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt en-AU.ini diff --git a/installation/language/en-CA/en-CA.ini b/installation/language/en-CA/en-CA.ini index 1e5861cccfd3f..95309042c11d1 100644 --- a/installation/language/en-CA/en-CA.ini +++ b/installation/language/en-CA/en-CA.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/en-CA/en-CA.xml b/installation/language/en-CA/en-CA.xml index 0ea35ef7fcc26..d3498b4835ff7 100644 --- a/installation/language/en-CA/en-CA.xml +++ b/installation/language/en-CA/en-CA.xml @@ -6,7 +6,7 @@ 3.6.3 October 2016 Joomla! Project - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt en-AU.ini diff --git a/installation/language/en-GB/en-GB.ini b/installation/language/en-GB/en-GB.ini index 48c151bc1d6e0..670f5aec54d1e 100644 --- a/installation/language/en-GB/en-GB.ini +++ b/installation/language/en-GB/en-GB.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/en-GB/en-GB.xml b/installation/language/en-GB/en-GB.xml index 527759a57a43d..da641fec0ebc4 100644 --- a/installation/language/en-GB/en-GB.xml +++ b/installation/language/en-GB/en-GB.xml @@ -6,7 +6,7 @@ 3.7.0 December 2016 Joomla! Project - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt en-GB.ini diff --git a/installation/language/en-NZ/en-NZ.ini b/installation/language/en-NZ/en-NZ.ini index 6de13cc898ebb..4ca802637616f 100644 --- a/installation/language/en-NZ/en-NZ.ini +++ b/installation/language/en-NZ/en-NZ.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/en-NZ/en-NZ.xml b/installation/language/en-NZ/en-NZ.xml index 56a98a8351912..ae8cfec8788d3 100644 --- a/installation/language/en-NZ/en-NZ.xml +++ b/installation/language/en-NZ/en-NZ.xml @@ -6,7 +6,7 @@ 3.6.3 October 2016 Joomla! Project - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt en-NZ.ini diff --git a/installation/language/en-US/en-US.ini b/installation/language/en-US/en-US.ini index 1a7afefcd992c..4d340ab6ffced 100644 --- a/installation/language/en-US/en-US.ini +++ b/installation/language/en-US/en-US.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/en-US/en-US.xml b/installation/language/en-US/en-US.xml index 83308bc030295..1d54b90fe04df 100644 --- a/installation/language/en-US/en-US.xml +++ b/installation/language/en-US/en-US.xml @@ -6,7 +6,7 @@ 3.6.3 October 2016 Joomla! Project - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt en-US.ini diff --git a/installation/language/eo-XX/eo-XX.ini b/installation/language/eo-XX/eo-XX.ini index 30214e885efb5..1a51ae8650a54 100644 --- a/installation/language/eo-XX/eo-XX.ini +++ b/installation/language/eo-XX/eo-XX.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/es-CO/es-CO.ini b/installation/language/es-CO/es-CO.ini index 6a9970ab5a5d7..27b14692758e2 100644 --- a/installation/language/es-CO/es-CO.ini +++ b/installation/language/es-CO/es-CO.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/es-CO/es-CO.xml b/installation/language/es-CO/es-CO.xml index 4aa8314500987..e15866b6c0756 100644 --- a/installation/language/es-CO/es-CO.xml +++ b/installation/language/es-CO/es-CO.xml @@ -5,7 +5,7 @@ Español (Colombia) 3.6.3 2016-09-15 - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt es-CO.ini diff --git a/installation/language/es-ES/es-ES.ini b/installation/language/es-ES/es-ES.ini index f1c7eb1683e6e..f017a5ea1cfb9 100644 --- a/installation/language/es-ES/es-ES.ini +++ b/installation/language/es-ES/es-ES.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/es-ES/es-ES.xml b/installation/language/es-ES/es-ES.xml index 0695f34531e4b..27d4bf3276f70 100644 --- a/installation/language/es-ES/es-ES.xml +++ b/installation/language/es-ES/es-ES.xml @@ -6,7 +6,7 @@ 3.6.3 2016-09-23 Spanish Translation Team - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt es-ES.ini diff --git a/installation/language/et-EE/et-EE.ini b/installation/language/et-EE/et-EE.ini index a58d27e1aac5e..603a72432d0f2 100644 --- a/installation/language/et-EE/et-EE.ini +++ b/installation/language/et-EE/et-EE.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/et-EE/et-EE.xml b/installation/language/et-EE/et-EE.xml index 3971b55675966..bc5717ee3b462 100644 --- a/installation/language/et-EE/et-EE.xml +++ b/installation/language/et-EE/et-EE.xml @@ -6,7 +6,7 @@ 3.6.3 2016-09-16 Joomla! Project - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt et-EE.ini diff --git a/installation/language/eu-ES/eu-ES.ini b/installation/language/eu-ES/eu-ES.ini index 83b01be3751c2..d8b998f835394 100644 --- a/installation/language/eu-ES/eu-ES.ini +++ b/installation/language/eu-ES/eu-ES.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/eu-ES/eu-ES.xml b/installation/language/eu-ES/eu-ES.xml index 0b48a7312363a..055d10629269a 100644 --- a/installation/language/eu-ES/eu-ES.xml +++ b/installation/language/eu-ES/eu-ES.xml @@ -6,7 +6,7 @@ 3.6.3 August 2016 Basque Translation Team - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt Basque language installation language file for Joomla diff --git a/installation/language/fa-IR/fa-IR.ini b/installation/language/fa-IR/fa-IR.ini index 4a3cd7913c759..422d4362f798b 100644 --- a/installation/language/fa-IR/fa-IR.ini +++ b/installation/language/fa-IR/fa-IR.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/fa-IR/fa-IR.xml b/installation/language/fa-IR/fa-IR.xml index a55f7c71176b4..aab2a9722abc6 100644 --- a/installation/language/fa-IR/fa-IR.xml +++ b/installation/language/fa-IR/fa-IR.xml @@ -6,7 +6,7 @@ 3.6.3 August 2016 JoomlaFarsi.Com Team - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt fa-IR.ini diff --git a/installation/language/fi-FI/fi-FI.ini b/installation/language/fi-FI/fi-FI.ini index 1cd48d73960a4..0037958dac902 100644 --- a/installation/language/fi-FI/fi-FI.ini +++ b/installation/language/fi-FI/fi-FI.ini @@ -1,6 +1,6 @@ ; $Id: fi_FI.ini ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/fi-FI/fi-FI.xml b/installation/language/fi-FI/fi-FI.xml index 68fc0931a4c7c..58131d6793b38 100644 --- a/installation/language/fi-FI/fi-FI.xml +++ b/installation/language/fi-FI/fi-FI.xml @@ -6,7 +6,7 @@ 3.6.1 July 2016 Sami Haaranen - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt fi-FI.ini diff --git a/installation/language/fr-CA/fr-CA.ini b/installation/language/fr-CA/fr-CA.ini index 474938822ec66..a5106f1c7f029 100644 --- a/installation/language/fr-CA/fr-CA.ini +++ b/installation/language/fr-CA/fr-CA.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/fr-CA/fr-CA.xml b/installation/language/fr-CA/fr-CA.xml index 21d27d766c1c3..af5dc16c62daa 100644 --- a/installation/language/fr-CA/fr-CA.xml +++ b/installation/language/fr-CA/fr-CA.xml @@ -6,7 +6,7 @@ 3.6.3 October 2016 Martin Lamothe - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt fr-CA.ini diff --git a/installation/language/fr-FR/fr-FR.ini b/installation/language/fr-FR/fr-FR.ini index a3523c57f37ba..ef67f046cf245 100644 --- a/installation/language/fr-FR/fr-FR.ini +++ b/installation/language/fr-FR/fr-FR.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/fr-FR/fr-FR.xml b/installation/language/fr-FR/fr-FR.xml index d8e68e69d3815..5719936c1b429 100644 --- a/installation/language/fr-FR/fr-FR.xml +++ b/installation/language/fr-FR/fr-FR.xml @@ -6,7 +6,7 @@ 3.6.3 September 2016 Joomla.fr - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt fr-FR.ini diff --git a/installation/language/ga-IE/ga-IE.ini b/installation/language/ga-IE/ga-IE.ini index 02f09bfb1faf2..9e9e3befca65d 100644 --- a/installation/language/ga-IE/ga-IE.ini +++ b/installation/language/ga-IE/ga-IE.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/ga-IE/ga-IE.xml b/installation/language/ga-IE/ga-IE.xml index 9c91321027a7a..21a19f75d2e85 100644 --- a/installation/language/ga-IE/ga-IE.xml +++ b/installation/language/ga-IE/ga-IE.xml @@ -4,7 +4,7 @@ 3.6.4.1 2016-11-08 Irish translation team - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt Irish installation language ga-IE.ini diff --git a/installation/language/gl-ES/gl-ES.ini b/installation/language/gl-ES/gl-ES.ini index 87d9f1f62b6ca..df847a6e5facf 100644 --- a/installation/language/gl-ES/gl-ES.ini +++ b/installation/language/gl-ES/gl-ES.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/gl-ES/gl-ES.xml b/installation/language/gl-ES/gl-ES.xml index 743864bb4af8d..75bd7257f0042 100644 --- a/installation/language/gl-ES/gl-ES.xml +++ b/installation/language/gl-ES/gl-ES.xml @@ -6,7 +6,7 @@ 3.2.0 July 2014 damufo - trasno.net - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt gl-ES.ini diff --git a/installation/language/he-IL/he-IL.ini b/installation/language/he-IL/he-IL.ini index 7716de07718b1..737aa5868a786 100644 --- a/installation/language/he-IL/he-IL.ini +++ b/installation/language/he-IL/he-IL.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/he-IL/he-IL.xml b/installation/language/he-IL/he-IL.xml index 9deae77ed4a34..fca1c2b208d5d 100644 --- a/installation/language/he-IL/he-IL.xml +++ b/installation/language/he-IL/he-IL.xml @@ -6,7 +6,7 @@ 3.6.1 יולי 2016 Joomla Israeli Community - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt he-IL.ini diff --git a/installation/language/hi-IN/hi-IN.xml b/installation/language/hi-IN/hi-IN.xml index 3c14c2a1b6ad4..dd1e7f1e2d0a7 100644 --- a/installation/language/hi-IN/hi-IN.xml +++ b/installation/language/hi-IN/hi-IN.xml @@ -7,7 +7,7 @@ 3.2.0 2014-12-11 Hindi Translation Team - BhavyaSoft.com - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt Hindi-हिंदी (India) diff --git a/installation/language/hr-HR/hr-HR.ini b/installation/language/hr-HR/hr-HR.ini index c0b43799fe77d..e31d61b1c7a55 100644 --- a/installation/language/hr-HR/hr-HR.ini +++ b/installation/language/hr-HR/hr-HR.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/hr-HR/hr-HR.xml b/installation/language/hr-HR/hr-HR.xml index 63d6c5fb89f2b..457da6834dede 100644 --- a/installation/language/hr-HR/hr-HR.xml +++ b/installation/language/hr-HR/hr-HR.xml @@ -5,7 +5,7 @@ 3.6.3 September 2016 Joomla! Hrvatska team - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt hr-HR.ini diff --git a/installation/language/hu-HU/hu-HU.ini b/installation/language/hu-HU/hu-HU.ini index 4bb6472487d8e..3520082bd4a50 100644 --- a/installation/language/hu-HU/hu-HU.ini +++ b/installation/language/hu-HU/hu-HU.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/hu-HU/hu-HU.xml b/installation/language/hu-HU/hu-HU.xml index 60842dbf1b4bf..5d1dab3438a93 100644 --- a/installation/language/hu-HU/hu-HU.xml +++ b/installation/language/hu-HU/hu-HU.xml @@ -6,7 +6,7 @@ 3.5.0 January 2016 Joomla! Magyarország - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt hu-HU.ini diff --git a/installation/language/hy-AM/hy-AM.ini b/installation/language/hy-AM/hy-AM.ini index 926b1ba160481..6a95e97ee823b 100644 --- a/installation/language/hy-AM/hy-AM.ini +++ b/installation/language/hy-AM/hy-AM.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note ։ All ini files need to be saved as UTF-8 diff --git a/installation/language/hy-AM/hy-AM.xml b/installation/language/hy-AM/hy-AM.xml index ed34aa64e041f..c24dedc1aa3af 100644 --- a/installation/language/hy-AM/hy-AM.xml +++ b/installation/language/hy-AM/hy-AM.xml @@ -6,7 +6,7 @@ 3.6.4 2016-10-20 Andrey Aleksanyants - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt hy-AM.ini diff --git a/installation/language/id-ID/id-ID.ini b/installation/language/id-ID/id-ID.ini index f6fc8b67d46a1..8b3964c26d163 100644 --- a/installation/language/id-ID/id-ID.ini +++ b/installation/language/id-ID/id-ID.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/id-ID/id-ID.xml b/installation/language/id-ID/id-ID.xml index 485a533fa673c..324317ecb3774 100644 --- a/installation/language/id-ID/id-ID.xml +++ b/installation/language/id-ID/id-ID.xml @@ -6,7 +6,7 @@ 3.2.0 January 2013 Tim Hanacaraka Joomla Indonesia - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt id-ID.ini diff --git a/installation/language/it-IT/it-IT.ini b/installation/language/it-IT/it-IT.ini index 78365f0a57ad0..41aeca4fec500 100644 --- a/installation/language/it-IT/it-IT.ini +++ b/installation/language/it-IT/it-IT.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/it-IT/it-IT.xml b/installation/language/it-IT/it-IT.xml index 1e8e51d295a72..f9734b287bd60 100644 --- a/installation/language/it-IT/it-IT.xml +++ b/installation/language/it-IT/it-IT.xml @@ -6,7 +6,7 @@ 3.6.3 August 2016 Italian Translation team - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt it-IT.ini diff --git a/installation/language/ja-JP/ja-JP.ini b/installation/language/ja-JP/ja-JP.ini index 8b4593eeb8580..ee1a479c89c9b 100644 --- a/installation/language/ja-JP/ja-JP.ini +++ b/installation/language/ja-JP/ja-JP.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/ja-JP/ja-JP.xml b/installation/language/ja-JP/ja-JP.xml index 7cdbf44297993..01601ea75dd30 100644 --- a/installation/language/ja-JP/ja-JP.xml +++ b/installation/language/ja-JP/ja-JP.xml @@ -4,7 +4,7 @@ 3.6.3 October 2016 Joomla.jp - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt ja-JP.ini diff --git a/installation/language/ka-GE/ka-GE.ini b/installation/language/ka-GE/ka-GE.ini index 6b0e54837b086..451cb1d5b9cbd 100644 --- a/installation/language/ka-GE/ka-GE.ini +++ b/installation/language/ka-GE/ka-GE.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/ka-GE/ka-GE.xml b/installation/language/ka-GE/ka-GE.xml index d7c1d1146b78a..a592a45fd6a9b 100644 --- a/installation/language/ka-GE/ka-GE.xml +++ b/installation/language/ka-GE/ka-GE.xml @@ -6,7 +6,7 @@ 3.6.3 September 2016 Georgian Translation Team - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt ka-GE.ini diff --git a/installation/language/km-KH/km-KH.ini b/installation/language/km-KH/km-KH.ini index d4906018c52c6..12ddc36d8622e 100644 --- a/installation/language/km-KH/km-KH.ini +++ b/installation/language/km-KH/km-KH.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 ; Stepbar diff --git a/installation/language/km-KH/km-KH.xml b/installation/language/km-KH/km-KH.xml index 4360bba2a5f1f..8928c1dda7e1c 100644 --- a/installation/language/km-KH/km-KH.xml +++ b/installation/language/km-KH/km-KH.xml @@ -4,7 +4,7 @@ 3.5.0 August 2015 Khmer Translation Team - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt km-KH.ini diff --git a/installation/language/ko-KR/ko-KR.ini b/installation/language/ko-KR/ko-KR.ini index ce061452d7699..19f781280d74c 100644 --- a/installation/language/ko-KR/ko-KR.ini +++ b/installation/language/ko-KR/ko-KR.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/ko-KR/ko-KR.xml b/installation/language/ko-KR/ko-KR.xml index 0a1268154135a..61e7d18a0f812 100644 --- a/installation/language/ko-KR/ko-KR.xml +++ b/installation/language/ko-KR/ko-KR.xml @@ -6,7 +6,7 @@ 3.6.3 August 2016 Korean translation team - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt ko-KR.ini diff --git a/installation/language/lv-LV/lv-LV.ini b/installation/language/lv-LV/lv-LV.ini index 75f22517a3d38..8f0b8230a746a 100644 --- a/installation/language/lv-LV/lv-LV.ini +++ b/installation/language/lv-LV/lv-LV.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/lv-LV/lv-LV.xml b/installation/language/lv-LV/lv-LV.xml index 509e7e0885620..22c0f8f29786a 100644 --- a/installation/language/lv-LV/lv-LV.xml +++ b/installation/language/lv-LV/lv-LV.xml @@ -6,7 +6,7 @@ 3.4.4 August 2015 Latvian Translation Team - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt lv-LV.ini diff --git a/installation/language/mk-MK/mk-MK.ini b/installation/language/mk-MK/mk-MK.ini index facbbf1b6f65d..5115f4004b106 100644 --- a/installation/language/mk-MK/mk-MK.ini +++ b/installation/language/mk-MK/mk-MK.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/mk-MK/mk-MK.xml b/installation/language/mk-MK/mk-MK.xml index 0a17da25be6ca..c7889bf59cb2a 100644 --- a/installation/language/mk-MK/mk-MK.xml +++ b/installation/language/mk-MK/mk-MK.xml @@ -6,7 +6,7 @@ 3.6.3 September 2016 Macedonian Translation Team - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt mk-MK.ini diff --git a/installation/language/ms-MY/ms-MY.ini b/installation/language/ms-MY/ms-MY.ini index 81e3e6761cae2..349874ef2e600 100644 --- a/installation/language/ms-MY/ms-MY.ini +++ b/installation/language/ms-MY/ms-MY.ini @@ -1,6 +1,6 @@ ; translator : MU DOT MY (http://mu.my) ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/ms-MY/ms-MY.xml b/installation/language/ms-MY/ms-MY.xml index ea25487cb1402..c80d7ecbc6311 100644 --- a/installation/language/ms-MY/ms-MY.xml +++ b/installation/language/ms-MY/ms-MY.xml @@ -6,7 +6,7 @@ 3.2.0 2013-10-01 MU DOT MY - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt ms-MY.ini diff --git a/installation/language/nb-NO/nb-NO.ini b/installation/language/nb-NO/nb-NO.ini index c5fcb0a36a6d0..486a9ade07d5a 100644 --- a/installation/language/nb-NO/nb-NO.ini +++ b/installation/language/nb-NO/nb-NO.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/nb-NO/nb-NO.xml b/installation/language/nb-NO/nb-NO.xml index 713db27a638e0..97cdd67fb633d 100644 --- a/installation/language/nb-NO/nb-NO.xml +++ b/installation/language/nb-NO/nb-NO.xml @@ -6,7 +6,7 @@ 3.6.3 August 2016 Joomla! Project - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt nb-NO.ini diff --git a/installation/language/nl-NL/nl-NL.ini b/installation/language/nl-NL/nl-NL.ini index 95e2c94f683b7..8819344164736 100644 --- a/installation/language/nl-NL/nl-NL.ini +++ b/installation/language/nl-NL/nl-NL.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/nl-NL/nl-NL.xml b/installation/language/nl-NL/nl-NL.xml index a5015549de85a..76b67edaf00ca 100644 --- a/installation/language/nl-NL/nl-NL.xml +++ b/installation/language/nl-NL/nl-NL.xml @@ -6,7 +6,7 @@ 3.6.3 October 2016 Dutch Translation Team - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt nl-NL.ini diff --git a/installation/language/nn-NO/nn-NO.ini b/installation/language/nn-NO/nn-NO.ini index df47eb2d90dfb..e7b0ff0df4a32 100644 --- a/installation/language/nn-NO/nn-NO.ini +++ b/installation/language/nn-NO/nn-NO.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/nn-NO/nn-NO.xml b/installation/language/nn-NO/nn-NO.xml index 6ba272cc1ff2c..6a7f0f08cc440 100644 --- a/installation/language/nn-NO/nn-NO.xml +++ b/installation/language/nn-NO/nn-NO.xml @@ -6,7 +6,7 @@ 3.6.1 2016-07-24 Norsk Joomla and Skolelinux - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt nn-NO.ini diff --git a/installation/language/pl-PL/pl-PL.ini b/installation/language/pl-PL/pl-PL.ini index ffd21b404c0e7..86e9c3a8e40fc 100644 --- a/installation/language/pl-PL/pl-PL.ini +++ b/installation/language/pl-PL/pl-PL.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/pl-PL/pl-PL.xml b/installation/language/pl-PL/pl-PL.xml index ae06be92e11c5..c6b6252f0a14b 100644 --- a/installation/language/pl-PL/pl-PL.xml +++ b/installation/language/pl-PL/pl-PL.xml @@ -4,7 +4,7 @@ 3.6.3 20-09-2016 Polskie Centrum Joomla!: joomla.pl - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt pl-PL.ini diff --git a/installation/language/prs-AF/prs-AF.ini b/installation/language/prs-AF/prs-AF.ini index 9d659b47a53b8..9a470ae2f7a4a 100644 --- a/installation/language/prs-AF/prs-AF.ini +++ b/installation/language/prs-AF/prs-AF.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 - No BOM diff --git a/installation/language/prs-AF/prs-AF.xml b/installation/language/prs-AF/prs-AF.xml index a07545918bdbe..92e3c15356b18 100644 --- a/installation/language/prs-AF/prs-AF.xml +++ b/installation/language/prs-AF/prs-AF.xml @@ -6,7 +6,7 @@ 3.4.2 2015-04-21 Joomla! Project - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt prs-AF.ini diff --git a/installation/language/pt-BR/pt-BR.ini b/installation/language/pt-BR/pt-BR.ini index ba3aca889454e..aeccf64f2ed02 100644 --- a/installation/language/pt-BR/pt-BR.ini +++ b/installation/language/pt-BR/pt-BR.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/pt-PT/pt-PT.ini b/installation/language/pt-PT/pt-PT.ini index def93707af46d..27a1ce64ccb7b 100644 --- a/installation/language/pt-PT/pt-PT.ini +++ b/installation/language/pt-PT/pt-PT.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/pt-PT/pt-PT.xml b/installation/language/pt-PT/pt-PT.xml index 689176bf4059f..41c8dba951d18 100644 --- a/installation/language/pt-PT/pt-PT.xml +++ b/installation/language/pt-PT/pt-PT.xml @@ -6,7 +6,7 @@ 3.5.0.1 2016-02-22 Joomla! Project - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt pt-PT.ini diff --git a/installation/language/ro-RO/ro-RO.ini b/installation/language/ro-RO/ro-RO.ini index ef967608650a5..3cd72fec09ec0 100644 --- a/installation/language/ro-RO/ro-RO.ini +++ b/installation/language/ro-RO/ro-RO.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/ro-RO/ro-RO.xml b/installation/language/ro-RO/ro-RO.xml index 0c489412771ad..980c138fc3a53 100644 --- a/installation/language/ro-RO/ro-RO.xml +++ b/installation/language/ro-RO/ro-RO.xml @@ -6,7 +6,7 @@ 3.6.0 11-05-2016 Horia Negura - Quanta - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt ro-RO.ini diff --git a/installation/language/ru-RU/ru-RU.ini b/installation/language/ru-RU/ru-RU.ini index ff1d96b776a5e..11a4ecaf118c6 100644 --- a/installation/language/ru-RU/ru-RU.ini +++ b/installation/language/ru-RU/ru-RU.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/ru-RU/ru-RU.xml b/installation/language/ru-RU/ru-RU.xml index 67def6e107043..52d3cbaced274 100644 --- a/installation/language/ru-RU/ru-RU.xml +++ b/installation/language/ru-RU/ru-RU.xml @@ -6,7 +6,7 @@ 3.2.0 2012-09-27 Joomlaportal.ru - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt ru-RU.ini diff --git a/installation/language/si-LK/si-LK.ini b/installation/language/si-LK/si-LK.ini index 301d58c110b94..9f89a7e2301de 100644 --- a/installation/language/si-LK/si-LK.ini +++ b/installation/language/si-LK/si-LK.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/si-LK/si-LK.xml b/installation/language/si-LK/si-LK.xml index 248dbbb1f85d6..8ab6c037d0ecb 100644 --- a/installation/language/si-LK/si-LK.xml +++ b/installation/language/si-LK/si-LK.xml @@ -6,7 +6,7 @@ 3.2.0 July 2014 Denuwan Wijewardena (Sri Lanka) - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt si-LK.ini diff --git a/installation/language/sk-SK/sk-SK.ini b/installation/language/sk-SK/sk-SK.ini index 982bf6556b996..60439fb9bdef1 100644 --- a/installation/language/sk-SK/sk-SK.ini +++ b/installation/language/sk-SK/sk-SK.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/sk-SK/sk-SK.xml b/installation/language/sk-SK/sk-SK.xml index 9c42a22ccf982..9ab0ae374a348 100644 --- a/installation/language/sk-SK/sk-SK.xml +++ b/installation/language/sk-SK/sk-SK.xml @@ -6,7 +6,7 @@ 3.6.3 October 2016 Joomla! Project - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt sk-SK.ini diff --git a/installation/language/sl-SI/sl-SI.ini b/installation/language/sl-SI/sl-SI.ini index ec950491a26f8..4d3c7b57dacba 100644 --- a/installation/language/sl-SI/sl-SI.ini +++ b/installation/language/sl-SI/sl-SI.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/sl-SI/sl-SI.xml b/installation/language/sl-SI/sl-SI.xml index fbeee6ff6774e..e96c3016c386f 100644 --- a/installation/language/sl-SI/sl-SI.xml +++ b/installation/language/sl-SI/sl-SI.xml @@ -6,7 +6,7 @@ 3.5.0 2016-01-22 - Copyright (C) 2005 - 2016 Open Source Matters. Vse pravice pridržane. + Copyright (C) 2005 - 2017 Open Source Matters. Vse pravice pridržane. http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL sl-SI jezik namestitve diff --git a/installation/language/sr-RS/sr-RS.ini b/installation/language/sr-RS/sr-RS.ini index 85412ef1e8a02..26b918cfd826e 100644 --- a/installation/language/sr-RS/sr-RS.ini +++ b/installation/language/sr-RS/sr-RS.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/sr-RS/sr-RS.xml b/installation/language/sr-RS/sr-RS.xml index 032174d2bf307..bb6e00d0f9023 100644 --- a/installation/language/sr-RS/sr-RS.xml +++ b/installation/language/sr-RS/sr-RS.xml @@ -6,7 +6,7 @@ 3.6.3 September 2016 joomla-serbia.com - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt sr-RS.ini diff --git a/installation/language/sr-YU/sr-YU.ini b/installation/language/sr-YU/sr-YU.ini index 055072542c3c7..e34ec29867258 100644 --- a/installation/language/sr-YU/sr-YU.ini +++ b/installation/language/sr-YU/sr-YU.ini @@ -1,5 +1,4 @@ -; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/sr-YU/sr-YU.xml b/installation/language/sr-YU/sr-YU.xml index b4db0c1e52c1b..b5b792814dfc5 100644 --- a/installation/language/sr-YU/sr-YU.xml +++ b/installation/language/sr-YU/sr-YU.xml @@ -6,7 +6,7 @@ 3.6.1 July 2016 joomla-serbia.com - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt sr-YU.ini diff --git a/installation/language/srp-ME/srp-ME.ini b/installation/language/srp-ME/srp-ME.ini index e49b9813523c4..61b7155d09eb9 100644 --- a/installation/language/srp-ME/srp-ME.ini +++ b/installation/language/srp-ME/srp-ME.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/srp-ME/srp-ME.xml b/installation/language/srp-ME/srp-ME.xml index 66b59b438f64c..fd5f0db6df1d2 100644 --- a/installation/language/srp-ME/srp-ME.xml +++ b/installation/language/srp-ME/srp-ME.xml @@ -6,7 +6,7 @@ 3.2.0 03-10-2013 Tolja - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt srp-ME.ini diff --git a/installation/language/sv-SE/sv-SE.ini b/installation/language/sv-SE/sv-SE.ini index ebf225217b2bd..65ca89edbdf7d 100644 --- a/installation/language/sv-SE/sv-SE.ini +++ b/installation/language/sv-SE/sv-SE.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/sv-SE/sv-SE.xml b/installation/language/sv-SE/sv-SE.xml index f82f54e0d94c4..5d482493536b2 100644 --- a/installation/language/sv-SE/sv-SE.xml +++ b/installation/language/sv-SE/sv-SE.xml @@ -6,7 +6,7 @@ 3.6.3 September 2016 svenskjoomla.se - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt sv-SE.ini diff --git a/installation/language/sw-KE/sw-KE.ini b/installation/language/sw-KE/sw-KE.ini index cfb9e302df5bc..edf18469e09bc 100644 --- a/installation/language/sw-KE/sw-KE.ini +++ b/installation/language/sw-KE/sw-KE.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. +; Copyright (C) 2005 - 2017 Open Source Matters. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/sw-KE/sw-KE.xml b/installation/language/sw-KE/sw-KE.xml index cee4f9495605f..804e0afceaec2 100644 --- a/installation/language/sw-KE/sw-KE.xml +++ b/installation/language/sw-KE/sw-KE.xml @@ -6,7 +6,7 @@ 3.6.3 September 2016 Hassan Abdalla - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt sw-KE.ini diff --git a/installation/language/sy-IQ/sy-IQ.ini b/installation/language/sy-IQ/sy-IQ.ini index 8c76a4dc9e9c7..d413c2dfbc1fb 100644 --- a/installation/language/sy-IQ/sy-IQ.ini +++ b/installation/language/sy-IQ/sy-IQ.ini @@ -1,4 +1,4 @@ -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt see LICENSE.php ; Note : All ini files need to be saved as UTF-8 - No BOM diff --git a/installation/language/sy-IQ/sy-IQ.xml b/installation/language/sy-IQ/sy-IQ.xml index 8d35692ae3b80..308bfe58ebf3f 100644 --- a/installation/language/sy-IQ/sy-IQ.xml +++ b/installation/language/sy-IQ/sy-IQ.xml @@ -6,7 +6,7 @@ 3.5.0 2012-09-25 East Syriac Translation Team - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt sy-IQ.ini diff --git a/installation/language/ta-IN/ta-IN.ini b/installation/language/ta-IN/ta-IN.ini index c7e2dba0dddf4..7a41049b14edd 100644 --- a/installation/language/ta-IN/ta-IN.ini +++ b/installation/language/ta-IN/ta-IN.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/ta-IN/ta-IN.xml b/installation/language/ta-IN/ta-IN.xml index 970c28dda3156..64a6304d4bf55 100644 --- a/installation/language/ta-IN/ta-IN.xml +++ b/installation/language/ta-IN/ta-IN.xml @@ -6,7 +6,7 @@ 3.6.3 August 2016 Ilagnayeru 'MIG' Manickam, Elango Samy Manim - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt ta-IN.ini diff --git a/installation/language/th-TH/th-TH.ini b/installation/language/th-TH/th-TH.ini index c4314458f7307..5ea4eb698f972 100644 --- a/installation/language/th-TH/th-TH.ini +++ b/installation/language/th-TH/th-TH.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/th-TH/th-TH.xml b/installation/language/th-TH/th-TH.xml index c89d33607c045..5ff279a3b628d 100644 --- a/installation/language/th-TH/th-TH.xml +++ b/installation/language/th-TH/th-TH.xml @@ -6,7 +6,7 @@ 3.6.3 September 2016 Thai Translation Team - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt th-TH.ini diff --git a/installation/language/tk-TM/tk-TM.ini b/installation/language/tk-TM/tk-TM.ini index 9114bde414ccf..32afba109fe6b 100644 --- a/installation/language/tk-TM/tk-TM.ini +++ b/installation/language/tk-TM/tk-TM.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/tk-TM/tk-TM.xml b/installation/language/tk-TM/tk-TM.xml index 6288cde82914d..8ed1b90b83838 100644 --- a/installation/language/tk-TM/tk-TM.xml +++ b/installation/language/tk-TM/tk-TM.xml @@ -6,7 +6,7 @@ 3.6.3 August 2016 Shohrat Permanov - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt tk-TM.ini diff --git a/installation/language/tr-TR/tr-TR.ini b/installation/language/tr-TR/tr-TR.ini index fcffdf98a1419..3e36f48e01c13 100644 --- a/installation/language/tr-TR/tr-TR.ini +++ b/installation/language/tr-TR/tr-TR.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/tr-TR/tr-TR.xml b/installation/language/tr-TR/tr-TR.xml index 8597fb590c821..1943d50f5ccbb 100644 --- a/installation/language/tr-TR/tr-TR.xml +++ b/installation/language/tr-TR/tr-TR.xml @@ -6,7 +6,7 @@ 3.6.0 May 2016 Ümit Kenan Gönüllü - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt tr-TR.ini diff --git a/installation/language/ug-CN/ug-CN.ini b/installation/language/ug-CN/ug-CN.ini index 5092dfa345833..8e219a5fbec93 100644 --- a/installation/language/ug-CN/ug-CN.ini +++ b/installation/language/ug-CN/ug-CN.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/ug-CN/ug-CN.xml b/installation/language/ug-CN/ug-CN.xml index 2bf2dfe4cc986..06b1a1eee6df5 100644 --- a/installation/language/ug-CN/ug-CN.xml +++ b/installation/language/ug-CN/ug-CN.xml @@ -4,7 +4,7 @@ 3.5.0 2012.10.28 Joomla! Uyghur Translation Team - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt ug-CN.ini diff --git a/installation/language/uk-UA/uk-UA.ini b/installation/language/uk-UA/uk-UA.ini index 1ec9473df8c28..4a5844191ba85 100644 --- a/installation/language/uk-UA/uk-UA.ini +++ b/installation/language/uk-UA/uk-UA.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/vi-VN/vi-VN.ini b/installation/language/vi-VN/vi-VN.ini index 720c8ed588f25..84275885e6a40 100644 --- a/installation/language/vi-VN/vi-VN.ini +++ b/installation/language/vi-VN/vi-VN.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/vi-VN/vi-VN.xml b/installation/language/vi-VN/vi-VN.xml index 6939163940592..bfe83b1695b1a 100644 --- a/installation/language/vi-VN/vi-VN.xml +++ b/installation/language/vi-VN/vi-VN.xml @@ -6,7 +6,7 @@ 3.5.0 August 2015 Joomla! Project - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt vn-VN.ini diff --git a/installation/language/zh-CN/zh-CN.ini b/installation/language/zh-CN/zh-CN.ini index 7a0675012e505..65126f03a1726 100644 --- a/installation/language/zh-CN/zh-CN.ini +++ b/installation/language/zh-CN/zh-CN.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note：All ini files need to be saved as UTF-8 diff --git a/installation/language/zh-CN/zh-CN.xml b/installation/language/zh-CN/zh-CN.xml index 5271c89a36778..15aa43d294d4f 100644 --- a/installation/language/zh-CN/zh-CN.xml +++ b/installation/language/zh-CN/zh-CN.xml @@ -7,7 +7,7 @@ 2016.06.01 Joomla! Project admin@joomla.org - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt This Chinese Simplified language for the installation of Joomla 3.x. diff --git a/installation/language/zh-TW/zh-TW.ini b/installation/language/zh-TW/zh-TW.ini index f3efd1d95dc3b..afdb73a7b2f3f 100644 --- a/installation/language/zh-TW/zh-TW.ini +++ b/installation/language/zh-TW/zh-TW.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/zh-TW/zh-TW.xml b/installation/language/zh-TW/zh-TW.xml index 2729f4432e141..9085a3261b5b1 100644 --- a/installation/language/zh-TW/zh-TW.xml +++ b/installation/language/zh-TW/zh-TW.xml @@ -6,7 +6,7 @@ 3.6.3 August 2016 Joomla! Taiwan - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt zh-TW.ini diff --git a/installation/model/configuration.php b/installation/model/configuration.php index 83ba3390ece6e..ab57f7bfa1f02 100644 --- a/installation/model/configuration.php +++ b/installation/model/configuration.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage Model * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/model/database.php b/installation/model/database.php index 1cad50a0be6f1..b8c9cf4e73a67 100644 --- a/installation/model/database.php +++ b/installation/model/database.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage Model * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/model/ftp.php b/installation/model/ftp.php index 2e8c23c088fbf..21eef15e90b35 100644 --- a/installation/model/ftp.php +++ b/installation/model/ftp.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage Model * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/model/languages.php b/installation/model/languages.php index 3a5fb6beaf280..e4aae0f9aa9d2 100644 --- a/installation/model/languages.php +++ b/installation/model/languages.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage Model * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/model/setup.php b/installation/model/setup.php index b33b5904b2209..4edba2040e697 100644 --- a/installation/model/setup.php +++ b/installation/model/setup.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage Model * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/response/json.php b/installation/response/json.php index 694e8c9f0c0fe..5b5e8a6d102ce 100644 --- a/installation/response/json.php +++ b/installation/response/json.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage Response * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql index 18b6411d663c4..5e3c69c9fc7ab 100644 --- a/installation/sql/mysql/joomla.sql +++ b/installation/sql/mysql/joomla.sql @@ -516,6 +516,7 @@ INSERT INTO `#__extensions` (`extension_id`, `package_id`, `name`, `type`, `elem (31, 0, 'com_ajax', 'component', 'com_ajax', '', 1, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0), (32, 0, 'com_postinstall', 'component', 'com_postinstall', '', 1, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0), (33, 0, 'com_fields', 'component', 'com_fields', '', 1, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0), +(34, 0, 'com_associations', 'component', 'com_associations', '', 1, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0), (102, 0, 'phputf8', 'library', 'phputf8', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0), (103, 0, 'Joomla! Platform', 'library', 'joomla', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0), (104, 0, 'IDNA Convert', 'library', 'idna_convert', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0), @@ -1381,27 +1382,28 @@ CREATE TABLE IF NOT EXISTS `#__menu` ( -- INSERT INTO `#__menu` (`id`, `menutype`, `title`, `alias`, `note`, `path`, `link`, `type`, `published`, `parent_id`, `level`, `component_id`, `checked_out`, `checked_out_time`, `browserNav`, `access`, `img`, `template_style_id`, `params`, `lft`, `rgt`, `home`, `language`, `client_id`) VALUES -(1, '', 'Menu_Item_Root', 'root', '', '', '', '', 1, 0, 0, 0, 0, '0000-00-00 00:00:00', 0, 0, '', 0, '', 0, 43, 0, '*', 0), -(2, 'menu', 'com_banners', 'Banners', '', 'Banners', 'index.php?option=com_banners', 'component', 0, 1, 1, 4, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners', 0, '', 1, 10, 0, '*', 1), -(3, 'menu', 'com_banners', 'Banners', '', 'Banners/Banners', 'index.php?option=com_banners', 'component', 0, 2, 2, 4, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners', 0, '', 2, 3, 0, '*', 1), -(4, 'menu', 'com_banners_categories', 'Categories', '', 'Banners/Categories', 'index.php?option=com_categories&extension=com_banners', 'component', 0, 2, 2, 6, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners-cat', 0, '', 4, 5, 0, '*', 1), -(5, 'menu', 'com_banners_clients', 'Clients', '', 'Banners/Clients', 'index.php?option=com_banners&view=clients', 'component', 0, 2, 2, 4, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners-clients', 0, '', 6, 7, 0, '*', 1), -(6, 'menu', 'com_banners_tracks', 'Tracks', '', 'Banners/Tracks', 'index.php?option=com_banners&view=tracks', 'component', 0, 2, 2, 4, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners-tracks', 0, '', 8, 9, 0, '*', 1), -(7, 'menu', 'com_contact', 'Contacts', '', 'Contacts', 'index.php?option=com_contact', 'component', 0, 1, 1, 8, 0, '0000-00-00 00:00:00', 0, 0, 'class:contact', 0, '', 11, 16, 0, '*', 1), -(8, 'menu', 'com_contact_contacts', 'Contacts', '', 'Contacts/Contacts', 'index.php?option=com_contact', 'component', 0, 7, 2, 8, 0, '0000-00-00 00:00:00', 0, 0, 'class:contact', 0, '', 12, 13, 0, '*', 1), -(9, 'menu', 'com_contact_categories', 'Categories', '', 'Contacts/Categories', 'index.php?option=com_categories&extension=com_contact', 'component', 0, 7, 2, 6, 0, '0000-00-00 00:00:00', 0, 0, 'class:contact-cat', 0, '', 14, 15, 0, '*', 1), -(10, 'menu', 'com_messages', 'Messaging', '', 'Messaging', 'index.php?option=com_messages', 'component', 0, 1, 1, 15, 0, '0000-00-00 00:00:00', 0, 0, 'class:messages', 0, '', 17, 22, 0, '*', 1), -(11, 'menu', 'com_messages_add', 'New Private Message', '', 'Messaging/New Private Message', 'index.php?option=com_messages&task=message.add', 'component', 0, 10, 2, 15, 0, '0000-00-00 00:00:00', 0, 0, 'class:messages-add', 0, '', 18, 19, 0, '*', 1), -(13, 'menu', 'com_newsfeeds', 'News Feeds', '', 'News Feeds', 'index.php?option=com_newsfeeds', 'component', 0, 1, 1, 17, 0, '0000-00-00 00:00:00', 0, 0, 'class:newsfeeds', 0, '', 23, 28, 0, '*', 1), -(14, 'menu', 'com_newsfeeds_feeds', 'Feeds', '', 'News Feeds/Feeds', 'index.php?option=com_newsfeeds', 'component', 0, 13, 2, 17, 0, '0000-00-00 00:00:00', 0, 0, 'class:newsfeeds', 0, '', 24, 25, 0, '*', 1), -(15, 'menu', 'com_newsfeeds_categories', 'Categories', '', 'News Feeds/Categories', 'index.php?option=com_categories&extension=com_newsfeeds', 'component', 0, 13, 2, 6, 0, '0000-00-00 00:00:00', 0, 0, 'class:newsfeeds-cat', 0, '', 26, 27, 0, '*', 1), -(16, 'menu', 'com_redirect', 'Redirect', '', 'Redirect', 'index.php?option=com_redirect', 'component', 0, 1, 1, 24, 0, '0000-00-00 00:00:00', 0, 0, 'class:redirect', 0, '', 29, 30, 0, '*', 1), -(17, 'menu', 'com_search', 'Basic Search', '', 'Basic Search', 'index.php?option=com_search', 'component', 0, 1, 1, 19, 0, '0000-00-00 00:00:00', 0, 0, 'class:search', 0, '', 31, 32, 0, '*', 1), -(18, 'menu', 'com_finder', 'Smart Search', '', 'Smart Search', 'index.php?option=com_finder', 'component', 0, 1, 1, 27, 0, '0000-00-00 00:00:00', 0, 0, 'class:finder', 0, '', 33, 34, 0, '*', 1), -(19, 'menu', 'com_joomlaupdate', 'Joomla! Update', '', 'Joomla! Update', 'index.php?option=com_joomlaupdate', 'component', 1, 1, 1, 28, 0, '0000-00-00 00:00:00', 0, 0, 'class:joomlaupdate', 0, '', 35, 36, 0, '*', 1), -(20, 'main', 'com_tags', 'Tags', '', 'Tags', 'index.php?option=com_tags', 'component', 0, 1, 1, 29, 0, '0000-00-00 00:00:00', 0, 1, 'class:tags', 0, '', 37, 38, 0, '', 1), -(21, 'main', 'com_postinstall', 'Post-installation messages', '', 'Post-installation messages', 'index.php?option=com_postinstall', 'component', 0, 1, 1, 32, 0, '0000-00-00 00:00:00', 0, 1, 'class:postinstall', 0, '', 39, 40, 0, '*', 1), -(101, 'mainmenu', 'Home', 'home', '', 'home', 'index.php?option=com_content&view=featured', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"featured_categories":[""],"layout_type":"blog","num_leading_articles":"1","num_intro_articles":"3","num_columns":"3","num_links":"0","multi_column_order":"1","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"2","show_pagination_results":"1","show_title":"","link_titles":"","show_intro":"","info_block_position":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_readmore":"","show_readmore_title":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_noauth":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":1,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 41, 42, 1, '*', 0); +(1, '', 'Menu_Item_Root', 'root', '', '', '', '', 1, 0, 0, 0, 0, '0000-00-00 00:00:00', 0, 0, '', 0, '', 0, 45, 0, '*', 0), +(2, 'main', 'com_banners', 'Banners', '', 'Banners', 'index.php?option=com_banners', 'component', 1, 1, 1, 4, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners', 0, '', 1, 10, 0, '*', 1), +(3, 'main', 'com_banners', 'Banners', '', 'Banners/Banners', 'index.php?option=com_banners', 'component', 1, 2, 2, 4, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners', 0, '', 2, 3, 0, '*', 1), +(4, 'main', 'com_banners_categories', 'Categories', '', 'Banners/Categories', 'index.php?option=com_categories&extension=com_banners', 'component', 1, 2, 2, 6, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners-cat', 0, '', 4, 5, 0, '*', 1), +(5, 'main', 'com_banners_clients', 'Clients', '', 'Banners/Clients', 'index.php?option=com_banners&view=clients', 'component', 1, 2, 2, 4, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners-clients', 0, '', 6, 7, 0, '*', 1), +(6, 'main', 'com_banners_tracks', 'Tracks', '', 'Banners/Tracks', 'index.php?option=com_banners&view=tracks', 'component', 1, 2, 2, 4, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners-tracks', 0, '', 8, 9, 0, '*', 1), +(7, 'main', 'com_contact', 'Contacts', '', 'Contacts', 'index.php?option=com_contact', 'component', 1, 1, 1, 8, 0, '0000-00-00 00:00:00', 0, 0, 'class:contact', 0, '', 11, 16, 0, '*', 1), +(8, 'main', 'com_contact_contacts', 'Contacts', '', 'Contacts/Contacts', 'index.php?option=com_contact', 'component', 1, 7, 2, 8, 0, '0000-00-00 00:00:00', 0, 0, 'class:contact', 0, '', 12, 13, 0, '*', 1), +(9, 'main', 'com_contact_categories', 'Categories', '', 'Contacts/Categories', 'index.php?option=com_categories&extension=com_contact', 'component', 1, 7, 2, 6, 0, '0000-00-00 00:00:00', 0, 0, 'class:contact-cat', 0, '', 14, 15, 0, '*', 1), +(10, 'main', 'com_messages', 'Messaging', '', 'Messaging', 'index.php?option=com_messages', 'component', 1, 1, 1, 15, 0, '0000-00-00 00:00:00', 0, 0, 'class:messages', 0, '', 17, 22, 0, '*', 1), +(11, 'main', 'com_messages_add', 'New Private Message', '', 'Messaging/New Private Message', 'index.php?option=com_messages&task=message.add', 'component', 1, 10, 2, 15, 0, '0000-00-00 00:00:00', 0, 0, 'class:messages-add', 0, '', 18, 19, 0, '*', 1), +(13, 'main', 'com_newsfeeds', 'News Feeds', '', 'News Feeds', 'index.php?option=com_newsfeeds', 'component', 1, 1, 1, 17, 0, '0000-00-00 00:00:00', 0, 0, 'class:newsfeeds', 0, '', 23, 28, 0, '*', 1), +(14, 'main', 'com_newsfeeds_feeds', 'Feeds', '', 'News Feeds/Feeds', 'index.php?option=com_newsfeeds', 'component', 1, 13, 2, 17, 0, '0000-00-00 00:00:00', 0, 0, 'class:newsfeeds', 0, '', 24, 25, 0, '*', 1), +(15, 'main', 'com_newsfeeds_categories', 'Categories', '', 'News Feeds/Categories', 'index.php?option=com_categories&extension=com_newsfeeds', 'component', 1, 13, 2, 6, 0, '0000-00-00 00:00:00', 0, 0, 'class:newsfeeds-cat', 0, '', 26, 27, 0, '*', 1), +(16, 'main', 'com_redirect', 'Redirect', '', 'Redirect', 'index.php?option=com_redirect', 'component', 1, 1, 1, 24, 0, '0000-00-00 00:00:00', 0, 0, 'class:redirect', 0, '', 29, 30, 0, '*', 1), +(17, 'main', 'com_search', 'Basic Search', '', 'Basic Search', 'index.php?option=com_search', 'component', 1, 1, 1, 19, 0, '0000-00-00 00:00:00', 0, 0, 'class:search', 0, '', 31, 32, 0, '*', 1), +(18, 'main', 'com_finder', 'Smart Search', '', 'Smart Search', 'index.php?option=com_finder', 'component', 1, 1, 1, 27, 0, '0000-00-00 00:00:00', 0, 0, 'class:finder', 0, '', 33, 34, 0, '*', 1), +(19, 'main', 'com_joomlaupdate', 'Joomla! Update', '', 'Joomla! Update', 'index.php?option=com_joomlaupdate', 'component', 1, 1, 1, 28, 0, '0000-00-00 00:00:00', 0, 0, 'class:joomlaupdate', 0, '', 35, 36, 0, '*', 1), +(20, 'main', 'com_tags', 'Tags', '', 'Tags', 'index.php?option=com_tags', 'component', 1, 1, 1, 29, 0, '0000-00-00 00:00:00', 0, 1, 'class:tags', 0, '', 37, 38, 0, '', 1), +(21, 'main', 'com_postinstall', 'Post-installation messages', '', 'Post-installation messages', 'index.php?option=com_postinstall', 'component', 1, 1, 1, 32, 0, '0000-00-00 00:00:00', 0, 1, 'class:postinstall', 0, '', 39, 40, 0, '*', 1), +(22, 'main', 'com_associations', 'Multilingual Associations', '', 'Multilingual Associations', 'index.php?option=com_associations', 'component', 1, 1, 1, 34, 0, '0000-00-00 00:00:00', 0, 0, 'class:associations', 0, '', 41, 42, 0, '*', 1), +(101, 'mainmenu', 'Home', 'home', '', 'home', 'index.php?option=com_content&view=featured', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"featured_categories":[""],"layout_type":"blog","num_leading_articles":"1","num_intro_articles":"3","num_columns":"3","num_links":"0","multi_column_order":"1","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"2","show_pagination_results":"1","show_title":"","link_titles":"","show_intro":"","info_block_position":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_readmore":"","show_readmore_title":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_noauth":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":1,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 43, 44, 1, '*', 0); -- -------------------------------------------------------- @@ -1415,6 +1417,7 @@ CREATE TABLE IF NOT EXISTS `#__menu_types` ( `menutype` varchar(24) NOT NULL, `title` varchar(48) NOT NULL, `description` varchar(255) NOT NULL DEFAULT '', + `client_id` int(11) NOT NULL DEFAULT '0', PRIMARY KEY (`id`), UNIQUE KEY `idx_menutype` (`menutype`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci; @@ -1423,8 +1426,8 @@ CREATE TABLE IF NOT EXISTS `#__menu_types` ( -- Dumping data for table `#__menu_types` -- -INSERT INTO `#__menu_types` (`id`, `menutype`, `title`, `description`) VALUES -(1, 'mainmenu', 'Main Menu', 'The main menu for the site'); +INSERT INTO `#__menu_types` (`id`, `menutype`, `title`, `description` , `client_id`) VALUES +(1, 'mainmenu', 'Main Menu', 'The main menu for the site', 0); -- -------------------------------------------------------- diff --git a/installation/sql/postgresql/joomla.sql b/installation/sql/postgresql/joomla.sql index 971720b2d3ce5..d2684caf3ece2 100644 --- a/installation/sql/postgresql/joomla.sql +++ b/installation/sql/postgresql/joomla.sql @@ -504,7 +504,8 @@ INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder" (30, 'com_contenthistory', 'component', 'com_contenthistory', '', 1, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0), (31, 'com_ajax', 'component', 'com_ajax', '', 1, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0), (32, 'com_postinstall', 'component', 'com_postinstall', '', 1, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0), -(33, 'com_fields', 'component', 'com_fields', '', 1, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0); +(33, 'com_fields', 'component', 'com_fields', '', 1, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0), +(34, 'com_associations', 'component', 'com_associations', '', 1, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0); -- Libraries INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES @@ -1327,26 +1328,27 @@ COMMENT ON COLUMN "#__menu"."home" IS 'Indicates if this menu item is the home o -- INSERT INTO "#__menu" ("id", "menutype", "title", "alias", "note", "path", "link", "type", "published", "parent_id", "level", "component_id", "checked_out", "checked_out_time", "browserNav", "access", "img", "template_style_id", "params", "lft", "rgt", "home", "language", "client_id") VALUES (1, '', 'Menu_Item_Root', 'root', '', '', '', '', 1, 0, 0, 0, 0, '1970-01-01 00:00:00', 0, 0, '', 0, '', 0, 43, 0, '*', 0), -(2, 'menu', 'com_banners', 'Banners', '', 'Banners', 'index.php?option=com_banners', 'component', 0, 1, 1, 4, 0, '1970-01-01 00:00:00', 0, 0, 'class:banners', 0, '', 1, 10, 0, '*', 1), -(3, 'menu', 'com_banners', 'Banners', '', 'Banners/Banners', 'index.php?option=com_banners', 'component', 0, 2, 2, 4, 0, '1970-01-01 00:00:00', 0, 0, 'class:banners', 0, '', 2, 3, 0, '*', 1), -(4, 'menu', 'com_banners_categories', 'Categories', '', 'Banners/Categories', 'index.php?option=com_categories&extension=com_banners', 'component', 0, 2, 2, 6, 0, '1970-01-01 00:00:00', 0, 0, 'class:banners-cat', 0, '', 4, 5, 0, '*', 1), -(5, 'menu', 'com_banners_clients', 'Clients', '', 'Banners/Clients', 'index.php?option=com_banners&view=clients', 'component', 0, 2, 2, 4, 0, '1970-01-01 00:00:00', 0, 0, 'class:banners-clients', 0, '', 6, 7, 0, '*', 1), -(6, 'menu', 'com_banners_tracks', 'Tracks', '', 'Banners/Tracks', 'index.php?option=com_banners&view=tracks', 'component', 0, 2, 2, 4, 0, '1970-01-01 00:00:00', 0, 0, 'class:banners-tracks', 0, '', 8, 9, 0, '*', 1), -(7, 'menu', 'com_contact', 'Contacts', '', 'Contacts', 'index.php?option=com_contact', 'component', 0, 1, 1, 8, 0, '1970-01-01 00:00:00', 0, 0, 'class:contact', 0, '', 11, 16, 0, '*', 1), -(8, 'menu', 'com_contact_contacts', 'Contacts', '', 'Contacts/Contacts', 'index.php?option=com_contact', 'component', 0, 7, 2, 8, 0, '1970-01-01 00:00:00', 0, 0, 'class:contact', 0, '', 12, 13, 0, '*', 1), -(9, 'menu', 'com_contact_categories', 'Categories', '', 'Contacts/Categories', 'index.php?option=com_categories&extension=com_contact', 'component', 0, 7, 2, 6, 0, '1970-01-01 00:00:00', 0, 0, 'class:contact-cat', 0, '', 14, 15, 0, '*', 1), -(10, 'menu', 'com_messages', 'Messaging', '', 'Messaging', 'index.php?option=com_messages', 'component', 0, 1, 1, 15, 0, '1970-01-01 00:00:00', 0, 0, 'class:messages', 0, '', 17, 22, 0, '*', 1), -(11, 'menu', 'com_messages_add', 'New Private Message', '', 'Messaging/New Private Message', 'index.php?option=com_messages&task=message.add', 'component', 0, 10, 2, 15, 0, '1970-01-01 00:00:00', 0, 0, 'class:messages-add', 0, '', 18, 19, 0, '*', 1), -(13, 'menu', 'com_newsfeeds', 'News Feeds', '', 'News Feeds', 'index.php?option=com_newsfeeds', 'component', 0, 1, 1, 17, 0, '1970-01-01 00:00:00', 0, 0, 'class:newsfeeds', 0, '', 23, 28, 0, '*', 1), -(14, 'menu', 'com_newsfeeds_feeds', 'Feeds', '', 'News Feeds/Feeds', 'index.php?option=com_newsfeeds', 'component', 0, 13, 2, 17, 0, '1970-01-01 00:00:00', 0, 0, 'class:newsfeeds', 0, '', 24, 25, 0, '*', 1), -(15, 'menu', 'com_newsfeeds_categories', 'Categories', '', 'News Feeds/Categories', 'index.php?option=com_categories&extension=com_newsfeeds', 'component', 0, 13, 2, 6, 0, '1970-01-01 00:00:00', 0, 0, 'class:newsfeeds-cat', 0, '', 26, 27, 0, '*', 1), -(16, 'menu', 'com_redirect', 'Redirect', '', 'Redirect', 'index.php?option=com_redirect', 'component', 0, 1, 1, 24, 0, '1970-01-01 00:00:00', 0, 0, 'class:redirect', 0, '', 29, 30, 0, '*', 1), -(17, 'menu', 'com_search', 'Basic Search', '', 'Basic Search', 'index.php?option=com_search', 'component', 0, 1, 1, 19, 0, '1970-01-01 00:00:00', 0, 0, 'class:search', 0, '', 31, 32, 0, '*', 1), -(18, 'menu', 'com_finder', 'Smart Search', '', 'Smart Search', 'index.php?option=com_finder', 'component', 0, 1, 1, 27, 0, '1970-01-01 00:00:00', 0, 0, 'class:finder', 0, '', 33, 34, 0, '*', 1), -(19, 'menu', 'com_joomlaupdate', 'Joomla! Update', '', 'Joomla! Update', 'index.php?option=com_joomlaupdate', 'component', 1, 1, 1, 28, 0, '1970-01-01 00:00:00', 0, 0, 'class:joomlaupdate', 0, '', 35, 36, 0, '*', 1), -(20, 'main', 'com_tags', 'Tags', '', 'Tags', 'index.php?option=com_tags', 'component', 0, 1, 1, 29, 0, '1970-01-01 00:00:00', 0, 1, 'class:tags', 0, '', 37, 38, 0, '', 1), -(21, 'main', 'com_postinstall', 'Post-installation messages', '', 'Post-installation messages', 'index.php?option=com_postinstall', 'component', 0, 1, 1, 32, 0, '1970-01-01 00:00:00', 0, 1, 'class:postinstall', 0, '', 39, 40, 0, '*', 1), -(101, 'mainmenu', 'Home', 'home', '', 'home', 'index.php?option=com_content&view=featured', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"featured_categories":[""],"layout_type":"blog","num_leading_articles":"1","num_intro_articles":"3","num_columns":"3","num_links":"0","multi_column_order":"1","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"2","show_pagination_results":"1","show_title":"","link_titles":"","show_intro":"","info_block_position":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_readmore":"","show_readmore_title":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_noauth":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":1,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 41, 42, 1, '*', 0); +(2, 'main', 'com_banners', 'Banners', '', 'Banners', 'index.php?option=com_banners', 'component', 1, 1, 1, 4, 0, '1970-01-01 00:00:00', 0, 0, 'class:banners', 0, '', 1, 10, 0, '*', 1), +(3, 'main', 'com_banners', 'Banners', '', 'Banners/Banners', 'index.php?option=com_banners', 'component', 1, 2, 2, 4, 0, '1970-01-01 00:00:00', 0, 0, 'class:banners', 0, '', 2, 3, 0, '*', 1), +(4, 'main', 'com_banners_categories', 'Categories', '', 'Banners/Categories', 'index.php?option=com_categories&extension=com_banners', 'component', 1, 2, 2, 6, 0, '1970-01-01 00:00:00', 0, 0, 'class:banners-cat', 0, '', 4, 5, 0, '*', 1), +(5, 'main', 'com_banners_clients', 'Clients', '', 'Banners/Clients', 'index.php?option=com_banners&view=clients', 'component', 1, 2, 2, 4, 0, '1970-01-01 00:00:00', 0, 0, 'class:banners-clients', 0, '', 6, 7, 0, '*', 1), +(6, 'main', 'com_banners_tracks', 'Tracks', '', 'Banners/Tracks', 'index.php?option=com_banners&view=tracks', 'component', 1, 2, 2, 4, 0, '1970-01-01 00:00:00', 0, 0, 'class:banners-tracks', 0, '', 8, 9, 0, '*', 1), +(7, 'main', 'com_contact', 'Contacts', '', 'Contacts', 'index.php?option=com_contact', 'component', 1, 1, 1, 8, 0, '1970-01-01 00:00:00', 0, 0, 'class:contact', 0, '', 11, 16, 0, '*', 1), +(8, 'main', 'com_contact_contacts', 'Contacts', '', 'Contacts/Contacts', 'index.php?option=com_contact', 'component', 1, 7, 2, 8, 0, '1970-01-01 00:00:00', 0, 0, 'class:contact', 0, '', 12, 13, 0, '*', 1), +(9, 'main', 'com_contact_categories', 'Categories', '', 'Contacts/Categories', 'index.php?option=com_categories&extension=com_contact', 'component', 1, 7, 2, 6, 0, '1970-01-01 00:00:00', 0, 0, 'class:contact-cat', 0, '', 14, 15, 0, '*', 1), +(10, 'main', 'com_messages', 'Messaging', '', 'Messaging', 'index.php?option=com_messages', 'component', 1, 1, 1, 15, 0, '1970-01-01 00:00:00', 0, 0, 'class:messages', 0, '', 17, 22, 0, '*', 1), +(11, 'main', 'com_messages_add', 'New Private Message', '', 'Messaging/New Private Message', 'index.php?option=com_messages&task=message.add', 'component', 1, 10, 2, 15, 0, '1970-01-01 00:00:00', 0, 0, 'class:messages-add', 0, '', 18, 19, 0, '*', 1), +(13, 'main', 'com_newsfeeds', 'News Feeds', '', 'News Feeds', 'index.php?option=com_newsfeeds', 'component', 1, 1, 1, 17, 0, '1970-01-01 00:00:00', 0, 0, 'class:newsfeeds', 0, '', 23, 28, 0, '*', 1), +(14, 'main', 'com_newsfeeds_feeds', 'Feeds', '', 'News Feeds/Feeds', 'index.php?option=com_newsfeeds', 'component', 1, 13, 2, 17, 0, '1970-01-01 00:00:00', 0, 0, 'class:newsfeeds', 0, '', 24, 25, 0, '*', 1), +(15, 'main', 'com_newsfeeds_categories', 'Categories', '', 'News Feeds/Categories', 'index.php?option=com_categories&extension=com_newsfeeds', 'component', 1, 13, 2, 6, 0, '1970-01-01 00:00:00', 0, 0, 'class:newsfeeds-cat', 0, '', 26, 27, 0, '*', 1), +(16, 'main', 'com_redirect', 'Redirect', '', 'Redirect', 'index.php?option=com_redirect', 'component', 1, 1, 1, 24, 0, '1970-01-01 00:00:00', 0, 0, 'class:redirect', 0, '', 29, 30, 0, '*', 1), +(17, 'main', 'com_search', 'Basic Search', '', 'Basic Search', 'index.php?option=com_search', 'component', 1, 1, 1, 19, 0, '1970-01-01 00:00:00', 0, 0, 'class:search', 0, '', 31, 32, 0, '*', 1), +(18, 'main', 'com_finder', 'Smart Search', '', 'Smart Search', 'index.php?option=com_finder', 'component', 1, 1, 1, 27, 0, '1970-01-01 00:00:00', 0, 0, 'class:finder', 0, '', 33, 34, 0, '*', 1), +(19, 'main', 'com_joomlaupdate', 'Joomla! Update', '', 'Joomla! Update', 'index.php?option=com_joomlaupdate', 'component', 1, 1, 1, 28, 0, '1970-01-01 00:00:00', 0, 0, 'class:joomlaupdate', 0, '', 35, 36, 0, '*', 1), +(20, 'main', 'com_tags', 'Tags', '', 'Tags', 'index.php?option=com_tags', 'component', 1, 1, 1, 29, 0, '1970-01-01 00:00:00', 0, 1, 'class:tags', 0, '', 37, 38, 0, '', 1), +(21, 'main', 'com_postinstall', 'Post-installation messages', '', 'Post-installation messages', 'index.php?option=com_postinstall', 'component', 1, 1, 1, 32, 0, '1970-01-01 00:00:00', 0, 1, 'class:postinstall', 0, '', 39, 40, 0, '*', 1), +(22, 'main', 'com_associations', 'Multilingual Associations', '', 'Multilingual Associations', 'index.php?option=com_associations', 'component', 1, 1, 1, 34, 0, '1970-01-01 00:00:00', 0, 0, 'class:associations', 0, '', 41, 42, 0, '*', 1), +(101, 'mainmenu', 'Home', 'home', '', 'home', 'index.php?option=com_content&view=featured', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"featured_categories":[""],"layout_type":"blog","num_leading_articles":"1","num_intro_articles":"3","num_columns":"3","num_links":"0","multi_column_order":"1","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"2","show_pagination_results":"1","show_title":"","link_titles":"","show_intro":"","info_block_position":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_readmore":"","show_readmore_title":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_noauth":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":1,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 43, 44, 1, '*', 0); SELECT setval('#__menu_id_seq', 102, false); @@ -1359,6 +1361,7 @@ CREATE TABLE "#__menu_types" ( "menutype" varchar(24) NOT NULL, "title" varchar(48) NOT NULL, "description" varchar(255) DEFAULT '' NOT NULL, + "client_id" int DEFAULT 0 NOT NULL, PRIMARY KEY ("id"), CONSTRAINT "#__menu_types_idx_menutype" UNIQUE ("menutype") ); @@ -1366,8 +1369,8 @@ CREATE TABLE "#__menu_types" ( -- -- Dumping data for table #__menu_types -- -INSERT INTO "#__menu_types" ("id", "menutype", "title", "description") VALUES -(1, 'mainmenu', 'Main Menu', 'The main menu for the site'); +INSERT INTO "#__menu_types" ("id", "menutype", "title", "description", "client_id") VALUES +(1, 'mainmenu', 'Main Menu', 'The main menu for the site', 0); SELECT setval('#__menu_types_id_seq', 2, false); diff --git a/installation/sql/sqlazure/joomla.sql b/installation/sql/sqlazure/joomla.sql index 79c7246e3681d..4dfb93b0d7a6d 100644 --- a/installation/sql/sqlazure/joomla.sql +++ b/installation/sql/sqlazure/joomla.sql @@ -805,7 +805,9 @@ SELECT 31, 'com_ajax', 'component', 'com_ajax', '', 1, 1, 1, 1, '', '', '', '', UNION ALL SELECT 32, 'com_postinstall', 'component', 'com_postinstall', '', 1, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0 UNION ALL -SELECT 33, 'com_fields', 'component', 'com_fields', '', 1, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0; +SELECT 33, 'com_fields', 'component', 'com_fields', '', 1, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0 +UNION ALL +SELECT 34, 'com_associations', 'component', 'com_associations', '', 1, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0; -- Libraries INSERT INTO [#__extensions] ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state]) @@ -2260,47 +2262,49 @@ CREATE NONCLUSTERED INDEX [idx_img] ON [#__menu] SET IDENTITY_INSERT [#__menu] ON; INSERT INTO [#__menu] ([id], [menutype], [title], [alias], [note], [path], [link], [type], [published], [parent_id], [level], [component_id], [checked_out], [checked_out_time], [browserNav], [access], [img], [template_style_id], [params], [lft], [rgt], [home], [language], [client_id]) -SELECT 1, '', 'Menu_Item_Root', 'root', '', '', '', '', 1, 0, 0, 0, 0, '1900-01-01 00:00:00', 0, 0, '', 0, '', 0, 43, 0, '*', 0 +SELECT 1, '', 'Menu_Item_Root', 'root', '', '', '', '', 1, 0, 0, 0, 0, '1900-01-01 00:00:00', 0, 0, '', 0, '', 0, 45, 0, '*', 0 +UNION ALL +SELECT 2, 'main', 'com_banners', 'Banners', '', 'Banners', 'index.php?option=com_banners', 'component', 1, 1, 1, 4, 0, '1900-01-01 00:00:00', 0, 0, 'class:banners', 0, '', 1, 10, 0, '*', 1 UNION ALL -SELECT 2, 'menu', 'com_banners', 'Banners', '', 'Banners', 'index.php?option=com_banners', 'component', 0, 1, 1, 4, 0, '1900-01-01 00:00:00', 0, 0, 'class:banners', 0, '', 1, 10, 0, '*', 1 +SELECT 3, 'main', 'com_banners', 'Banners', '', 'Banners/Banners', 'index.php?option=com_banners', 'component', 1, 2, 2, 4, 0, '1900-01-01 00:00:00', 0, 0, 'class:banners', 0, '', 2, 3, 0, '*', 1 UNION ALL -SELECT 3, 'menu', 'com_banners', 'Banners', '', 'Banners/Banners', 'index.php?option=com_banners', 'component', 0, 2, 2, 4, 0, '1900-01-01 00:00:00', 0, 0, 'class:banners', 0, '', 2, 3, 0, '*', 1 +SELECT 4, 'main', 'com_banners_categories', 'Categories', '', 'Banners/Categories', 'index.php?option=com_categories&extension=com_banners', 'component', 1, 2, 2, 6, 0, '1900-01-01 00:00:00', 0, 0, 'class:banners-cat', 0, '', 4, 5, 0, '*', 1 UNION ALL -SELECT 4, 'menu', 'com_banners_categories', 'Categories', '', 'Banners/Categories', 'index.php?option=com_categories&extension=com_banners', 'component', 0, 2, 2, 6, 0, '1900-01-01 00:00:00', 0, 0, 'class:banners-cat', 0, '', 4, 5, 0, '*', 1 +SELECT 5, 'main', 'com_banners_clients', 'Clients', '', 'Banners/Clients', 'index.php?option=com_banners&view=clients', 'component', 1, 2, 2, 4, 0, '1900-01-01 00:00:00', 0, 0, 'class:banners-clients', 0, '', 6, 7, 0, '*', 1 UNION ALL -SELECT 5, 'menu', 'com_banners_clients', 'Clients', '', 'Banners/Clients', 'index.php?option=com_banners&view=clients', 'component', 0, 2, 2, 4, 0, '1900-01-01 00:00:00', 0, 0, 'class:banners-clients', 0, '', 6, 7, 0, '*', 1 +SELECT 6, 'main', 'com_banners_tracks', 'Tracks', '', 'Banners/Tracks', 'index.php?option=com_banners&view=tracks', 'component', 1, 2, 2, 4, 0, '1900-01-01 00:00:00', 0, 0, 'class:banners-tracks', 0, '', 8, 9, 0, '*', 1 UNION ALL -SELECT 6, 'menu', 'com_banners_tracks', 'Tracks', '', 'Banners/Tracks', 'index.php?option=com_banners&view=tracks', 'component', 0, 2, 2, 4, 0, '1900-01-01 00:00:00', 0, 0, 'class:banners-tracks', 0, '', 8, 9, 0, '*', 1 +SELECT 7, 'main', 'com_contact', 'Contacts', '', 'Contacts', 'index.php?option=com_contact', 'component', 1, 1, 1, 8, 0, '1900-01-01 00:00:00', 0, 0, 'class:contact', 0, '', 11, 16, 0, '*', 1 UNION ALL -SELECT 7, 'menu', 'com_contact', 'Contacts', '', 'Contacts', 'index.php?option=com_contact', 'component', 0, 1, 1, 8, 0, '1900-01-01 00:00:00', 0, 0, 'class:contact', 0, '', 11, 16, 0, '*', 1 +SELECT 8, 'main', 'com_contact_contacts', 'Contacts', '', 'Contacts/Contacts', 'index.php?option=com_contact', 'component', 1, 7, 2, 8, 0, '1900-01-01 00:00:00', 0, 0, 'class:contact', 0, '', 12, 13, 0, '*', 1 UNION ALL -SELECT 8, 'menu', 'com_contact_contacts', 'Contacts', '', 'Contacts/Contacts', 'index.php?option=com_contact', 'component', 0, 7, 2, 8, 0, '1900-01-01 00:00:00', 0, 0, 'class:contact', 0, '', 12, 13, 0, '*', 1 +SELECT 9, 'main', 'com_contact_categories', 'Categories', '', 'Contacts/Categories', 'index.php?option=com_categories&extension=com_contact', 'component', 1, 7, 2, 6, 0, '1900-01-01 00:00:00', 0, 0, 'class:contact-cat', 0, '', 14, 15, 0, '*', 1 UNION ALL -SELECT 9, 'menu', 'com_contact_categories', 'Categories', '', 'Contacts/Categories', 'index.php?option=com_categories&extension=com_contact', 'component', 0, 7, 2, 6, 0, '1900-01-01 00:00:00', 0, 0, 'class:contact-cat', 0, '', 14, 15, 0, '*', 1 +SELECT 10, 'main', 'com_messages', 'Messaging', '', 'Messaging', 'index.php?option=com_messages', 'component', 1, 1, 1, 15, 0, '1900-01-01 00:00:00', 0, 0, 'class:messages', 0, '', 17, 22, 0, '*', 1 UNION ALL -SELECT 10, 'menu', 'com_messages', 'Messaging', '', 'Messaging', 'index.php?option=com_messages', 'component', 0, 1, 1, 15, 0, '1900-01-01 00:00:00', 0, 0, 'class:messages', 0, '', 17, 22, 0, '*', 1 +SELECT 11, 'main', 'com_messages_add', 'New Private Message', '', 'Messaging/New Private Message', 'index.php?option=com_messages&task=message.add', 'component', 1, 10, 2, 15, 0, '1900-01-01 00:00:00', 0, 0, 'class:messages-add', 0, '', 18, 19, 0, '*', 1 UNION ALL -SELECT 11, 'menu', 'com_messages_add', 'New Private Message', '', 'Messaging/New Private Message', 'index.php?option=com_messages&task=message.add', 'component', 0, 10, 2, 15, 0, '1900-01-01 00:00:00', 0, 0, 'class:messages-add', 0, '', 18, 19, 0, '*', 1 +SELECT 13, 'main', 'com_newsfeeds', 'News Feeds', '', 'News Feeds', 'index.php?option=com_newsfeeds', 'component', 1, 1, 1, 17, 0, '1900-01-01 00:00:00', 0, 0, 'class:newsfeeds', 0, '', 23, 28, 0, '*', 1 UNION ALL -SELECT 13, 'menu', 'com_newsfeeds', 'News Feeds', '', 'News Feeds', 'index.php?option=com_newsfeeds', 'component', 0, 1, 1, 17, 0, '1900-01-01 00:00:00', 0, 0, 'class:newsfeeds', 0, '', 23, 28, 0, '*', 1 +SELECT 14, 'main', 'com_newsfeeds_feeds', 'Feeds', '', 'News Feeds/Feeds', 'index.php?option=com_newsfeeds', 'component', 1, 13, 2, 17, 0, '1900-01-01 00:00:00', 0, 0, 'class:newsfeeds', 0, '', 24, 25, 0, '*', 1 UNION ALL -SELECT 14, 'menu', 'com_newsfeeds_feeds', 'Feeds', '', 'News Feeds/Feeds', 'index.php?option=com_newsfeeds', 'component', 0, 13, 2, 17, 0, '1900-01-01 00:00:00', 0, 0, 'class:newsfeeds', 0, '', 24, 25, 0, '*', 1 +SELECT 15, 'main', 'com_newsfeeds_categories', 'Categories', '', 'News Feeds/Categories', 'index.php?option=com_categories&extension=com_newsfeeds', 'component', 1, 13, 2, 6, 0, '1900-01-01 00:00:00', 0, 0, 'class:newsfeeds-cat', 0, '', 26, 27, 0, '*', 1 UNION ALL -SELECT 15, 'menu', 'com_newsfeeds_categories', 'Categories', '', 'News Feeds/Categories', 'index.php?option=com_categories&extension=com_newsfeeds', 'component', 0, 13, 2, 6, 0, '1900-01-01 00:00:00', 0, 0, 'class:newsfeeds-cat', 0, '', 26, 27, 0, '*', 1 +SELECT 16, 'main', 'com_redirect', 'Redirect', '', 'Redirect', 'index.php?option=com_redirect', 'component', 1, 1, 1, 24, 0, '1900-01-01 00:00:00', 0, 0, 'class:redirect', 0, '', 29, 30, 0, '*', 1 UNION ALL -SELECT 16, 'menu', 'com_redirect', 'Redirect', '', 'Redirect', 'index.php?option=com_redirect', 'component', 0, 1, 1, 24, 0, '1900-01-01 00:00:00', 0, 0, 'class:redirect', 0, '', 29, 30, 0, '*', 1 +SELECT 17, 'main', 'com_search', 'Basic Search', '', 'Basic Search', 'index.php?option=com_search', 'component', 1, 1, 1, 19, 0, '1900-01-01 00:00:00', 0, 0, 'class:search', 0, '', 31, 32, 0, '*', 1 UNION ALL -SELECT 17, 'menu', 'com_search', 'Basic Search', '', 'Basic Search', 'index.php?option=com_search', 'component', 0, 1, 1, 19, 0, '1900-01-01 00:00:00', 0, 0, 'class:search', 0, '', 31, 32, 0, '*', 1 +SELECT 18, 'main', 'com_finder', 'Smart Search', '', 'Smart Search', 'index.php?option=com_finder', 'component', 1, 1, 1, 27, 0, '1900-01-01 00:00:00', 0, 0, 'class:finder', 0, '', 33, 34, 0, '*', 1 UNION ALL -SELECT 18, 'menu', 'com_finder', 'Smart Search', '', 'Smart Search', 'index.php?option=com_finder', 'component', 0, 1, 1, 27, 0, '1900-01-01 00:00:00', 0, 0, 'class:finder', 0, '', 33, 34, 0, '*', 1 +SELECT 19, 'main', 'com_joomlaupdate', 'Joomla! Update', '', 'Joomla! Update', 'index.php?option=com_joomlaupdate', 'component', 1, 1, 1, 28, 0, '1900-01-01 00:00:00', 0, 0, 'class:joomlaupdate', 0, '', 35, 36, 0, '*', 1 UNION ALL -SELECT 19, 'menu', 'com_joomlaupdate', 'Joomla! Update', '', 'Joomla! Update', 'index.php?option=com_joomlaupdate', 'component', 1, 1, 1, 28, 0, '1900-01-01 00:00:00', 0, 0, 'class:joomlaupdate', 0, '', 35, 36, 0, '*', 1 +SELECT 20, 'main', 'com_tags', 'Tags', '', 'Tags', 'index.php?option=com_tags', 'component', 1, 1, 1, 29, 0, '1900-01-01 00:00:00', 0, 1, 'class:tags', 0, '', 37, 38, 0, '*', 1 UNION ALL -SELECT 20, 'menu', 'com_tags', 'Tags', '', 'Tags', 'index.php?option=com_tags', 'component', 0, 1, 1, 29, 0, '1900-01-01 00:00:00', 0, 1, 'class:tags', 0, '', 37, 38, 0, '*', 1 +SELECT 21, 'main', 'com_postinstall', 'Post-installation messages', '', 'Post-installation messages', 'index.php?option=com_postinstall', 'component', 1, 1, 1, 32, 0, '1900-01-01 00:00:00', 0, 1, 'class:postinstall', 0, '', 39, 40, 0, '*', 1 UNION ALL -SELECT 21, 'menu', 'com_postinstall', 'Post-installation messages', '', 'Post-installation messages', 'index.php?option=com_postinstall', 'component', 0, 1, 1, 32, 0, '1900-01-01 00:00:00', 0, 1, 'class:postinstall', 0, '', 39, 40, 0, '*', 1 +SELECT 22, 'main', 'com_associations', 'Multilingual Associations', '', 'Multilingual Associations', 'index.php?option=com_associations', 'component', 1, 1, 1, 34, 0, '1900-01-01 00:00:00', 0, 0, 'class:associations', 0, '', 41, 42, 0, '*', 1 UNION ALL -SELECT 101, 'mainmenu', 'Home', 'home', '', 'home', 'index.php?option=com_content&view=featured', 'component', 1, 1, 1, 22, 0, '1900-01-01 00:00:00', 0, 1, '', 0, '{"featured_categories":[""],"layout_type":"blog","num_leading_articles":"1","num_intro_articles":"3","num_columns":"3","num_links":"0","multi_column_order":"1","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"2","show_pagination_results":"1","show_title":"","link_titles":"","show_intro":"","info_block_position":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_readmore":"","show_readmore_title":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_noauth":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":1,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 41, 42, 1, '*', 0; +SELECT 101, 'mainmenu', 'Home', 'home', '', 'home', 'index.php?option=com_content&view=featured', 'component', 1, 1, 1, 22, 0, '1900-01-01 00:00:00', 0, 1, '', 0, '{"featured_categories":[""],"layout_type":"blog","num_leading_articles":"1","num_intro_articles":"3","num_columns":"3","num_links":"0","multi_column_order":"1","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"2","show_pagination_results":"1","show_title":"","link_titles":"","show_intro":"","info_block_position":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_readmore":"","show_readmore_title":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_noauth":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":1,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 43, 44, 1, '*', 0; SET IDENTITY_INSERT [#__menu] OFF; @@ -2313,6 +2317,7 @@ CREATE TABLE [#__menu_types]( [menutype] [nvarchar](24) NOT NULL, [title] [nvarchar](48) NOT NULL, [description] [nvarchar](255) NOT NULL DEFAULT '', + [client_id] [tinyint] NOT NULL DEFAULT 0, CONSTRAINT [PK_#__menu_types_id] PRIMARY KEY CLUSTERED ( [id] ASC @@ -2325,8 +2330,8 @@ CREATE TABLE [#__menu_types]( SET IDENTITY_INSERT [#__menu_types] ON; -INSERT INTO [#__menu_types] ([id], [menutype], [title], [description]) -SELECT 1, 'mainmenu', 'Main Menu', 'The main menu for the site'; +INSERT INTO [#__menu_types] ([id], [menutype], [title], [description], [client_id]) +SELECT 1, 'mainmenu', 'Main Menu', 'The main menu for the site', 0; SET IDENTITY_INSERT [#__menu_types] OFF; diff --git a/installation/template/body.php b/installation/template/body.php index 22e431c3ff823..f18080ddeae03 100644 --- a/installation/template/body.php +++ b/installation/template/body.php @@ -2,7 +2,7 @@ /** * @package Joomla.Installation * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/template/css/template.css b/installation/template/css/template.css index 9cf61894586b5..5932b0f4a6e5d 100644 --- a/installation/template/css/template.css +++ b/installation/template/css/template.css @@ -1,7 +1,7 @@ /** * @package Joomla.Installation * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ .container{ diff --git a/installation/template/css/template_rtl.css b/installation/template/css/template_rtl.css index dfdadf4f3bd76..df489e61ef0f4 100644 --- a/installation/template/css/template_rtl.css +++ b/installation/template/css/template_rtl.css @@ -1,7 +1,7 @@ /** * @package Joomla.Installation * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/template/index.php b/installation/template/index.php index 4794834abb262..4ecfbd49ee46c 100644 --- a/installation/template/index.php +++ b/installation/template/index.php @@ -2,7 +2,7 @@ /** * @package Joomla.Installation * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/template/js/installation.js b/installation/template/js/installation.js index a6668e95cc8d0..1b7ac6e619419 100644 --- a/installation/template/js/installation.js +++ b/installation/template/js/installation.js @@ -1,7 +1,7 @@ /** * @package Joomla.Installation * @subpackage JavaScript - * @copyright Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/view/complete/html.php b/installation/view/complete/html.php index ea81e0633aafc..00fd8c2802062 100644 --- a/installation/view/complete/html.php +++ b/installation/view/complete/html.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage View * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/view/complete/tmpl/default.php b/installation/view/complete/tmpl/default.php index 340aa19cdb878..918b4639d1f16 100644 --- a/installation/view/complete/tmpl/default.php +++ b/installation/view/complete/tmpl/default.php @@ -2,7 +2,7 @@ /** * @package Joomla.Installation * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/view/database/tmpl/default.php b/installation/view/database/tmpl/default.php index a24df28906eea..145182ca4c175 100644 --- a/installation/view/database/tmpl/default.php +++ b/installation/view/database/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage View * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/view/default.php b/installation/view/default.php index 648df45bd012f..a5953f95c4a0a 100644 --- a/installation/view/default.php +++ b/installation/view/default.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage View * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/view/defaultlanguage/html.php b/installation/view/defaultlanguage/html.php index 8a1b54bad9d7d..61ebaa65dab38 100644 --- a/installation/view/defaultlanguage/html.php +++ b/installation/view/defaultlanguage/html.php @@ -4,7 +4,7 @@ * @package Joomla.Installation * @subpackage View * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/view/defaultlanguage/tmpl/default.php b/installation/view/defaultlanguage/tmpl/default.php index 1638dc7a4125a..60797f8912532 100644 --- a/installation/view/defaultlanguage/tmpl/default.php +++ b/installation/view/defaultlanguage/tmpl/default.php @@ -2,7 +2,7 @@ /** * @package Joomla.Installation * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/view/ftp/tmpl/default.php b/installation/view/ftp/tmpl/default.php index 34bfe6bf648e7..f2ec4d83aa1b4 100644 --- a/installation/view/ftp/tmpl/default.php +++ b/installation/view/ftp/tmpl/default.php @@ -2,7 +2,7 @@ /** * @package Joomla.Installation * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/view/install/html.php b/installation/view/install/html.php index e12b42f76dedb..ac0c553cb7a29 100644 --- a/installation/view/install/html.php +++ b/installation/view/install/html.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage View * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/view/install/tmpl/default.php b/installation/view/install/tmpl/default.php index dd185b85699a9..22a1ece938bac 100644 --- a/installation/view/install/tmpl/default.php +++ b/installation/view/install/tmpl/default.php @@ -2,7 +2,7 @@ /** * @package Joomla.Installation * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/view/languages/html.php b/installation/view/languages/html.php index d3242bde8816c..4e5d345fc6af3 100644 --- a/installation/view/languages/html.php +++ b/installation/view/languages/html.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage View * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/view/languages/tmpl/default.php b/installation/view/languages/tmpl/default.php index 85265f64213b6..45aedba9a321e 100644 --- a/installation/view/languages/tmpl/default.php +++ b/installation/view/languages/tmpl/default.php @@ -2,7 +2,7 @@ /** * @package Joomla.Installation * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/view/preinstall/html.php b/installation/view/preinstall/html.php index dd974a495f176..faad53cf8f3c8 100644 --- a/installation/view/preinstall/html.php +++ b/installation/view/preinstall/html.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage View * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/view/preinstall/tmpl/default.php b/installation/view/preinstall/tmpl/default.php index 15c4154d53543..1a8c35695612f 100644 --- a/installation/view/preinstall/tmpl/default.php +++ b/installation/view/preinstall/tmpl/default.php @@ -2,7 +2,7 @@ /** * @package Joomla.Installation * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/view/remove/html.php b/installation/view/remove/html.php index e8d72fcf414f5..7c74441be7747 100644 --- a/installation/view/remove/html.php +++ b/installation/view/remove/html.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage View * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/view/remove/tmpl/default.php b/installation/view/remove/tmpl/default.php index e6df80acf1ade..0b576e46fe8ce 100644 --- a/installation/view/remove/tmpl/default.php +++ b/installation/view/remove/tmpl/default.php @@ -2,7 +2,7 @@ /** * @package Joomla.Installation * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/view/site/tmpl/default.php b/installation/view/site/tmpl/default.php index 45fd3f75c239f..480267ee23aca 100644 --- a/installation/view/site/tmpl/default.php +++ b/installation/view/site/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage View * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/view/summary/html.php b/installation/view/summary/html.php index 6bf9c9bd3b0de..5bb936345acf4 100644 --- a/installation/view/summary/html.php +++ b/installation/view/summary/html.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage View * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/view/summary/tmpl/default.php b/installation/view/summary/tmpl/default.php index 69c2a6e7c4dcb..550599e5344ad 100644 --- a/installation/view/summary/tmpl/default.php +++ b/installation/view/summary/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage View * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/language/en-GB/en-GB.com_ajax.ini b/language/en-GB/en-GB.com_ajax.ini index 59fe55dbff085..e3cdde4f9e971 100644 --- a/language/en-GB/en-GB.com_ajax.ini +++ b/language/en-GB/en-GB.com_ajax.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.com_config.ini b/language/en-GB/en-GB.com_config.ini index 08dd94b00fa81..162db6fa50b8b 100644 --- a/language/en-GB/en-GB.com_config.ini +++ b/language/en-GB/en-GB.com_config.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.com_contact.ini b/language/en-GB/en-GB.com_contact.ini index 8197b5745f4a4..b5b514fcbaa4d 100644 --- a/language/en-GB/en-GB.com_contact.ini +++ b/language/en-GB/en-GB.com_contact.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.com_content.ini b/language/en-GB/en-GB.com_content.ini index 178035d2e54d5..4c52e3b5428d0 100644 --- a/language/en-GB/en-GB.com_content.ini +++ b/language/en-GB/en-GB.com_content.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.com_finder.ini b/language/en-GB/en-GB.com_finder.ini index 3f23cfde5dca9..3f84b6b10036f 100644 --- a/language/en-GB/en-GB.com_finder.ini +++ b/language/en-GB/en-GB.com_finder.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.com_mailto.ini b/language/en-GB/en-GB.com_mailto.ini index 20603adde1eb9..a37acc37e6137 100644 --- a/language/en-GB/en-GB.com_mailto.ini +++ b/language/en-GB/en-GB.com_mailto.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.com_media.ini b/language/en-GB/en-GB.com_media.ini index fcf3f11d7c05e..dfd3508198b2a 100644 --- a/language/en-GB/en-GB.com_media.ini +++ b/language/en-GB/en-GB.com_media.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.com_messages.ini b/language/en-GB/en-GB.com_messages.ini index eaf78644889e7..27c9885e7d215 100644 --- a/language/en-GB/en-GB.com_messages.ini +++ b/language/en-GB/en-GB.com_messages.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.com_newsfeeds.ini b/language/en-GB/en-GB.com_newsfeeds.ini index 705509b2f9c8e..7636aa50d2c85 100644 --- a/language/en-GB/en-GB.com_newsfeeds.ini +++ b/language/en-GB/en-GB.com_newsfeeds.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.com_search.ini b/language/en-GB/en-GB.com_search.ini index fc5ff02e3e097..4c738a0907675 100644 --- a/language/en-GB/en-GB.com_search.ini +++ b/language/en-GB/en-GB.com_search.ini @@ -1,5 +1,5 @@ ; author Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; license GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.com_tags.ini b/language/en-GB/en-GB.com_tags.ini index 3876cb20b8be2..3286736fd9f8c 100644 --- a/language/en-GB/en-GB.com_tags.ini +++ b/language/en-GB/en-GB.com_tags.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.com_users.ini b/language/en-GB/en-GB.com_users.ini index ecd22d3b91415..f3d400ef581e9 100644 --- a/language/en-GB/en-GB.com_users.ini +++ b/language/en-GB/en-GB.com_users.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.com_weblinks.ini b/language/en-GB/en-GB.com_weblinks.ini index 4c91306ccac69..1f7f720df77c8 100644 --- a/language/en-GB/en-GB.com_weblinks.ini +++ b/language/en-GB/en-GB.com_weblinks.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.com_wrapper.ini b/language/en-GB/en-GB.com_wrapper.ini index 1f3de85914bc9..a25903056cc15 100644 --- a/language/en-GB/en-GB.com_wrapper.ini +++ b/language/en-GB/en-GB.com_wrapper.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.files_joomla.sys.ini b/language/en-GB/en-GB.files_joomla.sys.ini index c2aed062d820d..b06c5d1d4802a 100644 --- a/language/en-GB/en-GB.files_joomla.sys.ini +++ b/language/en-GB/en-GB.files_joomla.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.finder_cli.ini b/language/en-GB/en-GB.finder_cli.ini index 308e25613331f..78a7c67cd6690 100644 --- a/language/en-GB/en-GB.finder_cli.ini +++ b/language/en-GB/en-GB.finder_cli.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.ini b/language/en-GB/en-GB.ini index e2a94410756a1..e765b1dbbe0c0 100644 --- a/language/en-GB/en-GB.ini +++ b/language/en-GB/en-GB.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.lib_fof.ini b/language/en-GB/en-GB.lib_fof.ini old mode 100755 new mode 100644 diff --git a/language/en-GB/en-GB.lib_fof.sys.ini b/language/en-GB/en-GB.lib_fof.sys.ini index d7e3a1a8a7b7f..83a6f664f0534 100644 --- a/language/en-GB/en-GB.lib_fof.sys.ini +++ b/language/en-GB/en-GB.lib_fof.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.lib_idna_convert.sys.ini b/language/en-GB/en-GB.lib_idna_convert.sys.ini index cd02e8ba591be..d629badf5b5cb 100644 --- a/language/en-GB/en-GB.lib_idna_convert.sys.ini +++ b/language/en-GB/en-GB.lib_idna_convert.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.lib_joomla.ini b/language/en-GB/en-GB.lib_joomla.ini index a4242348619b3..25163a0cbffbc 100644 --- a/language/en-GB/en-GB.lib_joomla.ini +++ b/language/en-GB/en-GB.lib_joomla.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.lib_joomla.sys.ini b/language/en-GB/en-GB.lib_joomla.sys.ini index 07feae72f54ec..dfb41e85d9d47 100644 --- a/language/en-GB/en-GB.lib_joomla.sys.ini +++ b/language/en-GB/en-GB.lib_joomla.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.lib_phpass.sys.ini b/language/en-GB/en-GB.lib_phpass.sys.ini index 55d5af7a7f27c..5547bdee2b6e8 100644 --- a/language/en-GB/en-GB.lib_phpass.sys.ini +++ b/language/en-GB/en-GB.lib_phpass.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.lib_phputf8.sys.ini b/language/en-GB/en-GB.lib_phputf8.sys.ini index 58e4f5031311f..bb423fbaae249 100644 --- a/language/en-GB/en-GB.lib_phputf8.sys.ini +++ b/language/en-GB/en-GB.lib_phputf8.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.lib_simplepie.sys.ini b/language/en-GB/en-GB.lib_simplepie.sys.ini index e99a5ead9257f..7a405d48c1c03 100644 --- a/language/en-GB/en-GB.lib_simplepie.sys.ini +++ b/language/en-GB/en-GB.lib_simplepie.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.localise.php b/language/en-GB/en-GB.localise.php index 44a7c8cc52c78..6d4e391d3db5f 100644 --- a/language/en-GB/en-GB.localise.php +++ b/language/en-GB/en-GB.localise.php @@ -2,7 +2,7 @@ /** * @package Joomla.Language * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/language/en-GB/en-GB.mod_articles_archive.ini b/language/en-GB/en-GB.mod_articles_archive.ini index 0fa8056e1df2d..779217c61efd3 100644 --- a/language/en-GB/en-GB.mod_articles_archive.ini +++ b/language/en-GB/en-GB.mod_articles_archive.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_articles_archive.sys.ini b/language/en-GB/en-GB.mod_articles_archive.sys.ini index 66d9bb4a785d2..23be5f2e93729 100644 --- a/language/en-GB/en-GB.mod_articles_archive.sys.ini +++ b/language/en-GB/en-GB.mod_articles_archive.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_articles_categories.ini b/language/en-GB/en-GB.mod_articles_categories.ini index b7d026dc15fec..9e8b78e34d084 100644 --- a/language/en-GB/en-GB.mod_articles_categories.ini +++ b/language/en-GB/en-GB.mod_articles_categories.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_articles_categories.sys.ini b/language/en-GB/en-GB.mod_articles_categories.sys.ini index 3103237d14acb..87017e372f7bc 100644 --- a/language/en-GB/en-GB.mod_articles_categories.sys.ini +++ b/language/en-GB/en-GB.mod_articles_categories.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_articles_category.ini b/language/en-GB/en-GB.mod_articles_category.ini index 35d717c65bb15..49c891f0d5e72 100644 --- a/language/en-GB/en-GB.mod_articles_category.ini +++ b/language/en-GB/en-GB.mod_articles_category.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_articles_category.sys.ini b/language/en-GB/en-GB.mod_articles_category.sys.ini index 3d7ca5b4b9b83..380f2c7dcaa4a 100644 --- a/language/en-GB/en-GB.mod_articles_category.sys.ini +++ b/language/en-GB/en-GB.mod_articles_category.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_articles_latest.ini b/language/en-GB/en-GB.mod_articles_latest.ini index ccc39e6665804..9618506752903 100644 --- a/language/en-GB/en-GB.mod_articles_latest.ini +++ b/language/en-GB/en-GB.mod_articles_latest.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_articles_latest.sys.ini b/language/en-GB/en-GB.mod_articles_latest.sys.ini index 2ffddc052afa3..c592aac298c04 100644 --- a/language/en-GB/en-GB.mod_articles_latest.sys.ini +++ b/language/en-GB/en-GB.mod_articles_latest.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_articles_news.ini b/language/en-GB/en-GB.mod_articles_news.ini index 466855e41b523..4cdcd506be3d5 100644 --- a/language/en-GB/en-GB.mod_articles_news.ini +++ b/language/en-GB/en-GB.mod_articles_news.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_articles_news.sys.ini b/language/en-GB/en-GB.mod_articles_news.sys.ini index d101849609b84..028ea3f9e4c0b 100644 --- a/language/en-GB/en-GB.mod_articles_news.sys.ini +++ b/language/en-GB/en-GB.mod_articles_news.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_articles_popular.ini b/language/en-GB/en-GB.mod_articles_popular.ini index 2c6d5affb14c1..b991b0c01690d 100644 --- a/language/en-GB/en-GB.mod_articles_popular.ini +++ b/language/en-GB/en-GB.mod_articles_popular.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_articles_popular.sys.ini b/language/en-GB/en-GB.mod_articles_popular.sys.ini index 23e542cb5d559..604eb50293cf8 100644 --- a/language/en-GB/en-GB.mod_articles_popular.sys.ini +++ b/language/en-GB/en-GB.mod_articles_popular.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_banners.ini b/language/en-GB/en-GB.mod_banners.ini index 6731aff219fc9..3be9267e295ec 100644 --- a/language/en-GB/en-GB.mod_banners.ini +++ b/language/en-GB/en-GB.mod_banners.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_banners.sys.ini b/language/en-GB/en-GB.mod_banners.sys.ini index 6a3037f3e7ec9..db768ad3cc4f5 100644 --- a/language/en-GB/en-GB.mod_banners.sys.ini +++ b/language/en-GB/en-GB.mod_banners.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_breadcrumbs.ini b/language/en-GB/en-GB.mod_breadcrumbs.ini index dac51a3193f6a..dcf556db86add 100644 --- a/language/en-GB/en-GB.mod_breadcrumbs.ini +++ b/language/en-GB/en-GB.mod_breadcrumbs.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_breadcrumbs.sys.ini b/language/en-GB/en-GB.mod_breadcrumbs.sys.ini index 7ef2608cda57f..bd4b4341ce762 100644 --- a/language/en-GB/en-GB.mod_breadcrumbs.sys.ini +++ b/language/en-GB/en-GB.mod_breadcrumbs.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_custom.ini b/language/en-GB/en-GB.mod_custom.ini index ef0ed661d5ffb..4a0e69181619d 100644 --- a/language/en-GB/en-GB.mod_custom.ini +++ b/language/en-GB/en-GB.mod_custom.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_custom.sys.ini b/language/en-GB/en-GB.mod_custom.sys.ini index 8166663b9352a..ee3efa1b329de 100644 --- a/language/en-GB/en-GB.mod_custom.sys.ini +++ b/language/en-GB/en-GB.mod_custom.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_feed.ini b/language/en-GB/en-GB.mod_feed.ini index 87753ffb85e97..448ea4ca6e054 100644 --- a/language/en-GB/en-GB.mod_feed.ini +++ b/language/en-GB/en-GB.mod_feed.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_feed.sys.ini b/language/en-GB/en-GB.mod_feed.sys.ini index 8787cca723610..dddf6358f619a 100644 --- a/language/en-GB/en-GB.mod_feed.sys.ini +++ b/language/en-GB/en-GB.mod_feed.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_finder.ini b/language/en-GB/en-GB.mod_finder.ini index fbcab5eeb4210..85d0d60cdaae2 100644 --- a/language/en-GB/en-GB.mod_finder.ini +++ b/language/en-GB/en-GB.mod_finder.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_finder.sys.ini b/language/en-GB/en-GB.mod_finder.sys.ini index a7a48a00ce4d3..77e1e4081c2ae 100644 --- a/language/en-GB/en-GB.mod_finder.sys.ini +++ b/language/en-GB/en-GB.mod_finder.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_footer.ini b/language/en-GB/en-GB.mod_footer.ini index 0399657c70105..6f148a613221e 100644 --- a/language/en-GB/en-GB.mod_footer.ini +++ b/language/en-GB/en-GB.mod_footer.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 ; Note : %date% will be auto replaced by current year !Don't translate diff --git a/language/en-GB/en-GB.mod_footer.sys.ini b/language/en-GB/en-GB.mod_footer.sys.ini index 0d2dfcf3ff667..f3dfa84a1d3dd 100644 --- a/language/en-GB/en-GB.mod_footer.sys.ini +++ b/language/en-GB/en-GB.mod_footer.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 ; Note : %date% will be auto replaced by current year !Don't translate diff --git a/language/en-GB/en-GB.mod_languages.ini b/language/en-GB/en-GB.mod_languages.ini index 66a2347329393..9dd2ddbc505e2 100644 --- a/language/en-GB/en-GB.mod_languages.ini +++ b/language/en-GB/en-GB.mod_languages.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_languages.sys.ini b/language/en-GB/en-GB.mod_languages.sys.ini index 2484ad2ba6bcb..3bfbee2a8b1d4 100644 --- a/language/en-GB/en-GB.mod_languages.sys.ini +++ b/language/en-GB/en-GB.mod_languages.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_login.ini b/language/en-GB/en-GB.mod_login.ini index 2161e51929018..2bdbcd1389e47 100644 --- a/language/en-GB/en-GB.mod_login.ini +++ b/language/en-GB/en-GB.mod_login.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_login.sys.ini b/language/en-GB/en-GB.mod_login.sys.ini index 745c1baaff3f8..e13b452493eaa 100644 --- a/language/en-GB/en-GB.mod_login.sys.ini +++ b/language/en-GB/en-GB.mod_login.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_menu.ini b/language/en-GB/en-GB.mod_menu.ini index 4d4ab0230ebfd..3d12574e7db88 100644 --- a/language/en-GB/en-GB.mod_menu.ini +++ b/language/en-GB/en-GB.mod_menu.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_menu.sys.ini b/language/en-GB/en-GB.mod_menu.sys.ini index 94bb183c71548..49f0a12e6b79f 100644 --- a/language/en-GB/en-GB.mod_menu.sys.ini +++ b/language/en-GB/en-GB.mod_menu.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_random_image.ini b/language/en-GB/en-GB.mod_random_image.ini index 31779f7be6192..11dc845b28365 100644 --- a/language/en-GB/en-GB.mod_random_image.ini +++ b/language/en-GB/en-GB.mod_random_image.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_random_image.sys.ini b/language/en-GB/en-GB.mod_random_image.sys.ini index e7a1608b0cf77..78c27ed404705 100644 --- a/language/en-GB/en-GB.mod_random_image.sys.ini +++ b/language/en-GB/en-GB.mod_random_image.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_related_items.ini b/language/en-GB/en-GB.mod_related_items.ini index 2c178201c9b8c..9f93253b3ed3f 100644 --- a/language/en-GB/en-GB.mod_related_items.ini +++ b/language/en-GB/en-GB.mod_related_items.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_related_items.sys.ini b/language/en-GB/en-GB.mod_related_items.sys.ini index 9c49a94f8bcca..3812945e1527e 100644 --- a/language/en-GB/en-GB.mod_related_items.sys.ini +++ b/language/en-GB/en-GB.mod_related_items.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_search.ini b/language/en-GB/en-GB.mod_search.ini index 903469ea02392..b3f631c89dc72 100644 --- a/language/en-GB/en-GB.mod_search.ini +++ b/language/en-GB/en-GB.mod_search.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_search.sys.ini b/language/en-GB/en-GB.mod_search.sys.ini index 32a949ec1a2ad..d421e65c494f3 100644 --- a/language/en-GB/en-GB.mod_search.sys.ini +++ b/language/en-GB/en-GB.mod_search.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_stats.ini b/language/en-GB/en-GB.mod_stats.ini index a2f6d8afdd40c..b7c9b8a71f741 100644 --- a/language/en-GB/en-GB.mod_stats.ini +++ b/language/en-GB/en-GB.mod_stats.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_stats.sys.ini b/language/en-GB/en-GB.mod_stats.sys.ini index b8b161085d186..4b73204a30112 100644 --- a/language/en-GB/en-GB.mod_stats.sys.ini +++ b/language/en-GB/en-GB.mod_stats.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_syndicate.ini b/language/en-GB/en-GB.mod_syndicate.ini index 7e75565c20ca3..851f3cd0de579 100644 --- a/language/en-GB/en-GB.mod_syndicate.ini +++ b/language/en-GB/en-GB.mod_syndicate.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_syndicate.sys.ini b/language/en-GB/en-GB.mod_syndicate.sys.ini index a4c23de52d839..1dfd1cf9d9367 100644 --- a/language/en-GB/en-GB.mod_syndicate.sys.ini +++ b/language/en-GB/en-GB.mod_syndicate.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_tags_popular.ini b/language/en-GB/en-GB.mod_tags_popular.ini index a117e30380b66..5768cf8610fea 100644 --- a/language/en-GB/en-GB.mod_tags_popular.ini +++ b/language/en-GB/en-GB.mod_tags_popular.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_tags_popular.sys.ini b/language/en-GB/en-GB.mod_tags_popular.sys.ini index 0cb5653aad460..3b41b4ff729a8 100644 --- a/language/en-GB/en-GB.mod_tags_popular.sys.ini +++ b/language/en-GB/en-GB.mod_tags_popular.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_tags_similar.ini b/language/en-GB/en-GB.mod_tags_similar.ini index 94cf6a3d3cd5c..4c921e4622943 100644 --- a/language/en-GB/en-GB.mod_tags_similar.ini +++ b/language/en-GB/en-GB.mod_tags_similar.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_tags_similar.sys.ini b/language/en-GB/en-GB.mod_tags_similar.sys.ini index 6c2f3c2e53c01..6aa9a858a8934 100644 --- a/language/en-GB/en-GB.mod_tags_similar.sys.ini +++ b/language/en-GB/en-GB.mod_tags_similar.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_users_latest.ini b/language/en-GB/en-GB.mod_users_latest.ini index 4a497cddd6828..7f4fae2629917 100644 --- a/language/en-GB/en-GB.mod_users_latest.ini +++ b/language/en-GB/en-GB.mod_users_latest.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_users_latest.sys.ini b/language/en-GB/en-GB.mod_users_latest.sys.ini index cfdfbc1ead330..f13c9dded38de 100644 --- a/language/en-GB/en-GB.mod_users_latest.sys.ini +++ b/language/en-GB/en-GB.mod_users_latest.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_weblinks.ini b/language/en-GB/en-GB.mod_weblinks.ini index f5b29085ea57e..6749b21dc213f 100644 --- a/language/en-GB/en-GB.mod_weblinks.ini +++ b/language/en-GB/en-GB.mod_weblinks.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_weblinks.sys.ini b/language/en-GB/en-GB.mod_weblinks.sys.ini index a49b5a99ea7ee..1914b06474af5 100644 --- a/language/en-GB/en-GB.mod_weblinks.sys.ini +++ b/language/en-GB/en-GB.mod_weblinks.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_whosonline.ini b/language/en-GB/en-GB.mod_whosonline.ini index 14ae2ca8623bf..ff24344158197 100644 --- a/language/en-GB/en-GB.mod_whosonline.ini +++ b/language/en-GB/en-GB.mod_whosonline.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 MOD_WHOSONLINE="Who's Online" diff --git a/language/en-GB/en-GB.mod_whosonline.sys.ini b/language/en-GB/en-GB.mod_whosonline.sys.ini index c25a45a010342..8e34f78e013a3 100644 --- a/language/en-GB/en-GB.mod_whosonline.sys.ini +++ b/language/en-GB/en-GB.mod_whosonline.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_wrapper.ini b/language/en-GB/en-GB.mod_wrapper.ini index 90adc963020b2..66e32bdbe1ce8 100644 --- a/language/en-GB/en-GB.mod_wrapper.ini +++ b/language/en-GB/en-GB.mod_wrapper.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_wrapper.sys.ini b/language/en-GB/en-GB.mod_wrapper.sys.ini index b0a94a82be32f..4b4ea98af65b8 100644 --- a/language/en-GB/en-GB.mod_wrapper.sys.ini +++ b/language/en-GB/en-GB.mod_wrapper.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.tpl_protostar.ini b/language/en-GB/en-GB.tpl_protostar.ini index 15697fbd53ee6..d10d338618ca9 100644 --- a/language/en-GB/en-GB.tpl_protostar.ini +++ b/language/en-GB/en-GB.tpl_protostar.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.tpl_protostar.sys.ini b/language/en-GB/en-GB.tpl_protostar.sys.ini index 223aae8ef0a5b..3794835115d2b 100644 --- a/language/en-GB/en-GB.tpl_protostar.sys.ini +++ b/language/en-GB/en-GB.tpl_protostar.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.xml b/language/en-GB/en-GB.xml index 419087bfaaeba..354716ab0fa5c 100644 --- a/language/en-GB/en-GB.xml +++ b/language/en-GB/en-GB.xml @@ -6,7 +6,7 @@ Joomla! Project admin@joomla.org www.joomla.org - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml index 1af18136addc3..755b18f438803 100644 --- a/language/en-GB/install.xml +++ b/language/en-GB/install.xml @@ -7,7 +7,7 @@ Joomla! Project admin@joomla.org www.joomla.org - Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt en-GB site language diff --git a/layouts/joomla/content/associations.php b/layouts/joomla/content/associations.php index 578d161317f1d..87c9556337e2e 100644 --- a/layouts/joomla/content/associations.php +++ b/layouts/joomla/content/associations.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -15,7 +15,7 @@
      $item) : ?>
    • - link; ?> + link; ?>
    diff --git a/layouts/joomla/content/blog_style_default_item_title.php b/layouts/joomla/content/blog_style_default_item_title.php index 524f77b078f0b..67fc5bad2e4ce 100644 --- a/layouts/joomla/content/blog_style_default_item_title.php +++ b/layouts/joomla/content/blog_style_default_item_title.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/content/blog_style_default_links.php b/layouts/joomla/content/blog_style_default_links.php index abf7a2c60d63c..9698f54f4689a 100644 --- a/layouts/joomla/content/blog_style_default_links.php +++ b/layouts/joomla/content/blog_style_default_links.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/content/categories_default.php b/layouts/joomla/content/categories_default.php index 00ed399b6b4fd..1a906c9b0cd02 100644 --- a/layouts/joomla/content/categories_default.php +++ b/layouts/joomla/content/categories_default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/content/categories_default_items.php b/layouts/joomla/content/categories_default_items.php index e87c181bad1bf..e0b0b1c2dc1fc 100644 --- a/layouts/joomla/content/categories_default_items.php +++ b/layouts/joomla/content/categories_default_items.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/content/category_default.php b/layouts/joomla/content/category_default.php index 0071df0e34594..a91da2f600478 100644 --- a/layouts/joomla/content/category_default.php +++ b/layouts/joomla/content/category_default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/content/full_image.php b/layouts/joomla/content/full_image.php index 86c6bb14aceed..cdcada29c0a44 100644 --- a/layouts/joomla/content/full_image.php +++ b/layouts/joomla/content/full_image.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/content/icons.php b/layouts/joomla/content/icons.php index 84c4e54ed3be3..61d0a56e90c2d 100644 --- a/layouts/joomla/content/icons.php +++ b/layouts/joomla/content/icons.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/content/icons/create.php b/layouts/joomla/content/icons/create.php index 64ea4b2360bf9..7e5b30dcec96c 100644 --- a/layouts/joomla/content/icons/create.php +++ b/layouts/joomla/content/icons/create.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/content/icons/edit.php b/layouts/joomla/content/icons/edit.php index bff0fd8f25f8a..17b885fc33198 100644 --- a/layouts/joomla/content/icons/edit.php +++ b/layouts/joomla/content/icons/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/content/icons/edit_lock.php b/layouts/joomla/content/icons/edit_lock.php index cb1c08cdc9bd8..ab651d3386581 100644 --- a/layouts/joomla/content/icons/edit_lock.php +++ b/layouts/joomla/content/icons/edit_lock.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/content/icons/email.php b/layouts/joomla/content/icons/email.php index ec3b7358f2697..de5a11c52bd79 100644 --- a/layouts/joomla/content/icons/email.php +++ b/layouts/joomla/content/icons/email.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/content/icons/print_popup.php b/layouts/joomla/content/icons/print_popup.php index fff72b9b3fbf8..b7592348ae7ef 100644 --- a/layouts/joomla/content/icons/print_popup.php +++ b/layouts/joomla/content/icons/print_popup.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/content/icons/print_screen.php b/layouts/joomla/content/icons/print_screen.php index fff72b9b3fbf8..b7592348ae7ef 100644 --- a/layouts/joomla/content/icons/print_screen.php +++ b/layouts/joomla/content/icons/print_screen.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/content/info_block.php b/layouts/joomla/content/info_block.php index a6fe669763f04..6aa3be1be6bfd 100644 --- a/layouts/joomla/content/info_block.php +++ b/layouts/joomla/content/info_block.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/content/info_block/associations.php b/layouts/joomla/content/info_block/associations.php index 37f65bc022518..a34e7f59b56ee 100644 --- a/layouts/joomla/content/info_block/associations.php +++ b/layouts/joomla/content/info_block/associations.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/content/info_block/author.php b/layouts/joomla/content/info_block/author.php index 4e67610078954..e047fbd7785ae 100644 --- a/layouts/joomla/content/info_block/author.php +++ b/layouts/joomla/content/info_block/author.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/content/info_block/block.php b/layouts/joomla/content/info_block/block.php index 538bf038eb10e..bbe8d9f538159 100644 --- a/layouts/joomla/content/info_block/block.php +++ b/layouts/joomla/content/info_block/block.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/content/info_block/category.php b/layouts/joomla/content/info_block/category.php index 222ae4a1ca64c..d54394ed309cc 100644 --- a/layouts/joomla/content/info_block/category.php +++ b/layouts/joomla/content/info_block/category.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/content/info_block/create_date.php b/layouts/joomla/content/info_block/create_date.php index 0d86d0ef0666d..c9307c8681322 100644 --- a/layouts/joomla/content/info_block/create_date.php +++ b/layouts/joomla/content/info_block/create_date.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/content/info_block/hits.php b/layouts/joomla/content/info_block/hits.php index 9f208051ae46a..35b7b99c4eac8 100644 --- a/layouts/joomla/content/info_block/hits.php +++ b/layouts/joomla/content/info_block/hits.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/content/info_block/modify_date.php b/layouts/joomla/content/info_block/modify_date.php index bd3f112d80994..f60876a205ea6 100644 --- a/layouts/joomla/content/info_block/modify_date.php +++ b/layouts/joomla/content/info_block/modify_date.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/content/info_block/parent_category.php b/layouts/joomla/content/info_block/parent_category.php index bb4c95902c0a0..0407c161b8fe4 100644 --- a/layouts/joomla/content/info_block/parent_category.php +++ b/layouts/joomla/content/info_block/parent_category.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/content/info_block/publish_date.php b/layouts/joomla/content/info_block/publish_date.php index 6baf54145313e..9a18d3ef48ca0 100644 --- a/layouts/joomla/content/info_block/publish_date.php +++ b/layouts/joomla/content/info_block/publish_date.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/content/intro_image.php b/layouts/joomla/content/intro_image.php index 77c6460118945..072087425474d 100644 --- a/layouts/joomla/content/intro_image.php +++ b/layouts/joomla/content/intro_image.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/content/language.php b/layouts/joomla/content/language.php index 19aa4528144d8..40c7659d62635 100644 --- a/layouts/joomla/content/language.php +++ b/layouts/joomla/content/language.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/content/options_default.php b/layouts/joomla/content/options_default.php index 7be6c512a9b07..7cada2340d036 100644 --- a/layouts/joomla/content/options_default.php +++ b/layouts/joomla/content/options_default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -30,7 +30,7 @@ { JHtml::_('jquery.framework'); JHtml::_('script', 'jui/cms.js', array('version' => 'auto', 'relative' => true)); - $datashowon = ' data-showon=\'' . json_encode(JFormHelper::parseShowOnConditions($field->formControl, $field->showon)) . '\''; + $datashowon = ' data-showon=\'' . json_encode(JFormHelper::parseShowOnConditions($field->showon, $field->formControl, $field->group)) . '\''; } ?>
    > diff --git a/layouts/joomla/content/readmore.php b/layouts/joomla/content/readmore.php index bacb560045406..0e526041017c9 100644 --- a/layouts/joomla/content/readmore.php +++ b/layouts/joomla/content/readmore.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/content/tags.php b/layouts/joomla/content/tags.php index 8beb1509ddaef..42551e01f0f76 100644 --- a/layouts/joomla/content/tags.php +++ b/layouts/joomla/content/tags.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/edit/associations.php b/layouts/joomla/edit/associations.php index 1428b8e099b10..a79e80ef6b5de 100644 --- a/layouts/joomla/edit/associations.php +++ b/layouts/joomla/edit/associations.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/edit/details.php b/layouts/joomla/edit/details.php index 0d845e3289b75..5992b268d0a2e 100644 --- a/layouts/joomla/edit/details.php +++ b/layouts/joomla/edit/details.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt * * @deprecated 3.2 diff --git a/layouts/joomla/edit/fieldset.php b/layouts/joomla/edit/fieldset.php index fe424cd295c3d..4934d022f97e1 100644 --- a/layouts/joomla/edit/fieldset.php +++ b/layouts/joomla/edit/fieldset.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/edit/frontediting_modules.php b/layouts/joomla/edit/frontediting_modules.php index 13add8f387696..c6a3ee80540ab 100644 --- a/layouts/joomla/edit/frontediting_modules.php +++ b/layouts/joomla/edit/frontediting_modules.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/edit/global.php b/layouts/joomla/edit/global.php index 481dc89052f89..c5fe9dd92a393 100644 --- a/layouts/joomla/edit/global.php +++ b/layouts/joomla/edit/global.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/edit/item_title.php b/layouts/joomla/edit/item_title.php index 748f2d5d85fac..fc0d08029b3d3 100644 --- a/layouts/joomla/edit/item_title.php +++ b/layouts/joomla/edit/item_title.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt * * @deprecated 3.2 diff --git a/layouts/joomla/edit/metadata.php b/layouts/joomla/edit/metadata.php index 67f8fc349dfe3..2def10f460afa 100644 --- a/layouts/joomla/edit/metadata.php +++ b/layouts/joomla/edit/metadata.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/edit/params.php b/layouts/joomla/edit/params.php index 69f6a545b3d57..07baa2e3c55c4 100644 --- a/layouts/joomla/edit/params.php +++ b/layouts/joomla/edit/params.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/edit/publishingdata.php b/layouts/joomla/edit/publishingdata.php index bf1185fab8597..d1b742a9e9c62 100644 --- a/layouts/joomla/edit/publishingdata.php +++ b/layouts/joomla/edit/publishingdata.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/edit/title_alias.php b/layouts/joomla/edit/title_alias.php index f11012aadeaa1..d2ed001bcceb7 100644 --- a/layouts/joomla/edit/title_alias.php +++ b/layouts/joomla/edit/title_alias.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/editors/buttons.php b/layouts/joomla/editors/buttons.php index 330c0cd874c82..9e06e94ce7e71 100644 --- a/layouts/joomla/editors/buttons.php +++ b/layouts/joomla/editors/buttons.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/editors/buttons/button.php b/layouts/joomla/editors/buttons/button.php index a403a08e7ca23..d7627ed1ffc12 100644 --- a/layouts/joomla/editors/buttons/button.php +++ b/layouts/joomla/editors/buttons/button.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/form/field/calendar.php b/layouts/joomla/form/field/calendar.php index 2e688c255b40e..e7bf29193c7c6 100644 --- a/layouts/joomla/form/field/calendar.php +++ b/layouts/joomla/form/field/calendar.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/form/field/checkboxes.php b/layouts/joomla/form/field/checkboxes.php index 6d28d749fd7dd..94d0c05d3c7e7 100644 --- a/layouts/joomla/form/field/checkboxes.php +++ b/layouts/joomla/form/field/checkboxes.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/form/field/color/advanced.php b/layouts/joomla/form/field/color/advanced.php index 2829c9e3b02a0..b49629cc26ded 100644 --- a/layouts/joomla/form/field/color/advanced.php +++ b/layouts/joomla/form/field/color/advanced.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/form/field/color/simple.php b/layouts/joomla/form/field/color/simple.php index ed39833f987eb..6105c5590f3c0 100644 --- a/layouts/joomla/form/field/color/simple.php +++ b/layouts/joomla/form/field/color/simple.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/form/field/contenthistory.php b/layouts/joomla/form/field/contenthistory.php index a6916fd32dd32..e1616ec9c7a29 100644 --- a/layouts/joomla/form/field/contenthistory.php +++ b/layouts/joomla/form/field/contenthistory.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/form/field/email.php b/layouts/joomla/form/field/email.php index c19891c30a54f..fbf3835366fda 100644 --- a/layouts/joomla/form/field/email.php +++ b/layouts/joomla/form/field/email.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/form/field/file.php b/layouts/joomla/form/field/file.php index 69678eff0476e..a83427ca6f659 100644 --- a/layouts/joomla/form/field/file.php +++ b/layouts/joomla/form/field/file.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/form/field/hidden.php b/layouts/joomla/form/field/hidden.php index feaf316ee7af6..12c19014eacc0 100644 --- a/layouts/joomla/form/field/hidden.php +++ b/layouts/joomla/form/field/hidden.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/form/field/media.php b/layouts/joomla/form/field/media.php index 9119fdcc8b063..4338249d1b4c8 100644 --- a/layouts/joomla/form/field/media.php +++ b/layouts/joomla/form/field/media.php @@ -3,7 +3,7 @@ * @package Joomla.Admin * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/form/field/meter.php b/layouts/joomla/form/field/meter.php index 22f54b906fe0b..ce425e07d98ba 100644 --- a/layouts/joomla/form/field/meter.php +++ b/layouts/joomla/form/field/meter.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/form/field/moduleorder.php b/layouts/joomla/form/field/moduleorder.php index ccf105ce984a2..610be1f4fa4ab 100644 --- a/layouts/joomla/form/field/moduleorder.php +++ b/layouts/joomla/form/field/moduleorder.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/form/field/number.php b/layouts/joomla/form/field/number.php index a62303ed94330..286592d62aedf 100644 --- a/layouts/joomla/form/field/number.php +++ b/layouts/joomla/form/field/number.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/form/field/password.php b/layouts/joomla/form/field/password.php index ea108332619a9..59417d5534ef1 100644 --- a/layouts/joomla/form/field/password.php +++ b/layouts/joomla/form/field/password.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/form/field/radio.php b/layouts/joomla/form/field/radio.php index 8b392344bccd6..0e36cad29da13 100644 --- a/layouts/joomla/form/field/radio.php +++ b/layouts/joomla/form/field/radio.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/form/field/range.php b/layouts/joomla/form/field/range.php index cd43d4c2a0b43..9cb7ac8158a47 100644 --- a/layouts/joomla/form/field/range.php +++ b/layouts/joomla/form/field/range.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/form/field/subform/default.php b/layouts/joomla/form/field/subform/default.php index 5a41a6b5d3058..65e9687693f2a 100644 --- a/layouts/joomla/form/field/subform/default.php +++ b/layouts/joomla/form/field/subform/default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/form/field/subform/repeatable-table.php b/layouts/joomla/form/field/subform/repeatable-table.php index 0439a08495191..46d23df5b47b5 100644 --- a/layouts/joomla/form/field/subform/repeatable-table.php +++ b/layouts/joomla/form/field/subform/repeatable-table.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/form/field/subform/repeatable-table/section-byfieldsets.php b/layouts/joomla/form/field/subform/repeatable-table/section-byfieldsets.php index d56c1ef436c1f..bed322e08af35 100644 --- a/layouts/joomla/form/field/subform/repeatable-table/section-byfieldsets.php +++ b/layouts/joomla/form/field/subform/repeatable-table/section-byfieldsets.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/form/field/subform/repeatable-table/section.php b/layouts/joomla/form/field/subform/repeatable-table/section.php index 7fb39306533f2..a6279d7c15674 100644 --- a/layouts/joomla/form/field/subform/repeatable-table/section.php +++ b/layouts/joomla/form/field/subform/repeatable-table/section.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/form/field/subform/repeatable.php b/layouts/joomla/form/field/subform/repeatable.php index b8da5518d5a39..92ee55156b8a2 100644 --- a/layouts/joomla/form/field/subform/repeatable.php +++ b/layouts/joomla/form/field/subform/repeatable.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/form/field/subform/repeatable/section-byfieldsets.php b/layouts/joomla/form/field/subform/repeatable/section-byfieldsets.php index 839ea86613a82..a80f7b37ebaa9 100644 --- a/layouts/joomla/form/field/subform/repeatable/section-byfieldsets.php +++ b/layouts/joomla/form/field/subform/repeatable/section-byfieldsets.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/form/field/subform/repeatable/section.php b/layouts/joomla/form/field/subform/repeatable/section.php index 6c098fe127ff1..02f85c7be9bce 100644 --- a/layouts/joomla/form/field/subform/repeatable/section.php +++ b/layouts/joomla/form/field/subform/repeatable/section.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/form/field/tel.php b/layouts/joomla/form/field/tel.php index b11f5632bffd6..1edc4577c3f9c 100644 --- a/layouts/joomla/form/field/tel.php +++ b/layouts/joomla/form/field/tel.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/form/field/text.php b/layouts/joomla/form/field/text.php index ee96dc4be1a6c..b78eef32b1497 100644 --- a/layouts/joomla/form/field/text.php +++ b/layouts/joomla/form/field/text.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/form/field/textarea.php b/layouts/joomla/form/field/textarea.php index 1fe5648fe8fb3..62d4bb1678379 100644 --- a/layouts/joomla/form/field/textarea.php +++ b/layouts/joomla/form/field/textarea.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/form/field/url.php b/layouts/joomla/form/field/url.php index ed3b9804b6676..1538f99889f06 100644 --- a/layouts/joomla/form/field/url.php +++ b/layouts/joomla/form/field/url.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/form/field/user.php b/layouts/joomla/form/field/user.php index d7618529d777a..29b0d009c18a0 100644 --- a/layouts/joomla/form/field/user.php +++ b/layouts/joomla/form/field/user.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/form/renderfield.php b/layouts/joomla/form/renderfield.php index c17bb9b33f15b..cf2c1dc1e54cd 100644 --- a/layouts/joomla/form/renderfield.php +++ b/layouts/joomla/form/renderfield.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/form/renderlabel.php b/layouts/joomla/form/renderlabel.php index 05ee30100d2cf..da8f63669ebda 100644 --- a/layouts/joomla/form/renderlabel.php +++ b/layouts/joomla/form/renderlabel.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/html/batch/access.php b/layouts/joomla/html/batch/access.php index a18b8486267fe..40df5ddfd59c8 100644 --- a/layouts/joomla/html/batch/access.php +++ b/layouts/joomla/html/batch/access.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/html/batch/item.php b/layouts/joomla/html/batch/item.php index f33f480e8121a..b08a0499d32f5 100644 --- a/layouts/joomla/html/batch/item.php +++ b/layouts/joomla/html/batch/item.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/html/batch/language.php b/layouts/joomla/html/batch/language.php index 25d0701f7d0e8..2867288af1894 100644 --- a/layouts/joomla/html/batch/language.php +++ b/layouts/joomla/html/batch/language.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/html/batch/tag.php b/layouts/joomla/html/batch/tag.php index 3365b60221595..1cdfc167e7ab8 100644 --- a/layouts/joomla/html/batch/tag.php +++ b/layouts/joomla/html/batch/tag.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/html/batch/user.php b/layouts/joomla/html/batch/user.php index 104833c389b70..c7fa17cff5f85 100644 --- a/layouts/joomla/html/batch/user.php +++ b/layouts/joomla/html/batch/user.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/html/sortablelist.php b/layouts/joomla/html/sortablelist.php new file mode 100644 index 0000000000000..bfdbbe2416691 --- /dev/null +++ b/layouts/joomla/html/sortablelist.php @@ -0,0 +1,64 @@ + 'auto', 'relative' => true)); +JHtml::_('stylesheet', 'jui/sortablelist.css', array('version' => 'auto', 'relative' => true)); + +// Attach sortable to document +JFactory::getDocument()->addScriptDeclaration( + " + jQuery(document).ready(function ($){ + var sortableList = new $.JSortableList('#" + . $tableId . " tbody','" . $formId . "','" . $sortDir . "' , '" . $saveOrderingUrl . "','','" . $nestedList . "'); + }); + " +); + +if ($proceedSaveOrderButton) +{ + JFactory::getDocument()->addScriptDeclaration( + " + jQuery(document).ready(function ($){ + var saveOrderButton = $('.saveorder'); + saveOrderButton.css({'opacity':'0.2', 'cursor':'default'}).attr('onclick','return false;'); + var oldOrderingValue = ''; + $('.text-area-order').focus(function () + { + oldOrderingValue = $(this).attr('value'); + }) + .keyup(function (){ + var newOrderingValue = $(this).attr('value'); + if (oldOrderingValue != newOrderingValue) + { + saveOrderButton.css({'opacity':'1', 'cursor':'pointer'}).removeAttr('onclick') + } + }); + }); + " + ); +} diff --git a/layouts/joomla/html/tag.php b/layouts/joomla/html/tag.php new file mode 100644 index 0000000000000..e5c1ac45a7a9b --- /dev/null +++ b/layouts/joomla/html/tag.php @@ -0,0 +1,100 @@ + $selector, + 'type' => 'GET', + 'url' => JUri::root() . 'index.php?option=com_tags&task=tags.searchAjax', + 'dataType' => 'json', + 'jsonTermKey' => 'like', + 'minTermLength' => $minTermLength + ) +); + +JHtml::_('formbehavior.ajaxchosen', $chosenAjaxSettings); + +// Allow custom values ? +if ($allowCustom) +{ + JFactory::getDocument()->addScriptDeclaration( + " + jQuery(document).ready(function ($) { + + var customTagPrefix = '#new#'; + + // Method to add tags pressing enter + $('" . $selector . "_chzn input').keyup(function(event) { + + // Tag is greater than the minimum required chars and enter pressed + if (this.value && this.value.length >= " . $minTermLength . " && (event.which === 13 || event.which === 188)) { + + // Search an highlighted result + var highlighted = $('" . $selector . "_chzn').find('li.active-result.highlighted').first(); + + // Add the highlighted option + if (event.which === 13 && highlighted.text() !== '') + { + // Extra check. If we have added a custom tag with this text remove it + var customOptionValue = customTagPrefix + highlighted.text(); + $('" . $selector . " option').filter(function () { return $(this).val() == customOptionValue; }).remove(); + + // Select the highlighted result + var tagOption = $('" . $selector . " option').filter(function () { return $(this).html() == highlighted.text(); }); + tagOption.attr('selected', 'selected'); + } + // Add the custom tag option + else + { + var customTag = this.value; + + // Extra check. Search if the custom tag already exists (typed faster than AJAX ready) + var tagOption = $('" . $selector . " option').filter(function () { return $(this).html() == customTag; }); + if (tagOption.text() !== '') + { + tagOption.attr('selected', 'selected'); + } + else + { + var option = $('